dd: code shrink

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index f647a32bccee762d92f7a611153298414a632f3b..afad4ab8fd9a36ae3ac90150ea35f4928167cfeb 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,12 +4,29 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//usage:#define swapon_trivial_usage
+//usage:       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
+//usage:#define swapon_full_usage "\n\n"
+//usage:       "Start swapping on DEVICE\n"
+//usage:     "\n       -a      Start swapping on all swap devices"
+//usage:       IF_FEATURE_SWAPON_PRI(
+//usage:     "\n       -p PRI  Set swap device priority"
+//usage:       )
+//usage:
+//usage:#define swapoff_trivial_usage
+//usage:       "[-a] [DEVICE]"
+//usage:#define swapoff_full_usage "\n\n"
+//usage:       "Stop swapping on DEVICE\n"
+//usage:     "\n       -a      Stop swapping on all swap devices"
+
 #include "libbb.h"
 #include <mntent.h>
-#include <sys/swap.h>
+#ifndef __BIONIC__
+# include <sys/swap.h>
+#endif
 
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"
@@ -17,6 +34,10 @@
 # define resolve_mount_spec(fsname) ((void)0)
 #endif
 
+#ifndef MNTTYPE_SWAP
+# define MNTTYPE_SWAP "swap"
+#endif
+
 #if ENABLE_FEATURE_SWAPON_PRI
 struct globals {
        int flags;
@@ -26,6 +47,7 @@ struct globals {
 #else
 #define g_flags 0
 #endif
+#define INIT_G() do { } while (0)
 
 static int swap_enable_disable(char *device)
 {
@@ -66,11 +88,34 @@ static int do_em_all(void)
                bb_perror_msg_and_die("/etc/fstab");
 
        err = 0;
-       while ((m = getmntent(f)) != NULL)
-               if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0)
-                       err += swap_enable_disable(m->mnt_fsname);
+       while ((m = getmntent(f)) != NULL) {
+               if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0) {
+                       /* swapon -a should ignore entries with noauto,
+                        * but swapoff -a should process them */
+                       if (applet_name[5] != 'n'
+                        || hasmntopt(m, MNTOPT_NOAUTO) == NULL
+                       ) {
+#if ENABLE_FEATURE_SWAPON_PRI
+                               char *p;
+                               g_flags = 0; /* each swap space might have different flags */
+                               p = strstr(m->mnt_opts, "pri=");
+                               if (p) {
+                                       /* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */
+                                       int swap_prio = MIN(bb_strtoull(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
+                                       /* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */
+                                       if (errno != ERANGE) {
+                                               g_flags = SWAP_FLAG_PREFER |
+                                                       (swap_prio << SWAP_FLAG_PRIO_SHIFT);
+                                       }
+                               }
+#endif
+                               err += swap_enable_disable(m->mnt_fsname);
+                       }
+               }
+       }
 
-       endmntent(f);
+       if (ENABLE_FEATURE_CLEAN_UP)
+               endmntent(f);
 
        return err;
 }
@@ -80,10 +125,13 @@ int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
 {
        int ret;
 
+       INIT_G();
+
 #if !ENABLE_FEATURE_SWAPON_PRI
        ret = getopt32(argv, "a");
 #else
-       opt_complementary = "p+";
+       if (applet_name[5] == 'n')
+               opt_complementary = "p+";
        ret = getopt32(argv, (applet_name[5] == 'n') ? "ap:" : "a", &g_flags);
 
        if (ret & 2) { // -p