projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test applets containing numbers in their name. Thanks to Larry Doolittle.
[oweals/busybox.git]
/
swaponoff.c
diff --git
a/swaponoff.c
b/swaponoff.c
index 6aafe51a26dde27793cd884ab75d6e43ec7ab2dd..8a9134ca0075342a8066654ed441da594d770395 100644
(file)
--- a/
swaponoff.c
+++ b/
swaponoff.c
@@
-3,7
+3,7
@@
* Mini swapon/swapoff implementation for busybox
*
*
* Mini swapon/swapoff implementation for busybox
*
*
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000
,2001
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
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
@@
-22,12
+22,15
@@
*
*/
*
*/
-#include "
internal
.h"
+#include "
busybox
.h"
#include <stdio.h>
#include <stdio.h>
-#include <sys/mount.h>
#include <mntent.h>
#include <dirent.h>
#include <errno.h>
#include <mntent.h>
#include <dirent.h>
#include <errno.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);
_syscall2(int, swapon, const char *, path, int, flags);
_syscall1(int, swapoff, const char *, path);
@@
-35,8
+38,8
@@
_syscall1(int, swapoff, const char *, path);
static int whichApp;
static int whichApp;
-#define SWAPON_APP 1
-#define SWAPOFF_APP 2
+static const int SWAPON_APP = 1;
+static const int SWAPOFF_APP = 2;
static void swap_enable_disable(char *device)
static void swap_enable_disable(char *device)
@@
-48,10
+51,8
@@
static void swap_enable_disable(char *device)
else
status = swapoff(device);
else
status = swapoff(device);
- if (status != 0) {
- perror(applet_name);
- exit(FALSE);
- }
+ if (status != 0)
+ perror_msg_and_die(applet_name);
}
static void do_em_all()
}
static void do_em_all()
@@
-59,17
+60,15
@@
static void do_em_all()
struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r");
struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r");
- if (f == NULL) {
- perror("/etc/fstab");
- exit(FALSE);
- }
+ if (f == NULL)
+ 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);
}
}
endmntent(f);
while ((m = getmntent(f)) != NULL) {
if (strcmp(m->mnt_type, MNTTYPE_SWAP)==0) {
swap_enable_disable(m->mnt_fsname);
}
}
endmntent(f);
- exit(
TRUE
);
+ exit(
EXIT_SUCCESS
);
}
}
@@
-96,7
+95,7
@@
extern int swap_on_off_main(int argc, char **argv)
struct stat statBuf;
if (stat("/etc/fstab", &statBuf) < 0)
struct stat statBuf;
if (stat("/etc/fstab", &statBuf) < 0)
-
fatalError
("/etc/fstab file missing\n");
+
error_msg_and_die
("/etc/fstab file missing\n");
}
do_em_all();
break;
}
do_em_all();
break;
@@
-105,9
+104,8
@@
extern int swap_on_off_main(int argc, char **argv)
}
}
swap_enable_disable(*argv);
}
}
swap_enable_disable(*argv);
-
exit(TRUE)
;
+
return EXIT_SUCCESS
;
usage_and_exit:
usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
usage_and_exit:
usage((whichApp == SWAPON_APP) ? swapon_usage : swapoff_usage);
- exit(FALSE);
}
}