shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-31 05:47:43 +03:00
Code Releases Activity

report: recognize known prefix when processing "-o -field_name1,field_name2,..."

Browse Source
This commit is contained in:
Peter Rajnoha 2015-10-22 14:30:11 +02:00
parent bb4d3fa7a7
commit baf320455b
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/reporter.c
View File

@ -604,22 +604,48 @@ static void _check_pv_list(struct cmd_context *cmd, int argc, char **argv,
} }
} }
static void _del_option_from_list(struct dm_list *sll, const char *str) static void _del_option_from_list(struct dm_list *sll, const char *prefix,
size_t prefix_len, const char *str)
{ {
struct dm_list *slh; struct dm_list *slh;
struct dm_str_list *sl; struct dm_str_list *sl;
const char *a = str, *b;
prefix_len--;
dm_list_uniterate(slh, sll, sll) { dm_list_uniterate(slh, sll, sll) {
sl = dm_list_item(slh, struct dm_str_list); sl = dm_list_item(slh, struct dm_str_list);
/* exact match */
if (!strcmp(str, sl->str)) { if (!strcmp(str, sl->str)) {
dm_list_del(slh); dm_list_del(slh);
return; return;
} }
/* also try to match with known prefix */
b = sl->str;
if (!strncmp(prefix, a, prefix_len)) {
a += prefix_len;
if (*a == '_')
a++;
}
if (!strncmp(prefix, b, prefix_len)) {
b += prefix_len;
if (*b == '_')
b++;
}
if (!strcmp(a, b)) {
dm_list_del(slh);
return;
}
} }
} }
static int _get_report_options(struct cmd_context *cmd, const char **options) static int _get_report_options(struct cmd_context *cmd,
report_type_t report_type,
const char **options)
{ {
const char *prefix = report_get_field_prefix(report_type);
size_t prefix_len = strlen(prefix);
struct arg_value_group_list *current_group; struct arg_value_group_list *current_group;
struct dm_list *final_opts_list; struct dm_list *final_opts_list;
struct dm_list *opts_list = NULL; struct dm_list *opts_list = NULL;
@ -655,7 +681,8 @@ static int _get_report_options(struct cmd_context *cmd, const char **options)
dm_list_splice(final_opts_list, opts_list); dm_list_splice(final_opts_list, opts_list);
} else if (*opts == '-') { } else if (*opts == '-') {
dm_list_iterate_items(sl, opts_list) dm_list_iterate_items(sl, opts_list)
_del_option_from_list(final_opts_list, sl->str); _del_option_from_list(final_opts_list, prefix,
prefix_len, sl->str);
} }
str_list_destroy(opts_list, 1); str_list_destroy(opts_list, 1);
opts_list = NULL; opts_list = NULL;
@ -765,7 +792,7 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
/* If -o supplied use it, else use default for report_type */ /* If -o supplied use it, else use default for report_type */
if (arg_count(cmd, options_ARG) && if (arg_count(cmd, options_ARG) &&
((r = _get_report_options(cmd, &options) != ECMD_PROCESSED))) ((r = _get_report_options(cmd, report_type, &options) != ECMD_PROCESSED)))
return r; return r;
/* -O overrides default sort settings */ /* -O overrides default sort settings */