X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fload-fragment.c;h=c3909e9563432830e284c81acc33ccc13307f6db;hp=7a51bf81c811b46000b111515b49de5703cc4f2e;hb=61e5d8ed877b6389ea94c05e0e2f646f8b66d8bd;hpb=ddb26e1818f67c2b97313d2ccf7468b2240ec086 diff --git a/src/load-fragment.c b/src/load-fragment.c index 7a51bf81c..c3909e956 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -41,34 +41,6 @@ #include "unit-name.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 +61,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 +103,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; @@ -154,7 +126,7 @@ static int config_parse_names( return 0; } -static int config_parse_description( +static int config_parse_string_printf( const char *filename, unsigned line, const char *section, @@ -164,23 +136,24 @@ static int config_parse_description( void *userdata) { Unit *u = userdata; + char **s = data; char *k; assert(filename); assert(lvalue); assert(rvalue); - assert(data); + assert(s); + assert(u); if (!(k = unit_full_printf(u, rvalue))) return -ENOMEM; - free(u->meta.description); - + free(*s); if (*k) - u->meta.description = k; + *s = k; else { free(k); - u->meta.description = NULL; + *s = NULL; } return 0; @@ -391,73 +364,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; - assert(path_is_absolute(path)); + k = 0; + write_to_path = honour_argv0; + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + if (strncmp(w, ";", l) == 0) + break; - if (!(nce = new0(ExecCommand, 1))) - goto fail; + 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; + } + } - nce->argv = n; - nce->path = path; + n[k] = NULL; - path_kill_slashes(nce->path); + if (!n[0]) { + log_error("[%s:%u] Invalid command line: %s", filename, line, rvalue); + strv_free(n); + return -EINVAL; + } - exec_command_append_list(e, nce); + if (!path) + if (!(path = strdup(n[0]))) + goto fail; + + 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; @@ -495,8 +489,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, @@ -527,8 +521,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, @@ -716,7 +710,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; @@ -727,16 +721,18 @@ static int config_parse_cpu_affinity( r = safe_atou(t, &cpu); free(t); - if (r < 0 || cpu >= CPU_SETSIZE) { + if (!(c->cpuset)) + if (!(c->cpuset = cpu_set_malloc(&c->cpuset_ncpus))) + return -ENOMEM; + + if (r < 0 || cpu >= c->cpuset_ncpus) { log_error("[%s:%u] Failed to parse CPU affinity: %s", filename, line, rvalue); return -EBADMSG; } - CPU_SET(cpu, &c->cpu_affinity); + CPU_SET_S(cpu, CPU_ALLOC_SIZE(c->cpuset_ncpus), c->cpuset); } - c->cpu_affinity_set = true; - return 0; } @@ -791,7 +787,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")) @@ -832,7 +828,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; @@ -854,7 +850,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, @@ -877,7 +873,7 @@ static int config_parse_timer_slack_ns( return r; } - c->timer_slack_ns = u; + c->timer_slack_nsec = u; return 0; } @@ -927,11 +923,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); @@ -970,7 +966,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, @@ -992,7 +988,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) @@ -1204,6 +1200,35 @@ finish: return r; } +static int config_parse_ip_tos( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + int *ip_tos = data, x; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + if ((x = ip_tos_from_string(rvalue)) < 0) + if ((r = safe_atoi(rvalue, &x)) < 0) { + log_error("[%s:%u] Failed to parse IP TOS value: %s", filename, line, rvalue); + return r; + } + + *ip_tos = x; + return 0; +} + +static DEFINE_CONFIG_PARSE_ENUM(config_parse_notify_access, notify_access, NotifyAccess, "Failed to parse notify access specifier"); + #define FOLLOW_MAX 8 static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { @@ -1341,7 +1366,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 [...]" }, @@ -1357,9 +1382,13 @@ static void dump_items(FILE *f, const ConfigItem *items) { { config_parse_usec, "SECONDS" }, { config_parse_path_strv, "PATH [...]" }, { config_parse_mount_flags, "MOUNTFLAG [...]" }, - { config_parse_description, "DESCRIPTION" }, + { config_parse_string_printf, "STRING" }, { config_parse_timer, "TIMER" }, { config_parse_timer_unit, "NAME" }, + { config_parse_path_spec, "PATH" }, + { config_parse_path_unit, "UNIT" }, + { config_parse_notify_access, "ACCESS" }, + { config_parse_ip_tos, "TOS" }, }; assert(f); @@ -1407,8 +1436,8 @@ static int load_from_path(Unit *u, const char *path) { #define EXEC_CONTEXT_CONFIG_ITEMS(context, section) \ { "WorkingDirectory", config_parse_path, &(context).working_directory, section }, \ { "RootDirectory", config_parse_path, &(context).root_directory, section }, \ - { "User", config_parse_string, &(context).user, section }, \ - { "Group", config_parse_string, &(context).group, section }, \ + { "User", config_parse_string_printf, &(context).user, section }, \ + { "Group", config_parse_string_printf, &(context).group, section }, \ { "SupplementaryGroups", config_parse_strv, &(context).supplementary_groups, section }, \ { "Nice", config_parse_nice, &(context), section }, \ { "OOMAdjust", config_parse_oom_adjust, &(context), section }, \ @@ -1425,14 +1454,14 @@ static int load_from_path(Unit *u, const char *path) { { "StandardOutput", config_parse_output, &(context).std_output, section }, \ { "StandardError", config_parse_output, &(context).std_error, section }, \ { "TTYPath", config_parse_path, &(context).tty_path, section }, \ - { "SyslogIdentifier", config_parse_string, &(context).syslog_identifier, section }, \ + { "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 }, \ @@ -1455,12 +1484,12 @@ static int load_from_path(Unit *u, const char *path) { { "InaccessibleDirectories",config_parse_path_strv, &(context).inaccessible_dirs, section }, \ { "PrivateTmp", config_parse_bool, &(context).private_tmp, section }, \ { "MountFlags", config_parse_mount_flags, &(context), section }, \ - { "TCPWrapName", config_parse_string, &(context).tcpwrap_name, section }, \ - { "PAMName", config_parse_string, &(context).pam_name, section } + { "TCPWrapName", config_parse_string_printf, &(context).tcpwrap_name, section }, \ + { "PAMName", config_parse_string_printf, &(context).pam_name, section } const ConfigItem items[] = { { "Names", config_parse_names, u, "Unit" }, - { "Description", config_parse_description, u, "Unit" }, + { "Description", config_parse_string_printf, &u->meta.description, "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" }, @@ -1472,6 +1501,7 @@ static int load_from_path(Unit *u, const char *path) { { "RecursiveStop", config_parse_bool, &u->meta.recursive_stop, "Unit" }, { "StopWhenUnneeded", config_parse_bool, &u->meta.stop_when_unneeded, "Unit" }, { "OnlyByDependency", config_parse_bool, &u->meta.only_by_dependency, "Unit" }, + { "DefaultDependencies", config_parse_bool, &u->meta.default_dependencies, "Unit" }, { "PIDFile", config_parse_path, &u->service.pid_file, "Service" }, { "ExecStartPre", config_parse_exec, u->service.exec_command+SERVICE_EXEC_START_PRE, "Service" }, @@ -1490,7 +1520,8 @@ static int load_from_path(Unit *u, const char *path) { { "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" }, { "KillMode", config_parse_kill_mode, &u->service.kill_mode, "Service" }, { "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" }, - { "BusName", config_parse_string, &u->service.bus_name, "Service" }, + { "BusName", config_parse_string_printf, &u->service.bus_name, "Service" }, + { "NotifyAccess", config_parse_notify_access, &u->service.notify_access, "Service" }, EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"), { "ListenStream", config_parse_listen, &u->socket, "Socket" }, @@ -1509,6 +1540,16 @@ static int load_from_path(Unit *u, const char *path) { { "SocketMode", config_parse_mode, &u->socket.socket_mode, "Socket" }, { "KillMode", config_parse_kill_mode, &u->socket.kill_mode, "Socket" }, { "Accept", config_parse_bool, &u->socket.accept, "Socket" }, + { "MaxConnections", config_parse_unsigned, &u->socket.max_connections, "Socket" }, + { "KeepAlive", config_parse_bool, &u->socket.keep_alive, "Socket" }, + { "Priority", config_parse_int, &u->socket.priority, "Socket" }, + { "ReceiveBuffer", config_parse_size, &u->socket.receive_buffer, "Socket" }, + { "SendBuffer", config_parse_size, &u->socket.send_buffer, "Socket" }, + { "IPTOS", config_parse_ip_tos, &u->socket.ip_tos, "Socket" }, + { "IPTTL", config_parse_int, &u->socket.ip_ttl, "Socket" }, + { "Mark", config_parse_int, &u->socket.mark, "Socket" }, + { "PipeSize", config_parse_size, &u->socket.pipe_size, "Socket" }, + { "FreeBind", config_parse_bool, &u->socket.free_bind, "Socket" }, EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"), { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" }, @@ -1517,18 +1558,20 @@ static int load_from_path(Unit *u, const char *path) { { "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" }, + { "DirectoryMode", config_parse_mode, &u->mount.directory_mode, "Mount" }, EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"), { "Where", config_parse_path, &u->automount.where, "Automount" }, + { "DirectoryMode", config_parse_mode, &u->automount.directory_mode, "Automount" }, { "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" },