* 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.
*
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)