core/load-fragment: be more precise in error messages

[elogind.git] / src / core / load-fragment.c

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 4dc5c529a2bcca544c3049c9bc2e89a2b7c5a5e6..01f94844a6e434294d0f0661fa3503b67db9c868 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -4,6 +4,7 @@
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
+  Copyright 2012 Holger Hans Peter Freyther
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
@@ -85,7 +86,7 @@ int config_parse_unit_deps(
         assert(rvalue);
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t, *k;
+                char _cleanup_free_ *t = NULL, *k = NULL;
                 int r;
 
                 t = strndup(w, l);
@@ -93,15 +94,13 @@ int config_parse_unit_deps(
                         return -ENOMEM;
 
                 k = unit_name_printf(u, t);
-                free(t);
                 if (!k)
                         return -ENOMEM;
 
                 r = unit_add_dependency_by_name(u, d, k, NULL, true);
                 if (r < 0)
-                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r));
-
-                free(k);
+                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s",
+                                  filename, line, k, strerror(-r));
         }
 
         return 0;
@@ -438,6 +437,7 @@ int config_parse_exec(
         e += ltype;
 
         for (;;) {
+                int i;
                 char *w;
                 size_t l;
                 char *state;
@@ -452,18 +452,21 @@ int config_parse_exec(
                 if (rvalue[0] == 0)
                         break;
 
-                if (rvalue[0] == '-') {
-                        ignore = true;
-                        rvalue ++;
-                }
+                for (i = 0; i < 2; i++) {
+                        if (rvalue[0] == '-' && !ignore) {
+                                ignore = true;
+                                rvalue ++;
+                        }
 
-                if (rvalue[0] == '@') {
-                        honour_argv0 = true;
-                        rvalue ++;
+                        if (rvalue[0] == '@' && !honour_argv0) {
+                                honour_argv0 = true;
+                                rvalue ++;
+                        }
                 }
 
                 if (*rvalue != '/') {
-                        log_error("[%s:%u] Invalid executable path in command line, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Executable path is not absolute, ignoring: %s",
+                                  filename, line, rvalue);
                         return 0;
                 }
 
@@ -685,6 +688,8 @@ int config_parse_exec_cpu_sched_policy(
         }
 
         c->cpu_sched_policy = x;
+        /* Moving to or from real-time policy? We need to adjust the priority */
+        c->cpu_sched_priority = CLAMP(c->cpu_sched_priority, sched_get_priority_min(x), sched_get_priority_max(x));
         c->cpu_sched_set = true;
 
         return 0;
@@ -701,19 +706,28 @@ int config_parse_exec_cpu_sched_prio(
                 void *userdata) {
 
         ExecContext *c = data;
-        int i;
+        int i, min, max;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
         assert(data);
 
-        /* On Linux RR/FIFO have the same range */
-        if (safe_atoi(rvalue, &i) < 0 || i < sched_get_priority_min(SCHED_RR) || i > sched_get_priority_max(SCHED_RR)) {
+        if (safe_atoi(rvalue, &i) < 0) {
                 log_error("[%s:%u] Failed to parse CPU scheduling priority, ignoring: %s", filename, line, rvalue);
                 return 0;
         }
 
+
+        /* On Linux RR/FIFO range from 1 to 99 and OTHER/BATCH may only be 0 */
+        min = sched_get_priority_min(c->cpu_sched_policy);
+        max = sched_get_priority_max(c->cpu_sched_policy);
+
+        if (i < min || i > max) {
+                log_error("[%s:%u] CPU scheduling priority is out of range, ignoring: %s", filename, line, rvalue);
+                return 0;
+        }
+
         c->cpu_sched_priority = i;
         c->cpu_sched_set = true;
 
@@ -741,22 +755,25 @@ int config_parse_exec_cpu_affinity(
         assert(data);
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t;
+                char _cleanup_free_ *t = NULL;
                 int r;
                 unsigned cpu;
 
-                if (!(t = strndup(w, l)))
+                t = strndup(w, l);
+                if (!t)
                         return -ENOMEM;
 
                 r = safe_atou(t, &cpu);
-                free(t);
 
-                if (!(c->cpuset))
-                        if (!(c->cpuset = cpu_set_malloc(&c->cpuset_ncpus)))
+                if (!c->cpuset) {
+                        c->cpuset = cpu_set_malloc(&c->cpuset_ncpus);
+                        if (!c->cpuset)
                                 return -ENOMEM;
+                }
 
                 if (r < 0 || cpu >= c->cpuset_ncpus) {
-                        log_error("[%s:%u] Failed to parse CPU affinity, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Failed to parse CPU affinity %s, ignoring: %s",
+                                  filename, line, t, rvalue);
                         return 0;
                 }
 
@@ -833,7 +850,8 @@ int config_parse_exec_secure_bits(
                 else if (first_word(w, "noroot-locked"))
                         c->secure_bits |= SECURE_NOROOT_LOCKED;
                 else {
-                        log_error("[%s:%u] Failed to parse secure bits, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Failed to parse secure bits, ignoring: %s",
+                                  filename, line, rvalue);
                         return 0;
                 }
         }
@@ -874,7 +892,7 @@ int config_parse_bounding_set(
          * interface. */
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t;
+                char _cleanup_free_ *t = NULL;
                 int r;
                 cap_value_t cap;
 
@@ -883,10 +901,9 @@ int config_parse_bounding_set(
                         return -ENOMEM;
 
                 r = cap_from_name(t, &cap);
-                free(t);
-
                 if (r < 0) {
-                        log_error("[%s:%u] Failed to parse capability bounding set, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Failed to parse capability in bounding set, ignoring: %s",
+                                  filename, line, t);
                         continue;
                 }
 
@@ -952,7 +969,7 @@ int config_parse_unit_cgroup(
         char *state;
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t, *k;
+                char _cleanup_free_ *t = NULL, *k = NULL, *ku = NULL;
                 int r;
 
                 t = strndup(w, l);
@@ -960,22 +977,17 @@ int config_parse_unit_cgroup(
                         return -ENOMEM;
 
                 k = unit_full_printf(u, t);
-                free(t);
-
                 if (!k)
                         return -ENOMEM;
 
-                t = cunescape(k);
-                free(k);
-
-                if (!t)
+                ku = cunescape(k);
+                if (!ku)
                         return -ENOMEM;
 
-                r = unit_add_cgroup_from_text(u, t);
-                free(t);
-
+                r = unit_add_cgroup_from_text(u, ku);
                 if (r < 0) {
-                        log_error("[%s:%u] Failed to parse cgroup value, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Failed to parse cgroup value %s, ignoring: %s",
+                                  filename, line, k, rvalue);
                         return 0;
                 }
         }
@@ -1335,33 +1347,30 @@ int config_parse_service_sockets(
         assert(data);
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t, *k;
+                char _cleanup_free_ *t = NULL, *k = NULL;
 
                 t = strndup(w, l);
                 if (!t)
                         return -ENOMEM;
 
                 k = unit_name_printf(UNIT(s), t);
-                free(t);
-
                 if (!k)
                         return -ENOMEM;
 
                 if (!endswith(k, ".socket")) {
-                        log_error("[%s:%u] Unit must be of type socket, ignoring: %s", filename, line, rvalue);
-                        free(k);
+                        log_error("[%s:%u] Unit must be of type socket, ignoring: %s",
+                                  filename, line, k);
                         continue;
                 }
 
                 r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_WANTS, UNIT_AFTER, k, NULL, true);
                 if (r < 0)
-                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r));
+                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s",
+                                  filename, line, k, strerror(-r));
 
                 r = unit_add_dependency_by_name(UNIT(s), UNIT_TRIGGERED_BY, k, NULL, true);
                 if (r < 0)
                         return r;
-
-                free(k);
         }
 
         return 0;
@@ -2089,17 +2098,17 @@ int config_parse_syscall_filter(
 
         FOREACH_WORD_QUOTED(w, l, rvalue, state) {
                 int id;
-                char *t;
+                char _cleanup_free_ *t = NULL;
 
                 t = strndup(w, l);
                 if (!t)
                         return -ENOMEM;
 
                 id = syscall_from_name(t);
-                free(t);
 
                 if (id < 0)  {
-                        log_error("[%s:%u] Failed to parse syscall, ignoring: %s", filename, line, rvalue);
+                        log_error("[%s:%u] Failed to parse syscall, ignoring: %s",
+                                  filename, line, t);
                         continue;
                 }