midfavila
/
ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

swapon, swapoff: show usage with -a device 

... and small cleanup.
This commit is contained in:
Hiltjo Posthuma 2015-02-06 15:20:41 +01:00 committed by sin
parent 7e394bd70f
commit faa6fe28e2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swapoff.c
View File

@ -11,7 +11,7 @@
static void
usage(void)
{
eprintf("usage: %s [-a] device\n", argv0);
eprintf("usage: %s -a | device\n", argv0);
}
int
@ -20,6 +20,8 @@ main(int argc, char *argv[])
int i;
int ret = 0;
int all = 0;
struct mntent *me;
FILE *fp;
ARGBEGIN {
case 'a':
@ -29,13 +31,10 @@ main(int argc, char *argv[])
usage();
} ARGEND;
if (!all && argc < 1)
if ((!all && argc < 1) || (all && argc > 0))
usage();
if (all) {
struct mntent *me = NULL;
FILE *fp;
fp = setmntent("/etc/fstab", "r");
if (!fp)
eprintf("setmntent %s:", "/etc/fstab");

9
swapon.c
View File

@ -11,7 +11,7 @@
static void
usage(void)
{
eprintf("usage: %s [-dp] [-a] device\n", argv0);
eprintf("usage: %s [-dp] -a | device\n", argv0);
}
int
@ -21,6 +21,8 @@ main(int argc, char *argv[])
int ret = 0;
int flags = 0;
int all = 0;
struct mntent *me;
FILE *fp;
ARGBEGIN {
case 'a':
@ -36,13 +38,10 @@ main(int argc, char *argv[])
usage();
} ARGEND;
if (!all && argc < 1)
if ((!all && argc < 1) || (all && argc > 0))
usage();
if (all) {
struct mntent *me = NULL;
FILE *fp;
fp = setmntent("/etc/fstab", "r");
if (!fp)
eprintf("setmntent %s:", "/etc/fstab");