diff options
| author | jkh <jkh@FreeBSD.org> | 1998-09-11 07:26:58 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-09-11 07:26:58 +0000 |
| commit | dad2df585cf830423608e2027120a5a34082d64a (patch) | |
| tree | 9c49a1ce1161dfa3570080dd96d4c7194c4a8320 /usr.sbin/pkg_install/add/perform.c | |
| parent | 806b06993b8d6cf5a89015512afb8bd253173403 (diff) | |
| download | FreeBSD-src-dad2df585cf830423608e2027120a5a34082d64a.zip FreeBSD-src-dad2df585cf830423608e2027120a5a34082d64a.tar.gz | |
correct usage of cleanup() everywhere - this became bogus when the warnx/errx
stuff was added and nobody seems to have noticed. :)
Noticed by: Josh MacDonald <jmacd@paris.CS.Berkeley.EDU>
Diffstat (limited to 'usr.sbin/pkg_install/add/perform.c')
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 3345efb..f7cd122 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,6 +1,6 @@ #ifndef lint static const char rcsid[] = - "$Id: perform.c,v 1.51 1998/08/27 14:59:55 jkh Exp $"; + "$Id: perform.c,v 1.52 1998/09/08 03:02:45 jkh Exp $"; #endif /* @@ -480,17 +480,18 @@ sanity_check(char *pkg) } void -cleanup(int signo) +cleanup(int sig) { static int in_cleanup = 0; if (!in_cleanup) { in_cleanup = 1; - if (signo) - printf("Signal %d received, cleaning up..\n", signo); + if (sig) + printf("Signal %d received, cleaning up..\n", sig); if (!Fake && zapLogDir && LogDir[0]) - vsystem("%s -rf %s", REMOVE_CMD, LogDir); + vsystem("%s -rf %s", REMOVE_CMD, LogDir); leave_playpen(); } - exit(1); + if (sig) + exit(1); } |
