mdev: set $MDEV correctly for renamed nodes

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index beefac030441cf766aa81a5ae9e899a0aac388a3..863f7734a2b62fdc33c1797c3117d94723749b0c 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -11,6 +11,16 @@
 #include <mntent.h>
 #include <sys/swap.h>
 
+#if ENABLE_FEATURE_SWAPON_PRI
+struct globals {
+       int flags;
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define g_flags (G.flags)
+#else
+#define g_flags 0
+#endif
+
 static int swap_enable_disable(char *device)
 {
        int status;
@@ -26,7 +36,7 @@ static int swap_enable_disable(char *device)
 #endif
 
        if (applet_name[5] == 'n')
-               status = swapon(device, 0);
+               status = swapon(device, g_flags);
        else
                status = swapoff(device);
 
@@ -59,19 +69,34 @@ static int do_em_all(void)
 }
 
 int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int swap_on_off_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
 {
        int ret;
 
-       if (!argv[1])
-               bb_show_usage();
-
+#if !ENABLE_FEATURE_SWAPON_PRI
        ret = getopt32(argv, "a");
-       if (ret)
+#else
+       opt_complementary = "p+";
+       ret = getopt32(argv, (applet_name[5] == 'n') ? "ap:" : "a", &g_flags);
+
+       if (ret & 2) { // -p
+               g_flags = SWAP_FLAG_PREFER |
+                       ((g_flags & SWAP_FLAG_PRIO_MASK) << SWAP_FLAG_PRIO_SHIFT);
+               ret &= 1;
+       }
+#endif
+
+       if (ret /* & 1: not needed */) // -a
                return do_em_all();
 
+       argv += optind;
+       if (!*argv)
+               bb_show_usage();
+
        /* ret = 0; redundant */
-       while (*++argv)
+       do {
                ret += swap_enable_disable(*argv);
+       } while (*++argv);
+
        return ret;
 }