ntpd: print result of hostname resolution

[oweals/busybox.git] / util-linux / acpid.c

diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 361a2b206285cf18bc74424a6397da5d2a41ca94..3e68b61abf65a9fcaca46ee936e26e88b759fd34 100644 (file)
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -6,6 +6,32 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+//config:config ACPID
+//config:      bool "acpid"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        acpid listens to ACPI events coming either in textual form from
+//config:        /proc/acpi/event (though it is marked deprecated it is still widely
+//config:        used and _is_ a standard) or in binary form from specified evdevs
+//config:        (just use /dev/input/event*).
+//config:
+//config:        It parses the event to retrieve ACTION and a possible PARAMETER.
+//config:        It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+//config:        (if the resulting path is a directory) or directly as an executable.
+//config:
+//config:        N.B. acpid relies on run-parts so have the latter installed.
+//config:
+//config:config FEATURE_ACPID_COMPAT
+//config:      bool "Accept and ignore redundant options"
+//config:      default y
+//config:      depends on ACPID
+//config:      help
+//config:        Accept and ignore compatibility options -g -m -s -S -v.
+
+//applet:IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_ACPID) += acpid.o
 
 //usage:#define acpid_trivial_usage
 //usage:       "[-df] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
@@ -75,6 +101,7 @@ struct acpi_event {
 static const struct acpi_event f_evt_tab[] = {
        { "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" },
 };
 
 struct acpi_action {
@@ -120,10 +147,8 @@ static void process_event(const char *event)
        char *handler = xasprintf("./%s", event);
        const char *args[] = { "run-parts", handler, NULL };
 
-       // debug info
-       if (option_mask32 & OPT_d) {
-               bb_error_msg("%s", event);
-       }
+       // log the event
+       bb_error_msg("%s", event);
 
        // spawn handler
        // N.B. run-parts would require scripts to have #!/bin/sh
@@ -152,7 +177,7 @@ static const char *find_action(struct input_event *ev, const char *buf)
                }
 
                if (buf) {
-                       if (strncmp(buf, evt_tab[i].desc, strlen(buf)) == 0) {
+                       if (is_prefixed_with(evt_tab[i].desc, buf)) {
                                action = evt_tab[i].desc;
                                break;
                        }
@@ -234,7 +259,7 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
        const char *opt_action = "/etc/acpid.conf";
        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
 
        INIT_G();
@@ -255,7 +280,7 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
                /* 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);
+               xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_APPEND), 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);
@@ -268,8 +293,12 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
 
        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;
        nfd = 0;
@@ -337,7 +366,7 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
                        }
                        if (!event)
                                continue;
-                       // spawn event handler
+                       /* spawn event handler */
                        process_event(event);
                }
        }