sed: simpler fix for recent GNU compat stuff (by Rob Landley)

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 0080ff294691762925c7fa18c3b9f9a8eecd9ad8..863f7734a2b62fdc33c1797c3117d94723749b0c 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,44 +4,48 @@
  *
  * 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 <stdio.h>
+#include "libbb.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/mount.h>
 #include <sys/swap.h>
 
-#include "busybox.h"
-
-static int swap_enable_disable(const char *device)
+#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;
        struct stat st;
 
-       if (stat(device, &st) < 0)
-               bb_perror_msg_and_die("cannot stat %s", 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);
-               return EXIT_FAILURE;
+               bb_simple_perror_msg(device);
+               return 1;
        }
 
-       return EXIT_SUCCESS;
+       return 0;
 }
 
 static int do_em_all(void)
@@ -57,25 +61,42 @@ static int do_em_all(void)
        err = 0;
        while ((m = getmntent(f)) != NULL)
                if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0)
-                       if (swap_enable_disable(m->mnt_fsname) == EXIT_FAILURE)
-                               ++err;
+                       err += swap_enable_disable(m->mnt_fsname);
 
        endmntent(f);
 
        return err;
 }
 
-#define DO_ALL    0x01
-
-extern 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)
 {
-       unsigned long opt = bb_getopt_ulflags(argc, argv, "a");
+       int ret;
+
+#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
 
-       if (argc != 2)
+       if (ret /* & 1: not needed */) // -a
+               return do_em_all();
+
+       argv += optind;
+       if (!*argv)
                bb_show_usage();
 
-       if (opt & DO_ALL)
-               return do_em_all();
+       /* ret = 0; redundant */
+       do {
+               ret += swap_enable_disable(*argv);
+       } while (*++argv);
 
-       return swap_enable_disable(argv[1]);
+       return ret;
 }