X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=291a2f4054e1a084242f3ba1d053eecd35f31542;hp=a9c3e21d5120836ea8d02a64ab42d3c19b70ade7;hb=33e1e5a756300e29c74fdc59ea762f9394df8368;hpb=d2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index a9c3e21d5..291a2f405 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -33,21 +34,26 @@ int user_config_home(char **config_home) { const char *e; + char *r; e = getenv("XDG_CONFIG_HOME"); if (e) { - if (asprintf(config_home, "%s/systemd/user", e) < 0) + r = strappend(e, "/systemd/user"); + if (!r) return -ENOMEM; + *config_home = r; return 1; } else { const char *home; home = getenv("HOME"); if (home) { - if (asprintf(config_home, "%s/.config/systemd/user", home) < 0) + r = strappend(home, "/.config/systemd/user"); + if (!r) return -ENOMEM; + *config_home = r; return 1; } } @@ -55,6 +61,50 @@ int user_config_home(char **config_home) { return 0; } +int user_runtime_dir(char **runtime_dir) { + const char *e; + char *r; + + e = getenv("XDG_RUNTIME_DIR"); + if (e) { + r = strappend(e, "/systemd/user"); + if (!r) + return -ENOMEM; + + *runtime_dir = r; + return 1; + } + + return 0; +} + +static int user_data_home_dir(char **dir, const char *suffix) { + const char *e; + char *res; + + /* We don't treat /etc/xdg/systemd here as the spec + * suggests because we assume that that is a link to + * /etc/systemd/ anyway. */ + + e = getenv("XDG_DATA_HOME"); + if (e) + res = strappend(e, suffix); + else { + const char *home; + + home = getenv("HOME"); + if (home) + res = strjoin(home, "/.local/share", suffix, NULL); + else + return 0; + } + if (!res) + return -ENOMEM; + + *dir = res; + return 0; +} + static char** user_dirs( const char *generator, const char *generator_early, @@ -63,10 +113,11 @@ static char** user_dirs( const char * const config_unit_paths[] = { USER_CONFIG_UNIT_PATH, "/etc/systemd/user", - "/run/systemd/user", NULL }; + const char * const runtime_unit_path = "/run/systemd/user"; + const char * const data_unit_paths[] = { "/usr/local/lib/systemd/user", "/usr/local/share/systemd/user", @@ -76,10 +127,12 @@ static char** user_dirs( NULL }; - const char *home, *e; - char *config_home = NULL, *data_home = NULL; - char **config_dirs = NULL, **data_dirs = NULL; - char **r = NULL, **t; + const char *e; + _cleanup_free_ char *config_home = NULL, *runtime_dir = NULL, *data_home = NULL; + _cleanup_strv_free_ char **config_dirs = NULL, **data_dirs = NULL; + _cleanup_free_ char **res = NULL; + char **tmp; + int r; /* Implement the mechanisms defined in * @@ -91,40 +144,21 @@ static char** user_dirs( */ if (user_config_home(&config_home) < 0) - goto fail; + return NULL; - home = getenv("HOME"); + if (user_runtime_dir(&runtime_dir) < 0) + return NULL; e = getenv("XDG_CONFIG_DIRS"); if (e) { config_dirs = strv_split(e, ":"); if (!config_dirs) - goto fail; + return NULL; } - /* We don't treat /etc/xdg/systemd here as the spec - * suggests because we assume that that is a link to - * /etc/systemd/ anyway. */ - - e = getenv("XDG_DATA_HOME"); - if (e) { - if (asprintf(&data_home, "%s/systemd/user", e) < 0) - goto fail; - - } else if (home) { - if (asprintf(&data_home, "%s/.local/share/systemd/user", home) < 0) - goto fail; - - /* There is really no need for two unit dirs in $HOME, - * except to be fully compliant with the XDG spec. We - * now try to link the two dirs, so that we can - * minimize disk seeks a little. Further down we'll - * then filter out this link, if it is actually is - * one. */ - - mkdir_parents_label(data_home, 0777); - (void) symlink("../../../.config/systemd/user", data_home); - } + r = user_data_home_dir(&data_home, "/systemd/user"); + if (r < 0) + return NULL; e = getenv("XDG_DATA_DIRS"); if (e) @@ -134,104 +168,84 @@ static char** user_dirs( "/usr/share", NULL); if (!data_dirs) - goto fail; + return NULL; /* Now merge everything we found. */ - if (generator_early) { - t = strv_append(r, generator_early); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (generator_early) + if (strv_extend(&res, generator_early) < 0) + return NULL; - if (config_home) { - t = strv_append(r, config_home); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (config_home) + if (strv_extend(&res, config_home) < 0) + return NULL; - if (!strv_isempty(config_dirs)) { - t = strv_merge_concat(r, config_dirs, "/systemd/user"); - if (!t) - goto finish; - strv_free(r); - r = t; - } + if (!strv_isempty(config_dirs)) + if (strv_extend_strv_concat(&res, config_dirs, "/systemd/user") < 0) + return NULL; - t = strv_merge(r, (char**) config_unit_paths); - if (!t) - goto fail; - strv_free(r); - r = t; + if (strv_extend_strv(&res, (char**) config_unit_paths) < 0) + return NULL; - if (generator) { - t = strv_append(r, generator); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (runtime_dir) + if (strv_extend(&res, runtime_dir) < 0) + return NULL; - if (data_home) { - t = strv_append(r, data_home); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (strv_extend(&res, runtime_unit_path) < 0) + return NULL; - if (!strv_isempty(data_dirs)) { - t = strv_merge_concat(r, data_dirs, "/systemd/user"); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (generator) + if (strv_extend(&res, generator) < 0) + return NULL; - t = strv_merge(r, (char**) data_unit_paths); - if (!t) - goto fail; - strv_free(r); - r = t; + if (data_home) + if (strv_extend(&res, data_home) < 0) + return NULL; - if (generator_late) { - t = strv_append(r, generator_late); - if (!t) - goto fail; - strv_free(r); - r = t; - } + if (!strv_isempty(data_dirs)) + if (strv_extend_strv_concat(&res, data_dirs, "/systemd/user") < 0) + return NULL; - if (!path_strv_make_absolute_cwd(r)) - goto fail; + if (strv_extend_strv(&res, (char**) data_unit_paths) < 0) + return NULL; -finish: - free(config_home); - strv_free(config_dirs); - free(data_home); - strv_free(data_dirs); + if (generator_late) + if (strv_extend(&res, generator_late) < 0) + return NULL; - return r; + if (!path_strv_make_absolute_cwd(res)) + return NULL; -fail: - strv_free(r); - r = NULL; - goto finish; + tmp = res; + res = NULL; + return tmp; +} + +char **generator_paths(SystemdRunningAs running_as) { + if (running_as == SYSTEMD_USER) + return strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", + "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_PATH, + NULL); + else + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", + "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH, + NULL); } int lookup_paths_init( LookupPaths *p, - ManagerRunningAs running_as, + SystemdRunningAs running_as, bool personal, + const char *root_dir, const char *generator, const char *generator_early, const char *generator_late) { const char *e; - char *t; + bool append = false; /* Add items from SYSTEMD_UNIT_PATH before normal directories */ assert(p); @@ -239,91 +253,93 @@ int lookup_paths_init( * vars */ e = getenv("SYSTEMD_UNIT_PATH"); if (e) { + if (endswith(e, ":")) { + e = strndupa(e, strlen(e) - 1); + append = true; + } + + /* FIXME: empty components in other places should be + * rejected. */ + p->unit_path = path_split_and_make_absolute(e); if (!p->unit_path) return -ENOMEM; } else p->unit_path = NULL; - if (strv_isempty(p->unit_path)) { - /* Nothing is set, so let's figure something out. */ - strv_free(p->unit_path); + if (!p->unit_path || append) { + /* Let's figure something out. */ - /* For the user units we include share/ in the search - * path in order to comply with the XDG basedir - * spec. For the system stuff we avoid such - * nonsense. OTOH we include /lib in the search path - * for the system stuff but avoid it for user - * stuff. */ + _cleanup_strv_free_ char **unit_path; + int r; - if (running_as == MANAGER_USER) { + /* For the user units we include share/ in the search + * path in order to comply with the XDG basedir spec. + * For the system stuff we avoid such nonsense. OTOH + * we include /lib in the search path for the system + * stuff but avoid it for user stuff. */ + if (running_as == SYSTEMD_USER) { if (personal) - p->unit_path = user_dirs(generator, generator_early, generator_late); + unit_path = user_dirs(generator, generator_early, generator_late); else - p->unit_path = strv_new( - /* If you modify this you also want to modify - * systemduserunitpath= in systemd.pc.in, and - * the arrays in user_dirs() above! */ - STRV_IFNOTNULL(generator_early), - USER_CONFIG_UNIT_PATH, - "/etc/systemd/user", - "/run/systemd/user", - STRV_IFNOTNULL(generator), - "/usr/local/lib/systemd/user", - "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, - "/usr/lib/systemd/user", - "/usr/share/systemd/user", - STRV_IFNOTNULL(generator_late), - NULL); - - if (!p->unit_path) - return -ENOMEM; - - } else { - p->unit_path = strv_new( + unit_path = strv_new( /* If you modify this you also want to modify - * systemdsystemunitpath= in systemd.pc.in! */ + * systemduserunitpath= in systemd.pc.in, and + * the arrays in user_dirs() above! */ STRV_IFNOTNULL(generator_early), - SYSTEM_CONFIG_UNIT_PATH, - "/etc/systemd/system", - "/run/systemd/system", + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", + "/run/systemd/user", STRV_IFNOTNULL(generator), - "/usr/local/lib/systemd/system", - SYSTEM_DATA_UNIT_PATH, - "/usr/lib/systemd/system", -#ifdef HAVE_SPLIT_USR - "/lib/systemd/system", -#endif + "/usr/local/lib/systemd/user", + "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, + "/usr/lib/systemd/user", + "/usr/share/systemd/user", STRV_IFNOTNULL(generator_late), NULL); + } else + unit_path = strv_new( + /* If you modify this you also want to modify + * systemdsystemunitpath= in systemd.pc.in! */ + STRV_IFNOTNULL(generator_early), + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", + "/run/systemd/system", + STRV_IFNOTNULL(generator), + "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, + "/usr/lib/systemd/system", +#ifdef HAVE_SPLIT_USR + "/lib/systemd/system", +#endif + STRV_IFNOTNULL(generator_late), + NULL); - if (!p->unit_path) - return -ENOMEM; - } + if (!unit_path) + return -ENOMEM; + + r = strv_extend_strv(&p->unit_path, unit_path); + if (r < 0) + return r; } - if (!path_strv_canonicalize(p->unit_path)) + if (!path_strv_resolve_uniq(p->unit_path, root_dir)) return -ENOMEM; - strv_uniq(p->unit_path); - path_strv_remove_empty(p->unit_path); - if (!strv_isempty(p->unit_path)) { - - t = strv_join(p->unit_path, "\n\t"); + _cleanup_free_ char *t = strv_join(p->unit_path, "\n\t"); if (!t) return -ENOMEM; - log_debug("Looking for unit files in:\n\t%s", t); - free(t); + log_debug("Looking for unit files in (higher priority first):\n\t%s", t); } else { log_debug("Ignoring unit files."); strv_free(p->unit_path); p->unit_path = NULL; } - if (running_as == MANAGER_SYSTEM) { + if (running_as == SYSTEMD_SYSTEM) { #ifdef HAVE_SYSV_COMPAT /* /etc/init.d/ compatibility does not matter to users */ @@ -363,24 +379,17 @@ int lookup_paths_init( return -ENOMEM; } - if (!path_strv_canonicalize(p->sysvinit_path)) + if (!path_strv_resolve_uniq(p->sysvinit_path, root_dir)) return -ENOMEM; - if (!path_strv_canonicalize(p->sysvrcnd_path)) + if (!path_strv_resolve_uniq(p->sysvrcnd_path, root_dir)) return -ENOMEM; - strv_uniq(p->sysvinit_path); - strv_uniq(p->sysvrcnd_path); - path_strv_remove_empty(p->sysvinit_path); - path_strv_remove_empty(p->sysvrcnd_path); - if (!strv_isempty(p->sysvinit_path)) { - - t = strv_join(p->sysvinit_path, "\n\t"); + _cleanup_free_ char *t = strv_join(p->sysvinit_path, "\n\t"); if (!t) return -ENOMEM; log_debug("Looking for SysV init scripts in:\n\t%s", t); - free(t); } else { log_debug("Ignoring SysV init scripts."); strv_free(p->sysvinit_path); @@ -388,20 +397,19 @@ int lookup_paths_init( } if (!strv_isempty(p->sysvrcnd_path)) { - - t = strv_join(p->sysvrcnd_path, "\n\t"); + _cleanup_free_ char *t = + strv_join(p->sysvrcnd_path, "\n\t"); if (!t) return -ENOMEM; log_debug("Looking for SysV rcN.d links in:\n\t%s", t); - free(t); } else { log_debug("Ignoring SysV rcN.d links."); strv_free(p->sysvrcnd_path); p->sysvrcnd_path = NULL; } #else - log_debug("Disabled SysV init scripts and rcN.d links support"); + log_debug("SysV init scripts and rcN.d links support disabled"); #endif } @@ -420,3 +428,19 @@ void lookup_paths_free(LookupPaths *p) { p->sysvinit_path = p->sysvrcnd_path = NULL; #endif } + +int lookup_paths_init_from_scope(LookupPaths *paths, + UnitFileScope scope, + const char *root_dir) { + assert(paths); + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + + zero(*paths); + + return lookup_paths_init(paths, + scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, + scope == UNIT_FILE_USER, + root_dir, + NULL, NULL, NULL); +}