Skip to content

Commit

Permalink
btrfs-progs: subvol show: handle options by getopt
Browse files Browse the repository at this point in the history
The subvolume show command does not take any optios but at least it
should honor "--", as reported.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110181
Reported-by: <moviuro+kernel@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
kdave committed Jan 13, 2016
1 parent b9ec406 commit 0aa796c
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions cmds-subvolume.c
Expand Up @@ -921,13 +921,28 @@ static int cmd_subvol_show(int argc, char **argv)
int ret = 1;
DIR *dirstream1 = NULL, *dirstream2 = NULL;

if (check_argc_exact(argc, 2))
while (1) {
static const struct option long_options[] = {
{NULL, 0, NULL, 0}
};
int c = getopt_long(argc, argv, "", long_options, NULL);

if (c < 0)
break;

switch (c) {
default:
usage(cmd_subvol_show_usage);
}
}

if (check_argc_exact(argc - optind, 1))
usage(cmd_subvol_show_usage);

fullpath = realpath(argv[1], NULL);
fullpath = realpath(argv[optind], NULL);
if (!fullpath) {
error("cannot find real path for '%s': %s",
argv[1], strerror(errno));
argv[optind], strerror(errno));
goto out;
}

Expand Down

0 comments on commit 0aa796c

Please sign in to comment.