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 0613fa1e910cfa91f598f241a519dfd2aa14f6cc..7c7031bcee79424fbac0edf0be42d9f8cc21ef9e 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -2,9 +2,7 @@
 /*
  * Mini swapon/swapoff implementation for busybox
  *
- *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
@@ -26,57 +24,69 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
+#include <string.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);
+#include <sys/swap.h>
 
+#include "busybox.h"
 
-static int whichApp;
+static int whichApp;    /* default SWAPON_APP */
 
-static const int SWAPON_APP = 1;
-static const int SWAPOFF_APP = 2;
+static const int SWAPON_APP = 0;
+static const int SWAPOFF_APP = 1;
 
 
-static void swap_enable_disable(char *device)
+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);
+       }
+
+       /* 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)
-               perror_msg_and_die(applet_name);
+       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;
        FILE *f = setmntent("/etc/fstab", "r");
+       int err = 0;
 
        if (f == NULL)
-               perror_msg_and_die("/etc/fstab");
+               bb_perror_msg_and_die("/etc/fstab");
        while ((m = getmntent(f)) != NULL) {
                if (strcmp(m->mnt_type, MNTTYPE_SWAP)==0) {
-                       swap_enable_disable(m->mnt_fsname);
+                       if(swap_enable_disable(m->mnt_fsname) == EXIT_FAILURE)
+                               err++;
                }
        }
        endmntent(f);
-       exit(EXIT_SUCCESS);
+       return err;
 }
 
 
 extern int swap_on_off_main(int argc, char **argv)
 {
-       if (strcmp(applet_name, "swapon") == 0) {
-               whichApp = SWAPON_APP;
-       } else {
+       if (bb_applet_name[5] == 'f') { /* "swapoff" */
                whichApp = SWAPOFF_APP;
        }
 
@@ -95,17 +105,16 @@ extern int swap_on_off_main(int argc, char **argv)
                                        struct stat statBuf;
 
                                        if (stat("/etc/fstab", &statBuf) < 0)
-                                               error_msg_and_die("/etc/fstab file missing");
+                                               bb_error_msg_and_die("/etc/fstab file missing");
                                }
-                               do_em_all();
+                               return do_em_all();
                                break;
                        default:
                                goto usage_and_exit;
                        }
        }
-       swap_enable_disable(*argv);
-       return EXIT_SUCCESS;
+       return swap_enable_disable(*argv);
 
   usage_and_exit:
-       show_usage();
+       bb_show_usage();
 }