tls: in AES-GCM decoding, avoid memmove

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

diff --git a/util-linux/eject.c b/util-linux/eject.c
index 667932f6ca612ba87eba1d85a8c01a82681782e2..6c30facd2624a2def33319b35c2b931db4e6691f 100644 (file)
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -13,19 +13,19 @@
  * Most of the dirty work blatantly ripped off from cat.c =)
  */
 //config:config EJECT
-//config:      bool "eject"
+//config:      bool "eject (4.1 kb)"
 //config:      default y
 //config:      select PLATFORM_LINUX
 //config:      help
-//config:        Used to eject cdroms. (defaults to /dev/cdrom)
+//config:      Used to eject cdroms. (defaults to /dev/cdrom)
 //config:
 //config:config FEATURE_EJECT_SCSI
 //config:      bool "SCSI support"
 //config:      default y
 //config:      depends on EJECT
 //config:      help
-//config:        Add the -s option to eject, this allows to eject SCSI-Devices and
-//config:        usb-storage devices.
+//config:      Add the -s option to eject, this allows to eject SCSI-Devices and
+//config:      usb-storage devices.
 
 //applet:IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -124,8 +124,9 @@ int eject_main(int argc UNUSED_PARAM, char **argv)
        unsigned flags;
        const char *device;
 
-       opt_complementary = "?1:t--T:T--t";
-       flags = getopt32(argv, "tT" IF_FEATURE_EJECT_SCSI("s"));
+       flags = getopt32(argv, "^" "tT"IF_FEATURE_EJECT_SCSI("s")
+                       "\0" "?1:t--T:T--t"
+       );
        device = argv[optind] ? argv[optind] : "/dev/cdrom";
 
        /* We used to do "umount <device>" here, but it was buggy