X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-fragment.c;h=47cfcd676c45a391fce4b1c678bebe44b2541ffc;hp=1a6ae98e370e98c2b991005ceb7303c4fa5eb172;hb=6f5e3f352778090be1e87cda0b1ada7fdaacc334;hpb=108736d0d34d7b74a61a6ac7b99d4d4fec81ce09 diff --git a/load-fragment.c b/load-fragment.c index 1a6ae98e3..47cfcd676 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -37,6 +37,33 @@ #include "securebits.h" #include "missing.h" +#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, unsigned line, @@ -56,6 +83,15 @@ static int config_parse_deps( assert(lvalue); assert(rvalue); + if (UNIT_VTABLE(u)->refuse_requires && + (d == UNIT_REQUIRES || + d == UNIT_SOFT_REQUIRES || + d == UNIT_REQUISITE || + d == UNIT_SOFT_REQUISITE)) { + log_error("[%s:%u] Dependency of type %s not acceptable for this unit type.", filename, line, lvalue); + return -EBADMSG; + } + FOREACH_WORD(w, l, rvalue, state) { char *t; int r; @@ -392,59 +428,8 @@ static int config_parse_usec( return 0; } -static int config_parse_service_type( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - Service *s = data; - ServiceType x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = service_type_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse service type: %s", filename, line, rvalue); - return -EBADMSG; - } - - s->type = x; - - return 0; -} - -static int config_parse_service_restart( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - Service *s = data; - ServiceRestart x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = service_restart_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse service restart specifier: %s", filename, line, rvalue); - return -EBADMSG; - } - - s->restart = x; - - 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 int config_parse_bindtodevice( const char *filename, @@ -475,57 +460,8 @@ static int config_parse_bindtodevice( return 0; } -static int config_parse_output( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - ExecOutput *o = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = exec_output_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse output specifier: %s", filename, line, rvalue); - return -EBADMSG; - } - - *o = x; - - return 0; -} - -static int config_parse_input( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - ExecInput *i = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = exec_input_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse input specifier: %s", filename, line, rvalue); - return -EBADMSG; - } - - *i = x; - - 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 int config_parse_facility( const char *filename, @@ -544,13 +480,10 @@ static int config_parse_facility( assert(rvalue); assert(data); - if ((x = log_facility_from_string(rvalue)) < 0) - - /* Second try, let's see if this is a number. */ - if (safe_atoi(rvalue, &x) < 0 || !log_facility_to_string(x)) { - log_error("[%s:%u] Failed to parse log facility: %s", filename, line, rvalue); - return -EBADMSG; - } + if ((x = log_facility_from_string(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse log facility: %s", filename, line, rvalue); + return -EBADMSG; + } *o = LOG_MAKEPRI(x, LOG_PRI(*o)); @@ -574,13 +507,10 @@ static int config_parse_level( assert(rvalue); assert(data); - if ((x = log_level_from_string(rvalue)) < 0) - - /* Second try, let's see if this is a number. */ - if (safe_atoi(rvalue, &x) < 0 || !log_level_to_string(x)) { - log_error("[%s:%u] Failed to parse log level: %s", filename, line, rvalue); - return -EBADMSG; - } + if ((x = log_level_from_string(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse log level: %s", filename, line, rvalue); + return -EBADMSG; + } *o = LOG_MAKEPRI(LOG_FAC(*o), x); return 0; @@ -603,13 +533,10 @@ static int config_parse_io_class( assert(rvalue); assert(data); - if ((x = ioprio_class_from_string(rvalue)) < 0) - - /* Second try, let's see if this is a number. */ - if (safe_atoi(rvalue, &x) < 0 || !ioprio_class_to_string(x)) { - log_error("[%s:%u] Failed to parse IO scheduling class: %s", filename, line, rvalue); - return -EBADMSG; - } + if ((x = ioprio_class_from_string(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse IO scheduling class: %s", filename, line, rvalue); + return -EBADMSG; + } c->ioprio = IOPRIO_PRIO_VALUE(x, IOPRIO_PRIO_DATA(c->ioprio)); c->ioprio_set = true; @@ -663,13 +590,10 @@ static int config_parse_cpu_sched_policy( assert(rvalue); assert(data); - if ((x = sched_policy_from_string(rvalue)) < 0) - - /* Second try, let's see if this is a number. */ - if (safe_atoi(rvalue, &x) < 0 || !sched_policy_to_string(x)) { - log_error("[%s:%u] Failed to parse CPU scheduling policy: %s", filename, line, rvalue); - return -EBADMSG; - } + if ((x = sched_policy_from_string(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse CPU scheduling policy: %s", filename, line, rvalue); + return -EBADMSG; + } c->cpu_sched_policy = x; c->cpu_sched_set = true; @@ -979,31 +903,7 @@ static int config_parse_sysv_priority( return 0; } -static int config_parse_kill_mode( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - KillMode *m = data, x; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - - if ((x = kill_mode_from_string(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse kill mode specifier: %s", filename, line, rvalue); - return -EBADMSG; - } - - *m = x; - - return 0; -} +DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); #define FOLLOW_MAX 8 @@ -1116,7 +1016,80 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { return 0; } -static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { +static void dump_items(FILE *f, const ConfigItem *items) { + const ConfigItem *i; + const char *prev_section = NULL; + bool not_first = false; + + struct { + ConfigParserCallback callback; + const char *rvalue; + } table[] = { + { config_parse_int, "INTEGER" }, + { config_parse_unsigned, "UNSIGNED" }, + { config_parse_size, "SIZE" }, + { config_parse_bool, "BOOLEAN" }, + { config_parse_string, "STRING" }, + { config_parse_path, "PATH" }, + { config_parse_strv, "STRING [...]" }, + { config_parse_nice, "NICE" }, + { config_parse_oom_adjust, "OOMADJUST" }, + { config_parse_io_class, "IOCLASS" }, + { config_parse_io_priority, "IOPRIORITY" }, + { config_parse_cpu_sched_policy, "CPUSCHEDPOLICY" }, + { config_parse_cpu_sched_prio, "CPUSCHEDPRIO" }, + { config_parse_cpu_affinity, "CPUAFFINITY" }, + { config_parse_mode, "MODE" }, + { config_parse_output, "OUTPUT" }, + { config_parse_input, "INPUT" }, + { config_parse_facility, "FACILITY" }, + { config_parse_level, "LEVEL" }, + { config_parse_capabilities, "CAPABILITIES" }, + { config_parse_secure_bits, "SECUREBITS" }, + { config_parse_bounding_set, "BOUNDINGSET" }, + { config_parse_timer_slack_ns, "TIMERSLACK" }, + { config_parse_limit, "LIMIT" }, + { config_parse_cgroup, "CGROUP [...]" }, + { config_parse_deps, "UNIT [...]" }, + { config_parse_names, "UNIT [...]" }, + { config_parse_exec, "PATH [ARGUMENT [...]]" }, + { config_parse_service_type, "SERVICETYPE" }, + { config_parse_service_restart, "SERVICERESTART" }, + { config_parse_sysv_priority, "SYSVPRIORITY" }, + { config_parse_kill_mode, "KILLMODE" }, + { config_parse_listen, "SOCKET [...]" }, + { config_parse_socket_bind, "SOCKETBIND" }, + { config_parse_bindtodevice, "NETWORKINTERFACE" } + }; + + assert(f); + assert(items); + + for (i = items; i->lvalue; i++) { + unsigned j; + const char *rvalue = "OTHER"; + + if (!streq_ptr(i->section, prev_section)) { + if (!not_first) + not_first = true; + else + fputc('\n', f); + + fprintf(f, "[%s]\n", i->section); + prev_section = i->section; + } + + for (j = 0; j < ELEMENTSOF(table); j++) + if (i->parse == table[j].callback) { + rvalue = table[j].rvalue; + break; + } + + fprintf(f, "%s=%s\n", i->lvalue, rvalue); + } +} + +static int load_from_path(Unit *u, const char *path) { static const char* const section_table[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = "Service", @@ -1145,8 +1118,10 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "CPUAffinity", config_parse_cpu_affinity, &(context), section }, \ { "UMask", config_parse_mode, &(context).umask, section }, \ { "Environment", config_parse_strv, &(context).environment, section }, \ - { "Output", config_parse_output, &(context).output, section }, \ - { "Input", config_parse_input, &(context).input, section }, \ + { "StandardInput", config_parse_input, &(context).std_input, section }, \ + { "StandardOutput", config_parse_output, &(context).std_output, section }, \ + { "StandardError", config_parse_output, &(context).std_output, section }, \ + { "TTYPath", config_parse_path, &(context).tty_path, section }, \ { "SyslogIdentifier", config_parse_string, &(context).syslog_identifier, section }, \ { "SyslogFacility", config_parse_facility, &(context).syslog_priority, section }, \ { "SyslogLevel", config_parse_level, &(context).syslog_priority, section }, \ @@ -1170,8 +1145,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "LimitNICE", config_parse_limit, &(context).rlimit[RLIMIT_NICE], section }, \ { "LimitRTPRIO", config_parse_limit, &(context).rlimit[RLIMIT_RTPRIO], section }, \ { "LimitRTTIME", config_parse_limit, &(context).rlimit[RLIMIT_RTTIME], section }, \ - { "ControlGroup", config_parse_cgroup, u, section }, \ - { "NewSession", config_parse_bool, &(context).new_session, section } + { "ControlGroup", config_parse_cgroup, u, section } const ConfigItem items[] = { { "Names", config_parse_names, u, "Meta" }, @@ -1196,8 +1170,8 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "ExecStopPost", config_parse_exec, u->service.exec_command+SERVICE_EXEC_STOP_POST, "Service" }, { "RestartSec", config_parse_usec, &u->service.restart_usec, "Service" }, { "TimeoutSec", config_parse_usec, &u->service.timeout_usec, "Service" }, - { "Type", config_parse_service_type, &u->service, "Service" }, - { "Restart", config_parse_service_restart, &u->service, "Service" }, + { "Type", config_parse_service_type, &u->service.type, "Service" }, + { "Restart", config_parse_service_restart, &u->service.restart, "Service" }, { "PermissionsStartOnly", config_parse_bool, &u->service.permissions_start_only, "Service" }, { "RootDirectoryStartOnly", config_parse_bool, &u->service.root_directory_start_only, "Service" }, { "ValidNoProcess", config_parse_bool, &u->service.valid_no_process, "Service" }, @@ -1223,7 +1197,13 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "KillMode", config_parse_kill_mode, &u->socket.kill_mode, "Socket" }, EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"), - EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"), + { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" }, + { "Where", config_parse_path, &u->mount.where, "Mount" }, + { "Options", config_parse_string, &u->mount.parameters_fragment.options, "Mount" }, + { "Type", config_parse_string, &u->mount.parameters_fragment.fstype, "Mount" }, + { "TimeoutSec", config_parse_usec, &u->mount.timeout_usec, "Mount" }, + { "KillMode", config_parse_kill_mode, &u->mount.kill_mode, "Mount" }, + EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"), { NULL, NULL, NULL, NULL } }; @@ -1238,8 +1218,14 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { char *filename = NULL, *id = NULL; Unit *merged; + if (!u) { + /* Dirty dirty hack. */ + dump_items((FILE*) path, items); + return 0; + } + assert(u); - assert(new_state); + assert(path); sections[0] = "Meta"; sections[1] = section_table[u->meta.type]; @@ -1306,7 +1292,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { goto finish; if (merged != u) { - *new_state = UNIT_MERGED; + u->meta.load_state = UNIT_MERGED; r = 0; goto finish; } @@ -1319,7 +1305,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { u->meta.fragment_path = filename; filename = NULL; - *new_state = UNIT_LOADED; + u->meta.load_state = UNIT_LOADED; r = 0; finish: @@ -1335,16 +1321,14 @@ finish: return r; } -int unit_load_fragment(Unit *u, UnitLoadState *new_state) { +int unit_load_fragment(Unit *u) { int r; assert(u); - assert(new_state); - assert(*new_state == UNIT_STUB); if (u->meta.fragment_path) { - if ((r = load_from_path(u, u->meta.fragment_path, new_state)) < 0) + if ((r = load_from_path(u, u->meta.fragment_path)) < 0) return r; } else { @@ -1353,23 +1337,29 @@ int unit_load_fragment(Unit *u, UnitLoadState *new_state) { /* Try to find the unit under its id */ if ((t = unit_id(u))) - if ((r = load_from_path(u, t, new_state)) < 0) + if ((r = load_from_path(u, t)) < 0) return r; /* Try to find an alias we can load this with */ - if (*new_state == UNIT_STUB) + if (u->meta.load_state == UNIT_STUB) SET_FOREACH(t, u->meta.names, i) { if (unit_id(u) == t) continue; - if ((r = load_from_path(u, t, new_state)) < 0) + if ((r = load_from_path(u, t)) < 0) return r; - if (*new_state != UNIT_STUB) + if (u->meta.load_state != UNIT_STUB) break; } } return 0; } + +void unit_dump_config_items(FILE *f) { + /* OK, this wins a prize for extreme ugliness. */ + + load_from_path(NULL, (const void*) f); +}