From: Roy Marples <roy@marples.name>
Date: Thu, 15 May 2008 12:48:01 +0000 (+0000)
Subject: Move signal.{c,h} to signals.{c.h} so we can work better in the NetBSD source tree.
X-Git-Tag: v4.0.2~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c308ff18f5ae688edaa3680a7d5adbd79b7be3a;p=thirdparty%2Fdhcpcd.git

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 af150491..7c859153 100644
--- 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 c7cd378b..d848f8b7 100644
--- 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 0029fb8a..93144813 100644
--- 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 490d59a9..cca1465f 100644
--- 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 f9498748..9f0bd793 100644
--- 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