From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 4 Oct 2016 20:56:30 +0000 (+0000)
Subject: lib: Allow / and . to match VARIABLE_TKN, fix range matches
X-Git-Tag: frr-3.0-branchpoint~129^2~96
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cc0a8be6336c8f074a7397d3810cc5efa037e5cb;p=mirror%2Ffrr.git

lib: Allow / and . to match VARIABLE_TKN, fix range matches

Range matching function was returning 0 instead of no_match
on failed match, causing all input to match ranges.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/lib/command_match.c b/lib/command_match.c
index 85d627e1be..dcad943619 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -758,7 +758,7 @@ match_range (struct cmd_token *token, const char *str)
 
   val = strtoll (str, &endptr, 10);
   if (*endptr != '\0')
-    return 0;
+    return no_match;
 
   if (val < token->min || val > token->max)
     return no_match;
@@ -789,7 +789,7 @@ match_word (struct cmd_token *token, const char *word)
 }
 
 #define VARIABLE_ALPHABET \
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890:"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890:/."
 
 static enum match_type
 match_variable (struct cmd_token *token, const char *word)