X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fload-fragment.c;h=d474c9a88c9d529a2f9649a20c9a440d53589aa9;hp=a5ea0e41b09cd8ab857384907c600b951bedf432;hb=398ef8ba0266cca453d90a90b3a2aa1caa44189f;hpb=82c121a4754a9d405b07c75796e329942af2ccc5 diff --git a/src/load-fragment.c b/src/load-fragment.c index a5ea0e41b..d474c9a88 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -39,36 +39,9 @@ #include "securebits.h" #include "missing.h" #include "unit-name.h" +#include "bus-errors.h" #define COMMENTS "#;\n" -#define LINE_MAX 4096 - -#define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \ - static int function( \ - const char *filename, \ - unsigned line, \ - const char *section, \ - const char *lvalue, \ - const char *rvalue, \ - void *data, \ - void *userdata) { \ - \ - type *i = data, x; \ - \ - assert(filename); \ - assert(lvalue); \ - assert(rvalue); \ - assert(data); \ - \ - if ((x = name##_from_string(rvalue)) < 0) { \ - log_error("[%s:%u] " msg ": %s", filename, line, rvalue); \ - return -EBADMSG; \ - } \ - \ - *i = x; \ - \ - return 0; \ - } static int config_parse_deps( const char *filename, @@ -89,7 +62,7 @@ static int config_parse_deps( assert(lvalue); assert(rvalue); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t, *k; int r; @@ -131,7 +104,7 @@ static int config_parse_names( assert(rvalue); assert(data); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t, *k; int r; @@ -392,73 +365,94 @@ static int config_parse_exec( void *data, void *userdata) { - ExecCommand **e = data, *nce = NULL; - char **n; - char *w; + ExecCommand **e = data, *nce; + char *path, **n; unsigned k; - size_t l; - char *state, *path = NULL; - bool honour_argv0, write_to_path; assert(filename); assert(lvalue); assert(rvalue); - assert(data); + assert(e); /* We accept an absolute path as first argument, or * alternatively an absolute prefixed with @ to allow * overriding of argv[0]. */ - honour_argv0 = rvalue[0] == '@'; + for (;;) { + char *w; + size_t l; + char *state; + bool honour_argv0, write_to_path; - if (rvalue[honour_argv0 ? 1 : 0] != '/') { - log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue); - return -EINVAL; - } + path = NULL; + nce = NULL; + n = NULL; - k = 0; - FOREACH_WORD_QUOTED(w, l, rvalue, state) - k++; + rvalue += strspn(rvalue, WHITESPACE); - if (!(n = new(char*, k + (honour_argv0 ? 0 : 1)))) - return -ENOMEM; + if (rvalue[0] == 0) + break; - k = 0; - write_to_path = honour_argv0; - FOREACH_WORD_QUOTED(w, l, rvalue, state) { - if (write_to_path) { - if (!(path = strndup(w+1, l-1))) - goto fail; - write_to_path = false; - } else { - if (!(n[k++] = strndup(w, l))) - goto fail; + honour_argv0 = rvalue[0] == '@'; + + if (rvalue[honour_argv0 ? 1 : 0] != '/') { + log_error("[%s:%u] Invalid executable path in command line: %s", filename, line, rvalue); + return -EINVAL; } - } - n[k] = NULL; + k = 0; + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + if (strncmp(w, ";", l) == 0) + break; - if (!n[0]) { - log_error("[%s:%u] Invalid command line: %s", filename, line, rvalue); - strv_free(n); - return -EINVAL; - } + k++; + } - if (!path) - if (!(path = strdup(n[0]))) - goto fail; + if (!(n = new(char*, k + (honour_argv0 ? 0 : 1)))) + return -ENOMEM; + + k = 0; + write_to_path = honour_argv0; + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + if (strncmp(w, ";", l) == 0) + break; - assert(path_is_absolute(path)); + if (write_to_path) { + if (!(path = cunescape_length(w+1, l-1))) + goto fail; + write_to_path = false; + } else { + if (!(n[k++] = cunescape_length(w, l))) + goto fail; + } + } - if (!(nce = new0(ExecCommand, 1))) - goto fail; + n[k] = NULL; - nce->argv = n; - nce->path = path; + if (!n[0]) { + log_error("[%s:%u] Invalid command line: %s", filename, line, rvalue); + strv_free(n); + return -EINVAL; + } - path_kill_slashes(nce->path); + if (!path) + if (!(path = strdup(n[0]))) + goto fail; - exec_command_append_list(e, nce); + assert(path_is_absolute(path)); + + if (!(nce = new0(ExecCommand, 1))) + goto fail; + + nce->argv = n; + nce->path = path; + + path_kill_slashes(nce->path); + + exec_command_append_list(e, nce); + + rvalue = state; + } return 0; @@ -496,8 +490,8 @@ static int config_parse_usec( return 0; } -DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type"); -DEFINE_CONFIG_PARSE_ENUM(config_parse_service_restart, service_restart, ServiceRestart, "Failed to parse service restart specifier"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_service_restart, service_restart, ServiceRestart, "Failed to parse service restart specifier"); static int config_parse_bindtodevice( const char *filename, @@ -528,8 +522,8 @@ static int config_parse_bindtodevice( return 0; } -DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier"); -DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_output, exec_output, ExecOutput, "Failed to parse output specifier"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_input, exec_input, ExecInput, "Failed to parse input specifier"); static int config_parse_facility( const char *filename, @@ -717,7 +711,7 @@ static int config_parse_cpu_affinity( assert(rvalue); assert(data); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t; int r; unsigned cpu; @@ -725,13 +719,13 @@ static int config_parse_cpu_affinity( if (!(t = strndup(w, l))) return -ENOMEM; + r = safe_atou(t, &cpu); + free(t); + if (!(c->cpuset)) if (!(c->cpuset = cpu_set_malloc(&c->cpuset_ncpus))) return -ENOMEM; - r = safe_atou(t, &cpu); - free(t); - if (r < 0 || cpu >= c->cpuset_ncpus) { log_error("[%s:%u] Failed to parse CPU affinity: %s", filename, line, rvalue); return -EBADMSG; @@ -794,7 +788,7 @@ static int config_parse_secure_bits( assert(rvalue); assert(data); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { if (first_word(w, "keep-caps")) c->secure_bits |= SECURE_KEEP_CAPS; else if (first_word(w, "keep-caps-locked")) @@ -835,7 +829,7 @@ static int config_parse_bounding_set( assert(rvalue); assert(data); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t; int r; cap_value_t cap; @@ -857,7 +851,7 @@ static int config_parse_bounding_set( return 0; } -static int config_parse_timer_slack_ns( +static int config_parse_timer_slack_nsec( const char *filename, unsigned line, const char *section, @@ -880,7 +874,7 @@ static int config_parse_timer_slack_ns( return r; } - c->timer_slack_ns = u; + c->timer_slack_nsec = u; return 0; } @@ -930,11 +924,11 @@ static int config_parse_cgroup( size_t l; char *state; - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t; int r; - if (!(t = strndup(w, l))) + if (!(t = cunescape_length(w, l))) return -ENOMEM; r = unit_add_cgroup_from_text(u, t); @@ -973,7 +967,7 @@ static int config_parse_sysv_priority( return 0; } -DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); static int config_parse_mount_flags( const char *filename, @@ -995,7 +989,7 @@ static int config_parse_mount_flags( assert(rvalue); assert(data); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { if (strncmp(w, "shared", l) == 0) flags |= MS_SHARED; else if (strncmp(w, "slave", l) == 0) @@ -1064,14 +1058,23 @@ static int config_parse_timer_unit( Timer *t = data; int r; + DBusError error; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + dbus_error_init(&error); if (endswith(rvalue, ".timer")) { log_error("[%s:%u] Unit cannot be of type timer: %s", filename, line, rvalue); return -EINVAL; } - if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &t->unit)) < 0) { - log_error("[%s:%u] Failed to load unit: %s", filename, line, rvalue); + if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, NULL, &t->unit)) < 0) { + log_error("[%s:%u] Failed to load unit %s: %s", filename, line, rvalue, bus_error(&error, r)); + dbus_error_free(&error); return r; } @@ -1135,14 +1138,23 @@ static int config_parse_path_unit( Path *t = data; int r; + DBusError error; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + dbus_error_init(&error); if (endswith(rvalue, ".path")) { log_error("[%s:%u] Unit cannot be of type path: %s", filename, line, rvalue); return -EINVAL; } - if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &t->unit)) < 0) { - log_error("[%s:%u] Failed to load unit: %s", filename, line, rvalue); + if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &error, &t->unit)) < 0) { + log_error("[%s:%u] Failed to load unit %s: %s", filename, line, rvalue, bus_error(&error, r)); + dbus_error_free(&error); return r; } @@ -1234,7 +1246,7 @@ static int config_parse_ip_tos( return 0; } -DEFINE_CONFIG_PARSE_ENUM(config_parse_notify_access, notify_access, NotifyAccess, "Failed to parse notify access specifier"); +static DEFINE_CONFIG_PARSE_ENUM(config_parse_notify_access, notify_access, NotifyAccess, "Failed to parse notify access specifier"); #define FOLLOW_MAX 8 @@ -1373,7 +1385,7 @@ static void dump_items(FILE *f, const ConfigItem *items) { { config_parse_capabilities, "CAPABILITIES" }, { config_parse_secure_bits, "SECUREBITS" }, { config_parse_bounding_set, "BOUNDINGSET" }, - { config_parse_timer_slack_ns, "TIMERSLACK" }, + { config_parse_timer_slack_nsec, "TIMERSLACK" }, { config_parse_limit, "LIMIT" }, { config_parse_cgroup, "CGROUP [...]" }, { config_parse_deps, "UNIT [...]" }, @@ -1464,11 +1476,11 @@ static int load_from_path(Unit *u, const char *path) { { "SyslogIdentifier", config_parse_string_printf, &(context).syslog_identifier, section }, \ { "SyslogFacility", config_parse_facility, &(context).syslog_priority, section }, \ { "SyslogLevel", config_parse_level, &(context).syslog_priority, section }, \ - { "SyslogNoPrefix", config_parse_bool, &(context).syslog_no_prefix, section }, \ + { "SyslogLevelPrefix", config_parse_bool, &(context).syslog_level_prefix, section }, \ { "Capabilities", config_parse_capabilities, &(context), section }, \ { "SecureBits", config_parse_secure_bits, &(context), section }, \ { "CapabilityBoundingSetDrop", config_parse_bounding_set, &(context), section }, \ - { "TimerSlackNS", config_parse_timer_slack_ns, &(context), section }, \ + { "TimerSlackNSec", config_parse_timer_slack_nsec,&(context), section }, \ { "LimitCPU", config_parse_limit, &(context).rlimit[RLIMIT_CPU], section }, \ { "LimitFSIZE", config_parse_limit, &(context).rlimit[RLIMIT_FSIZE], section }, \ { "LimitDATA", config_parse_limit, &(context).rlimit[RLIMIT_DATA], section }, \ @@ -1574,11 +1586,11 @@ static int load_from_path(Unit *u, const char *path) { { "What", config_parse_path, &u->swap.parameters_fragment.what, "Swap" }, { "Priority", config_parse_int, &u->swap.parameters_fragment.priority, "Swap" }, - { "OnActive", config_parse_timer, &u->timer, "Timer" }, - { "OnBoot", config_parse_timer, &u->timer, "Timer" }, - { "OnStartup", config_parse_timer, &u->timer, "Timer" }, - { "OnUnitActive", config_parse_timer, &u->timer, "Timer" }, - { "OnUnitInactive", config_parse_timer, &u->timer, "Timer" }, + { "OnActiveSec", config_parse_timer, &u->timer, "Timer" }, + { "OnBootSec", config_parse_timer, &u->timer, "Timer" }, + { "OnStartupSec", config_parse_timer, &u->timer, "Timer" }, + { "OnUnitActiveSec", config_parse_timer, &u->timer, "Timer" }, + { "OnUnitInactiveSec", config_parse_timer, &u->timer, "Timer" }, { "Unit", config_parse_timer_unit, &u->timer, "Timer" }, { "PathExists", config_parse_path_spec, &u->path, "Path" },