parse_env_file() - return empty value strings like FOO="" as NULL value

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 47da11c1b8b0ce3633e352a8ce26be0ee081ec9b..ce8695be25f6c3fad0ee1e2b06028278b93db824 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -602,7 +602,7 @@ int parse_env_file(
                 const char *fname,
                 const char *seperator, ...) {
 
-        int r;
+        int r = 0;
         char *contents, *p;
 
         assert(fname);
@@ -641,8 +641,8 @@ int parse_env_file(
                                 n = strcspn(p, seperator);
 
                                 if (n >= 2 &&
-                                    strchr(QUOTES, v[0]) &&
-                                    v[n-1] == v[0])
+                                    strchr(QUOTES, p[0]) &&
+                                    p[n-1] == p[0])
                                         v = strndup(p+1, n-2);
                                 else
                                         v = strndup(p, n);
@@ -653,10 +653,18 @@ int parse_env_file(
                                         goto fail;
                                 }
 
+                                if (v[0] == '\0') {
+                                        /* return empty value strings as NULL */
+                                        free(v);
+                                        v = NULL;
+                                }
+
                                 free(*value);
                                 *value = v;
 
                                 p += n;
+
+                                r ++;
                                 break;
                         }
                         va_end(ap);
@@ -666,8 +674,6 @@ int parse_env_file(
                         p += strcspn(p, seperator);
         }
 
-        r = 0;
-
 fail:
         free(contents);
         return r;
@@ -2009,23 +2015,29 @@ int read_one_char(FILE *f, char *ret, bool *need_nl) {
 }
 
 int ask(char *ret, const char *replies, const char *text, ...) {
+        bool on_tty;
+
         assert(ret);
         assert(replies);
         assert(text);
 
+        on_tty = isatty(STDOUT_FILENO);
+
         for (;;) {
                 va_list ap;
                 char c;
                 int r;
                 bool need_nl = true;
 
-                fputs("\x1B[1m", stdout);
+                if (on_tty)
+                        fputs("\x1B[1m", stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 
-                fputs("\x1B[0m", stdout);
+                if (on_tty)
+                        fputs("\x1B[0m", stdout);
 
                 fflush(stdout);