shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-25 18:50:51 +03:00
Code Releases Activity

report: export DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} and show help on '<lvm_command> -O help'

Browse Source 
Share DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} between libdm and
any libdm user to handle reserved field names, in this case the virtual
field name to show help instead of failing on unrecognized field.
The libdm user also needs to check the field name so it can fire
proper code in this case (cleanup, exit etc.).
This commit is contained in:
Peter Rajnoha 2014-05-15 10:58:05 +02:00
parent 5684cfcb1c
commit 7c86131233
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.107 -
==================================
Make reporting commands show help about possible sort keys on '-O help'.
Add metadata_percent to lvs_cols.
Take account of parity areas with alloc anywhere in _calc_required_extents.
Use proper uint64 casting for calculation of cache metadata size.

2
WHATS_NEW_DM
View File

@ -1,5 +1,7 @@
Version 1.02.88 -
=================================
Also recognize 'help'/'?' as reserved sort key name to show help.
Export recognized DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} to show help.
Add dm_units_to_factor for size unit parsing.
Increase bitset size for minors for thin dmeventd plugin.

4
libdm/libdevmapper.h
View File

@ -1601,6 +1601,10 @@ struct dm_report_field;
#define DM_REPORT_FIELD_TYPE_ID_LEN 32
#define DM_REPORT_FIELD_TYPE_HEADING_LEN 32
/* Reserved field names for special purposes. */
#define DM_REPORT_FIELD_RESERVED_NAME_HELP "help" /* shows help */
#define DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT "?" /* shows help */
struct dm_report;
struct dm_report_field_type {
uint32_t type; /* object type id */

11
libdm/libdm-report.c
View File

@ -529,7 +529,8 @@ static int _parse_fields(struct dm_report *rh, const char *format,
if (!_field_match(rh, ws, (size_t) (we - ws), report_type_only)) {
_display_fields(rh);
log_warn(" ");
if (strcasecmp(ws, "help") && strcmp(ws, "?"))
if (strcasecmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP) &&
strcmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT))
log_error("Unrecognised field: %.*s",
(int) (we - ws), ws);
return 0;
@ -556,8 +557,12 @@ static int _parse_keys(struct dm_report *rh, const char *keys,
while (*we && *we != ',')
we++;
if (!_key_match(rh, ws, (size_t) (we - ws), report_type_only)) {
log_error("dm_report: Unrecognised field: %.*s",
(int) (we - ws), ws);
_display_fields(rh);
log_warn(" ");
if (strcasecmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP) &&
strcmp(ws, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT))
log_error("dm_report: Unrecognised field: %.*s",
(int) (we - ws), ws);
return 0;
}
}

5
tools/reporter.c
View File

@ -370,7 +370,10 @@ static int _report(struct cmd_context *cmd, int argc, char **argv,
separator, aligned, buffered,
headings, field_prefixes, quoted,
columns_as_rows))) {
if (!strcasecmp(options, "help") || !strcmp(options, "?"))
if ( (!strcasecmp(options, DM_REPORT_FIELD_RESERVED_NAME_HELP) ||
!strcmp(options, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) ||
(!strcasecmp(keys, DM_REPORT_FIELD_RESERVED_NAME_HELP) ||
!strcmp(keys, DM_REPORT_FIELD_RESERVED_NAME_HELP_ALT)) )
return r;
return_ECMD_FAILED;
}