aboutsummaryrefslogtreecommitdiff
path: root/src/rc/runscript.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-05 20:43:32 +0000
committerRoy Marples <roy@marples.name>2008-01-05 20:43:32 +0000
commite6c9bdf2a30d84e35b783146ebe36314b4269ffb (patch)
treef9a3d84e4e70ae56a8d6b56d30fa4425cea1154c /src/rc/runscript.c
parentc92be49041a7b56f651a93e71e15e94bc8727489 (diff)
Add the missing changes from the recent Makefile updates
Diffstat (limited to 'src/rc/runscript.c')
-rw-r--r--src/rc/runscript.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 1385bb02..615b4119 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -54,11 +54,11 @@
#endif
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
+#include "../rc-misc.h"
#include "rc-plugin.h"
-#include "strlist.h"
+#include "../strlist.h"
#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
@@ -1080,14 +1080,10 @@ int runscript (int argc, char **argv)
if ((softlevel = xstrdup (getenv ("RC_SOFTLEVEL"))) == NULL) {
/* Ensure our environment is pure
Also, add our configuration to it */
+ char *p;
env = env_filter ();
- tmplist = env_config ();
- rc_strlist_join (&env, tmplist);
- rc_strlist_free (tmplist);
- tmplist = NULL;
if (env) {
- char *p;
#ifdef __linux__
/* clearenv isn't portable, but there's no harm in using it
@@ -1108,12 +1104,16 @@ int runscript (int argc, char **argv)
}
tmp = NULL;
#endif
-
- STRLIST_FOREACH (env, p, i)
- putenv (p);
- /* We don't free our list as that would be null in environ */
}
+ tmplist = env_config ();
+ rc_strlist_join (&env, tmplist);
+ rc_strlist_free (tmplist);
+ tmplist = NULL;
+ STRLIST_FOREACH (env, p, i)
+ putenv (p);
+ /* We don't free our list as that would be null in environ */
+
softlevel = rc_runlevel_get ();
}