diff options
-rw-r--r-- | maintMakefile | 4 | ||||
-rw-r--r-- | src/job.c | 6 | ||||
-rw-r--r-- | src/read.c | 35 |
3 files changed, 25 insertions, 20 deletions
diff --git a/maintMakefile b/maintMakefile index fb98a42f..b9f822ad 100644 --- a/maintMakefile +++ b/maintMakefile @@ -259,7 +259,8 @@ CFGCHECK_BUILDFLAGS = # as well, and that will fail. CFGCHECK_MAKEFLAGS = # CFLAGS='$(AM_CFLAGS)' -# This test can no longer be run: now that we rely on gnulib we must use C99+ +# We don't support C90 anymore, strictly, but this test still works (with lots +# of warnings) and it helps us avoid egregious incompatibilities. checkcfg.strict-c90: CFGCHECK_CONFIGFLAGS = CFLAGS='-std=c90 -pedantic' checkcfg.strict-c90: CFGCHECK_MAKEFLAGS = @@ -277,6 +278,7 @@ checkcfg.no-sync: CFGCHECK_CONFIGFLAGS = CPPFLAGS=-DNO_OUTPUT_SYNC checkcfg.no-archives: CFGCHECK_CONFIGFLAGS = CPPFLAGS=-DNO_ARCHIVES CONFIG_CHECKS := \ + checkcfg.strict-c90 \ checkcfg.no-jobserver \ checkcfg.no-load \ checkcfg.no-guile \ @@ -3376,12 +3376,12 @@ construct_command_argv_internal (char *line, char **restp, const char *shell, { /* Parse shellflags using construct_command_argv_internal to handle quotes. */ - char **argv; + char **argv, **a; char *f; - f = alloca (sflags_len + 1); // +1 for null terminator. + f = alloca (sflags_len + 1); /* +1 for null terminator. */ memcpy (f, shellflags, sflags_len + 1); argv = construct_command_argv_internal (f, 0, 0, 0, 0, flags, 0); - for (char **a = argv; a && *a; ++a) + for (a = argv; a && *a; ++a) new_argv[n++] = *a; free (argv); } @@ -375,23 +375,26 @@ eval_makefile (const char *filename, unsigned short flags) makefile search path for this makefile. */ if (ebuf.fp == NULL && deps->error == ENOENT && (flags & RM_INCLUDED) && *filename != '/' && include_directories) - for (const char **dir = include_directories; *dir != NULL; ++dir) - { - const char *included = concat (3, *dir, "/", filename); + { + const char **dir; + for (dir = include_directories; *dir != NULL; ++dir) + { + const char *included = concat (3, *dir, "/", filename); - ENULLLOOP(ebuf.fp, fopen (included, "r")); - if (ebuf.fp) - { - filename = included; - break; - } - if (errno != ENOENT) - { - filename = included; - deps->error = errno; - break; - } - } + ENULLLOOP(ebuf.fp, fopen (included, "r")); + if (ebuf.fp) + { + filename = included; + break; + } + if (errno != ENOENT) + { + filename = included; + deps->error = errno; + break; + } + } + } /* Enter the final name for this makefile as a goaldep. */ filename = strcache_add (filename); |