base64: fix for unsigned chars (e.g. ARM).

[ccan] / ccan / grab_file / test / run-grab.c

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index 2b36a0fb70d77ba03b59ae83cb64ab66e6acb56b..c9f242609697423e38483af5b0181a5cd9b3fbc9 100644 (file)
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -1,13 +1,36 @@
 /* This is test for grab_file() function
  */
+#include <ccan/grab_file/grab_file.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <err.h>
+#include <sys/stat.h>
+#include <ccan/grab_file/grab_file.c>
+#include <ccan/tap/tap.h>
+#include <string.h>
 
-#include       <stdlib.h>
-#include       <stdio.h>
-#include       <err.h>
-#include       <sys/stat.h>
-#include       "string/string.h"
-#include       "string/string.c"
-#include       "tap/tap.h"
+static char **strsplit(const void *ctx, const char *string, const char *delims)
+{
+       char **lines = NULL;
+       unsigned int max = 64, num = 0;
+
+       lines = talloc_array(ctx, char *, max+1);
+
+       while (*string != '\0') {
+               unsigned int len = strcspn(string, delims);
+               lines[num] = talloc_array(lines, char, len + 1);
+               memcpy(lines[num], string, len);
+               lines[num][len] = '\0';
+               string += len;
+               string += strspn(string, delims) ? 1 : 0;
+               if (++num == max)
+                       lines = talloc_realloc(ctx, lines, char *, max*=2 + 1);
+       }
+       lines[num] = NULL;
+
+       /* Shrink, so talloc_get_size works */
+       return talloc_realloc(ctx, lines, char *, num+1);
+}
 
 int 
 main(int argc, char *argv[])
@@ -17,16 +40,19 @@ main(int argc, char *argv[])
        int             length;
        struct          stat st;
 
-       str = grab_file(NULL, "ccan/string/test/run-grab.c", NULL);
-       split = strsplit(NULL, str, "\n", NULL);
+       str = grab_file(NULL, "test/run-grab.c", NULL);
+       split = strsplit(str, str, "\n");
        length = strlen(split[0]);
-       ok1(streq(split[0], "/* This is test for grab_file() function"));
+       ok1(!strcmp(split[0], "/* This is test for grab_file() function"));
        for (i = 1; split[i]; i++)      
                length += strlen(split[i]);
-       ok1(streq(split[i-1], "/* End of grab_file() test */"));
-       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
-               err(1, "Could not stat self");
+       ok1(!strcmp(split[i-1], "/* End of grab_file() test */"));
+       if (stat("test/run-grab.c", &st) != 0) 
+               /* FIXME: ditto */
+               if (stat("ccan/grab_file/test/run-grab.c", &st) != 0) 
+                       err(1, "Could not stat self");
        ok1(st.st_size == length + i);
+       talloc_free(str);
        
        return 0;
 }