From: Andre Noll <maan@systemlinux.org>
Date: Fri, 20 Jun 2008 08:44:16 +0000 (+0200)
Subject: Move the uid-range parser to string.c.
X-Git-Tag: v0.0.3~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=9ca6c5e46bfbfeb6341a54703a21e25c15ef0f7e;p=adu.git

Move the uid-range parser to string.c.

This code will also be needed by the interactive mode.
---

diff --git a/adu.c b/adu.c
index 42d1b19..07248e9 100644
--- a/adu.c
+++ b/adu.c
@@ -166,61 +166,6 @@ static struct osl_column_description user_table_cols[] = {
 	},
 };
 
-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;
-}
-
-static 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;
-}
-
 /**
  * The log function.
  *
diff --git a/string.c b/string.c
index a0666d3..8b6ea5a 100644
--- a/string.c
+++ b/string.c
@@ -166,3 +166,59 @@ __must_check int atoi64(const char *str, int64_t *result)
 	*result = tmp;
 	return 1;
 }
+
+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;
+}
+
diff --git a/string.h b/string.h
index ebf3b17..d975178 100644
--- a/string.h
+++ b/string.h
@@ -12,3 +12,5 @@ __must_check __malloc void *adu_calloc(size_t size);
 __must_check __malloc char *adu_strdup(const char *s);
 __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
 __must_check int atoi64(const char *str, int64_t *result);
+int parse_uid_range(const char *orig_arg, struct uid_range *ur);
+