summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
authorSatoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>2016-03-14 09:02:34 +0900
committerDavid Sterba <dsterba@suse.com>2016-03-14 13:42:47 +0100
commitfc4c784b65bbb4517d6a057e3ef50613ff27d485 (patch)
tree5d363b014abf29359286e7379f8c76660697e398 /utils.c
parent1a521af045390b0f21356609d67cb8b3f7ccf837 (diff)
btrfs-progs: Avoid interpreting options after "--" when getting unit mode
* actual result ====================================== # ./btrfs device usage -- -m /btrfs /dev/sdf1, ID: 1 Device size: 95367.41MiB Data,single: 2056.00MiB Metadata,DUP: 2048.00MiB System,DUP: 16.00MiB Unallocated: 91247.41MiB ====================================== * expected result ====================================== # ./btrfs device usage -- -m /btrfs ERROR: can't access '-m': No such file or directory ====================================== Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/utils.c b/utils.c
index d7ceaa8c..77f0f68e 100644
--- a/utils.c
+++ b/utils.c
@@ -3024,6 +3024,9 @@ unsigned int get_unit_mode_from_arg(int *argc, char *argv[], int df_mode)
int arg_end;
for (arg_i = 0; arg_i < *argc; arg_i++) {
+ if (!strcmp(argv[arg_i], "--"))
+ break;
+
if (!strcmp(argv[arg_i], "--raw")) {
unit_mode = UNITS_RAW;
argv[arg_i] = NULL;