forked from Mirrors/btrfs-progs
btrfs-progs: help: use unknown command option helper
Update handling of unknown option in all commands. This will not print only the unknown option and short pointer to help. Dumping the whole help was a bad idea that stuck for too long. Signed-off-by: David Sterba <dsterba@suse.com>master
parent
c9b60c9087
commit
4ac44631a4
|
@ -586,7 +586,7 @@ static int cmd_balance_start(int argc, char **argv)
|
|||
background = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_balance_start_usage);
|
||||
usage_unknown_option(cmd_balance_start_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -850,7 +850,7 @@ static int cmd_balance_status(int argc, char **argv)
|
|||
verbose = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_balance_status_usage);
|
||||
usage_unknown_option(cmd_balance_status_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ static int cmd_device_add(int argc, char **argv)
|
|||
force = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_device_add_usage);
|
||||
usage_unknown_option(cmd_device_add_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -324,7 +324,7 @@ static int cmd_device_scan(int argc, char **argv)
|
|||
forget = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_device_scan_usage);
|
||||
usage_unknown_option(cmd_device_scan_usage, argv);
|
||||
}
|
||||
}
|
||||
devstart = optind;
|
||||
|
@ -486,9 +486,8 @@ static int cmd_device_stats(int argc, char **argv)
|
|||
case 'z':
|
||||
flags = BTRFS_DEV_STATS_RESET;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(cmd_device_stats_usage);
|
||||
usage_unknown_option(cmd_device_stats_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -581,7 +581,7 @@ int cmd_filesystem_du(int argc, char **argv)
|
|||
summarize = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_filesystem_du_usage);
|
||||
usage_unknown_option(cmd_filesystem_du_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -987,7 +987,7 @@ int cmd_filesystem_usage(int argc, char **argv)
|
|||
tabular = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_filesystem_usage_usage);
|
||||
usage_unknown_option(cmd_filesystem_usage_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -708,7 +708,7 @@ static int cmd_filesystem_show(int argc, char **argv)
|
|||
where = BTRFS_SCAN_MOUNTED;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_filesystem_show_usage);
|
||||
usage_unknown_option(cmd_filesystem_show_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -965,7 +965,7 @@ static int cmd_filesystem_defrag(int argc, char **argv)
|
|||
recursive = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_filesystem_defrag_usage);
|
||||
usage_unknown_option(cmd_filesystem_defrag_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -591,7 +591,7 @@ int cmd_inspect_dump_super(int argc, char **argv)
|
|||
all = 0;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_dump_super_usage);
|
||||
usage_unknown_option(cmd_inspect_dump_super_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -314,7 +314,7 @@ int cmd_inspect_dump_tree(int argc, char **argv)
|
|||
traverse = BTRFS_PRINT_TREE_BFS;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_dump_tree_usage);
|
||||
usage_unknown_option(cmd_inspect_dump_tree_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -444,7 +444,7 @@ int cmd_inspect_tree_stats(int argc, char **argv)
|
|||
no_pretty = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_tree_stats_usage);
|
||||
usage_unknown_option(cmd_inspect_tree_stats_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -105,7 +105,8 @@ static int cmd_inspect_inode_resolve(int argc, char **argv)
|
|||
verbose = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_inode_resolve_usage);
|
||||
usage_unknown_option(cmd_inspect_inode_resolve_usage,
|
||||
argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -166,7 +167,8 @@ static int cmd_inspect_logical_resolve(int argc, char **argv)
|
|||
size = arg_strtou64(optarg);
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_logical_resolve_usage);
|
||||
usage_unknown_option(cmd_inspect_logical_resolve_usage,
|
||||
argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -615,7 +617,8 @@ static int cmd_inspect_min_dev_size(int argc, char **argv)
|
|||
devid = arg_strtou64(optarg);
|
||||
break;
|
||||
default:
|
||||
usage(cmd_inspect_min_dev_size_usage);
|
||||
usage_unknown_option(cmd_inspect_min_dev_size_usage,
|
||||
argv);
|
||||
}
|
||||
}
|
||||
if (check_argc_exact(argc - optind, 1))
|
||||
|
|
|
@ -278,7 +278,7 @@ static void parse_args(int argc, char **argv,
|
|||
type_str = optarg;
|
||||
break;
|
||||
default:
|
||||
usage(usage_str);
|
||||
usage_unknown_option(usage_str, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -250,7 +250,7 @@ static int cmd_qgroup_create(int argc, char **argv)
|
|||
ret = _cmd_qgroup_create(1, argc, argv);
|
||||
|
||||
if (ret < 0)
|
||||
usage(cmd_qgroup_create_usage);
|
||||
usage_unknown_option(cmd_qgroup_create_usage, argv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -269,7 +269,7 @@ static int cmd_qgroup_destroy(int argc, char **argv)
|
|||
ret = _cmd_qgroup_create(0, argc, argv);
|
||||
|
||||
if (ret < 0)
|
||||
usage(cmd_qgroup_destroy_usage);
|
||||
usage_unknown_option(cmd_qgroup_destroy_usage, argv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -361,7 +361,7 @@ static int cmd_qgroup_show(int argc, char **argv)
|
|||
sync = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_qgroup_show_usage);
|
||||
usage_unknown_option(cmd_qgroup_show_usage, argv);
|
||||
}
|
||||
}
|
||||
btrfs_qgroup_setup_units(unit_mode);
|
||||
|
@ -444,7 +444,7 @@ static int cmd_qgroup_limit(int argc, char **argv)
|
|||
exclusive = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_qgroup_limit_usage);
|
||||
usage_unknown_option(cmd_qgroup_limit_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ static int cmd_quota_rescan(int argc, char **argv)
|
|||
wait_for_completion = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_quota_rescan_usage);
|
||||
usage_unknown_option(cmd_quota_rescan_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1301,10 +1301,8 @@ int cmd_receive(int argc, char **argv)
|
|||
case GETOPT_VAL_DUMP:
|
||||
dump = 1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
error("receive args invalid");
|
||||
return 1;
|
||||
usage_unknown_option(cmd_receive_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -146,9 +146,8 @@ static int cmd_replace_start(int argc, char **argv)
|
|||
case 'f':
|
||||
force_using_targetdev = 1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(cmd_replace_start_usage);
|
||||
usage_unknown_option(cmd_replace_start_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -345,9 +344,8 @@ static int cmd_replace_status(int argc, char **argv)
|
|||
case '1':
|
||||
once = 1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(cmd_replace_status_usage);
|
||||
usage_unknown_option(cmd_replace_status_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -513,7 +511,7 @@ static int cmd_replace_cancel(int argc, char **argv)
|
|||
switch (c) {
|
||||
case '?':
|
||||
default:
|
||||
usage(cmd_replace_cancel_usage);
|
||||
usage_unknown_option(cmd_replace_cancel_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -62,9 +62,9 @@ static int cmd_rescue_chunk_recover(int argc, char *argv[])
|
|||
case 'v':
|
||||
verbose = 1;
|
||||
break;
|
||||
case 'h':
|
||||
default:
|
||||
usage(cmd_rescue_chunk_recover_usage);
|
||||
usage_unknown_option(cmd_rescue_chunk_recover_usage,
|
||||
argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,8 @@ static int cmd_rescue_super_recover(int argc, char **argv)
|
|||
yes = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_rescue_super_recover_usage);
|
||||
usage_unknown_option(cmd_rescue_super_recover_usage,
|
||||
argv);
|
||||
}
|
||||
}
|
||||
if (check_argc_exact(argc - optind, 1))
|
||||
|
|
|
@ -1527,7 +1527,7 @@ int cmd_restore(int argc, char **argv)
|
|||
get_xattrs = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_restore_usage);
|
||||
usage_unknown_option(cmd_restore_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1172,10 +1172,9 @@ static int scrub_start(int argc, char **argv, int resume)
|
|||
case 'f':
|
||||
force = 1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(resume ? cmd_scrub_resume_usage :
|
||||
cmd_scrub_start_usage);
|
||||
usage_unknown_option(resume ? cmd_scrub_resume_usage :
|
||||
cmd_scrub_start_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1696,9 +1695,8 @@ static int cmd_scrub_status(int argc, char **argv)
|
|||
case 'R':
|
||||
print_raw = 1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(cmd_scrub_status_usage);
|
||||
usage_unknown_option(cmd_scrub_status_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -602,11 +602,8 @@ int cmd_send(int argc, char **argv)
|
|||
case GETOPT_VAL_SEND_NO_DATA:
|
||||
send_flags |= BTRFS_SEND_FLAG_NO_FILE_DATA;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
error("send arguments invalid");
|
||||
ret = 1;
|
||||
goto out;
|
||||
usage_unknown_option(cmd_send_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ static int cmd_subvol_create(int argc, char **argv)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
usage(cmd_subvol_create_usage);
|
||||
usage_unknown_option(cmd_subvol_create_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -275,7 +275,7 @@ static int cmd_subvol_delete(int argc, char **argv)
|
|||
verbose++;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_subvol_delete_usage);
|
||||
usage_unknown_option(cmd_subvol_delete_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -672,7 +672,7 @@ static int cmd_subvol_snapshot(int argc, char **argv)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
usage(cmd_subvol_snapshot_usage);
|
||||
usage_unknown_option(cmd_subvol_snapshot_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -962,7 +962,7 @@ static int cmd_subvol_show(int argc, char **argv)
|
|||
by_uuid = 1;
|
||||
break;
|
||||
default:
|
||||
usage(cmd_subvol_show_usage);
|
||||
usage_unknown_option(cmd_subvol_show_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1156,7 +1156,7 @@ static int cmd_subvol_sync(int argc, char **argv)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
usage(cmd_subvol_sync_usage);
|
||||
usage_unknown_option(cmd_subvol_sync_usage, argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue