X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fswaponoff.c;h=f2f52fb88ebc144a22b2df224c1073ad67d2f647;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=3c02bdd42d1baf1efefc1fc926e95cd177213acf;hpb=fac10d7c59f7db0facd5fb94de273310b9ec86e6;p=oweals%2Fbusybox.git

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 3c02bdd42..f2f52fb88 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -1,122 +1,118 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini swapon/swapoff implementation for busybox
  *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
- *
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <sys/mount.h>
-#include <sys/swap.h>
+#include "libbb.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <fstab.h>
-#include <errno.h>
-
-
-static int whichApp;
-static const char* appName;
-
-static const char swapoff_usage[] = 
-"swapoff device\n"
-"\nStop swapping virtual memory pages on the given device.\n";
-static const char swapon_usage[] = 
-"swapon device\n"
-"\nStart swapping virtual memory pages on the given device.\n";
-
-
-#define SWAPON_APP   1
-#define SWAPOFF_APP  2
-
+#include <sys/swap.h>
 
-static void
-swap_enable_disable( 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;
-    if ( whichApp == SWAPON_APP )
-	status = swapon(device, 0);
-    else 
-	status = swapoff(device);
-
-    if ( status != 0 ) { 
-	perror(appName);
-	exit( FALSE);
-    }
+	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 * (off_t)512 < st.st_size)
+			bb_error_msg("warning: swap file has holes");
+#endif
+
+	if (applet_name[5] == 'n')
+		status = swapon(device, g_flags);
+	else
+		status = swapoff(device);
+
+	if (status != 0) {
+		bb_simple_perror_msg(device);
+		return 1;
+	}
+
+	return 0;
 }
 
-static void
-do_em_all()
+static int do_em_all(void)
 {
 	struct mntent *m;
-	FILE *f = setmntent ("/etc/fstab", "r");
-
-	if (f == NULL) {
-	    perror("/etc/fstab");
-	    exit( FALSE); 
+	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) {
+			/* 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);
+			}
+		}
 	}
-	while ((m = getmntent (f)) != NULL) {
-	    if (!strstr (m->mnt_type, MNTTYPE_SWAP)) {
-		    swap_enable_disable( m->mnt_fsname);
-	    }
-	}
-	endmntent (f);
-	exit( TRUE);
-}
 
+	if (ENABLE_FEATURE_CLEAN_UP)
+		endmntent(f);
 
-extern int
-swap_on_off_main(int argc, char * * argv)
+	return err;
+}
+
+int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct stat statBuf;
-    if (stat("/etc/fstab", &statBuf) < 0) 
-	fprintf(stderr, "/etc/fstab file missing -- Please install one.\n\n");
-
-    if (strcmp(*argv, "swapon")==0) {
-	appName = *argv;
-	whichApp = SWAPON_APP;
-
-    } else {
-	appName = *argv;
-	whichApp = SWAPOFF_APP;
-    }
-
-    if (argc < 2)
-	goto usage_and_exit;
-    argc--;
-    argv++;
-
-    /* Parse any options */
-    while (**argv == '-') {
-	while (*++(*argv)) switch (**argv) {
-	    case 'a':
-		do_em_all();
-		break;
-	    default:
-		goto usage_and_exit;
+	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;
 	}
-    }
-    swap_enable_disable(*argv);
-    exit( TRUE);
+#endif
 
-usage_and_exit:
-    usage( (whichApp==SWAPON_APP)? swapon_usage : swapoff_usage);
-    exit( FALSE);
-}
+	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);
+
+	return ret;
+}