Simplifiy service file syntax

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

1 files changed, 45 insertions, 98 deletions

diff --git a/lib/src/splitkv.c b/lib/src/splitkv.c
index b1ef8d3..3631ea8 100644
--- a/lib/src/splitkv.c
+++ b/lib/src/splitkv.c
@@ -19,13 +19,6 @@
 
 #include "util.h"
 
-static char *skpspc(char *ptr)
-{
-	while (*ptr == ' ' || *ptr == '\t')
-		++ptr;
-	return ptr;
-}
-
 static int xdigit(int x)
 {
 	if (isupper(x))
@@ -35,107 +28,61 @@ static int xdigit(int x)
 	return x - '0';
 }
 
-static char *parse_str(char *src)
+int unescape(char *src)
 {
 	char *dst = src;
 	int c;
 
 	for (;;) {
-		c = *(src++);
-
-		switch (c) {
-		case '\\':
-			c = *(src++);
+		while (*src != '"' && *src != '\0')
+			*(dst++) = *(src++);
 
-			switch (c) {
-			case 'a': c = '\a'; break;
-			case 'b': c = '\b'; break;
-			case 'f': c = '\f'; break;
-			case 'n': c = '\n'; break;
-			case 't': c = '\t'; break;
-			case '\\': break;
-			case '"': break;
-			case 'x':
-				c = 0;
-				if (isxdigit(*src))
-					c = (c << 4) | xdigit(*(src++));
-				if (isxdigit(*src))
-					c = (c << 4) | xdigit(*(src++));
-				break;
-			case '0':
-				c = 0;
-				if (isdigit(*src) && *src < '8')
-					c = (c << 3) | (*(src++) - '0');
-				if (isdigit(*src) && *src < '8')
-					c = (c << 3) | (*(src++) - '0');
-				if (isdigit(*src) && *src < '8')
-					c = (c << 3) | (*(src++) - '0');
-				break;
-			default:
-				return NULL;
-			}
+		if (*src == '\0')
 			break;
-		case '"':
-			*(dst++) = '\0';
-			goto out;
-		}
-
-		*(dst++) = c;
-	}
-out:
-	return src;
-}
-
-int splitkv(char *line, char **key, char **value)
-{
-	*key = NULL;
-	*value = NULL;
-
-	line = skpspc(line);
-
-	if (*line == '#' || *line == '\0')
-		return 0;
 
-	if (!isalpha(*line))
-		return -1;
-
-	*key = line;
-
-	while (isalnum(*line))
-		++line;
-
-	if (*line == ' ' || *line == '\t') {
-		*(line++) = '\0';
-		line = skpspc(line);
-	}
-
-	if (*line != '=')
-		return -1;
-
-	*(line++) = '\0';
-	line = skpspc(line);
-
-	if (*line == '"') {
-		++line;
-		*value = line;
-
-		line = parse_str(line);
-	} else if (isalnum(*line)) {
-		*value = line;
-
-		while (isalnum(*line) || *line == '.' || *line == '_')
-			++line;
+		++src;
+
+		while ((c = *(src++)) != '"') {
+			if (c == '\0')
+				return -1;
+
+			if (c == '\\') {
+				c = *(src++);
+
+				switch (c) {
+				case 'a': c = '\a'; break;
+				case 'b': c = '\b'; break;
+				case 'f': c = '\f'; break;
+				case 'n': c = '\n'; break;
+				case 't': c = '\t'; break;
+				case '\\':
+				case '"':
+					break;
+				case 'x':
+					c = 0;
+					if (isxdigit(*src))
+						c = (c<<4) | xdigit(*(src++));
+					if (isxdigit(*src))
+						c = (c<<4) | xdigit(*(src++));
+					break;
+				case '0':
+					c = 0;
+					if (isdigit(*src) && *src < '8')
+						c = (c<<3) | (*(src++) - '0');
+					if (isdigit(*src) && *src < '8')
+						c = (c<<3) | (*(src++) - '0');
+					if (isdigit(*src) && *src < '8')
+						c = (c<<3) | (*(src++) - '0');
+					break;
+				default:
+					return -1;
+				}
+			}
 
-		if (*line != '\0')
-			*(line++) = '\0';
-	} else {
-		return -1;
+			*(dst++) = c;
+		}
 	}
 
-	line = skpspc(line);
-
-	if (*line != '\0' && *line != '#')
-		return -1;
-
+	*(dst++) = '\0';
 	return 0;
 }