tdb2: copy tdb1's changed expansion logic.

[ccan] / ccan / str_talloc / str_talloc.c

diff --git a/ccan/str_talloc/str_talloc.c b/ccan/str_talloc/str_talloc.c
index 7438f48033052eb1ae4fd56df267632dc9594cef..ce7fdf8f557962de34eeaeaec10b6985f9b0f429 100644 (file)
--- a/ccan/str_talloc/str_talloc.c
+++ b/ccan/str_talloc/str_talloc.c
@@ -1,13 +1,18 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
 #include "str_talloc.h"
-#include "talloc/talloc.h"
+#include <sys/types.h>
+#include <regex.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <ccan/talloc/talloc.h>
+#include <ccan/str/str.h>
 
-char **strsplit(const void *ctx, const char *string, const char *delims,
-                unsigned int *nump)
+char **strsplit(const void *ctx, const char *string, const char *delims)
 {
        char **lines = NULL;
        unsigned int max = 64, num = 0;
@@ -25,19 +30,68 @@ char **strsplit(const void *ctx, const char *string, const char *delims,
                        lines = talloc_realloc(ctx, lines, char *, max*=2 + 1);
        }
        lines[num] = NULL;
-       if (nump)
-               *nump = num;
-       return lines;
+
+       /* Shrink, so talloc_get_size works */
+       return talloc_realloc(ctx, lines, char *, num+1);
 }
 
 char *strjoin(const void *ctx, char *strings[], const char *delim)
 {
        unsigned int i;
        char *ret = talloc_strdup(ctx, "");
+       size_t totlen = 0, dlen = strlen(delim);
 
        for (i = 0; strings[i]; i++) {
-               ret = talloc_append_string(ret, strings[i]);
-               ret = talloc_append_string(ret, delim);
+               size_t len = strlen(strings[i]);
+               ret = talloc_realloc(ctx, ret, char, totlen + len + dlen + 1);
+               memcpy(ret + totlen, strings[i], len);
+               totlen += len;
+               memcpy(ret + totlen, delim, dlen);
+               totlen += dlen;
        }
+       ret[totlen] = '\0';
+       return ret;
+}
+
+bool strreg(const void *ctx, const char *string, const char *regex, ...)
+{
+       size_t nmatch = 1 + strcount(regex, "(");
+       regmatch_t *matches = talloc_array(ctx, regmatch_t, nmatch);
+       regex_t r;
+       bool ret;
+
+       if (!matches || regcomp(&r, regex, REG_EXTENDED) != 0)
+               return false;
+
+       if (regexec(&r, string, nmatch, matches, 0) == 0) {
+               unsigned int i;
+               va_list ap;
+
+               ret = true;
+               va_start(ap, regex);
+               for (i = 1; i < nmatch; i++) {
+                       char **arg;
+                       arg = va_arg(ap, char **);
+                       if (arg) {
+                               /* eg. ([a-z])? can give "no match". */
+                               if (matches[i].rm_so == -1)
+                                       *arg = NULL;
+                               else {
+                                       *arg = talloc_strndup(ctx,
+                                                     string + matches[i].rm_so,
+                                                     matches[i].rm_eo
+                                                     - matches[i].rm_so);
+                                       if (!*arg) {
+                                               ret = false;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               va_end(ap);
+       } else
+               ret = false;
+       talloc_free(matches);
+       regfree(&r);
        return ret;
 }