projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add platform tweaks
[oweals/busybox.git]
/
runit
/
runsv.c
diff --git
a/runit/runsv.c
b/runit/runsv.c
index 4155b8f43b552b2aa84d89e68ff9835bf225c6fa..6d34dc133005de7a4b6022327d5d6deb6f6ad3fc 100644
(file)
--- a/
runit/runsv.c
+++ b/
runit/runsv.c
@@
-304,15
+304,14
@@
static void stopservice(struct svdir *s)
static void startservice(struct svdir *s)
{
int p;
static void startservice(struct svdir *s)
{
int p;
- c
har *run[2]
;
+ c
onst char *run
;
if (s->state == S_FINISH)
if (s->state == S_FINISH)
- run
[0] = (char*)
"./finish";
+ run
=
"./finish";
else {
else {
- run
[0] = (char*)
"./run";
+ run
=
"./run";
custom(s, 'u');
}
custom(s, 'u');
}
- run[1] = NULL;
if (s->pid != 0)
stopservice(s); /* should never happen */
if (s->pid != 0)
stopservice(s); /* should never happen */
@@
-340,8
+339,8
@@
static void startservice(struct svdir *s)
, SIG_DFL);*/
sig_unblock(SIGCHLD);
sig_unblock(SIGTERM);
, SIG_DFL);*/
sig_unblock(SIGCHLD);
sig_unblock(SIGTERM);
- exec
vp(*run, run
);
- fatal2_cannot(s->islog ? "start log/" : "start ",
*
run);
+ exec
l(run, run, (char *) NULL
);
+ fatal2_cannot(s->islog ? "start log/" : "start ", run);
}
/* parent */
if (s->state != S_FINISH) {
}
/* parent */
if (s->state != S_FINISH) {
@@
-395,8
+394,7
@@
static int ctrl(struct svdir *s, char c)
case 'c': /* sig cont */
if (s->pid && !custom(s, c))
kill(s->pid, SIGCONT);
case 'c': /* sig cont */
if (s->pid && !custom(s, c))
kill(s->pid, SIGCONT);
- if (s->ctrl & C_PAUSE)
- s->ctrl &= ~C_PAUSE;
+ s->ctrl &= ~C_PAUSE;
update_status(s);
break;
case 'o': /* once */
update_status(s);
break;
case 'o': /* once */