rename ...trailing_char() to ...trailing_chars()

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index d26d53fe0b79d8b9fb61f97e61d186d85ee9d0d8..c75141f9fa36b6a06f30672c07bb24fff412ffef 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -636,8 +636,6 @@ static struct uevent_msg *get_netlink_msg(void)
 
 static void asmlinkage sig_handler(int signum)
 {
-       int rc;
-
        switch (signum) {
                case SIGINT:
                case SIGTERM:
@@ -653,14 +651,8 @@ static void asmlinkage sig_handler(int signum)
                        break;
        }
 
-       /* if pipe is empty, write to pipe to force select to return,
-        * which will wakeup our mainloop
-        */
-       if (!sig_flag) {
-               rc = write(signal_pipe[1], &signum, sizeof(signum));
-               if (rc >= 0)
-                       sig_flag = 1;
-       }
+       /* write to pipe, which will wakeup select() in our mainloop */
+       write(signal_pipe[WRITE_END], "", 1);
 }
 
 static void udev_done(int pid)
@@ -954,9 +946,8 @@ int main(int argc, char *argv[], char *envp[])
                                if (uevent_netlink_active && msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
                                        dbg("skip uevent_helper message, netlink is active");
                                        free(msg);
-                                       continue;
-                               }
-                               msg_queue_insert(msg);
+                               } else
+                                       msg_queue_insert(msg);
                        }
                }
 
@@ -974,16 +965,10 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* received a signal, clear our notification pipe */
-               if (FD_ISSET(signal_pipe[0], &readfds)) {
-                       int sig;
-                       ssize_t rlen;
-
-                       while(1) {
-                               rlen = read(signal_pipe[0], &sig, sizeof(sig));
-                               if (rlen <= 0)
-                                       break;
-                       }
-                       sig_flag = 0;
+               if (FD_ISSET(signal_pipe[READ_END], &readfds)) {
+                       char buf[256];
+
+                       read(signal_pipe[READ_END], &buf, sizeof(buf));
                }
 
                /* forked child have returned */