X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fswaponoff.c;h=863f7734a2b62fdc33c1797c3117d94723749b0c;hb=8e96b5b5314c3f2c3fdb6fd04abfa3e73ac27a5a;hp=b323cb10af59c8794f19026936f87536ad1f1764;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index b323cb10a..863f7734a 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -2,127 +2,101 @@
 /*
  * Mini swapon/swapoff implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * 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>
-
-#if __GNU_LIBRARY__ < 5
-/* libc5 doesn't have sys/swap.h, define these here. */ 
-extern int swapon (__const char *__path, int __flags);
-extern int swapoff (__const char *__path);
-#else
 #include <sys/swap.h>
-#endif
-
-#include "busybox.h"
-
-static int whichApp;    /* default SWAPON_APP */
-
-static const int SWAPON_APP = 0;
-static const int SWAPOFF_APP = 1;
 
+#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(const char *device)
+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 (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 (whichApp == SWAPON_APP)
-		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)
 {
 	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");
-	while ((m = getmntent(f)) != NULL) {
-		if (strcmp(m->mnt_type, MNTTYPE_SWAP)==0) {
-			if(swap_enable_disable(m->mnt_fsname) == EXIT_FAILURE)
-				err++;
-		}
-	}
+
+	err = 0;
+	while ((m = getmntent(f)) != NULL)
+		if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0)
+			err += swap_enable_disable(m->mnt_fsname);
+
 	endmntent(f);
+
 	return err;
 }
 
-
-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)
 {
-	if (bb_applet_name[5] == 'f') { /* "swapoff" */
-		whichApp = SWAPOFF_APP;
-	}
+	int ret;
 
-	if (argc != 2) {
-		goto usage_and_exit;
-	}
-	argc--;
-	argv++;
-
-	/* Parse any options */
-	while (**argv == '-') {
-		while (*++(*argv))
-			switch (**argv) {
-			case 'a':
-				{
-					struct stat statBuf;
-
-					if (stat("/etc/fstab", &statBuf) < 0)
-						bb_error_msg_and_die("/etc/fstab file missing");
-				}
-				return do_em_all();
-				break;
-			default:
-				goto usage_and_exit;
-			}
+#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;
 	}
-	return swap_enable_disable(*argv);
+#endif
+
+	if (ret /* & 1: not needed */) // -a
+		return do_em_all();
+
+	argv += optind;
+	if (!*argv)
+		bb_show_usage();
+
+	/* ret = 0; redundant */
+	do {
+		ret += swap_enable_disable(*argv);
+	} while (*++argv);
 
-  usage_and_exit:
-	bb_show_usage();
+	return ret;
 }