Fix talloc external alloc parent pointer.

[ccan] / ccan / string / test / run.c

diff --git a/ccan/string/test/run.c b/ccan/string/test/run.c
index fded0e49a3ebde3044ea9270cd02688055a7f0c3..02403d24511300a68f05d182d68fa98f66a6503e 100644 (file)
--- a/ccan/string/test/run.c
+++ b/ccan/string/test/run.c
@@ -1,12 +1,15 @@
+#include "string/string.h"

 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>

-#include "string/string.h"
+#include "string/string.c"

 #include "tap/tap.h"
 
 /* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
 #include "tap/tap.h"
 
 /* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 

-static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar" };
+static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+
+#define NUM_SUBSTRINGS (ARRAY_SIZE(substrings) - 1)

 
 static char *strdup_rev(const char *s)
 {
 
 static char *strdup_rev(const char *s)
 {


@@ -21,11 +24,13 @@ static char *strdup_rev(const char *s)
 int main(int argc, char *argv[])
 {
        unsigned int i, j, n;
 int main(int argc, char *argv[])
 {
        unsigned int i, j, n;

-       char *strings[ARRAY_SIZE(substrings) * ARRAY_SIZE(substrings)];
+       char **split, *str;
+       void *ctx;
+       char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];

 
        n = 0;
 
        n = 0;

-       for (i = 0; i < ARRAY_SIZE(substrings); i++) {
-               for (j = 0; j < ARRAY_SIZE(substrings); j++) {
+       for (i = 0; i < NUM_SUBSTRINGS; i++) {
+               for (j = 0; j < NUM_SUBSTRINGS; j++) {

                        strings[n] = malloc(strlen(substrings[i])
                                            + strlen(substrings[j]) + 1);
                        sprintf(strings[n++], "%s%s",
                        strings[n] = malloc(strlen(substrings[i])
                                            + strlen(substrings[j]) + 1);
                        sprintf(strings[n++], "%s%s",


@@ -33,7 +38,7 @@ int main(int argc, char *argv[])
                }
        }
 
                }
        }
 

-       plan_tests(n * n * 5);
+       plan_tests(n * n * 5 + 19);

        for (i = 0; i < n; i++) {
                for (j = 0; j < n; j++) {
                        unsigned int k, identical = 0;
        for (i = 0; i < n; i++) {
                for (j = 0; j < n; j++) {
                        unsigned int k, identical = 0;


@@ -73,5 +78,44 @@ int main(int argc, char *argv[])
                        }
                }
        }
                        }
                }
        }

+
+       split = strsplit(NULL, "hello  world", " ", &n);
+       ok1(n == 3);
+       ok1(streq(split[0], "hello"));
+       ok1(streq(split[1], ""));
+       ok1(streq(split[2], "world"));
+       ok1(split[3] == NULL);
+       talloc_free(split);
+
+       split = strsplit(NULL, "hello  world", " ", NULL);
+       ok1(streq(split[0], "hello"));
+       ok1(streq(split[1], ""));
+       ok1(streq(split[2], "world"));
+       ok1(split[3] == NULL);
+       talloc_free(split);
+
+       split = strsplit(NULL, "hello  world", "o ", NULL);
+       ok1(streq(split[0], "hell"));
+       ok1(streq(split[1], ""));
+       ok1(streq(split[2], ""));
+       ok1(streq(split[3], "w"));
+       ok1(streq(split[4], "rld"));
+       ok1(split[5] == NULL);
+
+       ctx = split;
+       split = strsplit(ctx, "hello  world", "o ", NULL);
+       ok1(talloc_parent(split) == ctx);
+       talloc_free(ctx);
+
+       str = strjoin(NULL, substrings, ", ");
+       ok1(streq(str, "far, bar, baz, b, ba, z, ar, "));
+       ctx = str;
+       str = strjoin(ctx, substrings, "");
+       ok1(streq(str, "farbarbazbbazar"));
+       ok1(talloc_parent(str) == ctx);
+       talloc_free(ctx);
+
+
+       

        return exit_status();
 }                              
        return exit_status();
 }