X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.h;h=adc77881a9432da3eab9f65f8477826549d6307e;hb=51e8372fb6cca277dc7afc6e83f48a1a2b6d4dbe;hp=31b2df3c145400dc78f52cc4f6b21ab98c5fb3b6;hpb=57ceb09c123ff52a2229413e5ac42a02d80089b6;p=elogind.git diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 31b2df3c1..adc77881a 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -21,16 +19,11 @@ along with systemd; If not, see . ***/ +#include #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 ManagerRunningAs { @@ -40,6 +33,7 @@ typedef enum ManagerRunningAs { _MANAGER_RUNNING_AS_INVALID = -1 } ManagerRunningAs; +#if 0 /// UNNEEDED by elogind int user_config_home(char **config_home); int user_runtime_dir(char **runtime_dir); @@ -52,9 +46,13 @@ int lookup_paths_init(LookupPaths *p, const char *generator, const char *generator_early, const char *generator_late); -void lookup_paths_free(LookupPaths *p); + +#include "install.h" + int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope, const char *root_dir); +void lookup_paths_free(LookupPaths *p); #define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free) +#endif // 0