Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of ignoring any SIGINTs when cleaning up, allow them. The 

user might actually know better, just this once.
This commit is contained in:
agc 1998-10-27 19:27:17 +00:00
parent 12fd61ebc9
commit 48b4d2e2ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/pkg_install/lib/pen.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: pen.c,v 1.12 1998/10/26 18:01:22 agc Exp $ */
/* $NetBSD: pen.c,v 1.13 1998/10/27 19:27:17 agc Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
#else
__RCSID("$NetBSD: pen.c,v 1.12 1998/10/26 18:01:22 agc Exp $");
__RCSID("$NetBSD: pen.c,v 1.13 1998/10/27 19:27:17 agc Exp $");
#endif
#endif
@ -146,8 +146,8 @@ leave_playpen(char *save)
{
void (*oldsig)(int);
/* Don't interrupt while we're cleaning up */
oldsig = signal(SIGINT, SIG_IGN);
/* Make us interruptable while we're cleaning up - just in case... */
oldsig = signal(SIGINT, SIG_DFL);
if (Previous[0] && chdir(Previous) == FAIL) {
cleanup(0);
errx(2, "can't chdir back to '%s'", Previous);
@ -156,7 +156,7 @@ leave_playpen(char *save)
fprintf(stderr,"PANIC: About to rm -rf / (not doing so, aborting)\n");
abort();
}
(void) fprintf(stderr, "[Warning]: about to perform \"rm -rf '%s'\"\n", Current);
warnx("[Info]: about to perform \"rm -rf '%s'\"\n", Current);
if (vsystem("rm -rf %s", Current))
warnx("couldn't remove temporary dir '%s'", Current);
strcpy(Current, Previous);