X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.c;h=07dd8459cda272666a4714941549d68bec1cc9b9;hp=a219bef6fec4410e2eb44c07713f02778a42cf60;hb=f638c88fad8a1350cf56d5f60ddef297ece92805;hpb=9e41a10fbee567866d78903b11646d341cfd9882

diff --git a/string.c b/string.c
index a219bef..07dd845 100644
--- a/string.c
+++ b/string.c
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file string.c Memory allocation and string handling functions. */
+/** \file string.c \brief Memory allocation and string handling functions. */
 
 #include "adu.h"
 #include "string.h"
@@ -12,7 +12,7 @@
 #include "error.h"
 
 /**
- * Paraslash's version of realloc().
+ * Adu's version of realloc().
  *
  * \param p Pointer to the memory block, may be \p NULL.
  * \param size The desired new size.
@@ -41,7 +41,7 @@ __must_check __malloc void *adu_realloc(void *p, size_t size)
 }
 
 /**
- * Paraslash's version of malloc().
+ * Adu's version of malloc().
  *
  * \param size The desired new size.
  *
@@ -66,7 +66,7 @@ __must_check __malloc void *adu_malloc(size_t size)
 }
 
 /**
- * Paraslash's version of calloc().
+ * Adu's version of calloc().
  *
  * \param size The desired new size.
  *
@@ -86,7 +86,7 @@ __must_check __malloc void *adu_calloc(size_t size)
 }
 
 /**
- * Paraslash's version of strdup().
+ * Adu's version of strdup().
  *
  * \param s The string to be duplicated.
  *
@@ -245,92 +245,6 @@ __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);
-
-	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(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)