diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-09-03 12:25:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-09-03 12:25:40 -0400 |
| commit | 866dfd7691eb0ba0829d0ddf370cdfa9b9e6ab36 (patch) | |
| tree | 356088a0857018a81f42d6fc01cd705fcaad78b7 | |
| parent | ceab64be75a00fd498d1b5955f1e5e94da49a4bf (diff) | |
nshd-tester: clean up exit code
| -rw-r--r-- | bin/nshd-tester.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/nshd-tester.c b/bin/nshd-tester.c index 42398c1..6304387 100644 --- a/bin/nshd-tester.c +++ b/bin/nshd-tester.c @@ -68,7 +68,7 @@ sigchld_handler(int sig __attribute__((__unused__))) { pid = waitpid(pid, &status, WNOHANG); int exited = WEXITSTATUS(status); error(exited, 0, _("%ld exited with status %d"), (long)pid, exited); - exit(0); + exit(EXIT_SUCCESS); } union addr { @@ -101,7 +101,6 @@ int new_unix_sock(const char *filename, int type) { return sock; } -char *cmdname = "nshd-tester"; const char *notify_sockname = "notify.sock"; const char *nslcd_sockname = "nslcd.sock"; void cleanup(void) { @@ -109,11 +108,10 @@ void cleanup(void) { unlink(nslcd_sockname); if (notify_sockname) unlink(notify_sockname); - fprintf(stderr, "%s: Exiting\n", cmdname); + error(0, 0, "Exiting"); } int main(int argc, char *argv[]) { - cmdname = argv[0]; if (argc < 2) { error(2, 0, _("Usage: %s NSHD_PROGRAM [ARGS]"), argv[0]); } @@ -149,7 +147,7 @@ int main(int argc, char *argv[]) { } /* Loop forever; the happy-path to termination is that our - * sigchld_handler() calls exit(0). */ + * sigchld_handler() calls exit(EXIT_SUCCESS). */ while (1) { union addr client_addr; socklen_t client_size; |