Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.

[oweals/busybox.git] / swaponoff.c

diff --git a/swaponoff.c b/swaponoff.c
index 6bda22277f95be1f3da7e6636344b4b69088cc5b..223436c29a14ad9b36a2b918c73504519d69d6ce 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 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
@@ -25,24 +25,35 @@
 #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 <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 [OPTION] [device]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nStop swapping virtual memory pages on the given device.\n\n"
+       "Options:\n"
+       "\t-a\tStop swapping on all swap devices\n"
+#endif
+       ;
 
-       "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";
+       "swapon [OPTION] [device]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nStart swapping virtual memory pages on the given device.\n\n"
+       "Options:\n"
+       "\t-a\tStart swapping on all swap devices\n"
+#endif
+       ;
 
 
 #define SWAPON_APP   1
@@ -74,7 +85,7 @@ static void do_em_all()
                exit(FALSE);
        }
        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);
                }
        }
@@ -85,12 +96,6 @@ static void do_em_all()
 
 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;
                whichApp = SWAPON_APP;
@@ -100,8 +105,9 @@ extern int swap_on_off_main(int argc, char **argv)
                whichApp = SWAPOFF_APP;
        }
 
-       if (argc < 2)
+       if (argc != 2) {
                goto usage_and_exit;
+       }
        argc--;
        argv++;
 
@@ -110,6 +116,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)
+                                               fatalError("/etc/fstab file missing\n");
+                               }
                                do_em_all();
                                break;
                        default: