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=7a715b713375cb23aa8798762c266e535c6e1e49;hb=72e6110485926c884f056717a21e4f5f3942908c;hpb=cf7d80a5fe549d4db11800015e02220dccec3096 diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 7a715b713..291a2f405 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -61,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, @@ -69,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", @@ -82,10 +127,12 @@ static char** user_dirs( NULL }; - const char *home, *e; - _cleanup_free_ char *config_home = NULL, *data_home = NULL; + 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; - char **r = NULL; + _cleanup_free_ char **res = NULL; + char **tmp; + int r; /* Implement the mechanisms defined in * @@ -97,30 +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; - } + r = user_data_home_dir(&data_home, "/systemd/user"); + if (r < 0) + return NULL; e = getenv("XDG_DATA_DIRS"); if (e) @@ -130,51 +168,71 @@ static char** user_dirs( "/usr/share", NULL); if (!data_dirs) - goto fail; + return NULL; /* Now merge everything we found. */ if (generator_early) - if (strv_extend(&r, generator_early) < 0) - goto fail; + if (strv_extend(&res, generator_early) < 0) + return NULL; if (config_home) - if (strv_extend(&r, config_home) < 0) - goto fail; + if (strv_extend(&res, config_home) < 0) + return NULL; if (!strv_isempty(config_dirs)) - if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0) - goto fail; + if (strv_extend_strv_concat(&res, config_dirs, "/systemd/user") < 0) + return NULL; + + if (strv_extend_strv(&res, (char**) config_unit_paths) < 0) + return NULL; - if (strv_extend_strv(&r, (char**) config_unit_paths) < 0) - goto fail; + if (runtime_dir) + if (strv_extend(&res, runtime_dir) < 0) + return NULL; + + if (strv_extend(&res, runtime_unit_path) < 0) + return NULL; if (generator) - if (strv_extend(&r, generator) < 0) - goto fail; + if (strv_extend(&res, generator) < 0) + return NULL; if (data_home) - if (strv_extend(&r, data_home) < 0) - goto fail; + if (strv_extend(&res, data_home) < 0) + return NULL; if (!strv_isempty(data_dirs)) - if (strv_extend_strv_concat(&r, data_dirs, "/systemd/user") < 0) - goto fail; + if (strv_extend_strv_concat(&res, data_dirs, "/systemd/user") < 0) + return NULL; - if (strv_extend_strv(&r, (char**) data_unit_paths) < 0) - goto fail; + if (strv_extend_strv(&res, (char**) data_unit_paths) < 0) + return NULL; if (generator_late) - if (strv_extend(&r, generator_late) < 0) - goto fail; + if (strv_extend(&res, generator_late) < 0) + return NULL; - if (!path_strv_make_absolute_cwd(r)) - goto fail; + if (!path_strv_make_absolute_cwd(res)) + return NULL; - return r; + tmp = res; + res = NULL; + return tmp; +} -fail: - strv_free(r); - return NULL; +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( @@ -212,7 +270,7 @@ int lookup_paths_init( if (!p->unit_path || append) { /* Let's figure something out. */ - char **unit_path; + _cleanup_strv_free_ char **unit_path; int r; /* For the user units we include share/ in the search @@ -370,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); +}