Move signals.c,h to signal.c,h

1 files changed, 0 insertions, 109 deletions

diff --git a/signals.c b/signals.c
deleted file mode 100644
index 234a0509..00000000
--- a/signals.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * dhcpcd - DHCP client daemon
- * Copyright 2006-2007 Roy Marples <roy@marples.name>
- * 
- * Distributed under the terms of the GNU General Public License v2
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "logger.h"
-#include "signals.h"
-
-static int signal_pipe[2];
-static int signal_signal = 0;
-
-static void signal_handler (int sig)
-{
-	/* Silently ignore this signal and wait for it. This stops zombies.
-	   We do this here instead of client.c so that we don't spam the log file
-	   with "waiting on select messages" */
-	if (sig == SIGCHLD) {
-		wait (0);
-		return;
-	}
-
-	signal_signal = sig;
-	if (send (signal_pipe[1], &sig, sizeof (sig), MSG_DONTWAIT) == -1)
-		logger (LOG_ERR, "Could not send signal: %s", strerror (errno));
-}
-
-/* Call this before doing anything else. Sets up the socket pair
- * and installs the signal handler */
-void signal_setup (void)
-{
-	int i;
-	int flags;
-
-	socketpair (AF_UNIX, SOCK_STREAM, 0, signal_pipe);
-
-	/* Stop any scripts from inheriting us */
-	for (i = 0; i < 2; i++)
-		if ((flags = fcntl (signal_pipe[i], F_GETFD, 0)) == -1 ||
-			fcntl (signal_pipe[i], F_SETFD, flags | FD_CLOEXEC) == -1)
-			logger (LOG_ERR ,"fcntl: %s", strerror (errno));
-
-	signal (SIGHUP, signal_handler);
-	signal (SIGALRM, signal_handler);
-	signal (SIGTERM, signal_handler);
-	signal (SIGINT, signal_handler);
-	signal (SIGCHLD, signal_handler);
-}
-
-/* Add the signal pipe to an fd set */
-int signal_fd_set (fd_set *rset, int fd)
-{
-	FD_ZERO (rset);
-	FD_SET (signal_pipe[0], rset);
-	if (fd >= 0)
-		FD_SET (fd, rset);
-	return signal_pipe[0] > fd ? signal_pipe[0] : fd;
-}
-
-/* Check if we have a signal or not */
-int signal_exists (const fd_set *rset)
-{
-	if (signal_signal || (rset && FD_ISSET (signal_pipe[0], rset)))
-		return 0;
-	return -1;
-}
-
-/* Read a signal from the signal pipe. Returns 0 if there is
- * no signal, -1 on error (and sets errno appropriately), and
- * your signal on success */
-int signal_read (fd_set *rset)
-{
-	int sig = -1;
-
-	if (signal_signal) {
-		sig = signal_signal;
-		signal_signal = 0;
-	}
-
-	if (rset && FD_ISSET (signal_pipe[0], rset)) {
-		int buflen = sizeof (sig) * 2;
-		char buf[buflen];
-		size_t bytes;
-
-		memset (buf, 0, buflen);
-		bytes = read (signal_pipe[0], buf, buflen);
-
-		if (bytes >= sizeof (sig))
-			memcpy (&sig, buf, sizeof (sig));
-
-		/* We need to clear us from rset if nothing left in the buffer
-		 * in case we are called many times */
-		if (bytes == sizeof (sig))
-			FD_CLR (signal_pipe[0], rset);
-	}
-
-	return sig;
-}