crypto/shachain: detect if we're inserting a bogus hash.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index eb4728462eab451a9785836b0cc7cb99b79de318..f4edb8ee1b214dbf97106bffe91335b12d5737ac 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -55,6 +55,7 @@ struct test {
        const char *depends;
        const char *link;
        const char *fragment;
+       const char *overrides; /* On success, force this to '1' */
        bool done;
        bool answer;
 };
@@ -79,6 +80,8 @@ static struct test tests[] = {
          "static int __attribute__((cold)) func(int x) { return x; }" },
        { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL, NULL,
          "static int __attribute__((const)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_PURE", DEFINES_FUNC, NULL, NULL,
+         "static int __attribute__((pure)) func(int x) { return x; }" },
        { "HAVE_ATTRIBUTE_MAY_ALIAS", OUTSIDE_MAIN, NULL, NULL,
          "typedef short __attribute__((__may_alias__)) short_a;" },
        { "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL, NULL,
@@ -111,10 +114,18 @@ static struct test tests[] = {
          "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "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(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
+         "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,
          "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFS", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ffs(0) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL, NULL,
@@ -123,6 +134,11 @@ static struct test tests[] = {
          "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
        { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" },
+       { "HAVE_ICCARM_INTRINSICS", DEFINES_FUNC, NULL, NULL,
+         "#include <intrinsics.h>\n"
+         "int func(int v) {\n"
+         "     return __CLZ(__RBIT(v));\n"
+         "}" },
        { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, NULL,
          "#include <byteswap.h>\n" },
        { "HAVE_CLOCK_GETTIME",
@@ -142,10 +158,21 @@ static struct test tests[] = {
          "     struct timespec ts;\n"
          "     clock_gettime(CLOCK_REALTIME, &ts);\n"
          "     return ts;\n"
-         "}\n" },
+         "}\n",
+         /* This means HAVE_CLOCK_GETTIME, too */
+         "HAVE_CLOCK_GETTIME" },
        { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
          "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
+       { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+         "#include <sys/types.h>\n"
+         "#include <sys/stat.h>\n"
+         "#include <fcntl.h>\n"
+         "#include <unistd.h>\n"
+         "int main(void) {\n"
+         "     int fd = open(\"..\", O_RDONLY);\n"
+         "     return fchdir(fd) == 0 ? 0 : 1;\n"
+         "}\n" },
        { "HAVE_ERR_H", DEFINES_FUNC, NULL, NULL,
          "#include <err.h>\n"
          "static void func(int arg) {\n"
@@ -187,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"
@@ -240,8 +273,17 @@ static struct test tests[] = {
          "return ({ int x = argc; x == argc ? 0 : 1; });" },
        { "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, NULL, /* Solaris needs this for FIONREAD */
          "#include <sys/filio.h>\n" },
+       { "HAVE_SYS_TERMIOS_H", OUTSIDE_MAIN, NULL, NULL,
+         "#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"
+         "     return *(int *)(pad) == *(int *)(pad + 1);\n"
+         "}\n" },
        { "HAVE_UTIME", DEFINES_FUNC, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <utime.h>\n"
@@ -331,7 +373,8 @@ static char *connect_args(const char *argv[], const char *extra)
        for (i = 1; argv[i]; i++) {
                strcpy(ret + len, argv[i]);
                len += strlen(argv[i]);
-               ret[len++] = ' ';
+               if (argv[i+1])
+                       ret[len++] = ' ';
        }
        strcpy(ret + len, extra);
        return ret;
@@ -465,6 +508,12 @@ static bool run_test(const char *cmd, struct test *test)
                test->answer = (status == 0);
        }
        test->done = true;
+
+       if (test->answer && test->overrides) {
+               struct test *override = find_test(test->overrides);
+               override->done = true;
+               override->answer = true;
+       }
        return test->answer;
 }
 
@@ -497,14 +546,13 @@ int main(int argc, const char *argv[])
        if (argc == 1)
                argv = default_args;
 
-       cmd = connect_args(argv, "-o " OUTPUT_FILE " " INPUT_FILE);
+       cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE);
        for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
                run_test(cmd, &tests[i]);
 
        unlink(OUTPUT_FILE);
        unlink(INPUT_FILE);
 
-       cmd[strlen(cmd) - strlen(" -o " OUTPUT_FILE " " INPUT_FILE)] = '\0';
        printf("/* Generated by CCAN configurator */\n"
               "#ifndef CCAN_CONFIG_H\n"
               "#define CCAN_CONFIG_H\n");
@@ -512,7 +560,7 @@ 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", cmd + strlen(argv[1]) + 1);
+       printf("#define CCAN_CFLAGS \"%s\"\n\n", connect_args(argv+1, ""));
        /* 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++)