emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swapon: random shrinkage

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-12 18:16:24 +00:00
parent 214aec46bd
commit b3f09f4a50
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util-linux/swaponoff.c
View File

@ -11,7 +11,6 @@
#include <mntent.h> #include <mntent.h>
#include <sys/swap.h> #include <sys/swap.h>
static int swap_enable_disable(char *device) static int swap_enable_disable(char *device)
{ {
int status; int status;
@ -19,10 +18,12 @@ static int swap_enable_disable(char *device)
xstat(device, &st); xstat(device, &st);
#ifdef BLOAT
/* test for holes */ /* test for holes */
if (S_ISREG(st.st_mode)) if (S_ISREG(st.st_mode))
if (st.st_blocks * 512 < st.st_size) if (st.st_blocks * 512 < st.st_size)
bb_error_msg_and_die("swap file has holes"); bb_error_msg_and_die("swap file has holes");
#endif
if (applet_name[5] == 'n') if (applet_name[5] == 'n')
status = swapon(device, 0); status = swapon(device, 0);
@ -57,8 +58,6 @@ static int do_em_all(void)
return err; return err;
} }
#define DO_ALL 0x01
int swap_on_off_main(int argc, char **argv); int swap_on_off_main(int argc, char **argv);
int swap_on_off_main(int argc, char **argv) int swap_on_off_main(int argc, char **argv)
{ {
@ -68,10 +67,10 @@ int swap_on_off_main(int argc, char **argv)
bb_show_usage(); bb_show_usage();
ret = getopt32(argc, argv, "a"); ret = getopt32(argc, argv, "a");
if (ret & DO_ALL) if (ret)
return do_em_all(); return do_em_all();
ret = 0; /* ret = 0; redundant */
while (*++argv) while (*++argv)
ret += swap_enable_disable(*argv); ret += swap_enable_disable(*argv);
return ret; return ret;