Module Name: src
Committed By: sjg
Date: Tue Jun 5 06:11:51 UTC 2012
Modified Files:
src/usr.bin/make: compat.c
Log Message:
Re-raising SIGINT etc, after running .INTERRUPT
provides much more reliable shutdown on some systems.
Based on CompatInterrupt in FreeBSD's make.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/make/compat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.86 src/usr.bin/make/compat.c:1.87
--- src/usr.bin/make/compat.c:1.86 Wed May 30 21:42:04 2012
+++ src/usr.bin/make/compat.c Tue Jun 5 06:11:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.86 2012/05/30 21:42:04 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.87 2012/06/05 06:11:51 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.86 2012/05/30 21:42:04 sjg Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.87 2012/06/05 06:11:51 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.86 2012/05/30 21:42:04 sjg Exp $");
+__RCSID("$NetBSD: compat.c,v 1.87 2012/06/05 06:11:51 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -180,7 +180,10 @@ CompatInterrupt(int signo)
}
}
- _exit(signo);
+ if (signo == SIGQUIT)
+ _exit(signo);
+ bmake_signal(signo, SIG_DFL);
+ raise(signo);
}
/*-
