Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/swaponoff.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/swaponoff.c (modified) (4 diffs)

branches/3.2/mindi-busybox/util-linux/swaponoff.c

@@ -8 +8 @@
  */
 
+//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
@@ -16 +33 @@
 #else
 # define resolve_mount_spec(fsname) ((void)0)
+#endif
+
+#ifndef MNTTYPE_SWAP
+# define MNTTYPE_SWAP "swap"
 #endif
 
@@ -27 +48 @@
 #define g_flags 0
 #endif
+#define INIT_G() do { } while (0)
 
 static int swap_enable_disable(char *device)
@@ -90 +112 @@
     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);