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 /debianutils | |
| 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 'debianutils')
| -rw-r--r-- | debianutils/start_stop_daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 68df44ae9..3e5dd9faa 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
| @@ -519,7 +519,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv) | |||
| 519 | /* why _exit? the child may have changed the stack, | 519 | /* why _exit? the child may have changed the stack, |
| 520 | * so "return 0" may do bad things | 520 | * so "return 0" may do bad things |
| 521 | */ | 521 | */ |
| 522 | _exit(EXIT_SUCCESS); | 522 | _exit_SUCCESS(); |
| 523 | } | 523 | } |
| 524 | /* Child */ | 524 | /* Child */ |
| 525 | setsid(); /* detach from controlling tty */ | 525 | setsid(); /* detach from controlling tty */ |
| @@ -531,7 +531,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv) | |||
| 531 | */ | 531 | */ |
| 532 | pid = xvfork(); | 532 | pid = xvfork(); |
| 533 | if (pid != 0) | 533 | if (pid != 0) |
| 534 | _exit(EXIT_SUCCESS); /* Parent */ | 534 | _exit_SUCCESS(); /* Parent */ |
| 535 | } | 535 | } |
| 536 | if (opt & OPT_MAKEPID) { | 536 | if (opt & OPT_MAKEPID) { |
| 537 | /* User wants _us_ to make the pidfile */ | 537 | /* User wants _us_ to make the pidfile */ |