Changeset 1993 for trunk/src/kmk/file.c

Timestamp:

Oct 29, 2008, 1:37:51 AM (17 years ago)

Author:

bird

Message:

Merged in current GNU Make code (CVS from 2008-10-28). Ref #55.

File:

• trunk/src/kmk/file.c (modified) (14 diffs)

trunk/src/kmk/file.c

@@ -1 +1 @@
 /* Target file management 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"
@@ -337 +337 @@
           if (to_file->cmds->fileinfo.filenm != 0)
             error (&from_file->cmds->fileinfo,
-                   _("Commands were specified for file `%s' at %s:%lu,"),
+                   _("Recipe was specified for file `%s' at %s:%lu,"),
                    from_file->name, to_file->cmds->fileinfo.filenm,
                    to_file->cmds->fileinfo.lineno);
           else
             error (&from_file->cmds->fileinfo,
-                   _("Commands for file `%s' were found by implicit rule search,"),
+                   _("Recipe for file `%s' was found by implicit rule search,"),
                    from_file->name);
           error (&from_file->cmds->fileinfo,
@@ -348 +348 @@
                  from_file->name, to_hname);
           error (&from_file->cmds->fileinfo,
-                 _("Commands for `%s' will be ignored in favor of those for `%s'."),
+                 _("Recipe for `%s' will be ignored in favor of the one for `%s'."),
                  to_hname, from_file->name);
         }
@@ -458 +458 @@
         /* Is this file eligible for automatic deletion?
            Yes, IFF: it's marked intermediate, it's not secondary, it wasn't
-           given on the command-line, and it's either a -include makefile or
+           given on the command line, and it's either a -include makefile or
            it's not precious.  */
         if (f->intermediate && (f->dontcare || !f->precious)
@@ -580 +580 @@
   for (d = old; d != 0; d = d->next)
     {
-      size_t buffer_offset; /* bird */
       struct dep *new, *d1;
       char *p;
@@ -628 +627 @@
         {
           p = variable_expand ("");
-          buffer_offset = p - variable_buffer;
 #ifndef CONFIG_WITH_STRCACHE2
           variable_buffer_output (p, d->name, strlen (d->name) + 1);
@@ -635 +633 @@
           variable_buffer_output (p, d->name, len + 1);
 #endif
-          p = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. (observed it) */
+          p = variable_buffer;
         }
       else
@@ -645 +643 @@
               char *o;
               char *buffer = variable_expand ("");
-              buffer_offset = buffer - variable_buffer; /* bird */
 
               o = subst_expand (buffer, d->name, "%", "$*", 1, 2, 0);
-              buffer = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. */
-
-              d->name = strcache_add_len (buffer, o - buffer);
+              buffer = variable_buffer; /* bird - variable_buffer may have been reallocated. */
+
+              d->name = strcache_add_len (variable_buffer,
+                                          o - variable_buffer);
               d->staticpattern = 0; /* Clear staticpattern so that we don't
                                        re-expand %s below. */
@@ -691 +689 @@
           const char *pattern = "%";
           char *buffer = variable_expand ("");
-          const size_t buffer_offset = buffer - variable_buffer; /* bird */
           struct dep *dp = new, *dl = 0;
 
@@ -732 +729 @@
                                                                 the if case does and strcache would appreciate it. */
                     }
-                  buffer = variable_buffer + buffer_offset; /* bird fix - variable_buffer may have been reallocated. */
+                  buffer = variable_buffer; /* bird fix - variable_buffer may have been reallocated. */
 
 
@@ -1193 +1190 @@
     puts (_("#  Phony target (prerequisite of .PHONY)."));
   if (f->cmd_target)
-    puts (_("#  Command-line target."));
+    puts (_("#  Command line target."));
   if (f->dontcare)
     puts (_("#  A default, MAKEFILES, or -include/sinclude makefile."));
@@ -1227 +1224 @@
     {
     case cs_running:
-      puts (_("#  Commands currently running (THIS IS A BUG)."));
+      puts (_("#  Recipe currently running (THIS IS A BUG)."));
       break;
     case cs_deps_running:
-      puts (_("#  Dependencies commands running (THIS IS A BUG)."));
+      puts (_("#  Dependencies recipe running (THIS IS A BUG)."));
       break;
     case cs_not_started: