Changeset 3140 for trunk/src/kmk/vpath.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)
• vpath.c (modified) (25 diffs)

trunk/src/kmk/vpath.c

@@ -1 +1 @@
 /* Implementation of pattern-matching file search paths 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 "variable.h"
@@ -29 +27 @@
 struct vpath
   {
-    struct vpath *next; /* Pointer to next struct in the linked list.  */
+    struct vpath *next; /* Pointer to next struct in the linked list.  */
     const char *pattern;/* The pattern to match.  */
-    const char *percent;/* Pointer into `pattern' where the `%' is.  */
+    const char *percent;/* Pointer into 'pattern' where the '%' is.  */
     unsigned int patlen;/* Length of the pattern.  */
     const char **searchpath; /* Null-terminated list of directories.  */
@@ -56 +54 @@
 
 void
-build_vpath_lists ()
+build_vpath_lists (void)
 {
   register struct vpath *new = 0;
@@ -98 +96 @@
       char gp[] = "%";
 
-      /* Empty `vpaths' so the new one will have no next, and `vpaths'
-         will still be nil if P contains no existing directories.  */
+      /* Empty 'vpaths' so the new one will have no next, and 'vpaths'
+         will still be nil if P contains no existing directories.  */
       vpaths = 0;
 
@@ -106 +104 @@
 
       /* Store the created path as the general path,
-         and restore the old list of vpaths.  */
+         and restore the old list of vpaths.  */
       general_vpath = vpaths;
       vpaths = save_vpaths;
@@ -135 +133 @@
       char gp[] = "%";
 
-      /* Empty `vpaths' so the new one will have no next, and `vpaths'
-         will still be nil if P contains no existing directories.  */
+      /* Empty 'vpaths' so the new one will have no next, and 'vpaths'
+         will still be nil if P contains no existing directories.  */
       vpaths = 0;
 
@@ -143 +141 @@
 
       /* Store the created path as the GPATH,
-         and restore the old list of vpaths.  */
+         and restore the old list of vpaths.  */
       gpaths = vpaths;
       vpaths = save_vpaths;
@@ -161 +159 @@
    pattern.  If PATTERN is nil, remove all VPATH listings.  Existing
    and readable directories that are not "." given in the DIRPATH
-   separated by the path element separator (defined in make.h) are
+   separated by the path element separator (defined in makeint.h) are
    loaded into the directory hash table if they are not there already
    and put in the VPATH searchpath for the given pattern with trailing
@@ -190 +188 @@
       path = vpaths;
       while (path != 0)
-        {
-          struct vpath *next = path->next;
-
-          if (pattern == 0
-              || (((percent == 0 && path->percent == 0)
-                   || (percent - pattern == path->percent - path->pattern))
-                  && streq (pattern, path->pattern)))
-            {
-              /* Remove it from the linked list.  */
-              if (lastpath == 0)
-                vpaths = path->next;
-              else
-                lastpath->next = next;
-
-              /* Free its unused storage.  */
+        {
+          struct vpath *next = path->next;
+
+          if (pattern == 0
+              || (((percent == 0 && path->percent == 0)
+                   || (percent - pattern == path->percent - path->pattern))
+                  && streq (pattern, path->pattern)))
+            {
+              /* Remove it from the linked list.  */
+              if (lastpath == 0)
+                vpaths = path->next;
+              else
+                lastpath->next = next;
+
+              /* Free its unused storage.  */
               /* MSVC erroneously warns without a cast here.  */
-              free ((void *)path->searchpath);
-              free (path);
-            }
-          else
-            lastpath = path;
-
-          path = next;
-        }
+              free ((void *)path->searchpath);
+              free (path);
+            }
+          else
+            lastpath = path;
+
+          path = next;
+        }
 
       return;
@@ -219 +217 @@
 
 #ifdef WINDOWS32
-    convert_vpath_to_windows32(dirpath, ';');
+    convert_vpath_to_windows32 (dirpath, ';');
 #endif
 
   /* Skip over any initial separators and blanks.  */
-  while (*dirpath == PATH_SEPARATOR_CHAR || isblank ((unsigned char)*dirpath))
+  while (STOP_SET (*dirpath, MAP_BLANK|MAP_PATHSEP))
     ++dirpath;
 
@@ -233 +231 @@
   p = dirpath;
   while (*p != '\0')
-    if (*p++ == PATH_SEPARATOR_CHAR || isblank ((unsigned char)*p))
+    if (STOP_SET (*p++, MAP_BLANK|MAP_PATHSEP))
       ++maxelem;
 
@@ -250 +248 @@
       while (*p != '\0'
 #if defined(HAVE_DOS_PATHS) && (PATH_SEPARATOR_CHAR == ':')
-             /* Platforms whose PATH_SEPARATOR_CHAR is ':' and which
-                also define HAVE_DOS_PATHS would like us to recognize
-                colons after the drive letter in the likes of
-                "D:/foo/bar:C:/xyzzy".  */
-             && (*p != PATH_SEPARATOR_CHAR
-                 || (p == v + 1 && (p[1] == '/' || p[1] == '\\')))
+             /* Platforms whose PATH_SEPARATOR_CHAR is ':' and which
+                also define HAVE_DOS_PATHS would like us to recognize
+                colons after the drive letter in the likes of
+                "D:/foo/bar:C:/xyzzy".  */
+             && (*p != PATH_SEPARATOR_CHAR
+                 || (p == v + 1 && (p[1] == '/' || p[1] == '\\')))
 #else
-             && *p != PATH_SEPARATOR_CHAR
-#endif
-             && !isblank ((unsigned char)*p))
-        ++p;
+             && *p != PATH_SEPARATOR_CHAR
+#endif
+             && !ISBLANK (*p))
+        ++p;
 
       len = p - v;
       /* Make sure there's no trailing slash,
-         but still allow "/" as a directory.  */
+         but still allow "/" as a directory.  */
 #if defined(__MSDOS__) || defined(__EMX__) || defined(HAVE_DOS_PATHS)
       /* We need also to leave alone a trailing slash in "d:/".  */
@@ -270 +268 @@
 #endif
       if (len > 1 && p[-1] == '/')
-        --len;
+        --len;
 
       /* Put the directory on the vpath list.  */
       if (len > 1 || *v != '.')
-        {
+        {
           vpath[elem++] = dir_name (strcache_add_len (v, len));
           if (len > maxvpath)
             maxvpath = len;
-        }
+        }
 
       /* Skip over separators and blanks between entries.  */
-      while (*p == PATH_SEPARATOR_CHAR || isblank ((unsigned char)*p))
-        ++p;
+      while (STOP_SET (*p, MAP_BLANK|MAP_PATHSEP))
+        ++p;
     }
 
@@ -289 +287 @@
       struct vpath *path;
       /* ELEM is now incremented one element past the last
-         entry, to where the nil-pointer terminator goes.
-         Usually this is maxelem - 1.  If not, shrink down.  */
+         entry, to where the nil-pointer terminator goes.
+         Usually this is maxelem - 1.  If not, shrink down.  */
       if (elem < (maxelem - 1))
-        vpath = (const char **)xrealloc (vpath, (elem+1) * sizeof (const char *));
+        vpath = xrealloc ((void *)vpath, (elem+1) * sizeof (const char *)); /* bird: Weird cast for msc. */
 
       /* Put the nil-pointer terminator on the end of the VPATH list.  */
@@ -322 +320 @@
 gpath_search (const char *file, unsigned int len)
 {
-  const char **gp;
-
   if (gpaths && (len <= gpaths->maxlen))
-    for (gp = gpaths->searchpath; *gp != NULL; ++gp)
-      if (strneq (*gp, file, len) && (*gp)[len] == '\0')
-        return 1;
+    {
+      const char **gp;
+      for (gp = gpaths->searchpath; *gp != NULL; ++gp)
+        if (strneq (*gp, file, len) && (*gp)[len] == '\0')
+          return 1;
+    }
 
   return 0;
@@ -351 +350 @@
   unsigned int maxvpath = path->maxlen;
   unsigned int i;
-  unsigned int flen, vlen, name_dplen;
+  unsigned int flen, name_dplen;
   int exists = 0;
 
@@ -372 +371 @@
   /* We need the rightmost slash or backslash.  */
   {
-    const char *bslash = strrchr(file, '\\');
+    const char *bslash = strrchr (file, '\\');
     if (!n || bslash > n)
       n = bslash;
@@ -391 +390 @@
     {
       int exists_in_cache = 0;
-      char *p;
-
-      p = name;
+      char *p = name;
+      unsigned int vlen = strlen (vpath[i]);
 
       /* Put the next VPATH entry into NAME at P and increment P past it.  */
-      vlen = strlen (vpath[i]);
       memcpy (p, vpath[i], vlen);
       p += vlen;
@@ -402 +399 @@
       /* Add the directory prefix already in *FILE.  */
       if (name_dplen > 0)
-        {
+        {
 #ifndef VMS
-          *p++ = '/';
-#endif
-          memcpy (p, file, name_dplen);
-          p += name_dplen;
-        }
+          *p++ = '/';
+#else
+          /* VMS: if this is not in VMS format, treat as Unix format */
+          if ((*p != ':') && (*p != ']') && (*p != '>'))
+            *p++ = '/';
+#endif
+          memcpy (p, file, name_dplen);
+          p += name_dplen;
+        }
 
 #ifdef HAVE_DOS_PATHS
       /* Cause the next if to treat backslash and slash alike.  */
       if (p != name && p[-1] == '\\' )
-        p[-1] = '/';
+        p[-1] = '/';
 #endif
       /* Now add the name-within-directory at the end of NAME.  */
 #ifndef VMS
       if (p != name && p[-1] != '/')
-        {
-          *p = '/';
-          memcpy (p + 1, filename, flen + 1);
-        }
+        {
+          *p = '/';
+          memcpy (p + 1, filename, flen + 1);
+        }
       else
-#endif
-        memcpy (p, filename, flen + 1);
+#else
+      /* VMS use a slash if no directory terminator present */
+      if (p != name && p[-1] != '/' && p[-1] != ':' &&
+          p[-1] != '>' && p[-1] != ']')
+        {
+          *p = '/';
+          memcpy (p + 1, filename, flen + 1);
+        }
+      else
+#endif
+        memcpy (p, filename, flen + 1);
 
       /* Check if the file is mentioned in a makefile.  If *FILE is not
-         a target, that is enough for us to decide this file exists.
-         If *FILE is a target, then the file must be mentioned in the
-         makefile also as a target to be chosen.
-
-         The restriction that *FILE must not be a target for a
-         makefile-mentioned file to be chosen was added by an
-         inadequately commented change in July 1990; I am not sure off
-         hand what problem it fixes.
-
-         In December 1993 I loosened this restriction to allow a file
-         to be chosen if it is mentioned as a target in a makefile.  This
-         seem logical.
+         a target, that is enough for us to decide this file exists.
+         If *FILE is a target, then the file must be mentioned in the
+         makefile also as a target to be chosen.
+
+         The restriction that *FILE must not be a target for a
+         makefile-mentioned file to be chosen was added by an
+         inadequately commented change in July 1990; I am not sure off
+         hand what problem it fixes.
+
+         In December 1993 I loosened this restriction to allow a file
+         to be chosen if it is mentioned as a target in a makefile.  This
+         seem logical.
 
          Special handling for -W / -o: make sure we preserve the special
@@ -448 +458 @@
       */
       {
-        struct file *f = lookup_file (name);
-        if (f != 0)
+        struct file *f = lookup_file (name);
+        if (f != 0)
           {
             exists = not_target || f->is_target;
@@ -462 +472 @@
 
       if (!exists)
-        {
-          /* That file wasn't mentioned in the makefile.
-             See if it actually exists.  */
+        {
+          /* That file wasn't mentioned in the makefile.
+             See if it actually exists.  */
 
 #ifdef VMS
-          exists_in_cache = exists = dir_file_exists_p (vpath[i], filename);
+          /* For VMS syntax just use the original vpath */
+          if (*p != '/')
+            exists_in_cache = exists = dir_file_exists_p (vpath[i], filename);
+          else
+#endif
+            {
+              /* Clobber a null into the name at the last slash.
+                 Now NAME is the name of the directory to look in.  */
+              *p = '\0';
+              /* We know the directory is in the hash table now because either
+                 construct_vpath_list or the code just above put it there.
+                 Does the file we seek exist in it?  */
+              exists_in_cache = exists = dir_file_exists_p (name, filename);
+            }
+        }
+
+      if (exists)
+        {
+          /* The file is in the directory cache.
+             Now check that it actually exists in the filesystem.
+             The cache may be out of date.  When vpath thinks a file
+             exists, but stat fails for it, confusion results in the
+             higher levels.  */
+
+          struct stat st;
+
+#ifndef VMS
+          /* Put the slash back in NAME.  */
+          *p = '/';
 #else
-          /* Clobber a null into the name at the last slash.
-             Now NAME is the name of the directory to look in.  */
-          *p = '\0';
-
-          /* We know the directory is in the hash table now because either
-             construct_vpath_list or the code just above put it there.
-             Does the file we seek exist in it?  */
-          exists_in_cache = exists = dir_file_exists_p (name, filename);
-#endif
-        }
-
-      if (exists)
-        {
-          /* The file is in the directory cache.
-             Now check that it actually exists in the filesystem.
-             The cache may be out of date.  When vpath thinks a file
-             exists, but stat fails for it, confusion results in the
-             higher levels.  */
-
-          struct stat st;
-
-#ifndef VMS
-          /* Put the slash back in NAME.  */
-          *p = '/';
-#endif
-
-          if (exists_in_cache)  /* Makefile-mentioned file need not exist.  */
-            {
+          /* If the slash was removed, put it back */
+          if (*p == 0)
+            *p = '/';
+#endif
+
+          if (exists_in_cache)  /* Makefile-mentioned file need not exist.  */
+            {
               int e;
 
@@ -526 +543 @@
 
           return strcache_add_len (name, (p + 1 - name) + flen);
-        }
+        }
     }
 
@@ -611 +628 @@
 
       for (i = 0; v->searchpath[i] != 0; ++i)
-        printf ("%s%c", v->searchpath[i],
-                v->searchpath[i + 1] == 0 ? '\n' : PATH_SEPARATOR_CHAR);
+        printf ("%s%c", v->searchpath[i],
+                v->searchpath[i + 1] == 0 ? '\n' : PATH_SEPARATOR_CHAR);
     }
 
   if (vpaths == 0)
-    puts (_("# No `vpath' search paths."));
+    puts (_("# No 'vpath' search paths."));
   else
-    printf (_("\n# %u `vpath' search paths.\n"), nvpaths);
+    printf (_("\n# %u 'vpath' search paths.\n"), nvpaths);
 
   if (general_vpath == 0)
-    puts (_("\n# No general (`VPATH' variable) search path."));
+    puts (_("\n# No general ('VPATH' variable) search path."));
   else
     {
@@ -627 +644 @@
       unsigned int i;
 
-      fputs (_("\n# General (`VPATH' variable) search path:\n# "), stdout);
+      fputs (_("\n# General ('VPATH' variable) search path:\n# "), stdout);
 
       for (i = 0; path[i] != 0; ++i)
-        printf ("%s%c", path[i],
-                path[i + 1] == 0 ? '\n' : PATH_SEPARATOR_CHAR);
+        printf ("%s%c", path[i],
+                path[i + 1] == 0 ? '\n' : PATH_SEPARATOR_CHAR);
     }
 }