Fix some compiler warnings emitted by gcc-4.8.0

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index b7cf69833304d060f0e5566cfa7627f9a737050c..afad4ab8fd9a36ae3ac90150ea35f4928167cfeb 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -11,7 +11,6 @@
 //usage:       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
 //usage:#define swapon_full_usage "\n\n"
 //usage:       "Start swapping on DEVICE\n"
-//usage:     "\nOptions:"
 //usage:     "\n       -a      Start swapping on all swap devices"
 //usage:       IF_FEATURE_SWAPON_PRI(
 //usage:     "\n       -p PRI  Set swap device priority"
@@ -21,12 +20,13 @@
 //usage:       "[-a] [DEVICE]"
 //usage:#define swapoff_full_usage "\n\n"
 //usage:       "Stop swapping on DEVICE\n"
-//usage:     "\nOptions:"
 //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"
@@ -34,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;
@@ -43,6 +47,7 @@ struct globals {
 #else
 #define g_flags 0
 #endif
+#define INIT_G() do { } while (0)
 
 static int swap_enable_disable(char *device)
 {
@@ -90,6 +95,20 @@ static int do_em_all(void)
                        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);
                        }
                }
@@ -106,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