This is a follow up patch for commit c70adc3cf6bf ("ndctl, filter: refactor
util_<obj>_filter() to support multiple space-seperated arguments")
refactored util_<obj>_filter() to support multiple space-seperated arguments.
But, when the keyword "all" is included in space-seperated arguments,
it will be treaded as <object>'s name. This patch fixes it.Signed-off-by: QI Fuli <[email protected]> Change log since v1: - Removing the strcmp(__ident, "all") == 0 at the top of util_<obj>_filter() - Changing the strcmp(ident, "all") == 0 to strcmp(name, "all") == 0 --- util/filter.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/util/filter.c b/util/filter.c index 0d3cc02..1734bce 100644 --- a/util/filter.c +++ b/util/filter.c @@ -31,7 +31,7 @@ struct ndctl_bus *util_bus_filter(struct ndctl_bus *bus, const char *__ident) unsigned long bus_id, id; const char *provider, *devname, *name; - if (!__ident || strcmp(__ident, "all") == 0) + if (!__ident) return bus; ident = strdup(__ident); @@ -40,6 +40,9 @@ struct ndctl_bus *util_bus_filter(struct ndctl_bus *bus, const char *__ident) for (name = strtok_r(ident, " ", &save); name; name = strtok_r(NULL, " ", &save)) { + if (strcmp(name, "all") == 0) + break; + bus_id = strtoul(ident, &end, 0); if (end == ident || end[0]) bus_id = ULONG_MAX; @@ -69,7 +72,7 @@ struct ndctl_region *util_region_filter(struct ndctl_region *region, const char *name, *region_name; unsigned long region_id, id; - if (!__ident || strcmp(__ident, "all") == 0) + if (!__ident) return region; ident = strdup(__ident); @@ -78,6 +81,9 @@ struct ndctl_region *util_region_filter(struct ndctl_region *region, for (name = strtok_r(ident, " ", &save); name; name = strtok_r(NULL, " ", &save)) { + if (strcmp(name, "all") == 0) + break; + region_id = strtoul(ident, &end, 0); if (end == ident || end[0]) region_id = ULONG_MAX; @@ -106,7 +112,7 @@ struct ndctl_namespace *util_namespace_filter(struct ndctl_namespace *ndns, const char *name; char *ident, *save; - if (!__ident || strcmp(__ident, "all") == 0) + if (!__ident) return ndns; ident = strdup(__ident); @@ -115,6 +121,9 @@ struct ndctl_namespace *util_namespace_filter(struct ndctl_namespace *ndns, for (name = strtok_r(ident, " ", &save); name; name = strtok_r(NULL, " ", &save)) { + if (strcmp(name, "all") == 0) + break; + if (strcmp(name, ndctl_namespace_get_devname(ndns)) == 0) break; @@ -137,7 +146,7 @@ struct ndctl_dimm *util_dimm_filter(struct ndctl_dimm *dimm, const char *name, *dimm_name; unsigned long dimm_id, id; - if (!__ident || strcmp(__ident, "all") == 0) + if (!__ident) return dimm; ident = strdup(__ident); @@ -146,6 +155,9 @@ struct ndctl_dimm *util_dimm_filter(struct ndctl_dimm *dimm, for (name = strtok_r(ident, " ", &save); name; name = strtok_r(NULL, " ", &save)) { + if (strcmp(name, "all") == 0) + break; + dimm_id = strtoul(ident, &end, 0); if (end == ident || end[0]) dimm_id = ULONG_MAX; -- 2.17.0.140.g0b0cc9f86 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
