X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=87f9c265984d1a1b160b8bf784a273e417c46198;hp=8bd34460877a389a40a85bccb67dfed49ead9871;hb=cecbe8525740b4a899cb1a6c91064e195ae1ada2;hpb=694171759afb90bfdc552676ff6d04697c93af00

diff --git a/string.c b/string.c
index 8bd3446..87f9c26 100644
--- a/string.c
+++ b/string.c
@@ -25,7 +25,7 @@
  *
  * \sa realloc(3).
  */
-__must_check __malloc void *para_realloc(void *p, size_t size)
+__must_check __malloc void *adu_realloc(void *p, size_t size)
 {
 	/*
 	 * No need to check for NULL pointers: If p is NULL, the  call
@@ -52,7 +52,7 @@ __must_check __malloc void *para_realloc(void *p, size_t size)
  *
  * \sa malloc(3).
  */
-__must_check __malloc void *para_malloc(size_t size)
+__must_check __malloc void *adu_malloc(size_t size)
 {
 	assert(size);
 	void *p = malloc(size);
@@ -77,9 +77,9 @@ __must_check __malloc void *para_malloc(size_t size)
  *
  * \sa calloc(3)
  */
-__must_check __malloc void *para_calloc(size_t size)
+__must_check __malloc void *adu_calloc(size_t size)
 {
-	void *ret = para_malloc(size);
+	void *ret = adu_malloc(size);
 
 	memset(ret, 0, size);
 	return ret;
@@ -98,7 +98,7 @@ __must_check __malloc void *para_calloc(size_t size)
  *
  * \sa strdup(3)
  */
-__must_check __malloc char *para_strdup(const char *s)
+__must_check __malloc char *adu_strdup(const char *s)
 {
 	char *ret;
 
@@ -148,7 +148,7 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
  *
  * \sa strtol(3), atoi(3).
  */
-int para_atoi64(const char *str, int64_t *value)
+__must_check int atoi64(const char *str, int64_t *result)
 {
 	char *endptr;
 	long long tmp;
@@ -163,6 +163,140 @@ int para_atoi64(const char *str, int64_t *value)
 		return -E_ATOI_NO_DIGITS;
 	if (*endptr != '\0') /* Further characters after number */
 		return -E_ATOI_JUNK_AT_END;
-	*value = tmp;
+	*result = tmp;
 	return 1;
 }
+
+/**
+ * Split string and return pointers to its parts.
+ *
+ * \param args The string to be split.
+ * \param argv_ptr Pointer to the list of substrings.
+ * \param delim Delimiter.
+ *
+ * This function modifies \a args by replacing each occurance of \a delim by
+ * zero. A \p NULL-terminated array of pointers to char* is allocated dynamically
+ * and these pointers are initialized to point to the broken-up substrings
+ * within \a args. A pointer to this array is returned via \a argv_ptr.
+ *
+ * \return The number of substrings found in \a args.
+ */
+__must_check unsigned split_args(char *args, char *** const argv_ptr, const char *delim)
+{
+	char *p = args;
+	char **argv;
+	size_t n = 0, i, j;
+
+	p = args + strspn(args, delim);
+	for (;;) {
+		i = strcspn(p, delim);
+		if (!i)
+			break;
+		p += i;
+		n++;
+		p += strspn(p, delim);
+	}
+	*argv_ptr = adu_malloc((n + 1) * sizeof(char *));
+	argv = *argv_ptr;
+	i = 0;
+	p = args + strspn(args, delim);
+	while (p) {
+		argv[i] = p;
+		j = strcspn(p, delim);
+		if (!j)
+			break;
+		p += strcspn(p, delim);
+		if (*p) {
+			*p = '\0';
+			p++;
+			p += strspn(p, delim);
+		}
+		i++;
+	}
+	argv[n] = NULL;
+	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);
+
+	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)
+{
+	int ret;
+	char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-');
+
+	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;
+		goto out;
+	}
+	/* 42- or 42-4711 */
+	*p = '\0';
+	p++;
+	ret = check_uid_arg(arg, &ur->low);
+	if (ret < 0)
+		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);
+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);
+	return ret;
+}
+
+int parse_uid_arg(const char *orig_arg, struct uid_range **ur)
+{
+	char *arg, **argv;
+	unsigned n;
+	int i, ret = 1;
+
+	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);
+		if (ret < 0)
+			break;
+	}
+	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;
+}