Move signal.{c,h} to signals.{c.h} so we can work better in the NetBSD source tree.

diff --git a/Makefile b/Makefile
index af1504910b8b834eefd1d1c383b4fd2009b233b0..7c85915381168f98716f3f40e782f5954150ce44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 PROG=          dhcpcd
 VERSION=       4.0.0-beta3
 
-SRCS=          common.c dhcp.c dhcpcd.c logger.c net.c signal.c
+SRCS=          common.c dhcp.c dhcpcd.c logger.c net.c signals.c
 SRCS+=         configure.c client.c
 SRCS+=         ${SRC_IF} ${SRC_SOCKET}
 SCRIPT=                dhcpcd.sh

diff --git a/client.c b/client.c
index c7cd378be9758fb4e19167a2aafa51158ce41e1d..d848f8b72223584fabcfe94e23737221f2a49bd2 100644 (file)
--- a/client.c
+++ b/client.c
@@ -51,7 +51,7 @@
 #include "dhcpcd.h"
 #include "net.h"
 #include "logger.h"
-#include "signal.h"
+#include "signals.h"
 
 #ifdef ENABLE_IPV4LL
 # ifndef ENABLE_ARP

diff --git a/configure.c b/configure.c
index 0029fb8ad5db19f252aea8466f09af787755071b..93144813a93bac7cb7e27697cb3f9643cb1df98d 100644 (file)
--- a/configure.c
+++ b/configure.c
@@ -44,7 +44,7 @@
 #include "dhcpcd.h"
 #include "logger.h"
 #include "net.h"
-#include "signal.h"
+#include "signals.h"
 
 #define DEFAULT_PATH   "PATH=/usr/bin:/usr/sbin:/bin:/sbin"
 

diff --git a/net.c b/net.c
index 490d59a9c37dcf3ab05af60d20a550f18e371790..cca1465feb9c5ccd1e083b356f3e4c7426ce9794 100644 (file)
--- a/net.c
+++ b/net.c
@@ -62,7 +62,7 @@
 #include "dhcp.h"
 #include "logger.h"
 #include "net.h"
-#include "signal.h"
+#include "signals.h"
 
 int
 inet_ntocidr(struct in_addr address)

diff --git a/signal.c b/signals.c
similarity index 91%
rename from signal.c
rename to signals.c
index f94987485f9dd3b1d365d6cfd62d05a9d8b70e06..9f0bd7935d9614d3d159702910e8fc0505ca14f8 100644 (file)
--- a/signal.c
+++ b/signals.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "signal.h"
+#include "signals.h"
 
 static int signal_pipe[2];
 static int signals[5];
@@ -133,14 +133,14 @@ signal_init(void)
        return 0;
 }
 
-int
-signal_setup(void)
+static int
+_signal_setup(void (*func)(int))
 {
        unsigned int i;
        struct sigaction sa;
 
        memset(&sa, 0, sizeof(sa));
-       sa.sa_handler = signal_handler;
+       sa.sa_handler = func;
        sigemptyset(&sa.sa_mask);
 
        for (i = 0; i < sizeof(handle_sigs) / sizeof(handle_sigs[0]); i++)
@@ -151,18 +151,13 @@ signal_setup(void)
 }
 
 int
-signal_reset(void)
+signal_setup(void)
 {
-       struct sigaction sa;
-       unsigned int i;
-
-       memset(&sa, 0, sizeof(sa));
-       sa.sa_handler = SIG_DFL;
-       sigemptyset(&sa.sa_mask);
-
-       for (i = 0; i < sizeof(handle_sigs) / sizeof(handle_sigs[0]); i++)
-               if (sigaction(handle_sigs[i], &sa, NULL) == -1)
-                       return -1;
+       return _signal_setup(signal_handler);
+}
 
-       return 0;
+int
+signal_reset(void)
+{
+       return _signal_setup(SIG_DFL);
 }

diff --git a/signal.h b/signals.h
similarity index 100%
rename from signal.h
rename to signals.h