utmp: if we don't have a previous runleve, just store 0

[elogind.git] / conf-parser.c

diff --git a/conf-parser.c b/conf-parser.c
index 8883d9ed6871191633e7dc77580b746b028f7af3..6994211b1095ace6e014320b46971ae1d2a4b6c2 100644 (file)
--- a/conf-parser.c
+++ b/conf-parser.c
@@ -32,7 +32,6 @@
 #include "log.h"
 
 #define COMMENTS "#;\n"
-#define NEWLINES "\n\r"
 #define LINE_MAX 4096
 
 /* Run the user supplied parser for an assignment */
@@ -64,7 +63,10 @@ static int next_assignment(
                 return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
         }
 
-        log_info("[%s:%u] Unknown lvalue '%s' in section '%s'. Ignoring.", filename, line, lvalue, strna(section));
+        /* Warn about unknown non-extension fields. */
+        if (!startswith(lvalue, "X-"))
+                log_info("[%s:%u] Unknown lvalue '%s' in section '%s'. Ignoring.", filename, line, lvalue, strna(section));
+
         return 0;
 }
 
@@ -109,6 +111,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const
                         return -ENOMEM;
 
                 if (sections && !strv_contains((char**) sections, n)) {
+                        log_error("[%s:%u] Unknown section '%s'.", filename, line, n);
                         free(n);
                         return -EBADMSG;
                 }
@@ -326,7 +329,7 @@ int config_parse_path(
         assert(rvalue);
         assert(data);
 
-        if (*rvalue != '/') {
+        if (!path_is_absolute(rvalue)) {
                 log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue);
                 return -EINVAL;
         }
@@ -371,6 +374,8 @@ int config_parse_strv(
         if (*sv)
                 for (k = 0; (*sv)[k]; k++)
                         n[k] = (*sv)[k];
+        else
+                k = 0;
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state)
                 if (!(n[k++] = strndup(w, l)))
@@ -389,3 +394,67 @@ fail:
 
         return -ENOMEM;
 }
+
+int config_parse_path_strv(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        char*** sv = data;
+        char **n;
+        char *w;
+        unsigned k;
+        size_t l;
+        char *state;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        k = strv_length(*sv);
+        FOREACH_WORD_QUOTED(w, l, rvalue, state)
+                k++;
+
+        if (!(n = new(char*, k+1)))
+                return -ENOMEM;
+
+        k = 0;
+        if (*sv)
+                for (; (*sv)[k]; k++)
+                        n[k] = (*sv)[k];
+
+        FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+                if (!(n[k] = strndup(w, l))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                if (!path_is_absolute(n[k])) {
+                        log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue);
+                        r = -EINVAL;
+                        goto fail;
+                }
+
+                k++;
+        }
+
+        n[k] = NULL;
+        free(*sv);
+        *sv = n;
+
+        return 0;
+
+fail:
+        free(n[k]);
+        for (; k > 0; k--)
+                free(n[k-1]);
+        free(n);
+
+        return r;
+}