configurator: hide type punning

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index d1aa5c61a564670e915a6921ee06fd9ec0968817..119404f54f855e184e891b9dad0ff99da8961e61 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -117,9 +117,9 @@ static struct test tests[] = {
        { "HAVE_BUILTIN_CTZ", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CTZL", INSIDE_MAIN, NULL, NULL,
-         "return __builtin_ctzl(1 << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+         "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
-         "return __builtin_ctzll(1 << (sizeof(long long)*8 - 1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+         "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CONSTANT_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_constant_p(1) ? 0 : 1;" },
        { "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL, NULL,
@@ -214,6 +214,12 @@ static struct test tests[] = {
          "static void *func(void *h, size_t hl, void *n, size_t nl) {\n"
          "return memmem(h, hl, n, nl);"
          "}\n", },
+       { "HAVE_MEMRCHR", DEFINES_FUNC, NULL, NULL,
+         "#define _GNU_SOURCE\n"
+         "#include <string.h>\n"
+         "static void *func(void *s, int c, size_t n) {\n"
+         "return memrchr(s, c, n);"
+         "}\n", },
        { "HAVE_MMAP", DEFINES_FUNC, NULL, NULL,
          "#include <sys/mman.h>\n"
          "static void *func(int fd) {\n"
@@ -271,6 +277,14 @@ static struct test tests[] = {
          "#include <sys/termios.h>\n" },
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
+       { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+         "#include <string.h>\n"
+         "int main(int argc, char *argv[]) {\n"
+         "     char pad[sizeof(int *) * 1];\n"
+         "     strncpy(pad, argv[0], sizeof(pad));\n"
+         "     int *x = (int *)pad, *y = (int *)(pad + 1);\n"
+         "     return *x == *y;\n"
+         "}\n" },
        { "HAVE_UTIME", DEFINES_FUNC, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <utime.h>\n"
@@ -417,6 +431,9 @@ static bool run_test(const char *cmd, struct test *test)
                                test->done = true;
                                return test->answer;
                        }
+                       if (deps[len])
+                               free(dep);
+
                        deps += len;
                        deps += strspn(deps, " ");
                }
@@ -536,6 +553,7 @@ int main(int argc, const char *argv[])
        cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE);
        for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
                run_test(cmd, &tests[i]);
+       free(cmd);
 
        unlink(OUTPUT_FILE);
        unlink(INPUT_FILE);
@@ -547,7 +565,9 @@ int main(int argc, const char *argv[])
        printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
        printf("#endif\n");
        printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
-       printf("#define CCAN_CFLAGS \"%s\"\n\n", connect_args(argv+1, ""));
+       cmd = connect_args(argv+1, "");
+       printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd);
+       free(cmd);
        /* This one implies "#include <ccan/..." works, eg. for tdb2.h */
        printf("#define HAVE_CCAN 1\n");
        for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)