Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/acpid.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

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

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

@@ -122 +122 @@
     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
@@ -154 +152 @@
 
         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;
@@ -257 +255 @@
          * 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 */