X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-scrub.c;h=c03bc5fb832acb3021f0704e0ed0fc765e4a0b1f;hb=ae60006cee1c15f87adee22d4595384ea5ab596b;hp=da614f2f2a64c9c8c46df3c056e203bf95ab9ea5;hpb=078618d82220e84609cffd074655faafbada4c24;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/cmds-scrub.c b/cmds-scrub.c
index da614f2..c03bc5f 100644
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -430,7 +430,7 @@ static int scrub_rename_file(const char *fn_base, const char *fn_local,
 /*
  * returns 0 if the key did not match (nothing was read)
  *         1 if the key did match (success)
- *        -1 if the key did match and an error occured
+ *        -1 if the key did match and an error occurred
  */
 static int scrub_kvread(int *i, int len, int avail, const char *buf,
 			const char *key, u64 *dest)
@@ -1141,7 +1141,6 @@ static int scrub_start(int argc, char **argv, int resume)
 	int force = 0;
 	int nothing_to_resume = 0;
 
-	optind = 1;
 	while ((c = getopt(argc, argv, "BdqrRc:n:f")) != -1) {
 		switch (c) {
 		case 'B':
@@ -1591,10 +1590,12 @@ static int cmd_scrub_cancel(int argc, char **argv)
 	int fdmnt = -1;
 	DIR *dirstream = NULL;
 
-	if (check_argc_exact(argc, 2))
+	clean_args_no_options(argc, argv, cmd_scrub_cancel_usage);
+
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_scrub_cancel_usage);
 
-	path = argv[1];
+	path = argv[optind];
 
 	fdmnt = open_path_or_dev_mnt(path, &dirstream, 1);
 	if (fdmnt < 0) {
@@ -1673,7 +1674,6 @@ static int cmd_scrub_status(int argc, char **argv)
 	int err = 0;
 	DIR *dirstream = NULL;
 
-	optind = 1;
 	while ((c = getopt(argc, argv, "dR")) != -1) {
 		switch (c) {
 		case 'd':