X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=load-fragment.c;h=0dfb49f1138f81d548f61bfe1336ae3c74ed5982;hb=25e870b5f79f158ba6ac0b715248b0c3d3549325;hp=680f04171f819ae239a60589b09fd9e1f32f5c41;hpb=15ae422b7471cf6f41ccf450243d8afd8ea0a054;p=elogind.git

diff --git a/load-fragment.c b/load-fragment.c
index 680f04171..0dfb49f11 100644
--- a/load-fragment.c
+++ b/load-fragment.c
@@ -28,6 +28,7 @@
 #include <sched.h>
 #include <sys/prctl.h>
 #include <sys/mount.h>
+#include <linux/fs.h>
 
 #include "unit.h"
 #include "strv.h"
@@ -150,6 +151,38 @@ static int config_parse_names(
         return 0;
 }
 
+static int config_parse_description(
+                const char *filename,
+                unsigned line,
+                const char *section,
+                const char *lvalue,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        Unit *u = userdata;
+        char *k;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (!(k = unit_full_printf(u, rvalue)))
+                return -ENOMEM;
+
+        free(u->meta.description);
+
+        if (*k)
+                u->meta.description = k;
+        else {
+                free(k);
+                u->meta.description = NULL;
+        }
+
+        return 0;
+}
+
 static int config_parse_listen(
                 const char *filename,
                 unsigned line,
@@ -411,7 +444,6 @@ static int config_parse_usec(
                 void *userdata) {
 
         usec_t *usec = data;
-        unsigned long long u;
         int r;
 
         assert(filename);
@@ -419,17 +451,11 @@ static int config_parse_usec(
         assert(rvalue);
         assert(data);
 
-        if ((r = safe_atollu(rvalue, &u)) < 0) {
+        if ((r = parse_usec(rvalue, usec)) < 0) {
                 log_error("[%s:%u] Failed to parse time value: %s", filename, line, rvalue);
                 return r;
         }
 
-        /* We actually assume the user configures seconds. Later on we
-         * might choose to support suffixes for time values, to
-         * configure bigger or smaller units */
-
-        *usec = u * USEC_PER_SEC;
-
         return 0;
 }
 
@@ -1101,7 +1127,11 @@ static void dump_items(FILE *f, const ConfigItem *items) {
                 { config_parse_kill_mode,        "KILLMODE" },
                 { config_parse_listen,           "SOCKET [...]" },
                 { config_parse_socket_bind,      "SOCKETBIND" },
-                { config_parse_bindtodevice,     "NETWORKINTERFACE" }
+                { config_parse_bindtodevice,     "NETWORKINTERFACE" },
+                { config_parse_usec,             "SECONDS" },
+                { config_parse_path_strv,        "PATH [...]" },
+                { config_parse_mount_flags,      "MOUNTFLAG [...]" },
+                { config_parse_description,      "DESCRIPTION" },
         };
 
         assert(f);
@@ -1196,7 +1226,7 @@ static int load_from_path(Unit *u, const char *path) {
 
         const ConfigItem items[] = {
                 { "Names",                  config_parse_names,           u,                                               "Unit"    },
-                { "Description",            config_parse_string,          &u->meta.description,                            "Unit"    },
+                { "Description",            config_parse_description,     u,                                               "Unit"    },
                 { "Requires",               config_parse_deps,            UINT_TO_PTR(UNIT_REQUIRES),                      "Unit"    },
                 { "RequiresOverridable",    config_parse_deps,            UINT_TO_PTR(UNIT_REQUIRES_OVERRIDABLE),          "Unit"    },
                 { "Requisite",              config_parse_deps,            UINT_TO_PTR(UNIT_REQUISITE),                     "Unit"    },