X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.h;h=b8a0aace83ad8c0a83e78a1c98233de9f5969d4b;hb=b5884878a2874447b2a9f07f324a7cd909d96d48;hp=e8a5a77a7b3a3c81e0600fe58e10c4a648472e4d;hpb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d;p=elogind.git diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index e8a5a77a7..b8a0aace8 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foopathlookuphfoo -#define foopathlookuphfoo +#pragma once /*** This file is part of systemd. @@ -22,6 +21,8 @@ along with systemd; If not, see . ***/ +#include "macro.h" + typedef struct LookupPaths { char **unit_path; #ifdef HAVE_SYSV_COMPAT @@ -30,11 +31,23 @@ typedef struct LookupPaths { #endif } LookupPaths; -#include "manager.h" +typedef enum SystemdRunningAs { + SYSTEMD_SYSTEM, + SYSTEMD_USER, + _SYSTEMD_RUNNING_AS_MAX, + _SYSTEMD_RUNNING_AS_INVALID = -1 +} SystemdRunningAs; int user_config_home(char **config_home); - -int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal); +int user_runtime_dir(char **runtime_dir); + +int lookup_paths_init(LookupPaths *p, + SystemdRunningAs running_as, + bool personal, + const char *root_dir, + const char *generator, + const char *generator_early, + const char *generator_late); void lookup_paths_free(LookupPaths *p); -#endif +#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)