diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /runit | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/runsv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index a4b8af494..6ad6bf46e 100644 --- a/runit/runsv.c +++ b/runit/runsv.c | |||
| @@ -700,7 +700,7 @@ int runsv_main(int argc UNUSED_PARAM, char **argv) | |||
| 700 | 700 | ||
| 701 | if (svd[0].sd_want == W_EXIT && svd[0].state == S_DOWN) { | 701 | if (svd[0].sd_want == W_EXIT && svd[0].state == S_DOWN) { |
| 702 | if (svd[1].pid == 0) | 702 | if (svd[1].pid == 0) |
| 703 | _exit(EXIT_SUCCESS); | 703 | _exit_SUCCESS(); |
| 704 | if (svd[1].sd_want != W_EXIT) { | 704 | if (svd[1].sd_want != W_EXIT) { |
| 705 | svd[1].sd_want = W_EXIT; | 705 | svd[1].sd_want = W_EXIT; |
| 706 | /* stopservice(&svd[1]); */ | 706 | /* stopservice(&svd[1]); */ |