tls: in AES-GCM decoding, avoid memmove

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 0a2d23f50085d7f77803a7374b30b37000115b29..f432ce18012c63447ef9c5cbfc6600dbfb01c333 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -6,43 +6,49 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config SWAPON
-//config:      bool "swapon"
+//config:      bool "swapon (4.9 kb)"
 //config:      default y
 //config:      select PLATFORM_LINUX
 //config:      help
-//config:        This option enables the 'swapon' utility.
-//config:        Once you have created some swap space using 'mkswap', you also need
-//config:        to enable your swap space with the 'swapon' utility. The 'swapoff'
-//config:        utility is used, typically at system shutdown, to disable any swap
-//config:        space. If you are not using any swap space, you can leave this
-//config:        option disabled.
+//config:      Once you have created some swap space using 'mkswap', you also need
+//config:      to enable your swap space with the 'swapon' utility. The 'swapoff'
+//config:      utility is used, typically at system shutdown, to disable any swap
+//config:      space. If you are not using any swap space, you can leave this
+//config:      option disabled.
 //config:
 //config:config FEATURE_SWAPON_DISCARD
 //config:      bool "Support discard option -d"
 //config:      default y
 //config:      depends on SWAPON
 //config:      help
-//config:        Enable support for discarding swap area blocks at swapon and/or as
-//config:        the kernel frees them. This option enables both the -d option on
-//config:        'swapon' and the 'discard' option for swap entries in /etc/fstab.
+//config:      Enable support for discarding swap area blocks at swapon and/or as
+//config:      the kernel frees them. This option enables both the -d option on
+//config:      'swapon' and the 'discard' option for swap entries in /etc/fstab.
 //config:
 //config:config FEATURE_SWAPON_PRI
 //config:      bool "Support priority option -p"
 //config:      default y
 //config:      depends on SWAPON
 //config:      help
-//config:        Enable support for setting swap device priority in swapon.
+//config:      Enable support for setting swap device priority in swapon.
 //config:
 //config:config SWAPOFF
-//config:      bool "swapoff"
+//config:      bool "swapoff (4.3 kb)"
 //config:      default y
 //config:      select PLATFORM_LINUX
+//config:
+//config:config FEATURE_SWAPONOFF_LABEL
+//config:      bool "Support specifying devices by label or UUID"
+//config:      default y
+//config:      depends on SWAPON || SWAPOFF
+//config:      select VOLUMEID
 //config:      help
-//config:        This option enables the 'swapoff' utility.
+//config:      This allows for specifying a device by label or uuid, rather than by
+//config:      name. This feature utilizes the same functionality as blkid/findfs.
 
-//applet:IF_SWAPON(APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
+//                  APPLET_ODDNAME:name     main         location     suid_type     help
+//applet:IF_SWAPON( APPLET_ODDNAME(swapon,  swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
 //applet:IF_SWAPOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff))
 
 //kbuild:lib-$(CONFIG_SWAPON) += swaponoff.o
@@ -75,7 +81,7 @@
 # include <sys/swap.h>
 #endif
 
-#if ENABLE_FEATURE_MOUNT_LABEL
+#if ENABLE_FEATURE_SWAPONOFF_LABEL
 # include "volume_id.h"
 #else
 # define resolve_mount_spec(fsname) ((void)0)