Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 45 insertions, 0 deletions

diff --git a/lib/frrstr.c b/lib/frrstr.c
index e5440c5..1e743d4 100644
--- a/lib/frrstr.c
+++ b/lib/frrstr.c
@@ -3,6 +3,7 @@
  * FRR string processing utilities.
  * Copyright (C) 2018  Cumulus Networks, Inc.
  *                     Quentin Young
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 
 #include "zebra.h"
@@ -225,3 +226,47 @@ char *frrstr_hex(char *buff, size_t bufsiz, const uint8_t *str, size_t num)
 
 	return buff;
 }
+
+const char *frrstr_skip_over_char(const char *s, int skipc)
+{
+	int c, quote = 0;
+
+	while ((c = *s++)) {
+		if (c == '\\') {
+			if (!*s++)
+				return NULL;
+			continue;
+		}
+		if (quote) {
+			if (c == quote)
+				quote = 0;
+			continue;
+		}
+		if (c == skipc)
+			return s;
+		if (c == '"' || c == '\'')
+			quote = c;
+	}
+	return NULL;
+}
+
+/*
+ * Advance backward in string until reaching the char `toc`
+ * if beginning of string is reached w/o finding char return NULL
+ *
+ * /foo/bar'baz/booz'/foo
+ */
+const char *frrstr_back_to_char(const char *s, int toc)
+{
+	const char *next = s;
+	const char *prev = NULL;
+
+	if (s[0] == 0)
+		return NULL;
+	if (!strpbrk(s, "'\"\\"))
+		return strrchr(s, toc);
+	while ((next = frrstr_skip_over_char(next, toc)))
+		prev = next - 1;
+	return prev;
+}
+