Move signal compat code into bsd-signal.{c,h}

7 files changed, 103 insertions, 56 deletions

diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 5eef024b5..213ded4d4 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@
 
 OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o recallocarray.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strcasestr.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o freezero.o
 
-COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-getpagesize.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-malloc.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xcrypt.o kludge-fd_set.o
+COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-getpagesize.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-malloc.o bsd-setres_id.o bsd-signal.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xcrypt.o kludge-fd_set.o
 
 PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-net.o port-uw.o
 
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 29f6ad38c..9f6dc8af2 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -104,16 +104,6 @@ const char *strerror(int e)
 }
 #endif
 
-#if !defined(HAVE_STRSIGNAL)
-char *strsignal(int sig)
-{
-        static char buf[16];
-
-        (void)snprintf(buf, sizeof(buf), "%d", sig);
-        return buf;
-}
-#endif
-
 #ifndef HAVE_UTIMES
 int utimes(char *filename, struct timeval *tvp)
 {
@@ -221,33 +211,6 @@ tcsendbreak(int fd, int duration)
 }
 #endif /* HAVE_TCSENDBREAK */
 
-mysig_t
-mysignal(int sig, mysig_t act)
-{
-#ifdef HAVE_SIGACTION
-        struct sigaction sa, osa;
-
-        if (sigaction(sig, NULL, &osa) == -1)
-                return (mysig_t) -1;
-        if (osa.sa_handler != act) {
-                memset(&sa, 0, sizeof(sa));
-                sigemptyset(&sa.sa_mask);
-                sa.sa_flags = 0;
-#ifdef SA_INTERRUPT
-                if (sig == SIGALRM)
-                        sa.sa_flags |= SA_INTERRUPT;
-#endif
-                sa.sa_handler = act;
-                if (sigaction(sig, &sa, NULL) == -1)
-                        return (mysig_t) -1;
-        }
-        return (osa.sa_handler);
-#else
-        #undef signal
-        return (signal(sig, act));
-#endif
-}
-
 #ifndef HAVE_STRDUP
 char *
 strdup(const char *str)
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 0b1a3504f..2cfd5dae6 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -49,10 +49,6 @@ int setegid(uid_t);
 const char *strerror(int);
 #endif
 
-#if !defined(HAVE_STRSIGNAL)
-char *strsignal(int);
-#endif
-
 #if !defined(HAVE_SETLINEBUF)
 #define setlinebuf(a)   (setvbuf((a), NULL, _IOLBF, 0))
 #endif
@@ -98,12 +94,6 @@ int tcsendbreak(int, int);
 int unsetenv(const char *);
 #endif
 
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
-
-#define signal(a,b) mysignal(a,b)
-
 #ifndef HAVE_ISBLANK
 int     isblank(int);
 #endif
diff --git a/openbsd-compat/bsd-signal.c b/openbsd-compat/bsd-signal.c
new file mode 100644
index 000000000..979010e84
--- /dev/null
+++ b/openbsd-compat/bsd-signal.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "includes.h"
+
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "openbsd-compat/bsd-signal.h"
+
+#undef signal
+
+mysig_t
+mysignal(int sig, mysig_t act)
+{
+#ifdef HAVE_SIGACTION
+        struct sigaction sa, osa;
+
+        if (sigaction(sig, NULL, &osa) == -1)
+                return (mysig_t) -1;
+        if (osa.sa_handler != act) {
+                memset(&sa, 0, sizeof(sa));
+                sigemptyset(&sa.sa_mask);
+                sa.sa_flags = 0;
+#ifdef SA_INTERRUPT
+                if (sig == SIGALRM)
+                        sa.sa_flags |= SA_INTERRUPT;
+#endif
+                sa.sa_handler = act;
+                if (sigaction(sig, &sa, NULL) == -1)
+                        return (mysig_t) -1;
+        }
+        return (osa.sa_handler);
+#else
+        return (signal(sig, act));
+#endif
+}
+
+#if !defined(HAVE_STRSIGNAL)
+char *strsignal(int sig)
+{
+        static char buf[16];
+
+        (void)snprintf(buf, sizeof(buf), "%d", sig);
+        return buf;
+}
+#endif
+
diff --git a/openbsd-compat/bsd-signal.h b/openbsd-compat/bsd-signal.h
new file mode 100644
index 000000000..4cb8cb7a0
--- /dev/null
+++ b/openbsd-compat/bsd-signal.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _BSD_SIGNAL_H
+#define _BSD_SIGNAL_H
+
+#include "includes.h"
+
+#ifndef _NSIG
+# ifdef NSIG
+#  define _NSIG NSIG
+# else
+#  define _NSIG 128
+# endif
+#endif
+
+/* wrapper for signal interface */
+typedef void (*mysig_t)(int);
+mysig_t mysignal(int sig, mysig_t act);
+#define signal(a,b) mysignal(a,b)
+
+#if !defined(HAVE_STRSIGNAL)
+char *strsignal(int);
+#endif
+
+#endif /* _BSD_SIGNAL_H */
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 73123bb3f..c7f660609 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -179,6 +179,7 @@ int writev(int, struct iovec *, int);
 /* Home grown routines */
 #include "bsd-misc.h"
 #include "bsd-setres_id.h"
+#include "bsd-signal.h"
 #include "bsd-statvfs.h"
 #include "bsd-waitpid.h"
 #include "bsd-poll.h"
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 24aed6e46..ff8ff3dec 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -46,14 +46,6 @@
 #  define _POSIX_VDISABLE       VDISABLE
 #endif
 
-#ifndef _NSIG
-# ifdef NSIG
-#  define _NSIG NSIG
-# else
-#  define _NSIG 128
-# endif
-#endif
-
 static volatile sig_atomic_t signo[_NSIG];
 
 static void handler(int);