diff options
author | christos <christos@pkgsrc.org> | 2006-05-16 18:43:44 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2006-05-16 18:43:44 +0000 |
commit | a784fe9161bcb22b48ea388c870b35e3e2e2de14 (patch) | |
tree | 8e9fd834a567ad432c80056d6aca772197f6681e /textproc | |
parent | 6589918263f4ac70181b94e7ef3b89a1ee46d8ef (diff) | |
download | pkgsrc-a784fe9161bcb22b48ea388c870b35e3e2e2de14.tar.gz |
use posix signals if available [no functional change]
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/qsubst/distinfo | 4 | ||||
-rw-r--r-- | textproc/qsubst/patches/patch-ab | 36 |
2 files changed, 32 insertions, 8 deletions
diff --git a/textproc/qsubst/distinfo b/textproc/qsubst/distinfo index 6a252e6d206..8932afc815a 100644 --- a/textproc/qsubst/distinfo +++ b/textproc/qsubst/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/03/24 16:27:40 christos Exp $ +$NetBSD: distinfo,v 1.6 2006/05/16 18:43:44 christos Exp $ SHA1 (qsubst-20010422.tar.gz) = 9602b274ff10266b94a96adc90ded003f8cdeda8 RMD160 (qsubst-20010422.tar.gz) = 443d5d5d2a014a286f436685c9e188255b6acd0a Size (qsubst-20010422.tar.gz) = 5965 bytes SHA1 (patch-aa) = d7ff425da3ddfaca2385e5d849457e74c89acfff -SHA1 (patch-ab) = 913cbd6afe72636a3e6d157ecf4f6fc6cb6269bb +SHA1 (patch-ab) = 1b740a8e82e0c6f20948b42cb03371fd028145fd diff --git a/textproc/qsubst/patches/patch-ab b/textproc/qsubst/patches/patch-ab index 5baf1c53505..356e3876cc6 100644 --- a/textproc/qsubst/patches/patch-ab +++ b/textproc/qsubst/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $ +$NetBSD: patch-ab,v 1.3 2006/05/16 18:43:45 christos Exp $ --- qsubst.c.orig 2001-04-22 01:35:35.000000000 -0400 -+++ qsubst.c 2005-03-24 11:23:34.000000000 -0500 ++++ qsubst.c 2006-05-16 14:39:11.923906738 -0400 @@ -105,7 +105,7 @@ #include <signal.h> #include <stdio.h> @@ -11,7 +11,31 @@ $NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $ #include <termcap.h> #include <termios.h> #include <unistd.h> -@@ -166,9 +166,9 @@ +@@ -148,12 +148,23 @@ + static void tstp_self(void) + { + void (*old_tstp)(int); ++#ifndef SIG_BLOCK + int mask; + + mask = sigblock(0); ++#else ++ sigset_t set, oset; ++ sigemptyset(&set); ++ sigprocmask(SIG_BLOCK, &set, &oset); ++#endif + kill(getpid(),SIGTSTP); + old_tstp = signal(SIGTSTP,SIG_DFL); ++#ifndef SIG_BLOCK + sigsetmask(mask&~sigmask(SIGTSTP)); ++#else ++ sigdelset(&oset, SIGTSTP); ++ sigprocmask(SIG_SETMASK, &set, &oset); ++#endif + signal(SIGTSTP,old_tstp); + } + +@@ -166,9 +177,9 @@ { tstp_self(); return; } @@ -23,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $ } static void limit_above_below(void) -@@ -181,7 +181,7 @@ +@@ -181,7 +192,7 @@ } } @@ -32,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $ { return( isascii(c) && ( isalnum(c) || -@@ -231,7 +231,7 @@ +@@ -231,7 +242,7 @@ tio.c_lflag &= ~(ICANON|ECHOKE|ECHOE|ECHO|ECHONL); tio.c_cc[VMIN] = 1; tio.c_cc[VTIME] = 0; @@ -41,7 +65,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $ switch (read(0,&c,1)) { case -1: break; -@@ -240,7 +240,7 @@ +@@ -240,7 +251,7 @@ case 1: break; } |