Refactor: tools: Strip rest of trailing whitespace in load_env_vars()

By stripping the rest of the trailing whitespace after stripping the
comment, we eliminate the need to null-terminate explictly. If the value
is valid (not followed by any garbage), then end already points to a
terminating null byte after stripping the comment and remaining
whitespace.

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/execd/remoted_pidone.c

@@ -109,7 +109,6 @@ load_env_vars(void)
         char *name = NULL;
         char *end = NULL;
         char *value = NULL;
-        char *value_end = NULL;
         char *quote = NULL;
         char *comment = NULL;
 
@@ -142,7 +141,7 @@ load_env_vars(void)
                 // Matching closing quote wasn't found
                 goto cleanup_loop;
             }
-            // Null-terminate value, and advance beyond close quote
+            // Discard closing quote and advance to check for trailing garbage
             *end++ = '\0';
 
         } else {
@@ -153,36 +152,28 @@ load_env_vars(void)
                    && (*end != '\0')) {
                 end++;
             }
-            // Do NOT null-terminate value (yet)
         }
 
         /* We have a valid name and value, and end is now the character after
          * the closing quote or the first whitespace after the unquoted value.
          * Make sure the rest of the line, if any, is just optional whitespace
          * followed by a comment.
          */
-        value_end = end;
 
         // Strip trailing comment beginning with '#'
         comment = strchr(end, '#');
         if (comment != NULL) {
             *comment = '\0';
         }
 
-        while (isspace(*end)) {
-            end++;
-        }
+        // Strip any remaining trailing whitespace from value
+        g_strchomp(end);
 
         if (*end != '\0') {
             // Found garbage after value
             goto cleanup_loop;
         }
 
-        if (quote == NULL) {
-            // Now we can null-terminate an unquoted value
-            *value_end = '\0';
-        }
-
         // Don't overwrite (bundle options take precedence)
         setenv(name, value, 0);