publish skip_string API for quoted strings

FreeRADIUS · Apr 6, 2020 · 568cc1b · 568cc1b
1 parent eaf6092
commit 568cc1b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
@@ -738,37 +738,6 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, xlat_exp_t **head, char co
 	return p - in;
 }
 
-static ssize_t skip_string(char const *start, char const *end)
-{
-	char const *p = start;
-	char quote;
-
-	quote = *(p++);
-
-	while (p < end) {
-		if (*p == quote) {
-			p++;
-			return p - start;
-		}
-
-		if (*p == '\\') {
-			if (((p + 1) >= end) || !p[1]) {
-				break;
-			}
-
-			p += 2;
-			continue;
-		}
-
-		p++;
-	}
-
-	/*
-	 *	Unexpected end of string.
-	 */
-	fr_strerror_printf("Unexpected end of string");
-	return -(p - start);
-}
 
 /** skip xlat expansions, included embedded strings and nested xlats.
  *
@@ -785,7 +754,7 @@ static ssize_t skip_xlat(char const *start, char const *end)
 		}
 
 		if ((*p == '"') || (*p == '\'')) {
-			slen = skip_string(p, end);
+			slen = fr_skip_string(p, end);
 			if (slen < 0) return slen - (p - start);
 
 			p += slen;
@@ -879,7 +848,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_t **head, char const *in, s
 		 *	Look for quoted strings.
 		 */
 		if ((*p == '"') || (*p == '\'')) {
-			slen = skip_string(p, end);
+			slen = fr_skip_string(p, end);
 			if (slen < 0) return slen - (p - in);
 
 		} else {

diff --git a/src/lib/util/token.c b/src/lib/util/token.c
@@ -487,3 +487,36 @@ char const *fr_token_name(int token)
 {
 	return fr_table_str_by_value(fr_tokens_table, token, "???");
 }
+
+
+ssize_t fr_skip_string(char const *start, char const *end)
+{
+	char const *p = start;
+	char quote;
+
+	quote = *(p++);
+
+	while (p < end) {
+		if (*p == quote) {
+			p++;
+			return p - start;
+		}
+
+		if (*p == '\\') {
+			if (((p + 1) >= end) || !p[1]) {
+				break;
+			}
+
+			p += 2;
+			continue;
+		}
+
+		p++;
+	}
+
+	/*
+	 *	Unexpected end of string.
+	 */
+	fr_strerror_printf("Unexpected end of string");
+	return -(p - start);
+}
diff --git a/src/lib/util/token.h b/src/lib/util/token.h
@@ -91,6 +91,7 @@ FR_TOKEN	gettoken(char const **ptr, char *buf, int buflen, bool unescape);
 FR_TOKEN	getop(char const **ptr);
 FR_TOKEN	getstring(char const **ptr, char *buf, int buflen, bool unescape);
 char const	*fr_token_name(int);
+ssize_t		fr_skip_string(char const *start, char const *end);
 
 #ifdef __cplusplus
 }