Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/acpid.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/acpid.c (modified) (12 diffs)

branches/3.2/mindi-busybox/util-linux/acpid.c

@@ -7 +7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define acpid_trivial_usage
+//usage:       "[-df] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
+//usage:#define acpid_full_usage "\n\n"
+//usage:       "Listen to ACPI events and spawn specific helpers on event arrival\n"
+//usage:     "\n    -d  Log to stderr, not log file (implies -f)"
+//usage:     "\n    -f  Run in foreground"
+//usage:     "\n    -c DIR  Config directory [/etc/acpi]"
+//usage:     "\n    -e FILE /proc event file [/proc/acpi/event]"
+//usage:     "\n    -l FILE Log file [/var/log/acpid.log]"
+//usage:     "\n    -p FILE Pid file [/var/run/acpid.pid]"
+//usage:     "\n    -a FILE Action file [/etc/acpid.conf]"
+//usage:     "\n    -M FILE Map file [/etc/acpi.map]"
+//usage:    IF_FEATURE_ACPID_COMPAT(
+//usage:     "\n\nAccept and ignore compatibility options -g -m -s -S -v"
+//usage:    )
+//usage:
+//usage:#define acpid_example_usage
+//usage:       "Without -e option, acpid uses all /dev/input/event* files\n"
+//usage:       "# acpid\n"
+//usage:       "# acpid -l /var/log/my-acpi-log\n"
+//usage:       "# acpid -e /proc/acpi/event\n"
+
 #include "libbb.h"
 #include <syslog.h>
 #include <linux/input.h>
+
+#ifndef EV_SW
+# define EV_SW         0x05
+#endif
+#ifndef EV_KEY
+# define EV_KEY        0x01
+#endif
+#ifndef SW_LID
+# define SW_LID        0x00
+#endif
+#ifndef SW_RFKILL_ALL
+# define SW_RFKILL_ALL 0x03
+#endif
+#ifndef KEY_POWER
+# define KEY_POWER      116     /* SC System Power Down */
+#endif
+#ifndef KEY_SLEEP
+# define KEY_SLEEP      142     /* SC System Sleep */
+#endif
 
 enum {
@@ -34 +76 @@
     { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRF 00000080" },
     { "EV_KEY", 0x01, "KEY_POWER", 116, 1, "button/power PWRB 00000080" },
+    { "EV_SW", 0x05, "SW_LID", 0x00, 1, "button/lid LID0 00000080" },
 };
 
@@ -184 +227 @@
 int acpid_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct input_event ev;
     int nfd;
     int opts;
@@ -194 +236 @@
     const char *opt_map = "/etc/acpi.map";
 #if ENABLE_FEATURE_PIDFILE
-    const char *opt_pidfile = "/var/run/acpid.pid";
+    const char *opt_pidfile = CONFIG_PID_FILE_PATH "/acpid.pid";
 #endif
 
@@ -207 +249 @@
 
     if (!(opts & OPT_f)) {
+        /* No -f "Foreground", we go to background */
         bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv);
     }
 
     if (!(opts & OPT_d)) {
+        /* No -d "Debug", we log to log file.
+         * This includes any output from children.
+         */
+        xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
+        xdup2(STDOUT_FILENO, STDERR_FILENO);
+        /* Also, acpid's messages (but not children) will go to syslog too */
         openlog(applet_name, LOG_PID, LOG_DAEMON);
         logmode = LOGMODE_SYSLOG | LOGMODE_STDIO;
-    } else {
-        xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
-    }
+    }
+    /* else: -d "Debug", log is not redirected */
 
     parse_conf_file(opt_action);
@@ -222 +270 @@
     xchdir(opt_dir);
 
+    /* We spawn children but don't wait for them. Prevent zombies: */
     bb_signals((1 << SIGCHLD), SIG_IGN);
-    bb_signals(BB_FATAL_SIGS, record_signo);
+    // If you enable this, (1) explain why, (2)
+    // make sure while(poll) loop below is still interruptible
+    // by SIGTERM et al:
+    //bb_signals(BB_FATAL_SIGS, record_signo);
 
     pfd = NULL;
@@ -231 +283 @@
         char *dev_event;
 
-        dev_event = xasprintf((option_mask32 & OPT_e) ? "%s" : "%s%u", opt_input, nfd);
+        dev_event = xasprintf((opts & OPT_e) ? "%s" : "%s%u", opt_input, nfd);
         fd = open(dev_event, O_RDONLY | O_NONBLOCK);
         if (fd < 0) {
@@ -238 +290 @@
             break;
         }
+        free(dev_event);
         pfd = xrealloc_vector(pfd, 1, nfd);
         pfd[nfd].fd = fd;
@@ -246 +299 @@
     write_pidfile(opt_pidfile);
 
-    while (poll(pfd, nfd, -1) > 0) {
+    while (safe_poll(pfd, nfd, -1) > 0) {
         int i;
         for (i = 0; i < nfd; i++) {
-            const char *event = NULL;
-
-            memset(&ev, 0, sizeof(ev));
-
-            if (!(pfd[i].revents & POLLIN))
-                continue;
-
+            const char *event;
+
+            if (!(pfd[i].revents & POLLIN)) {
+                if (pfd[i].revents == 0)
+                    continue; /* this fd has nothing */
+
+                /* Likely POLLERR, POLLHUP, POLLNVAL.
+                 * Do not listen on this fd anymore.
+                 */
+                close(pfd[i].fd);
+                nfd--;
+                for (; i < nfd; i++)
+                    pfd[i].fd = pfd[i + 1].fd;
+                break; /* do poll() again */
+            }
+
+            event = NULL;
             if (option_mask32 & OPT_e) {
                 char *buf;
                 int len;
 
-                buf = xmalloc_reads(pfd[i].fd, NULL, NULL);
+                buf = xmalloc_reads(pfd[i].fd, NULL);
                 /* buf = "button/power PWRB 00000080 00000000" */
                 len = strlen(buf) - 9;
@@ -266 +329 @@
                     buf[len] = '\0';
                 event = find_action(NULL, buf);
+                free(buf);
             } else {
+                struct input_event ev;
+
                 if (sizeof(ev) != full_read(pfd[i].fd, &ev, sizeof(ev)))
                     continue;
@@ -277 +343 @@
             if (!event)
                 continue;
-            // spawn event handler
+            /* spawn event handler */
             process_event(event);
         }
@@ -283 +349 @@
 
     if (ENABLE_FEATURE_CLEAN_UP) {
-        while (nfd--) {
-            if (pfd[nfd].fd) {
-                close(pfd[nfd].fd);
-            }
-        }
+        while (nfd--)
+            close(pfd[nfd].fd);
         free(pfd);
     }