Remove duplicate code in init_from_environment().

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

diff --git a/src/trackfds.h b/src/trackfds.h
index 00b3b6e3b55da47e7c66453e609e6b7754a6071d..acf7ce336d18dd30d29a661d62fe9bdfbeba917c 100644 (file)
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -100,7 +100,7 @@ static void init_from_environment(void) {
 #ifdef DEBUG
     debug("  getenv(\"%s\"): \"%s\"\n", ENV_NAME_FDS, env);
 #endif
-    /* Environment is read-only. */
+    /* Environment must be treated read-only. */
     char env_copy[strlen(env) + 1];
     strcpy(env_copy, env);
 
@@ -124,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) {
@@ -181,7 +184,7 @@ 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;