X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=2825cdca798d7366277768c522cfdc62ff5d315a;hp=87f9c265984d1a1b160b8bf784a273e417c46198;hb=6dc3d02ae5959a4ec5f3de4765d7440a580ff3e1;hpb=cecbe8525740b4a899cb1a6c91064e195ae1ada2

diff --git a/string.c b/string.c
index 87f9c26..2825cdc 100644
--- a/string.c
+++ b/string.c
@@ -129,6 +129,34 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
 	return msg;
 }
 
+/**
+ * adu's version of strcat().
+ *
+ * \param a String to be appended to.
+ * \param b String to append.
+ *
+ * Append \p b to \p a.
+ *
+ * \return If \a a is \p NULL, return a pointer to a copy of \a b, i.e.
+ * para_strcat(NULL, b) is equivalent to para_strdup(b). If \a b is \p NULL,
+ * return \a a without making a copy of \a a.  Otherwise, construct the
+ * concatenation \a c, free \a a (but not \a b) and return \a c.
+ *
+ * \sa strcat(3).
+ */
+__must_check __malloc char *adu_strcat(char *a, const char *b)
+{
+	char *tmp;
+
+	if (!a)
+		return adu_strdup(b);
+	if (!b)
+		return a;
+	tmp = make_message("%s%s", a, b);
+	free(a);
+	return tmp;
+}
+
 /** \cond LLONG_MAX and LLONG_LIN might not be defined. */
 #ifndef LLONG_MAX
 #define LLONG_MAX (1 << (sizeof(long) - 1))
@@ -290,13 +318,128 @@ int parse_uid_arg(const char *orig_arg, struct uid_range **ur)
 		if (ret < 0)
 			break;
 	}
+	free(argv);
 	free(arg);
 	if (ret < 0) {
 		free(*ur);
 		*ur = NULL;
+		return ret;
 	}
 	/* an empty range indicates the end of the list */
 	(*ur)[n].low = 1;
 	(*ur)[n].high = 0;
 	return n;
 }
+
+enum line_state_flags {LSF_HAVE_WORD = 1, LSF_BACKSLASH = 2, LSF_QUOTE = 4};
+
+static int get_next_word(const char *line, char **word)
+{
+	const char *in;
+	char *out;
+	int ret, state = 0;
+
+	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;
+	}
+	if (state & LSF_QUOTE) {
+		ERROR_LOG("unmatched quote character\n");
+		goto out;
+	}
+success:
+	*out = '\0';
+	return in - line;
+out:
+	free(*word);
+	*word = NULL;
+	return ret;
+}
+
+void free_argv(char **argv)
+{
+	int i;
+
+	for (i = 0; argv[i]; i++)
+		free(argv[i]);
+	free(argv);
+}
+
+/**
+ * \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;
+	}
+	argv[num_words] = NULL;
+	*result = argv;
+	return num_words;
+err:
+	while (num_words > 0)
+		free(argv[--num_words]);
+	free(argv);
+	return ret;
+}