Changeset 900 for vendor/gnumake/current/vpath.c

Timestamp:

May 23, 2007, 5:13:11 AM (18 years ago)

Author:

bird

Message:

Load /home/bird/src/Gnu/make/2007-05-23 into vendor/gnumake/current.

File:

• vendor/gnumake/current/vpath.c (modified) (24 diffs)

vendor/gnumake/current/vpath.c

@@ -30 +30 @@
   {
     struct vpath *next; /* Pointer to next struct in the linked list.  */
-    char *pattern;      /* The pattern to match.  */
-    char *percent;      /* Pointer into `pattern' where the `%' is.  */
+    const char *pattern;/* The pattern to match.  */
+    const char *percent;/* Pointer into `pattern' where the `%' is.  */
     unsigned int patlen;/* Length of the pattern.  */
-    char **searchpath;  /* Null-terminated list of directories.  */
+    const char **searchpath; /* Null-terminated list of directories.  */
     unsigned int maxlen;/* Maximum length of any entry in the list.  */
   };
@@ -50 +50 @@
 
 
-static int selective_vpath_search PARAMS ((struct vpath *path, char **file, FILE_TIMESTAMP *mtime_ptr));
-
-/* Reverse the chain of selective VPATH lists so they
-   will be searched in the order given in the makefiles
-   and construct the list from the VPATH variable.  */
+
+/* Reverse the chain of selective VPATH lists so they will be searched in the
+   order given in the makefiles and construct the list from the VPATH
+   variable.  */
 
 void
@@ -91 +90 @@
       /* Save the list of vpaths.  */
       struct vpath *save_vpaths = vpaths;
+      char gp[] = "%";
 
       /* Empty `vpaths' so the new one will have no next, and `vpaths'
@@ -97 +97 @@
 
       /* Parse P.  */
-      construct_vpath_list ("%", p);
+      construct_vpath_list (gp, p);
 
       /* Store the created path as the general path,
@@ -123 +123 @@
       /* Save the list of vpaths.  */
       struct vpath *save_vpaths = vpaths;
+      char gp[] = "%";
 
       /* Empty `vpaths' so the new one will have no next, and `vpaths'
@@ -129 +130 @@
 
       /* Parse P.  */
-      construct_vpath_list ("%", p);
+      construct_vpath_list (gp, p);
 
       /* Store the created path as the GPATH,
@@ -161 +162 @@
 construct_vpath_list (char *pattern, char *dirpath)
 {
-  register unsigned int elem;
-  register char *p;
-  register char **vpath;
-  register unsigned int maxvpath;
+  unsigned int elem;
+  char *p;
+  const char **vpath;
+  unsigned int maxvpath;
   unsigned int maxelem;
-  char *percent = NULL;
+  const char *percent = NULL;
 
   if (pattern != 0)
-    {
-      pattern = xstrdup (pattern);
-      percent = find_percent (pattern);
-    }
+    percent = find_percent (pattern);
 
   if (dirpath == 0)
     {
       /* Remove matching listings.  */
-      register struct vpath *path, *lastpath;
+      struct vpath *path, *lastpath;
 
       lastpath = 0;
@@ -197 +195 @@
 
               /* Free its unused storage.  */
-              free (path->pattern);
-              free ((char *) path->searchpath);
-              free ((char *) path);
+              free (path->searchpath);
+              free (path);
             }
           else
@@ -207 +204 @@
         }
 
-      if (pattern != 0)
-        free (pattern);
       return;
     }
@@ -215 +210 @@
     convert_vpath_to_windows32(dirpath, ';');
 #endif
+
+  /* Skip over any initial separators and blanks.  */
+  while (*dirpath == PATH_SEPARATOR_CHAR || isblank ((unsigned char)*dirpath))
+    ++dirpath;
 
   /* Figure out the maximum number of VPATH entries and put it in
@@ -226 +225 @@
       ++maxelem;
 
-  vpath = (char **) xmalloc (maxelem * sizeof (char *));
+  vpath = xmalloc (maxelem * sizeof (const char *));
   maxvpath = 0;
 
-  /* Skip over any initial separators and blanks.  */
+  elem = 0;
   p = dirpath;
-  while (*p == PATH_SEPARATOR_CHAR || isblank ((unsigned char)*p))
-    ++p;
-
-  elem = 0;
   while (*p != '\0')
     {
@@ -256 +251 @@
         --len;
 
+      /* Put the directory on the vpath list.  */
       if (len > 1 || *v != '.')
         {
-          v = savestring (v, len);
-
-          /* Verify that the directory actually exists.  */
-
-          if (dir_file_exists_p (v, ""))
-            {
-              /* It does.  Put it in the list.  */
-              vpath[elem++] = dir_name (v);
-              free (v);
-              if (len > maxvpath)
-                maxvpath = len;
-            }
-          else
-            /* The directory does not exist.  Omit from the list.  */
-            free (v);
+          vpath[elem++] = dir_name (strcache_add_len (v, len));
+          if (len > maxvpath)
+            maxvpath = len;
         }
 
@@ -287 +271 @@
          Usually this is maxelem - 1.  If not, shrink down.  */
       if (elem < (maxelem - 1))
-        vpath = (char **) xrealloc ((char *) vpath,
-                                    (elem + 1) * sizeof (char *));
+        vpath = xrealloc (vpath, (elem+1) * sizeof (const char *));
 
       /* Put the nil-pointer terminator on the end of the VPATH list.  */
-      vpath[elem] = 0;
+      vpath[elem] = NULL;
 
       /* Construct the vpath structure and put it into the linked list.  */
-      path = (struct vpath *) xmalloc (sizeof (struct vpath));
+      path = xmalloc (sizeof (struct vpath));
       path->searchpath = vpath;
       path->maxlen = maxvpath;
@@ -301 +284 @@
 
       /* Set up the members.  */
-      path->pattern = pattern;
-      path->percent = percent;
+      path->pattern = strcache_add (pattern);
       path->patlen = strlen (pattern);
+      path->percent = percent ? path->pattern + (percent - pattern) : 0;
     }
   else
-    {
-      /* There were no entries, so free whatever space we allocated.  */
-      free ((char *) vpath);
-      if (pattern != 0)
-        free (pattern);
-    }
+    /* There were no entries, so free whatever space we allocated.  */
+    free (vpath);
 }
 
@@ -319 +298 @@
 
 int
-gpath_search (char *file, unsigned int len)
+gpath_search (const char *file, unsigned int len)
 {
-  char **gp;
+  const char **gp;
 
   if (gpaths && (len <= gpaths->maxlen))
@@ -332 +311 @@
 
 
-/* Search the VPATH list whose pattern matches *FILE for a directory
-   where the name pointed to by FILE exists.  If it is found, we set *FILE to
-   the newly malloc'd name of the existing file, *MTIME_PTR (if MTIME_PTR is
-   not NULL) to its modtime (or zero if no stat call was done), and return 1.
-   Otherwise we return 0.  */
-
-int
-vpath_search (char **file, FILE_TIMESTAMP *mtime_ptr)
-{
-  register struct vpath *v;
-
-  /* If there are no VPATH entries or FILENAME starts at the root,
-     there is nothing we can do.  */
-
-  if (**file == '/'
-#ifdef HAVE_DOS_PATHS
-      || **file == '\\'
-      || (*file)[1] == ':'
-#endif
-      || (vpaths == 0 && general_vpath == 0))
-    return 0;
-
-  for (v = vpaths; v != 0; v = v->next)
-    if (pattern_matches (v->pattern, v->percent, *file))
-      if (selective_vpath_search (v, file, mtime_ptr))
-        return 1;
-
-  if (general_vpath != 0
-      && selective_vpath_search (general_vpath, file, mtime_ptr))
-    return 1;
-
-  return 0;
-}
-
-
-/* Search the given VPATH list for a directory where the name pointed
-   to by FILE exists.  If it is found, we set *FILE to the newly malloc'd
-   name of the existing file, *MTIME_PTR (if MTIME_PTR is not NULL) to
-   its modtime (or zero if no stat call was done), and we return 1.
-   Otherwise we return 0.  */
-
-static int
-selective_vpath_search (struct vpath *path, char **file,
+
+/* Search the given VPATH list for a directory where the name pointed to by
+   FILE exists.  If it is found, we return a cached name of the existing file
+   and set *MTIME_PTR (if MTIME_PTR is not NULL) to its modtime (or zero if no
+   stat call was done).  Otherwise we return NULL.  */
+
+static const char *
+selective_vpath_search (struct vpath *path, const char *file,
                         FILE_TIMESTAMP *mtime_ptr)
 {
   int not_target;
-  char *name, *n;
-  char *filename;
-  register char **vpath = path->searchpath;
+  char *name;
+  const char *n;
+  const char *filename;
+  const char **vpath = path->searchpath;
   unsigned int maxvpath = path->maxlen;
-  register unsigned int i;
+  unsigned int i;
   unsigned int flen, vlen, name_dplen;
   int exists = 0;
@@ -390 +335 @@
      files that don't exist but are mentioned in a makefile.  */
   {
-    struct file *f = lookup_file (*file);
+    struct file *f = lookup_file (file);
     not_target = f == 0 || !f->is_target;
   }
 
-  flen = strlen (*file);
+  flen = strlen (file);
 
   /* Split *FILE into a directory prefix and a name-within-directory.
-     NAME_DPLEN gets the length of the prefix; FILENAME gets the
-     pointer to the name-within-directory and FLEN is its length.  */
-
-  n = strrchr (*file, '/');
+     NAME_DPLEN gets the length of the prefix; FILENAME gets the pointer to
+     the name-within-directory and FLEN is its length.  */
+
+  n = strrchr (file, '/');
 #ifdef HAVE_DOS_PATHS
   /* We need the rightmost slash or backslash.  */
   {
-    char *bslash = strrchr(*file, '\\');
+    const char *bslash = strrchr(file, '\\');
     if (!n || bslash > n)
       n = bslash;
   }
 #endif
-  name_dplen = n != 0 ? n - *file : 0;
-  filename = name_dplen > 0 ? n + 1 : *file;
+  name_dplen = n != 0 ? n - file : 0;
+  filename = name_dplen > 0 ? n + 1 : file;
   if (name_dplen > 0)
     flen -= name_dplen + 1;
 
-  /* Allocate enough space for the biggest VPATH entry,
-     a slash, the directory prefix that came with *FILE,
-     another slash (although this one may not always be
-     necessary), the filename, and a null terminator.  */
-  name = (char *) xmalloc (maxvpath + 1 + name_dplen + 1 + flen + 1);
+  /* Get enough space for the biggest VPATH entry, a slash, the directory
+     prefix that came with FILE, another slash (although this one may not
+     always be necessary), the filename, and a null terminator.  */
+  name = alloca (maxvpath + 1 + name_dplen + 1 + flen + 1);
 
   /* Try each VPATH entry.  */
@@ -424 +368 @@
     {
       int exists_in_cache = 0;
-
-      n = name;
-
-      /* Put the next VPATH entry into NAME at N and increment N past it.  */
+      char *p;
+
+      p = name;
+
+      /* Put the next VPATH entry into NAME at P and increment P past it.  */
       vlen = strlen (vpath[i]);
-      bcopy (vpath[i], n, vlen);
-      n += vlen;
+      memcpy (p, vpath[i], vlen);
+      p += vlen;
 
       /* Add the directory prefix already in *FILE.  */
@@ -436 +381 @@
         {
 #ifndef VMS
-          *n++ = '/';
-#endif
-          bcopy (*file, n, name_dplen);
-          n += name_dplen;
+          *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 (n != name && n[-1] == '\\' )
-        n[-1] = '/';
+      if (p != name && p[-1] == '\\' )
+        p[-1] = '/';
 #endif
       /* Now add the name-within-directory at the end of NAME.  */
 #ifndef VMS
-      if (n != name && n[-1] != '/')
+      if (p != name && p[-1] != '/')
         {
-          *n = '/';
-          bcopy (filename, n + 1, flen + 1);
+          *p = '/';
+          memcpy (p + 1, filename, flen + 1);
         }
       else
 #endif
-        bcopy (filename, n, flen + 1);
+        memcpy (p, filename, flen + 1);
 
       /* Check if the file is mentioned in a makefile.  If *FILE is not
@@ -503 +448 @@
           /* Clobber a null into the name at the last slash.
              Now NAME is the name of the directory to look in.  */
-          *n = '\0';
+          *p = '\0';
 
           /* We know the directory is in the hash table now because either
@@ -524 +469 @@
 #ifndef VMS
           /* Put the slash back in NAME.  */
-          *n = '/';
+          *p = '/';
 #endif
 
@@ -547 +492 @@
 
           /* We have found a file.
-             Store the name we found into *FILE for the caller.  */
-
-          *file = savestring (name, (n + 1 - name) + flen);
-
-          /* If we get here and mtime_ptr hasn't been set, record
+             If we get here and mtime_ptr hasn't been set, record
              UNKNOWN_MTIME to indicate this.  */
           if (mtime_ptr != 0)
             *mtime_ptr = UNKNOWN_MTIME;
 
-          free (name);
-          return 1;
+          /* Store the name we found and return it.  */
+
+          return strcache_add_len (name, (p + 1 - name) + flen);
         }
     }
 
-  free (name);
+  return 0;
+}
+
+
+/* Search the VPATH list whose pattern matches FILE for a directory where FILE
+   exists.  If it is found, return the cached name of an existing file, and
+   set *MTIME_PTR (if MTIME_PTR is not NULL) to its modtime (or zero if no
+   stat call was done).  Otherwise we return 0.  */
+
+const char *
+vpath_search (const char *file, FILE_TIMESTAMP *mtime_ptr)
+{
+  struct vpath *v;
+
+  /* If there are no VPATH entries or FILENAME starts at the root,
+     there is nothing we can do.  */
+
+  if (file[0] == '/'
+#ifdef HAVE_DOS_PATHS
+      || file[0] == '\\' || file[1] == ':'
+#endif
+      || (vpaths == 0 && general_vpath == 0))
+    return 0;
+
+  for (v = vpaths; v != 0; v = v->next)
+    if (pattern_matches (v->pattern, v->percent, file))
+      {
+        const char *p = selective_vpath_search (v, file, mtime_ptr);
+        if (p)
+          return p;
+      }
+
+  if (general_vpath != 0)
+    {
+      const char *p = selective_vpath_search (general_vpath, file, mtime_ptr);
+      if (p)
+        return p;
+    }
+
   return 0;
 }
@@ -571 +551 @@
 print_vpath_data_base (void)
 {
-  register unsigned int nvpaths;
-  register struct vpath *v;
+  unsigned int nvpaths;
+  struct vpath *v;
 
   puts (_("\n# VPATH Search Paths\n"));
@@ -599 +579 @@
   else
     {
-      register char **path = general_vpath->searchpath;
-      register unsigned int i;
+      const char **path = general_vpath->searchpath;
+      unsigned int i;
 
       fputs (_("\n# General (`VPATH' variable) search path:\n# "), stdout);