X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=b78b112f4a9f0b523de52a4b212bc12b17fa9fad;hb=d0842865ca94a1bf4f7cdad329a2a0fc5d01b53a;hp=56880fb1875b066a6eddc3b99954ca65b0158cec;hpb=d1d29462c77d909b8e7a6b960bcc71c9422e0f8f;p=ccan

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 56880fb1..b78b112f 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -24,6 +24,7 @@ enum test_style {
 	DEFINES_FUNC		= 0x2,
 	INSIDE_MAIN		= 0x4,
 	DEFINES_EVERYTHING	= 0x8,
+	MAY_NOT_COMPILE		= 0x10,
 	EXECUTE			= 0x8000
 };
 
@@ -37,6 +38,11 @@ struct test {
 };
 
 static struct test tests[] = {
+	{ "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL,
+	  "#include <sys/types.h>\n"
+	  "int main(int argc, char *argv[]) {\n"
+	  "	return sizeof(off_t) == 4 ? 0 : 1;\n"
+	  "}\n" },
 	{ "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
 	  "return __alignof__(double) > 0 ? 0 : 1;" },
 	{ "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
@@ -92,8 +98,15 @@ 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_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
+	  "HAVE_32BIT_OFF_T",
+	  "#define _FILE_OFFSET_BITS 64\n"
+	  "#include <sys/types.h>\n"
+	  "int main(int argc, char *argv[]) {\n"
+	  "	return sizeof(off_t) == 8 ? 0 : 1;\n"
+	  "}\n" },
 	{ "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
 	  "for (int i = 0; i < argc; i++) { return 0; };\n"
 	  "return 1;" },
@@ -102,21 +115,37 @@ static struct test tests[] = {
 	{ "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL,
 	  "#include <unistd.h>\n"
 	  "static int func(void) { return getpagesize(); }" },
+	{ "HAVE_ISBLANK", DEFINES_FUNC, NULL,
+	  "#define _GNU_SOURCE\n"
+	  "#include <ctype.h>\n"
+	  "static int func(void) { return isblank(' '); }" },
 	{ "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
 	  "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"
 	  "	return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
 	  "}" },
-	{ "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
-	  "void (*func(int val))(int);\n"
-	  "void (*func(int val))(int) {\n"
-	  "	auto void add(int val2);\n"
-	  "	void add(int val2) { val += val2; }\n"
-	  "	return add;\n"
+	{ "HAVE_QSORT_R_PRIVATE_LAST",
+	  DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL,
+	  "#define _GNU_SOURCE 1\n"
+	  "#include <stdlib.h>\n"
+	  "static int cmp(const void *lp, const void *rp, void *priv) {\n"
+	  " *(unsigned int *)priv = 1;\n"
+	  " return *(const int *)lp - *(const int *)rp; }\n"
+	  "int main(void) {\n"
+	  " int array[] = { 9, 2, 5 };\n"
+	  " unsigned int called = 0;\n"
+	  " qsort_r(array, 3, sizeof(int), cmp, &called);\n"
+	  " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n"
 	  "}\n" },
 	{ "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL,
 	  "static long nest(const void *base, unsigned int i)\n"
@@ -208,7 +237,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;
@@ -264,7 +293,7 @@ static bool run_test(const char *cmd, struct test *test)
 		err(1, "creating %s", INPUT_FILE);
 
 	fprintf(outf, "%s", PRE_BOILERPLATE);
-	switch (test->style & ~EXECUTE) {
+	switch (test->style & ~(EXECUTE|MAY_NOT_COMPILE)) {
 	case INSIDE_MAIN:
 		fprintf(outf, "%s", MAIN_START_BOILERPLATE);
 		fprintf(outf, "%s", test->fragment);
@@ -301,7 +330,7 @@ static bool run_test(const char *cmd, struct test *test)
 			printf("Compile %s for %s, status %i: %s\n",
 			       status ? "fail" : "warning",
 			       test->name, status, output);
-		if (test->style & EXECUTE)
+		if ((test->style & EXECUTE) && !(test->style & MAY_NOT_COMPILE))
 			errx(1, "Test for %s did not compile:\n%s",
 			     test->name, output);
 		test->answer = false;
@@ -325,11 +354,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) {