X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=aec62ae9918f298578ec4881d7e9eebd63a1197f;hp=0b929688a2496d5a5f57c8a9e5590b17dd5d697a;hb=4ab31b4091f396b554b001629a5df61c432c8bbc;hpb=0a8f1be6ca96c7050f02129bb275c926671007f4

diff --git a/string.c b/string.c
index 0b92968..aec62ae 100644
--- a/string.c
+++ b/string.c
@@ -170,7 +170,7 @@ __must_check __malloc char *adu_strcat(char *a, const char *b)
  * Convert a string to a 64-bit signed integer value.
  *
  * \param str The string to be converted.
- * \param value Result pointer.
+ * \param result Result pointer.
  *
  * \return Standard.
  *
@@ -245,86 +245,115 @@ __must_check unsigned split_args(char *args, char *** const argv_ptr, const char
 	return n;
 }
 
-static int check_uid_arg(const char *arg, uint32_t *uid)
-{
-	const uint32_t max = ~0U;
-	/*
-	 * we need an 64-bit int for string -> uid conversion because strtoll()
-	 * returns a signed value.
-	 */
-	int64_t val;
-	int ret = atoi64(arg, &val);
+enum line_state_flags {LSF_HAVE_WORD = 1, LSF_BACKSLASH = 2, LSF_QUOTE = 4};
 
-	if (ret < 0)
-		return ret;
-	if (val < 0 || val > max)
-		return -ERRNO_TO_ERROR(EINVAL);
-	*uid = val;
-	return 1;
-}
-
-int parse_uid_range(const char *orig_arg, struct uid_range *ur)
+static int get_next_word(const char *line, char **word)
 {
-	int ret;
-	char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-');
+	const char *in;
+	char *out;
+	int ret, state = 0;
 
-	if (!p || p == arg) { /* -42 or 42 */
-		ret = check_uid_arg(p? p + 1 : arg, &ur->high);
-		if (ret < 0)
-			goto out;
-		ur->low = p? 0 : ur->high;
-		ret = 1;
+	out = adu_malloc(strlen(line) + 1);
+	*out = '\0';
+	*word = out;
+	for (in = line; *in; in++) {
+		switch (*in) {
+		case '\\':
+			if (state & LSF_BACKSLASH) /* \\ */
+				break;
+			state |= LSF_BACKSLASH;
+			state |= LSF_HAVE_WORD;
+			continue;
+		case 'n':
+		case 't':
+			if (state & LSF_BACKSLASH) { /* \n or \t */
+				*out++ = (*in == 'n')? '\n' : '\t';
+				state &= ~LSF_BACKSLASH;
+				continue;
+			}
+			break;
+		case '"':
+			if (state & LSF_BACKSLASH) /* \" */
+				break;
+			if (state & LSF_QUOTE) {
+				state &= ~LSF_QUOTE;
+				continue;
+			}
+			state |= LSF_HAVE_WORD;
+			state |= LSF_QUOTE;
+			continue;
+		case ' ':
+		case '\t':
+		case '\n':
+			if (state & LSF_BACKSLASH)
+				break;
+			if (state & LSF_QUOTE)
+				break;
+			if (state & LSF_HAVE_WORD)
+				goto success;
+			/* ignore space at the beginning */
+			continue;
+		}
+		/* copy char */
+		state |= LSF_HAVE_WORD;
+		*out++ = *in;
+		state &= ~LSF_BACKSLASH;
+	}
+	ret = 0;
+	if (!(state & LSF_HAVE_WORD))
+		goto out;
+	ret = -ERRNO_TO_ERROR(EINVAL);
+	if (state & LSF_BACKSLASH) {
+		ERROR_LOG("trailing backslash\n");
 		goto out;
 	}
-	/* 42- or 42-4711 */
-	*p = '\0';
-	p++;
-	ret = check_uid_arg(arg, &ur->low);
-	if (ret < 0)
+	if (state & LSF_QUOTE) {
+		ERROR_LOG("unmatched quote character\n");
 		goto out;
-	ur->high = ~0U;
-	if (*p) { /* 42-4711 */
-		ret = check_uid_arg(p, &ur->high);
-		if (ret < 0)
-			goto out;
 	}
-	if (ur->low > ur->high)
-		ret = -ERRNO_TO_ERROR(EINVAL);
+success:
+	*out = '\0';
+	return in - line;
 out:
-	if (ret < 0)
-		ERROR_LOG("bad uid option: %s\n", orig_arg);
-	else
-		INFO_LOG("admissible uid range: %u - %u\n", ur->low,
-			ur->high);
-	free(arg);
+	free(*word);
+	*word = NULL;
 	return ret;
 }
 
-int parse_uid_arg(const char *orig_arg, struct uid_range **ur)
+void free_argv(char **argv)
 {
-	char *arg, **argv;
-	unsigned n;
-	int i, ret = 1;
+	int i;
+
+	for (i = 0; argv[i]; i++)
+		free(argv[i]);
+	free(argv);
+}
 
-	if (!orig_arg)
-		return 0;
-	arg = adu_strdup(orig_arg);
-	n = split_args(arg, &argv, ",");
-	if (!n)
-		return -E_SYNTAX;
-	*ur = adu_malloc((n + 1) * sizeof(struct uid_range));
-	for (i = 0; i < n; i++) {
-		ret = parse_uid_range(argv[i], *ur + i);
+/**
+ * \return Number of words in \a line, negative on errors.
+ */
+int create_argv(const char *line, char ***result)
+{
+	char *word, **argv = adu_malloc(2 * sizeof(char *));
+	const char *p;
+	int ret, num_words;
+
+	argv[0] = adu_strdup(line);
+	for (p = line, num_words = 1; ; p += ret, num_words++) {
+		ret = get_next_word(p, &word);
 		if (ret < 0)
+			goto err;
+		if (!ret)
 			break;
+		argv = adu_realloc(argv, (num_words + 2) * sizeof(char*));
+		argv[num_words] = word;
 	}
-	free(arg);
-	if (ret < 0) {
-		free(*ur);
-		*ur = NULL;
-	}
-	/* an empty range indicates the end of the list */
-	(*ur)[n].low = 1;
-	(*ur)[n].high = 0;
-	return n;
+	argv[num_words] = NULL;
+	*result = argv;
+	return num_words;
+err:
+	while (num_words > 0)
+		free(argv[--num_words]);
+	free(argv);
+	return ret;
 }