From fc4c784b65bbb4517d6a057e3ef50613ff27d485 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Mon, 14 Mar 2016 09:02:34 +0900 Subject: [PATCH] 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 Signed-off-by: David Sterba --- utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils.c b/utils.c index d7ceaa8..77f0f68 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; -- 2.7.4