diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-09 18:58:26 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-09 18:58:26 +0000 |
| commit | f6addb5b9fc18ff1f93d77181902b7af9c311915 (patch) | |
| tree | ef9fae241f023a1da4bdac0e1070048ce90c38da /usr.sbin | |
| parent | 06b070ec25a7bc024eb14172b9f52568d5e5632c (diff) | |
o Rename clean_turds() in crontab.c to die() and just _exit(ERROR_EXIT)
instead of resetting the signal handler to SIG_DFL and redelivering.
o Use kill(2) instead of raise(3) (which is just a wrapper)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/cron/crontab.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c index 2190eeb76c9..22d3abfb29f 100644 --- a/usr.sbin/cron/crontab.c +++ b/usr.sbin/cron/crontab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crontab.c,v 1.31 2002/07/08 18:11:02 millert Exp $ */ +/* $OpenBSD: crontab.c,v 1.32 2002/07/09 18:58:25 millert Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * All rights reserved */ @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(LINT) -static char const rcsid[] = "$OpenBSD: crontab.c,v 1.31 2002/07/08 18:11:02 millert Exp $"; +static char const rcsid[] = "$OpenBSD: crontab.c,v 1.32 2002/07/09 18:58:25 millert Exp $"; #endif /* crontab - install and manage per-user crontab files @@ -58,9 +58,9 @@ static void list_cmd(void), edit_cmd(void), poke_daemon(void), check_error(const char *), - parse_args(int c, char *v[]); + parse_args(int c, char *v[]), + die(int); static int replace_cmd(void); -static void clean_turds(int); static void usage(const char *msg) { @@ -409,7 +409,7 @@ edit_cmd(void) { ProgramName); exit(ERROR_EXIT); } - execlp(_PATH_BSHELL, _PATH_BSHELL, "-c", q, (char *)NULL); + execlp(_PATH_BSHELL, _PATH_BSHELL, "-c", q, (char *)0); perror(editor); exit(ERROR_EXIT); /*NOTREACHED*/ @@ -430,7 +430,7 @@ edit_cmd(void) { ProgramName, (long)xpid, (long)pid, editor); goto fatal; } else if (WIFSTOPPED(waiter)) { - raise(WSTOPSIG(waiter)); + kill(getpid(), WSTOPSIG(waiter)); } else if (WIFEXITED(waiter) && WEXITSTATUS(waiter)) { fprintf(stderr, "%s: \"%s\" exited with status %d\n", ProgramName, editor, WEXITSTATUS(waiter)); @@ -529,9 +529,9 @@ replace_cmd(void) { return (-2); } - (void) signal(SIGHUP, clean_turds); - (void) signal(SIGINT, clean_turds); - (void) signal(SIGQUIT, clean_turds); + (void) signal(SIGHUP, die); + (void) signal(SIGINT, die); + (void) signal(SIGQUIT, die); /* write a signature at the top of the file. * @@ -668,16 +668,8 @@ poke_daemon() { } static void -clean_turds(signo) - int signo; -{ - int save_errno = errno; - +die(int x) { if (TempFilename[0]) (void) unlink(TempFilename); - if (signo) { - (void) signal(signo, SIG_DFL); - (void) raise(signo); - } - errno = save_errno; + _exit(ERROR_EXIT); } |