swapon, swapoff: show usage with -a device - ubase - suckless linux base utils
HTML git clone git://git.suckless.org/ubase
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit faa6fe28e2fabf39a8160dda6438033775d887b2
DIR parent 7e394bd70f7ef1be7bee8f646fd0322ff3fdf33f
HTML Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 6 Feb 2015 15:20:41 +0100
swapon, swapoff: show usage with -a device
... and small cleanup.
Diffstat:
M swapoff.c | 9 ++++-----
M swapon.c | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
---
DIR diff --git a/swapoff.c b/swapoff.c
@@ -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");
DIR diff --git a/swapon.c b/swapon.c
@@ -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");