Merge commit 'fml/master'

[adu.git] / string.c

diff --git a/string.c b/string.c
index 8b6ea5a90e466f67064ad2ef9d755b6fd7ee783a..87f9c265984d1a1b160b8bf784a273e417c46198 100644 (file)
--- a/string.c
+++ b/string.c
@@ -167,6 +167,56 @@ __must_check int atoi64(const char *str, int64_t *result)
        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;
@@ -222,3 +272,31 @@ out:
        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;
+}