Add configurator test for memmem()

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 56880fb1875b066a6eddc3b99954ca65b0158cec..af7955a3144449db4cb1d04fc82454c40558a8ae 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -92,7 +92,7 @@ static struct test tests[] = {
        { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL,
          "#include <byteswap.h>\n" },
        { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL,
-         "char **foo = (char *[]) { \"x\", \"y\", \"z\" };\n"
+         "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
        { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
          "for (int i = 0; i < argc; i++) { return 0; };\n"
@@ -106,6 +106,12 @@ static struct test tests[] = {
          "union { int i; char c[sizeof(int)]; } u;\n"
          "u.i = 0x01020304;\n"
          "return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;" },
+       { "HAVE_MEMMEM", DEFINES_FUNC, NULL,
+         "#define _GNU_SOURCE\n"
+         "#include <string.h>\n"
+         "static void *func(void *h, size_t hl, void *n, size_t nl) {\n"
+         "return memmem(h, hl, n, nl);"
+         "}\n", },
        { "HAVE_MMAP", DEFINES_FUNC, NULL,
          "#include <sys/mman.h>\n"
          "static void *func(int fd) {\n"
@@ -208,7 +214,7 @@ static char *run(const char *cmd, int *exitstatus)
        return ret;
 }
 
-static char *connect_args(char *argv[], const char *extra)
+static char *connect_args(const char *argv[], const char *extra)
 {
        unsigned int i, len = strlen(extra) + 1;
        char *ret;
@@ -325,11 +331,12 @@ static bool run_test(const char *cmd, struct test *test)
        return test->answer;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
        char *cmd;
-       char *default_args[] = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
        unsigned int i;
+       const char *default_args[]
+               = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
 
        if (argc > 1) {
                if (strcmp(argv[1], "--help") == 0) {