Remove duplicate code in init_from_environment().

[coloredstderr/coloredstderr.git] / src / trackfds.h

diff --git a/src/trackfds.h b/src/trackfds.h
index 1eede800ddcd745f7e8eb1a4595157260bf74131..acf7ce336d18dd30d29a661d62fe9bdfbeba917c 100644 (file)
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -51,6 +51,8 @@ static void tracked_fds_debug(void) {
 #endif
 
 static int init_tracked_fds_list(size_t count) {
+    assert(count > 0);
+
     /* Reduce reallocs. */
     count += TRACKFDS_REALLOC_STEP;
 
@@ -95,7 +97,10 @@ static void init_from_environment(void) {
         errno = saved_errno;
         return;
     }
-    /* Environment is read-only. */
+#ifdef DEBUG
+    debug("  getenv(\"%s\"): \"%s\"\n", ENV_NAME_FDS, env);
+#endif
+    /* Environment must be treated read-only. */
     char env_copy[strlen(env) + 1];
     strcpy(env_copy, env);
 
@@ -119,18 +124,21 @@ static void init_from_environment(void) {
         }
         /* ',' at the beginning or double ',' - ignore. */
         if (x == last) {
-            last = x + 1;
-            continue;
+            goto next;
         }
 
         if (i == count) {
             break;
         }
 
+        /* Replace ',' to null-terminate number for atoi(). */
         *x = 0;
 
         int fd = atoi(last);
-        if (fd < TRACKFDS_STATIC_COUNT) {
+        if (fd < 0) {
+            goto next;
+
+        } else if (fd < TRACKFDS_STATIC_COUNT) {
             tracked_fds[fd] = 1;
         } else {
             if (!tracked_fds_list) {
@@ -161,8 +169,10 @@ next:
 }
 
 static char *update_environment_buffer_entry(char *x, int fd) {
+    assert(fd >= 0);
+
     int length = snprintf(x, 10 + 1, "%d", fd);
-    if (length >= 10 + 1) {
+    if (length >= 10 + 1 || length <= 0 /* shouldn't happen */) {
         /* Integer too big to fit the buffer, skip it. */
 #ifdef WARNING
         warning("update_environment_buffer_entry(): truncated fd: %d [%d]\n",
@@ -174,12 +184,14 @@ static char *update_environment_buffer_entry(char *x, int fd) {
     /* Write comma after number. */
     x += length;
     *x++ = ',';
-    /* Make sure the string is always zero terminated. */
+    /* Make sure the string is always null-terminated. */
     *x = 0;
 
     return x;
 }
 static void update_environment_buffer(char *x) {
+    assert(initialized);
+
     size_t i;
     for (i = 0; i < TRACKFDS_STATIC_COUNT; i++) {
         if (tracked_fds[i]) {
@@ -191,6 +203,8 @@ static void update_environment_buffer(char *x) {
     }
 }
 inline static size_t update_environment_buffer_size(void) {
+    assert(initialized);
+
     /* Use the maximum count (TRACKFDS_STATIC_COUNT) of used descriptors
      * because it's simple and small enough not to be a problem.
      *
@@ -217,7 +231,7 @@ static void update_environment(void) {
     update_environment_buffer(env);
 
 #if 0
-    debug("    setenv('%s', '%s', 1)\n", ENV_NAME_FDS, env);
+    debug("    setenv(\"%s\", \"%s\", 1)\n", ENV_NAME_FDS, env);
 #endif
 
     setenv(ENV_NAME_FDS, env, 1 /* overwrite */);
@@ -226,6 +240,8 @@ static void update_environment(void) {
 
 
 static void tracked_fds_add(int fd) {
+    assert(fd >= 0);
+
     if (fd < TRACKFDS_STATIC_COUNT) {
         tracked_fds[fd] = 1;
 #if 0
@@ -266,6 +282,8 @@ static void tracked_fds_add(int fd) {
 #endif
 }
 static int tracked_fds_remove(int fd) {
+    assert(fd >= 0);
+
     if (fd < TRACKFDS_STATIC_COUNT) {
         int old_value = tracked_fds[fd];
         tracked_fds[fd] = 0;
@@ -310,7 +328,9 @@ static int tracked_fds_find_slow(int fd) noinline;
  * they are not called often enough.
  */
 inline static int tracked_fds_find(int fd) always_inline;
-static int tracked_fds_find(int fd) {
+inline static int tracked_fds_find(int fd) {
+    assert(fd >= 0);
+
     if (fd < TRACKFDS_STATIC_COUNT) {
         return tracked_fds[fd];
     }
@@ -318,6 +338,8 @@ static int tracked_fds_find(int fd) {
     return tracked_fds_find_slow(fd);
 }
 static int tracked_fds_find_slow(int fd) {
+    assert(initialized);
+
     if (tracked_fds_list_count == 0) {
         return 0;
     }