tls: in AES-GCM decoding, avoid memmove

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

diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 3e68b61abf65a9fcaca46ee936e26e88b759fd34..4f491fa1428fd2b4ae79e88dc9dc1316764778fe 100644 (file)
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -7,27 +7,27 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config ACPID
-//config:      bool "acpid"
+//config:      bool "acpid (8.7 kb)"
 //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:      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:      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:      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.
+//config:      Accept and ignore compatibility options -g -m -s -S -v.
 
 //applet:IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
 
@@ -264,8 +264,12 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
 
        INIT_G();
 
-       opt_complementary = "df:e--e";
-       opts = getopt32(argv, "c:de:fl:a:M:" IF_FEATURE_PIDFILE("p:") IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"),
+       opts = getopt32(argv, "^"
+               "c:de:fl:a:M:"
+               IF_FEATURE_PIDFILE("p:")
+               IF_FEATURE_ACPID_COMPAT("g:m:s:S:v")
+               "\0"
+               "df:e--e",
                &opt_dir, &opt_input, &opt_logfile, &opt_action, &opt_map
                IF_FEATURE_PIDFILE(, &opt_pidfile)
                IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL)