hush: rename o_quoted to has_quoted_part; small code shrink

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 1e3fe5a4384812211ab4e5dbb6d07e0900eb5aa2..e2c060f303a6b8dc40ad7eef46176c60178280e0 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,92 +4,115 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#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"
+#if ENABLE_FEATURE_MOUNT_LABEL
+# include "volume_id.h"
+#else
+# define resolve_mount_spec(fsname) ((void)0)
+#endif
 
-static int swap_enable_disable(const char *device)
+#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;
 
-       if (stat(device, &st) < 0) {
-               bb_perror_msg_and_die("cannot stat %s", device);
-       }
+       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 (S_ISREG(st.st_mode))
+               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;
        }
-       /*printf("%s: %s\n", bb_applet_name, device);*/
-       return EXIT_SUCCESS;
+
+       return 0;
 }
 
 static int do_em_all(void)
 {
        struct mntent *m;
-       FILE *f = setmntent("/etc/fstab", "r");
-       int err = 0;
+       FILE *f;
+       int err;
 
+       f = setmntent("/etc/fstab", "r");
        if (f == NULL)
                bb_perror_msg_and_die("/etc/fstab");
+
+       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++;
+               if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0) {
+                       /* swapon -a should ignore entries with noauto,
+                        * but swapoff -a should process them */
+                       if (applet_name[5] != 'n'
+                        || hasmntopt(m, MNTOPT_NOAUTO) == NULL
+                       ) {
+                               err += swap_enable_disable(m->mnt_fsname);
+                       }
                }
        }
-       endmntent(f);
+
+       if (ENABLE_FEATURE_CLEAN_UP)
+               endmntent(f);
+
        return err;
 }
 
-#define DO_ALL      1
-
-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");
-       
-       if (argc != 2) {
-               bb_show_usage();
+       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;
        }
-       
-       if (opt & DO_ALL)
+#endif
+
+       if (ret /* & 1: not needed */) // -a
                return do_em_all();
-       
-       return swap_enable_disable(argv[1]);
+
+       argv += optind;
+       if (!*argv)
+               bb_show_usage();
+
+       /* ret = 0; redundant */
+       do {
+               ret += swap_enable_disable(*argv);
+       } while (*++argv);
+
+       return ret;
 }