summaryrefslogtreecommitdiff
path: root/src/rc/start-stop-daemon.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-19 19:57:24 +0000
committerRoy Marples <roy@marples.name>2008-03-19 19:57:24 +0000
commit6159a32f39afc60d88602cc796cef6a395bb78bf (patch)
tree6b2471081a475c0c42b41bd7aca6a1a0e8fcdbe6 /src/rc/start-stop-daemon.c
parent6d2e1f7addcf5ff6594d381845708229086d8d96 (diff)
downloadopenrc-6159a32f39afc60d88602cc796cef6a395bb78bf.tar.gz
openrc-6159a32f39afc60d88602cc796cef6a395bb78bf.tar.bz2
openrc-6159a32f39afc60d88602cc796cef6a395bb78bf.tar.xz
SVCNAME -> RC_SVCNAME, but export SVCNAME still for compat.
Diffstat (limited to 'src/rc/start-stop-daemon.c')
-rw-r--r--src/rc/start-stop-daemon.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index 6aec70b..b989582 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -583,7 +583,7 @@ int start_stop_daemon(int argc, char **argv)
int stderr_fd;
pid_t pid;
int i;
- char *svcname = getenv("SVCNAME");
+ char *svcname = getenv("RC_SVCNAME");
RC_STRINGLIST *env_list;
RC_STRING *env;
char *path;
@@ -974,8 +974,9 @@ int start_stop_daemon(int argc, char **argv)
rc_stringlist_add(env_list, environ[i++]);
TAILQ_FOREACH(env, env_list, entries) {
if ((strncmp(env->value, "RC_", 3) == 0 &&
- strncmp(env->value, "RC_SERVICE=", strlen("RC_SERVICE=")) != 0) ||
- strncmp(env->value, "SSD_NICELEVEL=", strlen("SSD_NICELEVEL=")) == 0)
+ strncmp(env->value, "RC_SERVICE=", 10) != 0 &&
+ strncmp(env->value, "RC_SVCNAME=", 10) != 0) ||
+ strncmp(env->value, "SSD_NICELEVEL=", 14)) == 0)
{
p = strchr(env->value, '=');
*p = '\0';