Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/signalpipe.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/signalpipe.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/signalpipe.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* signalpipe.c
  *
@@ -20 +21 @@
  */
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
+#include "common.h"
 
-
-#include "signalpipe.h"
-#include "common.h"
 
 static int signal_pipe[2];
@@ -35 +28 @@
 static void signal_handler(int sig)
 {
-    if (send(signal_pipe[1], &sig, sizeof(sig), MSG_DONTWAIT) < 0)
-        DEBUG(LOG_ERR, "Could not send signal: %m");
+    unsigned char ch = sig; /* use char, avoid dealing with partial writes */
+    if (write(signal_pipe[1], &ch, 1) != 1)
+        bb_perror_msg("cannot send signal");
 }
 
@@ -44 +38 @@
 void udhcp_sp_setup(void)
 {
-    socketpair(AF_UNIX, SOCK_STREAM, 0, signal_pipe);
+    /* was socketpair, but it needs AF_UNIX in kernel */
+    xpipe(signal_pipe);
     fcntl(signal_pipe[0], F_SETFD, FD_CLOEXEC);
     fcntl(signal_pipe[1], F_SETFD, FD_CLOEXEC);
+    fcntl(signal_pipe[1], F_SETFL, O_NONBLOCK);
     signal(SIGUSR1, signal_handler);
     signal(SIGUSR2, signal_handler);
@@ -73 +69 @@
 int udhcp_sp_read(fd_set *rfds)
 {
-    int sig;
+    unsigned char sig;
 
     if (!FD_ISSET(signal_pipe[0], rfds))
         return 0;
 
-    if (read(signal_pipe[0], &sig, sizeof(sig)) < 0)
+    if (read(signal_pipe[0], &sig, 1) != 1)
         return -1;