X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.h;h=3982974bad9638cfb2253003881cf9aa490f7617;hb=30ab6a0fc1bb950c4dcd90dcd3dfe00a810c7fc1;hp=4c77bee39382d614ddfb77ddb220604f32c65c01;hpb=2968644080fd103062f070e83edd620e0a58c44d;p=elogind.git diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 4c77bee39..3982974ba 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -23,12 +23,10 @@ #include "macro.h" +typedef enum UnitFileScope UnitFileScope; + typedef struct LookupPaths { char **unit_path; -#ifdef HAVE_SYSV_COMPAT - char **sysvinit_path; - char **sysvrcnd_path; -#endif } LookupPaths; typedef enum SystemdRunningAs { @@ -38,12 +36,8 @@ typedef enum SystemdRunningAs { _SYSTEMD_RUNNING_AS_INVALID = -1 } SystemdRunningAs; -#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free) - -const char* systemd_running_as_to_string(SystemdRunningAs i) _const_; -SystemdRunningAs systemd_running_as_from_string(const char *s) _pure_; - int user_config_home(char **config_home); +int user_runtime_dir(char **runtime_dir); int lookup_paths_init(LookupPaths *p, SystemdRunningAs running_as, @@ -53,3 +47,8 @@ int lookup_paths_init(LookupPaths *p, const char *generator_early, const char *generator_late); void lookup_paths_free(LookupPaths *p); +int lookup_paths_init_from_scope(LookupPaths *paths, + UnitFileScope scope, + const char *root_dir); + +#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)