Changeset 3140 for trunk/src/kmk/commands.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• commands.c (modified) (28 diffs)

trunk/src/kmk/commands.c

@@ -1 +1 @@
 /* Command processing for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010 Free Software Foundation, Inc.
+Copyright (C) 1988-2016 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -17 +15 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "make.h"
+#include "makeint.h"
+#include "filedef.h"
 #include "dep.h"
-#include "filedef.h"
 #include "variable.h"
 #include "job.h"
@@ -32 +30 @@
 
 #if VMS
-# define FILE_LIST_SEPARATOR ','
+# define FILE_LIST_SEPARATOR (vms_comma_separator ? ',' : ' ')
 #else
 # define FILE_LIST_SEPARATOR ' '
 #endif
 
-int remote_kill (int id, int sig);
-
-#ifndef HAVE_UNISTD_H
+#ifndef HAVE_UNISTD_H
 int getpid ();
 #endif
@@ -176 +172 @@
 #endif
 
-#ifndef NO_ARCHIVES
-  /* If the target is an archive member `lib(member)',
-     then $@ is `lib' and $% is `member'.  */
+#ifndef NO_ARCHIVES
+  /* If the target is an archive member 'lib(member)',
+     then $@ is 'lib' and $% is 'member'.  */
 
   if (ar_name (file->name))
@@ -198 +194 @@
     }
   else
-#endif  /* NO_ARCHIVES.  */
+#endif  /* NO_ARCHIVES.  */
     {
       at = file->name;
@@ -208 +204 @@
     {
       /* In Unix make, $* is set to the target name with
-         any suffix in the .SUFFIXES list stripped off for
-         explicit rules.  We store this in the `stem' member.  */
+         any suffix in the .SUFFIXES list stripped off for
+         explicit rules.  We store this in the 'stem' member.  */
       const char *name;
       unsigned int len;
 
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES
       if (ar_name (file->name))
+        {
+          name = strchr (file->name, '(') + 1;
+          len = strlen (name) - 1;
+        }
+      else
+#endif
         {
-          name = strchr (file->name, '(') + 1;
-          len = strlen (name) - 1;
-        }
-      else
-#endif
-        {
-          name = file->name;
+          name = file->name;
 #ifndef CONFIG_WITH_STRCACHE2
-          len = strlen (name);
-#else
-          len = strcache2_get_len (&file_strcache, name);
-#endif
-        }
+          len = strlen (name);
+#else
+          len = strcache2_get_len (&file_strcache, name);
+#endif
+        }
 
 #ifndef CONFIG_WITH_STRCACHE2
       for (d = enter_file (strcache_add (".SUFFIXES"))->deps; d ; d = d->next)
-        {
-          unsigned int slen = strlen (dep_name (d));
+        {
+          unsigned int slen = strlen (dep_name (d));
 #else
       for (d = enter_file (suffixes_strcached)->deps; d ; d = d->next)
         {
-          unsigned int slen = strcache2_get_len (&file_strcache, dep_name (d));
-#endif
-          if (len > slen && strneq (dep_name (d), name + (len - slen), slen))
-            {
-              file->stem = strcache_add_len (name, len - slen);
-              break;
-            }
-        }
+          unsigned int slen = strcache2_get_len (&file_strcache, dep_name (d));
+#endif
+          if (len > slen && strneq (dep_name (d), name + (len - slen), slen))
+            {
+              file->stem = strcache_add_len (name, len - slen);
+              break;
+            }
+        }
       if (d == 0)
-        file->stem = "";
+        file->stem = "";
     }
   star = file->stem;
@@ -265 +261 @@
     less = at;
 
-#define DEFINE_VARIABLE(name, len, value) \
+#define DEFINE_VARIABLE(name, len, value) \
   (void) define_variable_for_file (name,len,value,o_automatic,0,file)
 
@@ -369 +365 @@
     cp = plus_value;
 
-    qmark_len = plus_len + 1;   /* Will be this or less.  */
+    qmark_len = plus_len + 1;   /* Will be this or less.  */
     for (d = file->deps; d != 0; d = d->next)
       if (! d->ignore_mtime && ! d->need_2nd_expansion)
@@ -375 +371 @@
           const char *c = dep_name (d);
 
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES
           if (ar_name (c))
             {
@@ -393 +389 @@
           *cp++ = FILE_LIST_SEPARATOR;
           if (! (d->changed || always_make_flag))
-            qmark_len -= len + 1;       /* Don't space in $? for this one.  */
+            qmark_len -= len + 1;       /* Don't space in $? for this one.  */
         }
 
@@ -448 +444 @@
 
         c = dep_name (d);
-#ifndef NO_ARCHIVES
+#ifndef NO_ARCHIVES
         if (ar_name (c))
-          {
-            c = strchr (c, '(') + 1;
-            len = strlen (c) - 1;
-          }
-        else
+          {
+            c = strchr (c, '(') + 1;
+            len = strlen (c) - 1;
+          }
+        else
 #endif
 #ifndef CONFIG_WITH_STRCACHE2
-          len = strlen (c);
-#else
-          len = strcache2_get_len (&file_strcache, c);
+          len = strlen (c);
+#else
+          len = strcache2_get_len (&file_strcache, c);
 #endif
 
@@ -465 +461 @@
           {
             memcpy (bp, c, len);
-            bp += len;
-            *bp++ = FILE_LIST_SEPARATOR;
-          }
-        else
+            bp += len;
+            *bp++ = FILE_LIST_SEPARATOR;
+          }
+        else
           {
             memcpy (cp, c, len);
@@ -495 +491 @@
     DEFINE_VARIABLE ("|", 1, bar_value);
   }
-#undef  DEFINE_VARIABLE
+#undef  DEFINE_VARIABLE
 }
 
 
 /* Chop CMDS up into individual command lines if necessary.
-   Also set the `lines_flags' and `any_recurse' members.  */
+   Also set the 'lines_flags' and 'any_recurse' members.  */
 
 void
@@ -577 +573 @@
      CMDS->any_recurse flag.  */
 
+  if (nlines > USHRT_MAX)
+    ON (fatal, &cmds->fileinfo, _("Recipe has too many lines (%ud)"), nlines);
+
   cmds->ncommand_lines = nlines;
   cmds->command_lines = lines;
@@ -589 +588 @@
   for (idx = 0; idx < nlines; ++idx)
     {
-      int flags = 0;
+      unsigned char flags = 0;
       const char *p = lines[idx];
 
-      while (isblank (*p) || *p == '-' || *p == '@' || *p == '+' IF_WITH_COMMANDS_FUNC(|| *p == '%'))
+      while (ISBLANK (*p) || *p == '-' || *p == '@' || *p == '+' IF_WITH_COMMANDS_FUNC(|| *p == '%'))
         switch (*(p++))
           {
@@ -628 +627 @@
 
       cmds->lines_flags[idx] = flags;
-      cmds->any_recurse |= flags & COMMANDS_RECURSE;
+      cmds->any_recurse |= flags & COMMANDS_RECURSE ? 1 : 0;
     }
 }
@@ -668 +667 @@
 
   for (p = file->cmds->commands; *p != '\0'; ++p)
-    if (!isspace ((unsigned char)*p) && *p != '-' && *p != '@')
+    if (!ISSPACE (*p) && *p != '-' && *p != '@' && *p != '+')
       break;
   if (*p == '\0')
@@ -677 +676 @@
 #endif
       set_command_state (file, cs_running);
-      file->update_status = 0;
+      file->update_status = us_success;
       notice_finished_file (file);
       return;
@@ -691 +690 @@
   set_file_variables (file);
 #endif
+
+  /* If this is a loaded dynamic object, unload it before remaking.
+     Some systems don't support overwriting a loaded object.  */
+  if (file->loaded)
+    unload_file (file->name);
 
   /* Start the commands running.  */
@@ -737 +741 @@
 
       if (susp_count != 0)
-        fprintf (stderr, "SuspendThread: suspend count = %ld\n", susp_count);
+        fprintf (stderr, "SuspendThread: suspend count = %ld\n", susp_count);
       else if (susp_count == (DWORD)-1)
-        {
-          DWORD ierr = GetLastError ();
-
-          fprintf (stderr, "SuspendThread: error %ld: %s\n",
-                   ierr, map_windows32_error_to_string (ierr));
-        }
+        {
+          DWORD ierr = GetLastError ();
+
+          fprintf (stderr, "SuspendThread: error %ld: %s\n",
+                   ierr, map_windows32_error_to_string (ierr));
+        }
     }
 #endif
@@ -760 +764 @@
       struct child *c;
       for (c = children; c != 0; c = c->next)
-        if (!c->remote)
-          (void) kill (c->pid, SIGTERM);
+        if (!c->remote)
+          (void) kill (c->pid, SIGTERM);
     }
 
@@ -779 +783 @@
 
       /* Remote children won't automatically get signals sent
-         to the process group, so we must send them.  */
+         to the process group, so we must send them.  */
       for (c = children; c != 0; c = c->next)
-        if (c->remote)
-          (void) remote_kill (c->pid, sig);
+        if (c->remote)
+          (void) remote_kill (c->pid, sig);
 
       for (c = children; c != 0; c = c->next)
-        delete_child_targets (c);
+        delete_child_targets (c);
 
       /* Clean up the children.  We don't just use the call below because
-         we don't want to print the "Waiting for children" message.  */
+         we don't want to print the "Waiting for children" message.  */
       while (job_slots_used > 0)
-        reap_children (1, 0);
+        reap_children (1, 0);
     }
   else
@@ -804 +808 @@
     /* We don't want to send ourselves SIGQUIT, because it will
        cause a core dump.  Just exit instead.  */
-    exit (EXIT_FAILURE);
+    exit (MAKE_TROUBLE);
 #endif
 
@@ -845 +849 @@
     {
       time_t file_date = (file->last_mtime == NONEXISTENT_MTIME
-                          ? (time_t) -1
-                          : (time_t) FILE_TIMESTAMP_S (file->last_mtime));
+                          ? (time_t) -1
+                          : (time_t) FILE_TIMESTAMP_S (file->last_mtime));
       if (ar_member_date (file->name) != file_date)
-        {
-          if (on_behalf_of)
-            error (NILF, _("*** [%s] Archive member `%s' may be bogus; not deleted"),
-                   on_behalf_of, file->name);
-          else
-            error (NILF, _("*** Archive member `%s' may be bogus; not deleted"),
-                   file->name);
-        }
+        {
+          if (on_behalf_of)
+            OSS (error, NILF,
+                 _("*** [%s] Archive member '%s' may be bogus; not deleted"),
+                 on_behalf_of, file->name);
+          else
+            OS (error, NILF,
+                _("*** Archive member '%s' may be bogus; not deleted"),
+                file->name);
+        }
       return;
     }
@@ -866 +872 @@
     {
       if (on_behalf_of)
-        error (NILF, _("*** [%s] Deleting file `%s'"), on_behalf_of, file->name);
+        OSS (error, NILF,
+             _("*** [%s] Deleting file '%s'"), on_behalf_of, file->name);
       else
-        error (NILF, _("*** Deleting file `%s'"), file->name);
+        OS (error, NILF, _("*** Deleting file '%s'"), file->name);
       if (unlink (file->name) < 0
-          && errno != ENOENT)   /* It disappeared; so what.  */
-        perror_with_name ("unlink: ", file->name);
+          && errno != ENOENT)   /* It disappeared; so what.  */
+        perror_with_name ("unlink: ", file->name);
     }
 }
@@ -890 +897 @@
   delete_target (child->file, NULL);
 
-  /* Also remove any non-precious targets listed in the `also_make' member.  */
+  /* Also remove any non-precious targets listed in the 'also_make' member.  */
   for (d = child->file->also_make; d != 0; d = d->next)
     delete_target (d->file, child->file->name);
@@ -923 +930 @@
     puts (_(" (built-in):"));
   else
-    printf (_(" (from `%s', line %lu):\n"),
+    printf (_(" (from '%s', line %lu):\n"),
             cmds->fileinfo.filenm, cmds->fileinfo.lineno);
 
@@ -930 +937 @@
     {
       const char *end;
-
-      end = strchr (s, '\n');
-      if (end == 0)
-        end = s + strlen (s);
+      int bs;
+
+      /* Print one full logical recipe line: find a non-escaped newline.  */
+      for (end = s, bs = 0; *end != '\0'; ++end)
+        {
+          if (*end == '\n' && !bs)
+            break;
+
+          bs = *end == '\\' ? !bs : 0;
+        }
 
       printf ("%c%.*s\n", cmd_prefix, (int) (end - s), s);