Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/swaponoff.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/swaponoff.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/util-linux/swaponoff.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <mntent.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
 #include <sys/swap.h>
 
-
-static int swap_enable_disable(const char *device)
+static int swap_enable_disable(char *device)
 {
     int status;
@@ -23 +19 @@
     xstat(device, &st);
 
+#if ENABLE_DESKTOP
     /* 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");
+            bb_error_msg("warning: swap file has holes");
+#endif
 
-    if (bb_applet_name[5] == 'n')
+    if (applet_name[5] == 'n')
         status = swapon(device, 0);
     else
@@ -61 +59 @@
 }
 
-#define DO_ALL    0x01
-
+int swap_on_off_main(int argc, char **argv);
 int swap_on_off_main(int argc, char **argv)
 {
@@ -70 +67 @@
         bb_show_usage();
 
-    ret = bb_getopt_ulflags(argc, argv, "a");
-    if (ret & DO_ALL)
+    ret = getopt32(argv, "a");
+    if (ret)
         return do_em_all();
 
-    ret = 0;
+    /* ret = 0; redundant */
     while (*++argv)
         ret += swap_enable_disable(*argv);