Changeset 1989 for vendor/gnumake/current/job.c

Timestamp:

Oct 29, 2008, 12:02:45 AM (17 years ago)

Author:

bird

Message:

Load gnumake-2008-10-28-CVS into vendor/gnumake/current.

File:

• vendor/gnumake/current/job.c (modified) (17 diffs)

vendor/gnumake/current/job.c

@@ -1 +1 @@
 /* Job execution and handling for GNU Make.
 Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 Foundation, Inc.
 This file is part of GNU Make.
@@ -7 +7 @@
 GNU Make is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14 +15 @@
 
 You should have received a copy of the GNU General Public License along with
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "make.h"
@@ -1023 +1023 @@
     argv = p;
 #else
-    argv = construct_command_argv (p, &end, child->file, &child->sh_batch_file);
+    argv = construct_command_argv (p, &end, child->file,
+                                   child->file->cmds->lines_flags[child->command_line - 1],
+                                   &child->sh_batch_file);
 #endif
     if (end == NULL)
@@ -1729 +1731 @@
 
   /* The job is now primed.  Start it running.
-     (This will notice if there are in fact no commands.)  */
+     (This will notice if there is in fact no recipe.)  */
   if (cmds->fileinfo.filenm)
-    DB (DB_BASIC, (_("Invoking commands from %s:%lu to update target `%s'.\n"),
+    DB (DB_BASIC, (_("Invoking recipe from %s:%lu to update target `%s'.\n"),
                    cmds->fileinfo.filenm, cmds->fileinfo.lineno,
                    c->file->name));
   else
-    DB (DB_BASIC, (_("Invoking builtin commands to update target `%s'.\n"),
+    DB (DB_BASIC, (_("Invoking builtin recipe to update target `%s'.\n"),
                    c->file->name));
 
@@ -1908 +1910 @@
 
 /* EMX: Start a child process. This function returns the new pid.  */
-# if defined __MSDOS__ || defined __EMX__
+# if defined __EMX__
 int
 child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp)
@@ -2211 +2213 @@
 
    SHELL is the shell to use, or nil to use the default shell.
-   IFS is the value of $IFS, or nil (meaning the default).  */
+   IFS is the value of $IFS, or nil (meaning the default).
+
+   FLAGS is the value of lines_flags for this command line.  It is
+   used in the WINDOWS32 port to check whether + or $(MAKE) were found
+   in this command line, in which case the effect of just_print_flag
+   is overridden.  */
 
 static char **
 construct_command_argv_internal (char *line, char **restp, char *shell,
-                                 char *ifs, char **batch_filename_ptr)
+                                 char *ifs, int flags,
+                                 char **batch_filename_ptr)
 {
 #ifdef __MSDOS__
@@ -2464 +2472 @@
                   *(ap++) = *p;
                 }
-              /* If there's a command prefix char here, skip it.  */
-              if (p[1] == cmd_prefix)
-                ++p;
             }
           else if (*p == '\n' && restp != NULL)
@@ -2514 +2519 @@
                 ++p;
 
-                /* If there is a command prefix after a backslash-newline,
-                   remove it.  */
-                if (p[1] == cmd_prefix)
-                  ++p;
-
                 /* If there's nothing in this argument yet, skip any
                    whitespace before the start of the next word.  */
@@ -2746 +2746 @@
         else if (*p == '\\' && p[1] == '\n')
           {
-            /* POSIX says we keep the backslash-newline, but throw out
-               the next char if it's a TAB.  If we don't have a POSIX
-               shell on DOS/Windows/OS2, mimic the pre-POSIX behavior
+            /* POSIX says we keep the backslash-newline.  If we don't have a
+               POSIX shell on DOS/Windows/OS2, mimic the pre-POSIX behavior
                and remove the backslash/newline.  */
 #if defined (__MSDOS__) || defined (__EMX__) || defined (WINDOWS32)
@@ -2758 +2757 @@
               {
                 *(ap++) = '\\';
-                *(ap++) = '\\';
+                /* Only non-batch execution needs another backslash,
+                   because it will be passed through a recursive
+                   invocation of this function.  */
+                if (!batch_mode_shell)
+                  *(ap++) = '\\';
                 *(ap++) = '\n';
               }
-
             ++p;
-            if (p[1] == cmd_prefix)
-              ++p;
-
             continue;
           }
@@ -2795 +2794 @@
        command line (e.g. Cygnus GNUWIN32 sh.exe on WIN32 systems).  In these
        cases, run commands via a script file.  */
-    if (just_print_flag) {
+    if (just_print_flag && !(flags & COMMANDS_RECURSE)) {
       /* Need to allocate new_argv, although it's unused, because
         start_job_command will want to free it and its 0'th element.  */
@@ -2823 +2822 @@
       fputc ('\n', batch);
       fclose (batch);
+      DB (DB_JOBS, (_("Batch file contents:%s\n\t%s\n"),
+                    !unixy_shell ? "\n\t@echo off" : "", command_ptr));
 
       /* create argv */
@@ -2837 +2838 @@
 #endif /* WINDOWS32 */
     if (unixy_shell)
-      new_argv = construct_command_argv_internal (new_line, 0, 0, 0, 0);
+      new_argv = construct_command_argv_internal (new_line, 0, 0, 0, flags, 0);
 #ifdef __EMX__
     else if (!unixy_shell)
@@ -2852 +2853 @@
           {
             if (q[0] == '\\' && q[1] == '\n')
-              {
-                q += 2; /* remove '\\' and '\n' */
-                /* Remove any command prefix in the next line */
-                if (q[0] == cmd_prefix)
-                  q++;
-              }
+              q += 2; /* remove '\\' and '\n' */
             else
               *p++ = *q++;
@@ -2948 +2944 @@
 char **
 construct_command_argv (char *line, char **restp, struct file *file,
-                        char **batch_filename_ptr)
+                        int cmd_flags, char **batch_filename_ptr)
 {
   char *shell, *ifs;
@@ -3060 +3056 @@
   }
 
-  argv = construct_command_argv_internal (line, restp, shell, ifs, batch_filename_ptr);
+  argv = construct_command_argv_internal (line, restp, shell, ifs,
+                                          cmd_flags, batch_filename_ptr);
 
   free (shell);