emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Our match arguments could be different from the exec arguments, as only the kernel should set script arguments.

Browse Source
This commit is contained in:
Roy Marples 2008-09-22 12:14:47 +00:00
parent 554d2fea19
commit 53693367df
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/rc/start-stop-daemon.c
View File

@ -606,6 +606,7 @@ int start_stop_daemon(int argc, char **argv)
size_t len; size_t len;
bool setumask = false; bool setumask = false;
mode_t numask; mode_t numask;
char **margv;
TAILQ_INIT(&schedule); TAILQ_INIT(&schedule);
atexit(cleanup); atexit(cleanup);
@ -868,7 +869,7 @@ int start_stop_daemon(int argc, char **argv)
if (line[0] == '#' && line[1] == '!') { if (line[0] == '#' && line[1] == '!') {
p = line + 2; p = line + 2;
/* Strip leading spaces */ /* Strip leading spaces */
while (*p == ' ') while (*p == ' ' || *p == '\t')
p++; p++;
/* Remove the trailing newline */ /* Remove the trailing newline */
len = strlen(p) - 1; len = strlen(p) - 1;
@ -876,29 +877,29 @@ int start_stop_daemon(int argc, char **argv)
p[len] = '\0'; p[len] = '\0';
token = strsep(&p, " "); token = strsep(&p, " ");
strncpy(exec_file, token, sizeof(exec_file)); strncpy(exec_file, token, sizeof(exec_file));
token = strsep(&p, " ");
opt = 0; opt = 0;
for (nav = argv; *nav; nav++) for (nav = argv; *nav; nav++)
opt++; opt++;
nav = xmalloc(sizeof(char *) * (opt + token ? 3 : 2)); nav = xmalloc(sizeof(char *) * (opt + 3));
nav[0] = exec_file; nav[0] = exec_file;
if (token) len = 1;
nav[1] = token; if (p)
nav[len++] = p;
for (i = 0; i < opt; i++) for (i = 0; i < opt; i++)
nav[i + token ? 2 : 1] = argv[i]; nav[i + len] = argv[i];
nav[i + token ? 2 : 1] = '\0'; nav[i + len] = '\0';
argv = nav;
exec = exec_file;
} }
} }
} }
margv = nav ? nav : argv;
if (pidfile) if (pidfile)
pid = get_pid(pidfile, true); pid = get_pid(pidfile, true);
else else
pid = 0; pid = 0;
if (do_stop(exec, (const char * const *)argv, pid, uid, if (do_stop(exec, (const char * const *)margv, pid, uid,
0, true, false, true) > 0) 0, true, false, true) > 0)
eerrorx("%s: %s is already running", applet, exec); eerrorx("%s: %s is already running", applet, exec);
@ -1165,7 +1166,7 @@ int start_stop_daemon(int argc, char **argv)
nloopsp = 0; nloopsp = 0;
} else } else
pid = 0; pid = 0;
if (do_stop(exec, (const char *const *)argv, if (do_stop(exec, (const char *const *)margv,
pid, uid, 0, true, false, true) > 0) pid, uid, 0, true, false, true) > 0)
alive = true; alive = true;
} }
@ -1176,7 +1177,7 @@ int start_stop_daemon(int argc, char **argv)
} }
if (svcname) if (svcname)
rc_service_daemon_set(svcname, exec, (const char *const *)argv, rc_service_daemon_set(svcname, exec, (const char *const *)margv,
pidfile, true); pidfile, true);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);