X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=swaponoff.c;h=ce0e2c6ccdb2e403c92a508ed116d8e66b414ac0;hb=044228d5ecb9b79397f9fc915d046cf4538281e2;hp=6bda22277f95be1f3da7e6636344b4b69088cc5b;hpb=e49d5ecbbe51718fa925b6890a735e5937cc2aa2;p=oweals%2Fbusybox.git

diff --git a/swaponoff.c b/swaponoff.c
index 6bda22277..ce0e2c6cc 100644
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -3,7 +3,7 @@
  * Mini swapon/swapoff implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -22,31 +22,28 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
-#include <sys/mount.h>
-#include <sys/swap.h>
 #include <mntent.h>
 #include <dirent.h>
-#include <fstab.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
 
-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";
+#include "busybox.h"
 
+static int whichApp;
 
-#define SWAPON_APP   1
-#define SWAPOFF_APP  2
+static const int SWAPON_APP = 1;
+static const int SWAPOFF_APP = 2;
 
 
 static void swap_enable_disable(char *device)
@@ -58,10 +55,8 @@ static void swap_enable_disable(char *device)
 	else
 		status = swapoff(device);
 
-	if (status != 0) {
-		perror(appName);
-		exit(FALSE);
-	}
+	if (status != 0)
+		perror_msg_and_die(applet_name);
 }
 
 static void do_em_all()
@@ -69,39 +64,29 @@ static void do_em_all()
 	struct mntent *m;
 	FILE *f = setmntent("/etc/fstab", "r");
 
-	if (f == NULL) {
-		perror("/etc/fstab");
-		exit(FALSE);
-	}
+	if (f == NULL)
+		perror_msg_and_die("/etc/fstab");
 	while ((m = getmntent(f)) != NULL) {
-		if (!strstr(m->mnt_type, MNTTYPE_SWAP)) {
+		if (strcmp(m->mnt_type, MNTTYPE_SWAP)==0) {
 			swap_enable_disable(m->mnt_fsname);
 		}
 	}
 	endmntent(f);
-	exit(TRUE);
+	exit(EXIT_SUCCESS);
 }
 
 
 extern int swap_on_off_main(int argc, 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;
+	if (strcmp(applet_name, "swapon") == 0) {
 		whichApp = SWAPON_APP;
-
 	} else {
-		appName = *argv;
 		whichApp = SWAPOFF_APP;
 	}
 
-	if (argc < 2)
+	if (argc != 2) {
 		goto usage_and_exit;
+	}
 	argc--;
 	argv++;
 
@@ -110,6 +95,12 @@ extern int swap_on_off_main(int argc, char **argv)
 		while (*++(*argv))
 			switch (**argv) {
 			case 'a':
+				{
+					struct stat statBuf;
+
+					if (stat("/etc/fstab", &statBuf) < 0)
+						error_msg_and_die("/etc/fstab file missing");
+				}
 				do_em_all();
 				break;
 			default:
@@ -117,9 +108,8 @@ extern int swap_on_off_main(int argc, char **argv)
 			}
 	}
 	swap_enable_disable(*argv);
-	exit(TRUE);
+	return EXIT_SUCCESS;
 
   usage_and_exit:
-	usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
-	exit(FALSE);
+	show_usage();
 }