X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftrackfds.h;h=243e8e0d62d33d6f563d525c4f892a92a99ea25d;hb=291a1432675964b3f9d4169850ce9d5addbba587;hp=30693f47d1a07888bb578c665227f2ae3afc36d6;hpb=0d7f3068981f2b08e583cec21d9069e97c73addd;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/trackfds.h b/src/trackfds.h
index 30693f4..243e8e0 100644
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -50,6 +50,36 @@ static void tracked_fds_debug(void) {
 }
 #endif
 
+/* Check if filename occurs in the comma-separated list ignore. */
+static int is_program_ignored(char const *filename, char const *ignore) {
+    size_t length;
+    size_t filename_length = strlen(filename);
+
+#ifdef DEBUG
+    debug("  is_program_ignored(\"%s\", \"%s\")\n", filename, ignore);
+#endif
+
+    for (; *ignore; ignore += length) {
+        while (*ignore == ',') {
+            ignore++;
+        }
+
+        length = strcspn(ignore, ",");
+        if (length == 0) {
+            break;
+        }
+
+        if (length != filename_length) {
+            continue;
+        }
+        if (!strncmp(filename, ignore, length)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 static int init_tracked_fds_list(size_t count) {
     assert(count > 0);
 
@@ -83,9 +113,27 @@ static void init_from_environment(void) {
 
     int saved_errno = errno;
 
+    assert(!initialized);
+
     initialized = 1;
     tracked_fds_list_count = 0;
 
+    /* Don't color writes to stderr for this binary (and its children) if it's
+     * contained in the comma-separated list in ENV_NAME_IGNORED_BINARIES. */
+    env = getenv(ENV_NAME_IGNORED_BINARIES);
+    if (env) {
+        char path[512];
+
+        /* TODO: Don't require /proc/. */
+        ssize_t written = readlink("/proc/self/exe", path, sizeof(path) - 1);
+        if (written > 0) {
+            path[written] = 0; /* readlink() does not null-terminate! */
+            if (is_program_ignored(path, env)) {
+                return;
+            }
+        }
+    }
+
     /* If ENV_NAME_FORCE_WRITE is set and not empty, allow writes to a non-tty
      * device. Use with care! Mainly used for the test suite. */
     env = getenv(ENV_NAME_FORCE_WRITE);
@@ -137,10 +185,6 @@ static void init_from_environment(void) {
             goto next;
         }
 
-        if (i == count) {
-            break;
-        }
-
         /* Replace ',' to null-terminate number for atoi(). */
         *x = 0;