configurator: fix single-arg case.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 143069074ff4c74d222c8a48df061daf9b5d0794..bbf7259e6b9306010b99113c98548621f33e2891 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -340,7 +340,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]);
        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;
        }
        strcpy(ret + len, extra);
        return ret;


@@ -506,14 +507,13 @@ int main(int argc, const char *argv[])
        if (argc == 1)
                argv = default_args;
 
        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);
 
        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");
        printf("/* Generated by CCAN configurator */\n"
               "#ifndef CCAN_CONFIG_H\n"
               "#define CCAN_CONFIG_H\n");


@@ -521,7 +521,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 _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++)
        /* 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++)