Fixes so "make allnoconfig" works again.

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

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 5a2d735ad8f65fca130ee51a131829393799aa9a..7c7031bcee79424fbac0edf0be42d9f8cc21ef9e 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini swapon/swapoff implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
@@ -19,103 +20,101 @@
  *
  */
 
-#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>
+#include <sys/swap.h>
 
+#include "busybox.h"
 
-static int whichApp;
-static const char* appName;
+static int whichApp;    /* default SWAPON_APP */
 
-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 const int SWAPON_APP = 0;
+static const int SWAPOFF_APP = 1;
 
 
-#define SWAPON_APP   1
-#define SWAPOFF_APP  2
+static int swap_enable_disable(const char *device)
+{
+       int status;
+       struct stat st;
 
+       if (stat(device, &st) < 0) {
+               bb_perror_msg_and_die("cannot stat %s", device);
+       }
 
-static void
-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);
-    }
+       /* test for holes */
+       if (S_ISREG(st.st_mode)) {
+               if (st.st_blocks * 512 < st.st_size) {
+                       bb_error_msg_and_die("swap file has holes");
+               }
+       }
+
+       if (whichApp == SWAPON_APP)
+               status = swapon(device, 0);
+       else
+               status = swapoff(device);
+
+       if (status != 0) {
+               bb_perror_msg("%s", device);
+               return EXIT_FAILURE;
+       }
+       return EXIT_SUCCESS;
 }
 
-static void
-do_em_all()
+static int do_em_all(void)
 {
        struct mntent *m;
-       char swapName[NAME_MAX];
-       FILE *f = setmntent ("/etc/fstab", "r");
-
-       if (f == NULL) {
-           perror("/etc/fstab");
-           exit( FALSE); 
-       }
-       while ((m = getmntent (f)) != NULL) {
-           if (!strstr (m->mnt_type, "swap")) {
-                   swap_enable_disable( swapName);
-           }
+       FILE *f = setmntent("/etc/fstab", "r");
+       int err = 0;
+
+       if (f == NULL)
+               bb_perror_msg_and_die("/etc/fstab");
+       while ((m = getmntent(f)) != NULL) {
+               if (strcmp(m->mnt_type, MNTTYPE_SWAP)==0) {
+                       if(swap_enable_disable(m->mnt_fsname) == EXIT_FAILURE)
+                               err++;
+               }
        }
-       endmntent (f);
-       exit( TRUE);
+       endmntent(f);
+       return err;
 }
 
 
-extern int
-swap_on_off_main(int argc, char * * argv)
+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;
-
-    } 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:
+       if (bb_applet_name[5] == 'f') { /* "swapoff" */
+               whichApp = SWAPOFF_APP;
+       }
+
+       if (argc != 2) {
                goto usage_and_exit;
        }
-    }
-    swap_enable_disable(*argv);
-    exit( TRUE);
+       argc--;
+       argv++;
+
+       /* Parse any options */
+       while (**argv == '-') {
+               while (*++(*argv))
+                       switch (**argv) {
+                       case 'a':
+                               {
+                                       struct stat statBuf;
+
+                                       if (stat("/etc/fstab", &statBuf) < 0)
+                                               bb_error_msg_and_die("/etc/fstab file missing");
+                               }
+                               return do_em_all();
+                               break;
+                       default:
+                               goto usage_and_exit;
+                       }
+       }
+       return swap_enable_disable(*argv);
 
-usage_and_exit:
-    usage( (whichApp==SWAPON_APP)? swapon_usage : swapoff_usage);
-    exit( FALSE);
+  usage_and_exit:
+       bb_show_usage();
 }
-