*
* Copyright 2011 Rusty Russell <rusty@rustcorp.com.au>. MIT license.
*
+ * c12r_err, c12r_errx functions copied from ccan/err/err.c
+ * Copyright Rusty Russell <rusty@rustcorp.com.au>. 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
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#define _POSIX_C_SOURCE 200809L /* For pclose, popen, strdup */
+
+#include <errno.h>
#include <stdio.h>
+#include <stdarg.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <err.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <string.h>
+#ifdef _MSC_VER
+#define popen _popen
+#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"
#define DIR_SEP "/"
#endif
+static const char *progname = "";
static int verbose;
enum test_style {
},
};
-static char *grab_fd(int fd)
+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)
{
- int ret;
- size_t max, size = 0;
+ 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;
char *buffer;
- max = 16384;
- buffer = malloc(max+1);
- while ((ret = read(fd, buffer + size, max - size)) > 0) {
+ max = BUFSIZ;
+ buffer = malloc(max);
+ while ((ret = fread(buffer+size, 1, max - size, file)) == max - size) {
size += ret;
- if (size == max)
- buffer = realloc(buffer, max *= 2);
+ buffer = realloc(buffer, max *= 2);
}
- if (ret < 0)
- err(1, "reading from command");
+ size += ret;
+ if (ferror(file))
+ c12r_err(1, "reading from command");
buffer[size] = '\0';
return buffer;
}
static char *run(const char *cmd, int *exitstatus)
{
- pid_t pid;
- int p[2];
+ static const char redir[] = " 2>&1";
+ size_t cmdlen;
+ char *cmdredir;
+ FILE *cmdout;
char *ret;
- int status;
- if (pipe(p) != 0)
- err(1, "creating pipe");
-
- pid = fork();
- if (pid == -1)
- err(1, "forking");
-
- if (pid == 0) {
- if (dup2(p[1], STDOUT_FILENO) != STDOUT_FILENO
- || dup2(p[1], STDERR_FILENO) != STDERR_FILENO
- || close(p[0]) != 0
- || close(STDIN_FILENO) != 0
- || open("/dev/null", O_RDONLY) != STDIN_FILENO)
- exit(128);
-
- status = system(cmd);
- if (WIFEXITED(status))
- exit(WEXITSTATUS(status));
- /* Here's a hint... */
- exit(128 + WTERMSIG(status));
- }
+ cmdlen = strlen(cmd);
+ cmdredir = malloc(cmdlen + sizeof(redir));
+ memcpy(cmdredir, cmd, cmdlen);
+ memcpy(cmdredir + cmdlen, redir, sizeof(redir));
- close(p[1]);
- ret = grab_fd(p[0]);
- /* This shouldn't fail... */
- if (waitpid(pid, &status, 0) != pid)
- err(1, "Failed to wait for child");
- close(p[0]);
- if (WIFEXITED(status))
- *exitstatus = WEXITSTATUS(status);
- else
- *exitstatus = -WTERMSIG(status);
+ cmdout = popen(cmdredir, "r");
+ if (!cmdout)
+ c12r_err(1, "popen \"%s\"", cmdredir);
+
+ free(cmdredir);
+
+ ret = grab_stream(cmdout);
+ *exitstatus = pclose(cmdout);
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]);
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;
}
}
}
- 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)) {
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);
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 {
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);
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] [<compiler> <flags>...]\n"
- " <compiler> <flags> will have \"-o <outfile> <infile.c>\" appended\n"
- "Default: %s %s\n",
- DEFAULT_COMPILER, DEFAULT_FLAGS);
+ printf("Usage: configurator [-v] [-O<outflag>] [<compiler> <flags>...]\n"
+ " <compiler> <flags> will have \"<outflag> <outfile> <infile.c>\" 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);
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 <ccan/..." works, eg. for tdb2.h */
printf("#define HAVE_CCAN 1\n");
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
projects / ccan / blobdiff