Close IMG tag.

[oweals/busybox.git] / swaponoff.c

diff --git a/swaponoff.c b/swaponoff.c
index 6bda22277f95be1f3da7e6636344b4b69088cc5b..8a9134ca0075342a8066654ed441da594d770395 100644 (file)
--- 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,24 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.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>
 
+_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 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";
 
+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 +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()
@@ -69,39 +60,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 +91,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\n");
+                               }
                                do_em_all();
                                break;
                        default:
@@ -117,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);
 }