@@ -887,6 +887,23 @@ int matches(const char *prefix, const char *string)
return *prefix;
}
+static int matches_warn(const char *prefix, const char *string)
+{
+ int rc;
+
+ rc = matches(prefix, string);
+ if (rc)
+ return rc;
+
+ if (strlen(prefix) != strlen(string))
+ fprintf(stderr,
+ "WARNING: '%s' matches '%s' by prefix.\n"
+ "Matching by prefix is deprecated in this context, please use the full string.\n",
+ prefix, string);
+
+ return 0;
+}
+
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{
const __u32 *a1 = a->data;
@@ -1755,7 +1772,7 @@ __parse_one_of(const char *msg, const char *realval,
int parse_one_of(const char *msg, const char *realval, const char * const *list,
size_t len, int *p_err)
{
- return __parse_one_of(msg, realval, list, len, p_err, matches);
+ return __parse_one_of(msg, realval, list, len, p_err, matches_warn);
}
int parse_one_of_deprecated(const char *msg, const char *realval,
The function parse_one_of() currently uses matches() for string comparison under the hood. Extending matches()-based parsers is tricky, because newly added matches might change the way strings are parsed, if the newly-added string shares a prefix with a string that is matched later in the code. Therefore in this patch, add a twist to parse_one_of() that partial prefix matches yield a warning. This will not disturb standard output or the overall behavior, but will make it obvious that the usage is discouraged and prompt users to update their scripts and habits. An example of output: # dcb ets set dev swp1 tc-tsa 0:s WARNING: 's' matches 'strict' by prefix. Matching by prefix is deprecated in this context, please use the full string. Signed-off-by: Petr Machata <petrm@nvidia.com> --- lib/utils.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)