btrfs-progs: better option/error handling for btrfs-vol

Today wrong cmdlines give odd results:

	# ./btrfs-vol /dev/sdb1
	Unable to open device (null)
	# ./btrfs-vol -a /dev/sdb1
	usage: btrfs-vol [options] mount_point ...

Make it a bit more informative:

	# ./btrfs-vol /dev/sdb1
	No command specified
	usage: btrfs-vol [options] mount_point ...
	# ./btrfs-vol -a /dev/sdb1
	No mountpoint specified
	usage: btrfs-vol [options] mount_point ...

(even though it's deprecated ...)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
master
Eric Sandeen 2013-03-04 16:40:03 -06:00 committed by David Sterba
parent 7b81119b1d
commit 6626354fdf
1 changed files with 6 additions and 1 deletions

View File

@ -106,8 +106,13 @@ int main(int ac, char **av)
}
}
ac = ac - optind;
if (ac == 0)
if (ac == 0 || !cmd) {
if (!ac)
fprintf(stderr, "No mountpoint specified\n");
else
fprintf(stderr, "No command specified\n");
print_usage();
}
mnt = av[optind];
if (device && strcmp(device, "missing") == 0 &&