Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Re-raising SIGINT etc, after running .INTERRUPT



details:   https://anonhg.NetBSD.org/src/rev/9582b21c5815
branches:  trunk
changeset: 779604:9582b21c5815
user:      sjg <sjg%NetBSD.org@localhost>
date:      Tue Jun 05 06:11:51 2012 +0000

description:
Re-raising SIGINT etc, after running .INTERRUPT
provides much more reliable shutdown on some systems.
Based on CompatInterrupt in FreeBSD's make.

diffstat:

 usr.bin/make/compat.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r fa93b8056012 -r 9582b21c5815 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Tue Jun 05 00:57:09 2012 +0000
+++ b/usr.bin/make/compat.c     Tue Jun 05 06:11:51 2012 +0000
@@ -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 @@
        }
 
     }
-    _exit(signo);
+    if (signo == SIGQUIT)
+       _exit(signo);
+    bmake_signal(signo, SIG_DFL);
+    raise(signo);
 }
 
 /*-



Home | Main Index | Thread Index | Old Index