bug-make
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

@file response file support for make, revised


From: Joseph S. Myers
Subject: @file response file support for make, revised
Date: Thu, 27 Sep 2007 22:57:04 +0000 (UTC)

This patch is a revision of my previous patch adding @file support to GNU 
make, as discussed at 
<http://lists.gnu.org/archive/html/bug-make/2006-09/msg00008.html> and 
<http://savannah.gnu.org/patch/?5809>.  This version will use @file with 
temporary files created by make to pass down options to sub-makes, as 
requested in that patch tracker issue.  It uses the same approach as in 
GCC: a temporary @file is created to pass down options iff an @file was 
used on the original make's command line (or in its MAKEFLAGS, so further 
levels of recursive make work OK).  It is inevitably rather more 
complicated than the previous version of the patch.

2007-09-27  Joseph Myers  <address@hidden>

        * argv.c: New.  From libiberty.
        * Makefile.am (make_SOURCES): Add argv.c.
        * doc/make.texi: Update.
        * main.c (write_env_switches, at_file_supplied,
        open_tmpfile_default, struct tmpfile_list, tmpfiles,
        open_tmpfile_record, remove_tmpfile, remove_tmpfiles,
        env_switches_to_array, process_env_switches,
        write_env_switches_callback): New.
        (main): Call expandargv.  If @FILE is used, use it for passing
        down options and variables to sub-makes.  Use
        open_tmpfile_default.  Call remove_tmpfiles.  Use remove_tmpfile.
        (decode_env_switches): Use env_switches_to_array.
        (define_makeflags): If @FILE is used, use it for passing down
        options to sub-makes.  Allow for temporary file name ending with
        '-'.
        (die): Call remove_tmpfiles.
        * make.h (buildargv, freeargv, dupargv, writeargv, expandargv):
        Declare.

diff -rupN make.orig/Makefile.am make/Makefile.am
--- make.orig/Makefile.am       2007-07-04 19:35:16.000000000 +0000
+++ make/Makefile.am    2007-09-27 14:48:32.000000000 +0000
@@ -40,8 +40,8 @@ else
 endif
 
 
-make_SOURCES = ar.c arscan.c commands.c default.c dir.c expand.c file.c \
-               function.c getopt.c getopt1.c implicit.c job.c main.c \
+make_SOURCES = ar.c argv.c arscan.c commands.c default.c dir.c expand.c \
+               file.c function.c getopt.c getopt1.c implicit.c job.c main.c \
                misc.c read.c remake.c $(remote) rule.c signame.c \
                strcache.c variable.c version.c vpath.c hash.c
 
diff -rupN make.orig/argv.c make/argv.c
--- make.orig/argv.c    1970-01-01 00:00:00.000000000 +0000
+++ make/argv.c 2007-09-27 21:28:37.000000000 +0000
@@ -0,0 +1,511 @@
+/* Create and destroy argument vectors (argv's)
+   Copyright (C) 1992, 2001, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Written by Fred Fish @ Cygnus Support
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth 
Floor,
+Boston, MA 02110-1301, USA.  */
+
+
+/*  Create and destroy argument vectors.  An argument vector is simply an
+    array of string pointers, terminated by a NULL pointer. */
+
+#include "make.h"
+
+/*  Routines imported from standard C runtime libraries. */
+
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifndef EOS
+#define EOS '\0'
+#endif
+
+#define INITIAL_MAXARGC 8      /* Number of args + NULL in initial argv */
+
+#define ISBLANK(c)     ((c) == ' ' || (c) == '\t')
+#define ISSPACE(c)     ((c) == ' ' || (c) == '\t' || (c) == '\n'       \
+                        || (c) == '\r' || (c) == '\f' || (c) == '\v')
+
+/*
+
address@hidden Extension char** dupargv (char address@hidden)
+
+Duplicate an argument vector.  Simply scans through @var{vector},
+duplicating each argument until the terminating @code{NULL} is found.
+Returns a pointer to the argument vector if successful.  Returns
address@hidden if there is insufficient memory to complete building the
+argument vector.
+
address@hidden deftypefn
+
+*/
+
+char **
+dupargv (char **argv)
+{
+  int argc;
+  char **copy;
+  
+  if (argv == NULL)
+    return NULL;
+  
+  /* the vector */
+  for (argc = 0; argv[argc] != NULL; argc++);
+  copy = (char **) malloc ((argc + 1) * sizeof (char *));
+  if (copy == NULL)
+    return NULL;
+  
+  /* the strings */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    {
+      int len = strlen (argv[argc]);
+      copy[argc] = (char *) malloc (len + 1);
+      if (copy[argc] == NULL)
+       {
+         freeargv (copy);
+         return NULL;
+       }
+      strcpy (copy[argc], argv[argc]);
+    }
+  copy[argc] = NULL;
+  return copy;
+}
+
+/*
+
address@hidden Extension void freeargv (char address@hidden)
+
+Free an argument vector that was built using @code{buildargv}.  Simply
+scans through @var{vector}, freeing the memory for each argument until
+the terminating @code{NULL} is found, and then frees @var{vector}
+itself.
+
address@hidden deftypefn
+
+*/
+
+void freeargv (char **vector)
+{
+  register char **scan;
+
+  if (vector != NULL)
+    {
+      for (scan = vector; *scan != NULL; scan++)
+       {
+         free (*scan);
+       }
+      free (vector);
+    }
+}
+
+/*
+
address@hidden Extension char** buildargv (char address@hidden)
+
+Given a pointer to a string, parse the string extracting fields
+separated by whitespace and optionally enclosed within either single
+or double quotes (which are stripped off), and build a vector of
+pointers to copies of the string for each field.  The input string
+remains unchanged.  The last element of the vector is followed by a
address@hidden element.
+
+All of the memory for the pointer array and copies of the string
+is obtained from @code{malloc}.  All of the memory can be returned to the
+system with the single function call @code{freeargv}, which takes the
+returned result of @code{buildargv}, as it's argument.
+
+Returns a pointer to the argument vector if successful.  Returns
address@hidden if @var{sp} is @code{NULL} or if there is insufficient
+memory to complete building the argument vector.
+
+If the input is a null string (as opposed to a @code{NULL} pointer),
+then buildarg returns an argument vector that has one arg, a null
+string.
+
address@hidden deftypefn
+
+The memory for the argv array is dynamically expanded as necessary.
+
+In order to provide a working buffer for extracting arguments into,
+with appropriate stripping of quotes and translation of backslash
+sequences, we allocate a working buffer at least as long as the input
+string.  This ensures that we always have enough space in which to
+work, since the extracted arg is never larger than the input string.
+
+The argument vector is always kept terminated with a @code{NULL} arg
+pointer, so it can be passed to @code{freeargv} at any time, or
+returned, as appropriate.
+
+*/
+
+char **buildargv (const char *input)
+{
+  char *arg;
+  char *copybuf;
+  int squote = 0;
+  int dquote = 0;
+  int bsquote = 0;
+  int argc = 0;
+  int maxargc = 0;
+  char **argv = NULL;
+  char **nargv;
+
+  if (input != NULL)
+    {
+      copybuf = (char *) alloca (strlen (input) + 1);
+      /* Is a do{}while to always execute the loop once.  Always return an
+        argv, even for null strings.  See NOTES above, test case below. */
+      do
+       {
+         /* Pick off argv[argc] */
+         while (ISBLANK (*input))
+           {
+             input++;
+           }
+         if ((maxargc == 0) || (argc >= (maxargc - 1)))
+           {
+             /* argv needs initialization, or expansion */
+             if (argv == NULL)
+               {
+                 maxargc = INITIAL_MAXARGC;
+                 nargv = (char **) malloc (maxargc * sizeof (char *));
+               }
+             else
+               {
+                 maxargc *= 2;
+                 nargv = (char **) realloc (argv, maxargc * sizeof (char *));
+               }
+             if (nargv == NULL)
+               {
+                 if (argv != NULL)
+                   {
+                     freeargv (argv);
+                     argv = NULL;
+                   }
+                 break;
+               }
+             argv = nargv;
+             argv[argc] = NULL;
+           }
+         /* Begin scanning arg */
+         arg = copybuf;
+         while (*input != EOS)
+           {
+             if (ISSPACE (*input) && !squote && !dquote && !bsquote)
+               {
+                 break;
+               }
+             else
+               {
+                 if (bsquote)
+                   {
+                     bsquote = 0;
+                     *arg++ = *input;
+                   }
+                 else if (*input == '\\')
+                   {
+                     bsquote = 1;
+                   }
+                 else if (squote)
+                   {
+                     if (*input == '\'')
+                       {
+                         squote = 0;
+                       }
+                     else
+                       {
+                         *arg++ = *input;
+                       }
+                   }
+                 else if (dquote)
+                   {
+                     if (*input == '"')
+                       {
+                         dquote = 0;
+                       }
+                     else
+                       {
+                         *arg++ = *input;
+                       }
+                   }
+                 else
+                   {
+                     if (*input == '\'')
+                       {
+                         squote = 1;
+                       }
+                     else if (*input == '"')
+                       {
+                         dquote = 1;
+                       }
+                     else
+                       {
+                         *arg++ = *input;
+                       }
+                   }
+                 input++;
+               }
+           }
+         *arg = EOS;
+         argv[argc] = strdup (copybuf);
+         if (argv[argc] == NULL)
+           {
+             freeargv (argv);
+             argv = NULL;
+             break;
+           }
+         argc++;
+         argv[argc] = NULL;
+
+         while (ISSPACE (*input))
+           {
+             input++;
+           }
+       }
+      while (*input != EOS);
+    }
+  return (argv);
+}
+
+/*
+
address@hidden Extension int writeargv (const char address@hidden, FILE 
address@hidden)
+
+Write each member of ARGV, handling all necessary quoting, to the file
+named by FILE, separated by whitespace.  Return 0 on success, non-zero
+if an error occurred while writing to FILE.
+
address@hidden deftypefn
+
+*/
+
+int
+writeargv (char **argv, FILE *f)
+{
+  int status = 0;
+
+  if (f == NULL)
+    return 1;
+
+  while (*argv != NULL)
+    {
+      const char *arg = *argv;
+
+      while (*arg != EOS)
+        {
+          char c = *arg;
+
+          if (ISSPACE(c) || c == '\\' || c == '\'' || c == '"')
+            if (EOF == fputc ('\\', f))
+              {
+                status = 1;
+                goto done;
+              }
+
+          if (EOF == fputc (c, f))
+            {
+              status = 1;
+              goto done;
+            }
+          arg++;
+        }
+
+      if (EOF == fputc ('\n', f))
+        {
+          status = 1;
+          goto done;
+        }
+      argv++;
+    }
+
+ done:
+  return status;
+}
+
+/*
+
address@hidden Extension void expandargv (int address@hidden, char 
address@hidden)
+
+The @var{argcp} and @code{argvp} arguments are pointers to the usual
address@hidden and @code{argv} arguments to @code{main}.  This function
+looks for arguments that begin with the character @samp{@@}.  Any such
+arguments are interpreted as ``response files''.  The contents of the
+response file are interpreted as additional command line options.  In
+particular, the file is separated into whitespace-separated strings;
+each such string is taken as a command-line option.  The new options
+are inserted in place of the option naming the response file, and
address@hidden and @code{*argvp} will be updated.  If the value of
address@hidden is modified by this function, then the new value has
+been dynamically allocated and can be deallocated by the caller with
address@hidden  However, most callers will simply call
address@hidden near the beginning of @code{main} and allow the
+operating system to free the memory when the program exits.
+
address@hidden deftypefn
+
+*/
+
+void
+expandargv (int *argcp, char ***argvp)
+{
+  /* The argument we are currently processing.  */
+  int i = 0;
+  /* Non-zero if ***argvp has been dynamically allocated.  */
+  int argv_dynamic = 0;
+  /* Loop over the arguments, handling response files.  We always skip
+     ARGVP[0], as that is the name of the program being run.  */
+  while (++i < *argcp)
+    {
+      /* The name of the response file.  */
+      const char *filename;
+      /* The response file.  */
+      FILE *f;
+      /* An upper bound on the number of characters in the response
+        file.  */
+      long pos;
+      /* The number of characters in the response file, when actually
+        read.  */
+      size_t len;
+      /* A dynamically allocated buffer used to hold options read from a
+        response file.  */
+      char *buffer;
+      /* Dynamically allocated storage for the options read from the
+        response file.  */
+      char **file_argv;
+      /* The number of options read from the response file, if any.  */
+      size_t file_argc;
+      /* We are only interested in options of the form "@file".  */
+      filename = (*argvp)[i];
+      if (filename[0] != '@')
+       continue;
+      /* Read the contents of the file.  */
+      f = fopen (++filename, "r");
+      if (!f)
+       continue;
+      if (fseek (f, 0L, SEEK_END) == -1)
+       goto error;
+      pos = ftell (f);
+      if (pos == -1)
+       goto error;
+      if (fseek (f, 0L, SEEK_SET) == -1)
+       goto error;
+      buffer = (char *) xmalloc (pos * sizeof (char) + 1);
+      len = fread (buffer, sizeof (char), pos, f);
+      if (len != (size_t) pos
+         /* On Windows, fread may return a value smaller than POS,
+            due to CR/LF->CR translation when reading text files.
+            That does not in-and-of itself indicate failure.  */
+         && ferror (f))
+       goto error;
+      /* Add a NUL terminator.  */
+      buffer[len] = '\0';
+      /* Parse the string.  */
+      file_argv = buildargv (buffer);
+      /* If *ARGVP is not already dynamically allocated, copy it.  */
+      if (!argv_dynamic)
+       {
+         *argvp = dupargv (*argvp);
+         if (!*argvp)
+           {
+             fputs ("\nout of memory\n", stderr);
+             exit (1);
+           }
+       }
+      /* Count the number of arguments.  */
+      file_argc = 0;
+      while (file_argv[file_argc] && *file_argv[file_argc])
+       ++file_argc;
+      /* Now, insert FILE_ARGV into ARGV.  The "+1" below handles the
+        NULL terminator at the end of ARGV.  */ 
+      *argvp = ((char **) 
+               xrealloc (*argvp, 
+                         (*argcp + file_argc + 1) * sizeof (char *)));
+      memmove (*argvp + i + file_argc, *argvp + i + 1, 
+              (*argcp - i) * sizeof (char *));
+      memcpy (*argvp + i, file_argv, file_argc * sizeof (char *));
+      /* The original option has been replaced by all the new
+        options.  */
+      *argcp += file_argc - 1;
+      /* Free up memory allocated to process the response file.  We do
+        not use freeargv because the individual options in FILE_ARGV
+        are now in the main ARGV.  */
+      free (file_argv);
+      free (buffer);
+      /* Rescan all of the arguments just read to support response
+        files that include other response files.  */
+      --i;
+    error:
+      /* We're all done with the file now.  */
+      fclose (f);
+    }
+}
+
+#ifdef MAIN
+
+/* Simple little test driver. */
+
+static const char *const tests[] =
+{
+  "a simple command line",
+  "arg 'foo' is single quoted",
+  "arg \"bar\" is double quoted",
+  "arg \"foo bar\" has embedded whitespace",
+  "arg 'Jack said \\'hi\\'' has single quotes",
+  "arg 'Jack said \\\"hi\\\"' has double quotes",
+  "a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4 5 6 7 8 9",
+  
+  /* This should be expanded into only one argument.  */
+  "trailing-whitespace ",
+
+  "",
+  NULL
+};
+
+int
+main (void)
+{
+  char **argv;
+  const char *const *test;
+  char **targs;
+
+  for (test = tests; *test != NULL; test++)
+    {
+      printf ("buildargv(\"%s\")\n", *test);
+      if ((argv = buildargv (*test)) == NULL)
+       {
+         printf ("failed!\n\n");
+       }
+      else
+       {
+         for (targs = argv; *targs != NULL; targs++)
+           {
+             printf ("\t\"%s\"\n", *targs);
+           }
+         printf ("\n");
+       }
+      freeargv (argv);
+    }
+
+  return 0;
+}
+
+#endif /* MAIN */
diff -rupN make.orig/doc/make.texi make/doc/make.texi
--- make.orig/doc/make.texi     2007-08-15 13:53:54.000000000 +0000
+++ make/doc/make.texi  2007-09-27 14:48:32.000000000 +0000
@@ -8226,6 +8226,19 @@ imagination of @code{make}.
 Issue a warning message whenever @code{make} sees a reference to an
 undefined variable.  This can be helpful when you are trying to debug
 makefiles which use variables in complex ways.
+
address@hidden @@@var{file}
+Read command-line options from @var{file}.  The options read are
+inserted in place of the original @@@var{file} option.  If @var{file}
+does not exist, or cannot be read, then the option will be treated
+literally, and not removed.  
+
+Options in @var{file} are separated by whitespace.  A whitespace
+character may be included in an option by surrounding the entire
+option in either single or double quotes.  Any character (including a
+backslash) may be included by prefixing the character to be included
+with a backslash.  The @var{file} may itself contain additional
+@@@var{file} options; any such options will be processed recursively.
 @end table
 
 @node Implicit Rules, Archives, Running, Top
diff -rupN make.orig/main.c make/main.c
--- make.orig/main.c    2007-07-04 19:35:19.000000000 +0000
+++ make/main.c 2007-09-27 22:36:15.000000000 +0000
@@ -88,6 +88,7 @@ static void print_data_base (void);
 static void print_version (void);
 static void decode_switches (int argc, char **argv, int env);
 static void decode_env_switches (char *envar, unsigned int len);
+static void write_env_switches (char *value, FILE *f);
 static void define_makeflags (int all, int makefile);
 static char *quote_for_env (char *out, const char *in);
 static void initialize_global_hash_tables (void);
@@ -451,6 +452,12 @@ struct command_variable
     struct variable *variable;
   };
 static struct command_variable *command_variables;
+
+/* Whether an @FILE argument was used to provide arguments and so
+   @FILE arguments should be used to pass down arguments to
+   sub-makes.  */
+
+static int at_file_supplied = 0;
 
 /* The name we were invoked with.  */
 
@@ -899,6 +906,87 @@ open_tmpfile(char **name, const char *te
 #endif
 }
 
+/* Open a temporary file with a default template name.  */
+
+static FILE *
+open_tmpfile_default (char **name)
+{
+  char *template, *tmpdir;
+
+#ifdef VMS
+# define DEFAULT_TMPDIR     "sys$scratch:"
+#else
+# ifdef P_tmpdir
+#  define DEFAULT_TMPDIR    P_tmpdir
+# else
+#  define DEFAULT_TMPDIR    "/tmp"
+# endif
+#endif
+#define DEFAULT_TMPFILE     "GmXXXXXX"
+
+  if (((tmpdir = getenv ("TMPDIR")) == NULL || *tmpdir == '\0')
+#if defined (__MSDOS__) || defined (WINDOWS32) || defined (__EMX__)
+      /* These are also used commonly on these platforms.  */
+      && ((tmpdir = getenv ("TEMP")) == NULL || *tmpdir == '\0')
+      && ((tmpdir = getenv ("TMP")) == NULL || *tmpdir == '\0')
+#endif
+      )
+    tmpdir = DEFAULT_TMPDIR;
+
+  template = alloca (strlen (tmpdir) + sizeof (DEFAULT_TMPFILE) + 1);
+  strcpy (template, tmpdir);
+
+#ifdef HAVE_DOS_PATHS
+  if (strchr ("/\\", template[strlen (template) - 1]) == NULL)
+    strcat (template, "/");
+#else
+# ifndef VMS
+  if (template[strlen (template) - 1] != '/')
+    strcat (template, "/");
+# endif /* !VMS */
+#endif /* !HAVE_DOS_PATHS */
+
+  strcat (template, DEFAULT_TMPFILE);
+
+  return open_tmpfile (name, template);
+}
+
+/* Track temporary files to clean up on exit.  */
+struct tmpfile_list
+{
+  char *name;
+  struct tmpfile_list *next;
+};
+
+struct tmpfile_list *tmpfiles;
+
+static FILE *
+open_tmpfile_record (char **name)
+{
+  FILE *f = open_tmpfile_default (name);
+  if (f)
+    {
+      struct tmpfile_list *new = xmalloc (sizeof (struct tmpfile_list));
+      new->name = *name;
+      new->next = tmpfiles;
+      tmpfiles = new;
+    }
+  return f;
+}
+
+static void
+remove_tmpfile (const char *name)
+{
+  if (unlink (name) < 0 && errno != ENOENT)
+    perror_with_name (_("unlink (temporary file): "), name);
+}
+
+static void
+remove_tmpfiles (void)
+{
+  for (; tmpfiles; tmpfiles = tmpfiles->next)
+    remove_tmpfile (tmpfiles->name);
+}
 
 #ifdef _AMIGA
 int
@@ -913,6 +1001,7 @@ main (int argc, char **argv, char **envp
   struct dep *read_makefiles;
   PATH_VAR (current_directory);
   unsigned int restarts = 0;
+  char **old_argv;
 #ifdef WINDOWS32
   char *unix_path = NULL;
   char *windows32_path = NULL;
@@ -1246,6 +1335,10 @@ main (int argc, char **argv, char **envp
      and we set the -p, -i and -e switches.  Doesn't seem quite right.  */
   decode_env_switches (STRING_SIZE_TUPLE ("MFLAGS"));
 #endif
+  old_argv = argv;
+  expandargv (&argc, &argv);
+  if (argv != old_argv)
+    at_file_supplied = 1;
   decode_switches (argc, argv, 0);
 #ifdef WINDOWS32
   if (suspend_flag) {
@@ -1363,6 +1456,18 @@ main (int argc, char **argv, char **envp
        }
       p[-1] = '\0';            /* Kill the final space and terminate.  */
 
+      if (at_file_supplied)
+       {
+         FILE *at_file;
+         char *at_file_name;
+         at_file = open_tmpfile_record (&at_file_name);
+         write_env_switches (value, at_file);
+         value = alloca (2 + strlen (at_file_name));
+         value[0] = '@';
+         strcpy (value + 1, at_file_name);
+         fclose (at_file);
+       }
+
       /* Define an unchangeable variable with a name that no POSIX.2
         makefile could validly use for its own variable.  */
       (void) define_variable ("-*-command-variables-*-", 23,
@@ -1476,46 +1581,11 @@ main (int argc, char **argv, char **envp
               and thus re-read the makefiles, we read standard input
               into a temporary file and read from that.  */
            FILE *outfile;
-            char *template, *tmpdir;
 
             if (stdin_nm)
               fatal (NILF, _("Makefile from standard input specified twice."));
 
-#ifdef VMS
-# define DEFAULT_TMPDIR     "sys$scratch:"
-#else
-# ifdef P_tmpdir
-#  define DEFAULT_TMPDIR    P_tmpdir
-# else
-#  define DEFAULT_TMPDIR    "/tmp"
-# endif
-#endif
-#define DEFAULT_TMPFILE     "GmXXXXXX"
-
-           if (((tmpdir = getenv ("TMPDIR")) == NULL || *tmpdir == '\0')
-#if defined (__MSDOS__) || defined (WINDOWS32) || defined (__EMX__)
-                /* These are also used commonly on these platforms.  */
-                && ((tmpdir = getenv ("TEMP")) == NULL || *tmpdir == '\0')
-                && ((tmpdir = getenv ("TMP")) == NULL || *tmpdir == '\0')
-#endif
-               )
-             tmpdir = DEFAULT_TMPDIR;
-
-            template = alloca (strlen (tmpdir) + sizeof (DEFAULT_TMPFILE) + 1);
-           strcpy (template, tmpdir);
-
-#ifdef HAVE_DOS_PATHS
-           if (strchr ("/\\", template[strlen (template) - 1]) == NULL)
-             strcat (template, "/");
-#else
-# ifndef VMS
-           if (template[strlen (template) - 1] != '/')
-             strcat (template, "/");
-# endif /* !VMS */
-#endif /* !HAVE_DOS_PATHS */
-
-           strcat (template, DEFAULT_TMPFILE);
-           outfile = open_tmpfile (&stdin_nm, template);
+           outfile = open_tmpfile_default (&stdin_nm);
            if (outfile == 0)
              pfatal_with_name (_("fopen (temporary file)"));
            while (!feof (stdin) && ! ferror (stdin))
@@ -1991,6 +2061,8 @@ main (int argc, char **argv, char **envp
 
          remove_intermediates (0);
 
+         remove_tmpfiles ();
+
          if (print_data_base_flag)
            print_data_base ();
 
@@ -2155,8 +2227,8 @@ main (int argc, char **argv, char **envp
 
   /* If there is a temp file from reading a makefile from stdin, get rid of
      it now.  */
-  if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
-    perror_with_name (_("unlink (temporary file): "), stdin_nm);
+  if (stdin_nm)
+    remove_tmpfile (stdin_nm);
 
   {
     int status;
@@ -2587,26 +2659,19 @@ decode_switches (int argc, char **argv, 
     }
 }
 
-/* Decode switches from environment variable ENVAR (which is LEN chars long).
-   We do this by chopping the value into a vector of words, prepending a
-   dash to the first word if it lacks one, and passing the vector to
-   decode_switches.  */
+/* Convert switches (in a string as passed in the environment) into an
+   array and call another function on it.  This is used both to decode
+   switches from the environment, and to convert a string that might
+   be passed in the environment to an array for writeargv instead.  */
 
 static void
-decode_env_switches (char *envar, unsigned int len)
+env_switches_to_array (char *value, void *context,
+                      void (*f) (int argc, char **argv, void *context))
 {
-  char *varref = alloca (2 + len + 2);
-  char *value, *p;
+  char *p;
   int argc;
   char **argv;
-
-  /* Get the variable's value.  */
-  varref[0] = '$';
-  varref[1] = '(';
-  memcpy (&varref[2], envar, len);
-  varref[2 + len] = ')';
-  varref[2 + len + 1] = '\0';
-  value = variable_expand (varref);
+  unsigned int len;
 
   /* Skip whitespace, and check for an empty value.  */
   value = next_token (value);
@@ -2624,7 +2689,7 @@ decode_env_switches (char *envar, unsign
 
   /* getopt will look at the arguments starting at ARGV[1].
      Prepend a spacer word.  */
-  argv[0] = 0;
+  argv[0] = "";
   argc = 1;
   argv[argc] = p;
   while (*value != '\0')
@@ -2646,16 +2711,69 @@ decode_env_switches (char *envar, unsign
   *p = '\0';
   argv[++argc] = 0;
 
-  if (argv[1][0] != '-' && strchr (argv[1], '=') == 0)
-    /* The first word doesn't start with a dash and isn't a variable
+  if (argv[1][0] != '-'
+      && argv[1][0] != '@'
+      && strchr (argv[1], '=') == 0)
+    /* The first word doesn't start with a dash or '@' and isn't a variable
        definition.  Add a dash and pass it along to decode_switches.  We
        need permanent storage for this in case decode_switches saves
        pointers into the value.  */
     argv[1] = xstrdup (concat ("-", argv[1], ""));
 
-  /* Parse those words.  */
+  (*f) (argc, argv, context);
+}
+
+/* Do the actual processing of switches from decode_env_switches.  */
+
+static void
+process_env_switches (int argc, char **argv, void *context UNUSED)
+{
+  char **old_argv = argv;
+  expandargv (&argc, &argv);
+  if (argv != old_argv)
+    at_file_supplied = 1;
   decode_switches (argc, argv, 1);
 }
+
+/* Decode switches from environment variable ENVAR (which is LEN chars long).
+   We do this by chopping the value into a vector of words, prepending a
+   dash to the first word if it lacks one, and passing the vector to
+   decode_switches.  */
+
+static void
+decode_env_switches (char *envar, unsigned int len)
+{
+  char *varref = alloca (2 + len + 2);
+  char *value;
+
+  /* Get the variable's value.  */
+  varref[0] = '$';
+  varref[1] = '(';
+  memcpy (&varref[2], envar, len);
+  varref[2 + len] = ')';
+  varref[2 + len + 1] = '\0';
+  value = variable_expand (varref);
+
+  env_switches_to_array (value, NULL, process_env_switches);
+}
+
+/* Write environment switches to a file using writeargv.  */
+
+static void
+write_env_switches_callback (int argc UNUSED, char **argv,
+                            void *context UNUSED)
+{
+  FILE *f = context;
+  if (writeargv (argv + 1, f))
+    perror_with_name ("write (temporary file)", "");
+}
+
+static void
+write_env_switches (char *value, FILE *f)
+{
+  env_switches_to_array (value, f, write_env_switches_callback);
+}
+
 
 /* Quote the string IN so that it will be interpreted as a single word with
    no magic by decode_env_switches; also double dollar signs to avoid
@@ -2692,6 +2810,8 @@ define_makeflags (int all, int makefile)
   register char *p;
   unsigned int words;
   struct variable *v;
+  FILE *at_file = NULL;
+  char *at_file_name = NULL;
 
   /* We will construct a linked list of `struct flag's describing
      all the flags which need to go in MAKEFLAGS.  Then, once we
@@ -2805,6 +2925,12 @@ define_makeflags (int all, int makefile)
 
   flagslen += 4 + sizeof posixref; /* Four more for the possible " -- ".  */
 
+  if (at_file_supplied)
+    {
+      at_file = open_tmpfile_record (&at_file_name);
+      flagslen += 2 + strlen (at_file_name);
+    }
+
 #undef ADD_FLAG
 
   /* Construct the value in FLAGSTRING.
@@ -2873,6 +2999,15 @@ define_makeflags (int all, int makefile)
     /* Terminate the string.  */
     *p = '\0';
 
+  if (at_file_supplied)
+    {
+      write_env_switches (flagstring, at_file);
+      fclose (at_file);
+      flagstring[0] = '@';
+      strcpy (flagstring + 1, at_file_name);
+      p = flagstring + strlen (flagstring);
+    }
+
   /* Since MFLAGS is not parsed for flags, there is no reason to
      override any makefile redefinition.  */
   (void) define_variable ("MFLAGS", 6, flagstring, o_env, 1);
@@ -2888,7 +3023,7 @@ define_makeflags (int all, int makefile)
       else
        {
          /* Separate the variables from the switches with a "--" arg.  */
-         if (p[-1] != '-')
+         if (p[-1] != '-' || p[-2] != ' ')
            {
              /* We did not already write a trailing " -".  */
              *p++ = ' ';
@@ -2916,7 +3051,7 @@ define_makeflags (int all, int makefile)
       words = 0;
       --p;
     }
-  else if (p[-1] == '-')
+  else if (p[-1] == '-' && p[-2] == ' ')
     /* Kill the final space and dash.  */
     p -= 2;
   /* Terminate the string.  */
@@ -3081,6 +3216,8 @@ die (int status)
       /* Remove the intermediate files.  */
       remove_intermediates (0);
 
+      remove_tmpfiles ();
+
       if (print_data_base_flag)
        print_data_base ();
 
diff -rupN make.orig/make.h make/make.h
--- make.orig/make.h    2007-07-04 19:35:19.000000000 +0000
+++ make/make.h 2007-09-27 21:55:45.000000000 +0000
@@ -445,6 +445,13 @@ const char *strcache_add (const char *st
 const char *strcache_add_len (const char *str, int len);
 int strcache_setbufsize (int size);
 
+/* argv handling.  */
+char **buildargv (const char *);
+void freeargv (char **);
+char **dupargv (char **);
+int writeargv (char **, FILE *);
+void expandargv (int *, char ***);
+
 #ifdef  HAVE_VFORK_H
 # include <vfork.h>
 #endif

-- 
Joseph S. Myers
address@hidden




reply via email to

[Prev in Thread] Current Thread [Next in Thread]