X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=6ec30bd6deb77596fde041983175f4eaa117741d;hb=d1827b423b5d30c8ecb184a3186d95d9f134f806;hp=2ad3fffa254b277130ad4e34c545f91aef886f03;hpb=93992ee36410c42dd29bfb013c184ef9e9f360b3;p=ccan diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index 2ad3fffa..6ec30bd6 100644 --- a/tools/configurator/configurator.c +++ b/tools/configurator/configurator.c @@ -3,6 +3,9 @@ * * Copyright 2011 Rusty Russell . MIT license. * + * c12r_err, c12r_errx functions copied from ccan/err/err.c + * Copyright Rusty Russell . CC0 (Public domain) License. + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -23,10 +26,11 @@ */ #define _POSIX_C_SOURCE 200809L /* For pclose, popen, strdup */ +#include #include +#include #include #include -#include #include #ifdef _MSC_VER @@ -34,8 +38,21 @@ #define pclose _pclose #endif +#ifdef _MSC_VER +#define DEFAULT_COMPILER "cl" +/* Note: Dash options avoid POSIX path conversion when used under msys bash + * and are therefore preferred to slash (e.g. -nologo over /nologo) + * Note: Disable Warning 4200 "nonstandard extension used : zero-sized array + * in struct/union" for flexible array members. + */ +#define DEFAULT_FLAGS "-nologo -Zi -W4 -wd4200 " \ + "-D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS" +#define DEFAULT_OUTPUT_EXE_FLAG "-Fe:" +#else #define DEFAULT_COMPILER "cc" #define DEFAULT_FLAGS "-g3 -ggdb -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition" +#define DEFAULT_OUTPUT_EXE_FLAG "-o" +#endif #define OUTPUT_FILE "configurator.out" #define INPUT_FILE "configuratortest.c" @@ -46,6 +63,7 @@ #define DIR_SEP "/" #endif +static const char *progname = ""; static int verbose; enum test_style { @@ -377,6 +395,47 @@ static struct test tests[] = { }, }; +static void c12r_err(int eval, const char *fmt, ...) +{ + int err_errno = errno; + va_list ap; + + fprintf(stderr, "%s: ", progname); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, ": %s\n", strerror(err_errno)); + exit(eval); +} + +static void c12r_errx(int eval, const char *fmt, ...) +{ + va_list ap; + + fprintf(stderr, "%s: ", progname); + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n"); + exit(eval); +} + +static size_t fcopy(FILE *fsrc, FILE *fdst) +{ + char buffer[BUFSIZ]; + size_t rsize, wsize; + size_t copied = 0; + + while ((rsize = fread(buffer, 1, BUFSIZ, fsrc)) > 0) { + wsize = fwrite(buffer, 1, rsize, fdst); + copied += wsize; + if (wsize != rsize) + break; + } + + return copied; +} + static char *grab_stream(FILE *file) { size_t max, ret, size = 0; @@ -390,7 +449,7 @@ static char *grab_stream(FILE *file) } size += ret; if (ferror(file)) - err(1, "reading from command"); + c12r_err(1, "reading from command"); buffer[size] = '\0'; return buffer; } @@ -410,7 +469,7 @@ static char *run(const char *cmd, int *exitstatus) cmdout = popen(cmdredir, "r"); if (!cmdout) - err(1, "popen \"%s\"", cmdredir); + c12r_err(1, "popen \"%s\"", cmdredir); free(cmdredir); @@ -419,10 +478,12 @@ static char *run(const char *cmd, int *exitstatus) return ret; } -static char *connect_args(const char *argv[], const char *extra) +static char *connect_args(const char *argv[], const char *outflag, + const char *files) { - unsigned int i, len = strlen(extra) + 1; + unsigned int i; char *ret; + size_t len = strlen(outflag) + strlen(files) + 1; for (i = 1; argv[i]; i++) len += 1 + strlen(argv[i]); @@ -432,10 +493,12 @@ 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]); - if (argv[i+1]) + if (argv[i+1] || *outflag) ret[len++] = ' '; } - strcpy(ret + len, extra); + strcpy(ret + len, outflag); + len += strlen(outflag); + strcpy(ret + len, files); return ret; } @@ -500,9 +563,9 @@ static bool run_test(const char *cmd, struct test *test) } } - outf = fopen(INPUT_FILE, "w"); + outf = fopen(INPUT_FILE, verbose > 1 ? "w+" : "w"); if (!outf) - err(1, "creating %s", INPUT_FILE); + c12r_err(1, "creating %s", INPUT_FILE); fprintf(outf, "%s", PRE_BOILERPLATE); switch (test->style & ~(EXECUTE|MAY_NOT_COMPILE)) { @@ -531,11 +594,13 @@ static bool run_test(const char *cmd, struct test *test) abort(); } - fclose(outf); - if (verbose > 1) - if (system("cat " INPUT_FILE) == -1) - ; + if (verbose > 1) { + fseek(outf, 0, SEEK_SET); + fcopy(outf, stdout); + } + + fclose(outf); newcmd = strdup(cmd); @@ -567,8 +632,8 @@ static bool run_test(const char *cmd, struct test *test) status ? "fail" : "warning", test->name, status, output); if ((test->style & EXECUTE) && !(test->style & MAY_NOT_COMPILE)) - errx(1, "Test for %s did not compile:\n%s", - test->name, output); + c12r_errx(1, "Test for %s did not compile:\n%s", + test->name, output); test->answer = false; free(output); } else { @@ -578,8 +643,8 @@ static bool run_test(const char *cmd, struct test *test) if ((test->style & EXECUTE) || (test->style & INSIDE_MAIN)) { output = run("." DIR_SEP OUTPUT_FILE, &status); if (!(test->style & EXECUTE) && status != 0) - errx(1, "Test for %s failed with %i:\n%s", - test->name, status, output); + c12r_errx(1, "Test for %s failed with %i:\n%s", + test->name, status, output); if (verbose && status) printf("%s exited %i\n", test->name, status); free(output); @@ -602,30 +667,47 @@ int main(int argc, const char *argv[]) unsigned int i; const char *default_args[] = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL }; + const char *outflag = DEFAULT_OUTPUT_EXE_FLAG; + + if (argc > 0) + progname = argv[0]; - if (argc > 1) { + while (argc > 1) { if (strcmp(argv[1], "--help") == 0) { - printf("Usage: configurator [-v] [ ...]\n" - " will have \"-o \" appended\n" - "Default: %s %s\n", - DEFAULT_COMPILER, DEFAULT_FLAGS); + printf("Usage: configurator [-v] [-O] [ ...]\n" + " will have \" \" appended\n" + "Default: %s %s %s\n", + DEFAULT_COMPILER, DEFAULT_FLAGS, + DEFAULT_OUTPUT_EXE_FLAG); exit(0); } - if (strcmp(argv[1], "-v") == 0) { + if (strncmp(argv[1], "-O", 2) == 0) { + argc--; + argv++; + outflag = argv[1] + 2; + if (!*outflag) { + fprintf(stderr, + "%s: option requires an argument -- O\n", + argv[0]); + exit(1); + } + } else if (strcmp(argv[1], "-v") == 0) { argc--; argv++; - verbose = 1; + verbose++; } else if (strcmp(argv[1], "-vv") == 0) { argc--; argv++; - verbose = 2; + verbose += 2; + } else { + break; } } if (argc == 1) argv = default_args; - cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE); + cmd = connect_args(argv, outflag, OUTPUT_FILE " " INPUT_FILE); for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) run_test(cmd, &tests[i]); free(cmd); @@ -640,9 +722,10 @@ 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]); - cmd = connect_args(argv+1, ""); - printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd); + cmd = connect_args(argv + 1, "", ""); + printf("#define CCAN_CFLAGS \"%s\"\n", cmd); free(cmd); + printf("#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag); /* This one implies "#include