Refactor: remoted: Strip trailing comment in load_env_vars()

We don't want to do this until after parsing the value, because a '#'
character inside a quoted value should be treated as part of the value.

Note that currently if an unquoted value ends in '#' characters, they
are treated as part of the value. I consider this a bug. For example,

name=value###  # comment

would set the "name" environment variable to "value###". For an unquoted
value, I would expect "name" to be set to "value".

For a quoted value, such as

name="value###"  # comment

I would indeed expect "name" to be set to "value###".

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

Author: nrwahl2

daemons/execd/remoted_pidone.c

@@ -111,6 +111,7 @@ load_env_vars(void)
         char *value = NULL;
         char *value_end = NULL;
         char *quote = NULL;
+        char *comment = NULL;
 
         // Strip leading and trailing whitespace
         g_strstrip(line);
@@ -162,11 +163,17 @@ load_env_vars(void)
          */
         value_end = end;
 
+        // Strip trailing comment beginning with '#'
+        comment = strchr(end, '#');
+        if (comment != NULL) {
+            *comment = '\0';
+        }
+
         while (isspace(*end)) {
             end++;
         }
 
-        if ((*end != '\0') && (*end != '#')) {
+        if (*end != '\0') {
             // Found garbage after value
             goto cleanup_loop;
         }