Remove legacy printf_verbose()/printf_debug() and others

[babeltrace.git] / common / common.c

diff --git a/common/common.c b/common/common.c
index 975bf6ae068d2f5d7c6a48ca2146c1dd567e9cf0..0a0d15836e329d866c40286ded145f209d671b2e 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "COMMON"
+#include "logging.h"
+
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
@@ -92,18 +95,26 @@ const char *bt_common_get_system_plugin_path(void)
        return SYSTEM_PLUGIN_PATH;
 }
 
+#ifdef __MINGW32__
+BT_HIDDEN
+bool bt_common_is_setuid_setgid(void)
+{
+       return false;
+}
+#else /* __MINGW32__ */
 BT_HIDDEN
 bool bt_common_is_setuid_setgid(void)
 {
        return (geteuid() != getuid() || getegid() != getgid());
 }
+#endif /* __MINGW32__ */
 
 static
 char *bt_secure_getenv(const char *name)
 {
        if (bt_common_is_setuid_setgid()) {
-               printf_error("Disregarding %s environment variable for setuid/setgid binary",
-                       name);
+               BT_LOGD("Disregarding environment variable for setuid/setgid binary: "
+                       "name=\"%s\"", name);
                return NULL;
        }
        return getenv(name);
@@ -142,15 +153,18 @@ char *bt_common_get_home_plugin_path(void)
 {
        char *path = NULL;
        const char *home_dir;
+       size_t length;
 
        home_dir = bt_get_home_dir();
        if (!home_dir) {
                goto end;
        }
 
-       if (strlen(home_dir) + strlen(HOME_PLUGIN_SUBPATH) + 1 >= PATH_MAX) {
-               printf_error("Home directory path is too long: `%s`\n",
-                       home_dir);
+       length = strlen(home_dir) + strlen(HOME_PLUGIN_SUBPATH) + 1;
+
+       if (length >= PATH_MAX) {
+               BT_LOGW("Home directory path is too long: length=%zu",
+                       length);
                goto end;
        }
 
@@ -232,6 +246,7 @@ bool bt_common_colors_supported(void)
        static bool supports_colors = false;
        static bool supports_colors_set = false;
        const char *term;
+       const char *force;
 
        if (supports_colors_set) {
                goto end;
@@ -239,6 +254,12 @@ bool bt_common_colors_supported(void)
 
        supports_colors_set = true;
 
+       force = getenv("BABELTRACE_FORCE_COLORS");
+       if (force && strcmp(force, "1") == 0) {
+               supports_colors = true;
+               goto end;
+       }
+
        term = getenv("TERM");
        if (!term) {
                goto end;
@@ -1148,7 +1169,8 @@ size_t bt_common_get_page_size(void)
 
        page_size = bt_sysconf(_SC_PAGESIZE);
        if (page_size < 0) {
-               printf_error("Cannot get system page size.");
+               BT_LOGF("Cannot get system's page size: ret=%d",
+                       page_size);
                abort();
        }