X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Fswaponoff.c;h=f647a32bccee762d92f7a611153298414a632f3b;hb=4f0408b5bc6ed726e7f98d6adedede41337b9b74;hp=9bb70a1f5a797710d50a6e0cb86a54d9173e600c;hpb=22d26fc6ae2af584482deaf92f25bb6a7261ad78;p=oweals%2Fbusybox.git

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 9bb70a1f5..f647a32bc 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,36 +4,51 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
 #include <sys/swap.h>
 
-
-static int swap_enable_disable(const char *device)
+#if ENABLE_FEATURE_MOUNT_LABEL
+# include "volume_id.h"
+#else
+# define resolve_mount_spec(fsname) ((void)0)
+#endif
+
+#if ENABLE_FEATURE_SWAPON_PRI
+struct globals {
+	int flags;
+} FIX_ALIASING;
+#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;
 	struct stat st;
 
+	resolve_mount_spec(&device);
 	xstat(device, &st);
 
+#if ENABLE_DESKTOP
 	/* test for holes */
 	if (S_ISREG(st.st_mode))
-		if (st.st_blocks * 512 < st.st_size)
-			bb_error_msg_and_die("swap file has holes");
+		if (st.st_blocks * (off_t)512 < st.st_size)
+			bb_error_msg("warning: swap file has holes");
+#endif
 
-	if (bb_applet_name[5] == 'n')
-		status = swapon(device, 0);
+	if (applet_name[5] == 'n')
+		status = swapon(device, g_flags);
 	else
 		status = swapoff(device);
 
 	if (status != 0) {
-		bb_perror_msg("%s", device);
+		bb_simple_perror_msg(device);
 		return 1;
 	}
 
@@ -60,21 +75,35 @@ static int do_em_all(void)
 	return err;
 }
 
-#define DO_ALL    0x01
-
-int swap_on_off_main(int argc, char **argv)
+int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
 {
 	int ret;
 
-	if (argc == 1)
-		bb_show_usage();
+#if !ENABLE_FEATURE_SWAPON_PRI
+	ret = getopt32(argv, "a");
+#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
 
-	ret = bb_getopt_ulflags(argc, argv, "a");
-	if (ret & DO_ALL)
+	if (ret /* & 1: not needed */) // -a
 		return do_em_all();
 
-	ret = 0;
-	while (*++argv)
+	argv += optind;
+	if (!*argv)
+		bb_show_usage();
+
+	/* ret = 0; redundant */
+	do {
 		ret += swap_enable_disable(*argv);
+	} while (*++argv);
+
 	return ret;
 }