It turns out that DODMALLOC was broken when I reorganized busybox.h

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index dca40196626a51180fb641c5acba26a06101804a..0613fa1e910cfa91f598f241a519dfd2aa14f6cc 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/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,34 +22,24 @@
  *
  */
 
-#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 <stdlib.h>
+#include <sys/mount.h>
+#include <sys/syscall.h>
+#include <linux/unistd.h>
+#include "busybox.h"
 
+_syscall2(int, swapon, const char *, path, int, flags);
+_syscall1(int, swapoff, const char *, path);
 
-static int whichApp;
-static const char *appName;
-
-static const char swapoff_usage[] =
-       "swapoff [OPTION] [device]\n\n"
-       "Stop swapping virtual memory pages on the given device.\n\n"
-       "Options:\n"
-       "\t-a\tStop swapping on all swap devices\n";
-
-static const char swapon_usage[] =
-       "swapon [OPTION] [device]\n\n"
-       "Start swapping virtual memory pages on the given device.\n\n"
-       "Options:\n"
-       "\t-a\tStart swapping on all swap devices\n";
 
+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)
@@ -61,10 +51,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()
@@ -72,28 +60,23 @@ 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)
 {
-       if (strcmp(*argv, "swapon") == 0) {
-               appName = *argv;
+       if (strcmp(applet_name, "swapon") == 0) {
                whichApp = SWAPON_APP;
-
        } else {
-               appName = *argv;
                whichApp = SWAPOFF_APP;
        }
 
@@ -112,7 +95,7 @@ extern int swap_on_off_main(int argc, char **argv)
                                        struct stat statBuf;
 
                                        if (stat("/etc/fstab", &statBuf) < 0)
-                                               fatalError("/etc/fstab file missing\n");
+                                               error_msg_and_die("/etc/fstab file missing");
                                }
                                do_em_all();
                                break;
@@ -121,9 +104,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();
 }