diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-17 19:22:53 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-17 19:29:45 +0000 |
commit | 2b7c2b8cf1248c5cea7c56ad1a3141973a34fe0a (patch) | |
tree | d06954d40aa8a2f2aefba84c9767f54cff98f2ce /src/librc/rc.h.in | |
parent | 6e876bca1313d0cc2ef576da15124a9082f404db (diff) | |
download | openrc-2b7c2b8cf1248c5cea7c56ad1a3141973a34fe0a.tar.gz openrc-2b7c2b8cf1248c5cea7c56ad1a3141973a34fe0a.tar.bz2 openrc-2b7c2b8cf1248c5cea7c56ad1a3141973a34fe0a.tar.xz |
Bug #351570: Hidden function fixes: rc_conf_value.
Refactor rc_conf_value into librc for use in library context.
Also requires moving:
- rc_conf internal static
- Defines: PROFILE_ENV, SYS_WHITELIST, USR_WHITELIST, RC_PATH_PREFIX
moved to rc.h with new RC_ prefix added.
- Defines: RC_CONF, RC_CONF_OLD moved to rc.h.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'src/librc/rc.h.in')
-rw-r--r-- | src/librc/rc.h.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 5aad1d5..5b06de2 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -43,6 +43,14 @@ __BEGIN_DECLS #define RC_CONFDIR RC_SYSCONFDIR "/conf.d" #define RC_PLUGINDIR RC_LIBDIR "/plugins" +#define RC_PROFILE_ENV RC_SYSCONFDIR "/profile.env" +#define RC_SYS_WHITELIST RC_LIBEXECDIR "/conf.d/env_whitelist" +#define RC_USR_WHITELIST RC_SYSCONFDIR "/conf.d/env_whitelist" +#define RC_CONF RC_SYSCONFDIR "/rc.conf" +#define RC_CONF_OLD RC_SYSCONFDIR "/conf.d/rc" + +#define RC_PATH_PREFIX RC_LIBEXECDIR "/bin:/bin:/sbin:/usr/bin:/usr/sbin" + /* PKG_PREFIX is where packages are installed if different from the base OS * On Gentoo this is normally unset, on FreeBSD /usr/local and on NetBSD * /usr/pkg. */ @@ -462,6 +470,9 @@ RC_STRINGLIST *rc_config_load(const char *); /*! Return the value of the entry from a key=value list. */ char *rc_config_value(RC_STRINGLIST *, const char *); +/*! Return the value of the entry from rc.conf. */ +char *rc_conf_value(const char *); + /*! Check if a variable is a boolean and return its value. * If variable is not a boolean then we set errno to be ENOENT when it does * not exist or EINVAL if it's not a boolean. |