Module Name: src
Committed By: kamil
Date: Fri Jun 23 00:00:58 UTC 2017
Modified Files:
src/bin/ksh: config.h trap.c
Log Message:
ksh: Drop support for UNIX V7-style signal routines
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/bin/ksh/config.h
cvs rdiff -u -r1.11 -r1.12 src/bin/ksh/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/config.h
diff -u src/bin/ksh/config.h:1.34 src/bin/ksh/config.h:1.35
--- src/bin/ksh/config.h:1.34 Thu Jun 22 23:59:28 2017
+++ src/bin/ksh/config.h Fri Jun 23 00:00:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.34 2017/06/22 23:59:28 kamil Exp $ */
+/* $NetBSD: config.h,v 1.35 2017/06/23 00:00:58 kamil Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -66,9 +66,6 @@
/* Define if you have posix signal routines (sigaction(), et. al.) */
#define POSIX_SIGNALS 1
-/* Define if you have v7 signal routines (signal(), signal reset on delivery) */
-/* #undef V7_SIGNALS */
-
/* Define to use the fake posix signal routines (sigact.[ch]) */
/* #undef USE_FAKE_SIGACT */
Index: src/bin/ksh/trap.c
diff -u src/bin/ksh/trap.c:1.11 src/bin/ksh/trap.c:1.12
--- src/bin/ksh/trap.c:1.11 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/trap.c Fri Jun 23 00:00:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.11 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: trap.c,v 1.12 2017/06/23 00:00:58 kamil Exp $ */
/*
* signal handling
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: trap.c,v 1.11 2017/06/22 14:20:46 kamil Exp $");
+__RCSID("$NetBSD: trap.c,v 1.12 2017/06/23 00:00:58 kamil Exp $");
#endif
#include "sh.h"
@@ -141,10 +141,7 @@ trapsig(i)
}
if (p->shtrap)
(*p->shtrap)(i);
-#ifdef V7_SIGNALS
- if (sigtraps[i].cursig == trapsig) /* this for SIGCHLD,SIGALRM */
- sigaction(i, &Sigact_trap, (struct sigaction *) 0);
-#endif /* V7_SIGNALS */
+
errno = errno_;
return RETSIGVAL;
}
