This is vodz' latest patch. Sorry it took so long...

[oweals/busybox.git] / swaponoff.c

diff --git a/swaponoff.c b/swaponoff.c
index 8a9134ca0075342a8066654ed441da594d770395..ce0e2c6ccdb2e403c92a508ed116d8e66b414ac0 100644 (file)
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -22,19 +22,23 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #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>
 
-_syscall2(int, swapon, const char *, path, int, flags);
-_syscall1(int, swapoff, const char *, path);
+#if __GNU_LIBRARY__ < 5
+/* libc5 doesn't have sys/swap.h, define these here. */ 
+extern int swapon (__const char *__path, int __flags);
+extern int swapoff (__const char *__path);
+#else
+#include <sys/swap.h>
+#endif
 
+#include "busybox.h"
 
 static int whichApp;
 
@@ -95,7 +99,7 @@ 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\n");
+                                               error_msg_and_die("/etc/fstab file missing");
                                }
                                do_em_all();
                                break;
@@ -107,5 +111,5 @@ extern int swap_on_off_main(int argc, char **argv)
        return EXIT_SUCCESS;
 
   usage_and_exit:
-       usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
+       show_usage();
 }