Changeset 900 in kBuild for vendor/gnumake/current/dir.c

Timestamp:

May 23, 2007 3: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/dir.c (modified) (55 diffs)

vendor/gnumake/current/dir.c

@@ -24 +24 @@
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 # ifdef VMS
-extern char *vmsify PARAMS ((char *name, int type));
+char *vmsify (char *name, int type);
 # endif
 #else
@@ -69 +69 @@
 #endif
 
-static char *
-dosify (char *filename)
+static const char *
+dosify (const char *filename)
 {
   static char dos_filename[14];
@@ -119 +119 @@
 
 #ifdef HAVE_CASE_INSENSITIVE_FS
-static char *
-downcase (char *filename)
+static const char *
+downcase (const char *filename)
 {
   static PATH_VAR (new_filename);
@@ -132 +132 @@
 
   /* First, transform the name part.  */
-  for (i = 0; *filename != '\0'; ++i)
-  {
-    *df++ = tolower ((unsigned char)*filename);
-    ++filename;
-  }
+  while (*filename != '\0')
+    {
+      *df++ = tolower ((unsigned char)*filename);
+      ++filename;
+    }
 
   *df = 0;
@@ -217 +217 @@
     dev_t dev;                  /* Device and inode numbers of this dir.  */
 #ifdef WINDOWS32
-    /*
-     * Inode means nothing on WINDOWS32. Even file key information is
-     * unreliable because it is random per file open and undefined
-     * for remote filesystems. The most unique attribute I can
-     * come up with is the fully qualified name of the directory. Beware
-     * though, this is also unreliable. I'm open to suggestion on a better
-     * way to emulate inode.
-     */
+    /* Inode means nothing on WINDOWS32. Even file key information is
+     * unreliable because it is random per file open and undefined for remote
+     * filesystems. The most unique attribute I can come up with is the fully
+     * qualified name of the directory. Beware though, this is also
+     * unreliable. I'm open to suggestion on a better way to emulate inode.  */
     char *path_key;
     int   ctime;
     int   mtime;        /* controls check for stale directory cache */
     int   fs_flags;     /* FS_FAT, FS_NTFS, ... */
-#define FS_FAT      0x1
-#define FS_NTFS     0x2
-#define FS_UNKNOWN  0x4
-#else
-#ifdef VMS
+# define FS_FAT      0x1
+# define FS_NTFS     0x2
+# define FS_UNKNOWN  0x4
+#else
+# ifdef VMS
     ino_t ino[3];
-#else
+# else
     ino_t ino;
-#endif
+# endif
 #endif /* WINDOWS32 */
     struct hash_table dirfiles; /* Files in this directory.  */
@@ -246 +243 @@
 directory_contents_hash_1 (const void *key_0)
 {
-  struct directory_contents const *key = (struct directory_contents const *) key_0;
+  const struct directory_contents *key = key_0;
   unsigned long hash;
 
@@ -269 +266 @@
 directory_contents_hash_2 (const void *key_0)
 {
-  struct directory_contents const *key = (struct directory_contents const *) key_0;
+  const struct directory_contents *key = key_0;
   unsigned long hash;
 
@@ -304 +301 @@
 directory_contents_hash_cmp (const void *xv, const void *yv)
 {
-  struct directory_contents const *x = (struct directory_contents const *) xv;
-  struct directory_contents const *y = (struct directory_contents const *) yv;
+  const struct directory_contents *x = xv;
+  const struct directory_contents *y = yv;
   int result;
 
@@ -341 +338 @@
 struct directory
   {
-    char *name;                 /* Name of the directory.  */
+    const char *name;                   /* Name of the directory.  */
 
     /* The directory's contents.  This data may be shared by several
@@ -352 +349 @@
 directory_hash_1 (const void *key)
 {
-  return_ISTRING_HASH_1 (((struct directory const *) key)->name);
+  return_ISTRING_HASH_1 (((const struct directory *) key)->name);
 }
 
@@ -358 +355 @@
 directory_hash_2 (const void *key)
 {
-  return_ISTRING_HASH_2 (((struct directory const *) key)->name);
+  return_ISTRING_HASH_2 (((const struct directory *) key)->name);
 }
 
@@ -364 +361 @@
 directory_hash_cmp (const void *x, const void *y)
 {
-  return_ISTRING_COMPARE (((struct directory const *) x)->name,
-                          ((struct directory const *) y)->name);
+  return_ISTRING_COMPARE (((const struct directory *) x)->name,
+                          ((const struct directory *) y)->name);
 }
 
@@ -382 +379 @@
 struct dirfile
   {
-    char *name;                 /* Name of the file.  */
+    const char *name;           /* Name of the file.  */
     short length;
     short impossible;           /* This file is impossible.  */
@@ -402 +399 @@
 dirfile_hash_cmp (const void *xv, const void *yv)
 {
-  struct dirfile const *x = ((struct dirfile const *) xv);
-  struct dirfile const *y = ((struct dirfile const *) yv);
+  const struct dirfile *x = xv;
+  const struct dirfile *y = yv;
   int result = x->length - y->length;
   if (result)
@@ -415 +412 @@
 
 
-static int dir_contents_file_exists_p PARAMS ((struct directory_contents *dir, char *filename));
-static struct directory *find_directory PARAMS ((char *name));
+static int dir_contents_file_exists_p (struct directory_contents *dir,
+                                       const char *filename);
+static struct directory *find_directory (const char *name);
 
 /* Find the directory named NAME and return its `struct directory'.  */
 
 static struct directory *
-find_directory (char *name)
-{
-  register char *p;
-  register struct directory *dir;
-  register struct directory **dir_slot;
+find_directory (const char *name)
+{
+  const char *p;
+  struct directory *dir;
+  struct directory **dir_slot;
   struct directory dir_key;
   int r;
@@ -454 +452 @@
 
       p = name + strlen (name);
-      dir = (struct directory *) xmalloc (sizeof (struct directory));
-      dir->name = savestring (name, p - name);
+      dir = xmalloc (sizeof (struct directory));
+      dir->name = strcache_add_len (name, p - name);
       hash_insert_at (&directories, dir, dir_slot);
       /* The directory is not in the name hash table.
@@ -553 +551 @@
               ENULLLOOP (dc->dirstream, opendir (name));
               if (dc->dirstream == 0)
-                /* Couldn't open the directory.  Mark this by
-                   setting the `files' member to a nil pointer.  */
+                /* Couldn't open the directory.  Mark this by setting the
+                   `files' member to a nil pointer.  */
                 dc->dirfiles.ht_vec = 0;
               else
@@ -565 +563 @@
                     /* We have too many directories open already.
                        Read the entire directory and then close it.  */
-                    (void) dir_contents_file_exists_p (dc, (char *) 0);
+                    dir_contents_file_exists_p (dc, 0);
                 }
             }
@@ -582 +580 @@
 
 static int
-dir_contents_file_exists_p (struct directory_contents *dir, char *filename)
+dir_contents_file_exists_p (struct directory_contents *dir,
+                            const char *filename)
 {
   unsigned int hash;
@@ -593 +592 @@
 
   if (dir == 0 || dir->dirfiles.ht_vec == 0)
-    {
     /* The directory could not be stat'd or opened.  */
-      return 0;
-    }
+    return 0;
+
 #ifdef __MSDOS__
   filename = dosify (filename);
@@ -626 +624 @@
       dirfile_key.name = filename;
       dirfile_key.length = strlen (filename);
-      df = (struct dirfile *) hash_find_item (&dir->dirfiles, &dirfile_key);
+      df = hash_find_item (&dir->dirfiles, &dirfile_key);
       if (df)
-        {
-          return !df->impossible;
-        }
+        return !df->impossible;
     }
 
@@ -651 +647 @@
               rehash = 1;
             }
-          else if (stat(dir->path_key, &st) == 0 && st.st_mtime > dir->mtime)
+          else if (stat (dir->path_key, &st) == 0 && st.st_mtime > dir->mtime)
             {
               /* reset date stamp to show most recent re-process.  */
@@ -663 +659 @@
 
           /* make sure directory can still be opened; if not return.  */
-          dir->dirstream = opendir(dir->path_key);
+          dir->dirstream = opendir (dir->path_key);
           if (!dir->dirstream)
             return 0;
@@ -682 +678 @@
       ENULLLOOP (d, readdir (dir->dirstream));
       if (d == 0)
-        break;
+        {
+          if (errno)
+            fatal (NILF, "INTERNAL: readdir: %s\n", strerror (errno));
+          break;
+        }
 
 #if defined(VMS) && defined(HAVE_DIRENT_H)
@@ -707 +707 @@
 #endif
         {
-          df = (struct dirfile *) xmalloc (sizeof (struct dirfile));
-          df->name = savestring (d->d_name, len);
+          df = xmalloc (sizeof (struct dirfile));
+          df->name = strcache_add_len (d->d_name, len);
           df->length = len;
           df->impossible = 0;
@@ -715 +715 @@
       /* Check if the name matches the one we're searching for.  */
       if (filename != 0 && strieq (d->d_name, filename))
-        {
-          return 1;
-        }
+        return 1;
     }
 
@@ -736 +734 @@
 
 int
-dir_file_exists_p (char *dirname, char *filename)
+dir_file_exists_p (const char *dirname, const char *filename)
 {
   return dir_contents_file_exists_p (find_directory (dirname)->contents,
@@ -746 +744 @@
 
 int
-file_exists_p (char *name)
-{
-  char *dirend;
-  char *dirname;
-  char *slash;
+file_exists_p (const char *name)
+{
+  const char *dirend;
+  const char *dirname;
+  const char *slash;
 
 #ifndef NO_ARCHIVES
@@ -761 +759 @@
   if (dirend == 0)
     dirend = strrchr (name, ':');
-  if (dirend == (char *)0)
+  if (dirend == 0)
     return dir_file_exists_p ("[]", name);
 #else /* !VMS */
@@ -768 +766 @@
   /* Forward and backslashes might be mixed.  We need the rightmost one.  */
   {
-    char *bslash = strrchr(name, '\\');
+    const char *bslash = strrchr(name, '\\');
     if (!dirend || bslash > dirend)
       dirend = bslash;
@@ -789 +787 @@
   else
     {
+      char *p;
 #ifdef HAVE_DOS_PATHS
   /* d:/ and d: are *very* different...  */
@@ -795 +794 @@
         dirend++;
 #endif
-      dirname = (char *) alloca (dirend - name + 1);
-      bcopy (name, dirname, dirend - name);
-      dirname[dirend - name] = '\0';
+      p = alloca (dirend - name + 1);
+      memcpy (p, name, dirend - name);
+      p[dirend - name] = '\0';
+      dirname = p;
     }
   return dir_file_exists_p (dirname, slash + 1);
@@ -808 +808 @@
 
 void
-file_impossible (char *filename)
-{
-  char *dirend;
-  register char *p = filename;
-  register struct directory *dir;
-  register struct dirfile *new;
+file_impossible (const char *filename)
+{
+  const char *dirend;
+  const char *p = filename;
+  struct directory *dir;
+  struct dirfile *new;
 
 #ifdef VMS
@@ -827 +827 @@
   /* Forward and backslashes might be mixed.  We need the rightmost one.  */
   {
-    char *bslash = strrchr(p, '\\');
+    const char *bslash = strrchr(p, '\\');
     if (!dirend || bslash > dirend)
       dirend = bslash;
@@ -844 +844 @@
   else
     {
-      char *dirname;
-      char *slash = dirend;
+      const char *dirname;
+      const char *slash = dirend;
       if (dirend == p)
         dirname = "/";
       else
         {
+          char *cp;
 #ifdef HAVE_DOS_PATHS
           /* d:/ and d: are *very* different...  */
@@ -856 +857 @@
             dirend++;
 #endif
-          dirname = (char *) alloca (dirend - p + 1);
-          bcopy (p, dirname, dirend - p);
-          dirname[dirend - p] = '\0';
+          cp = alloca (dirend - p + 1);
+          memcpy (cp, p, dirend - p);
+          cp[dirend - p] = '\0';
+          dirname = cp;
         }
       dir = find_directory (dirname);
@@ -868 +870 @@
       /* The directory could not be stat'd.  We allocate a contents
          structure for it, but leave it out of the contents hash table.  */
-      dir->contents = (struct directory_contents *)
-        xmalloc (sizeof (struct directory_contents));
-      bzero ((char *) dir->contents, sizeof (struct directory_contents));
+      dir->contents = xmalloc (sizeof (struct directory_contents));
+      memset (dir->contents, '\0', sizeof (struct directory_contents));
     }
 
@@ -881 +882 @@
   /* Make a new entry and put it in the table.  */
 
-  new = (struct dirfile *) xmalloc (sizeof (struct dirfile));
-  new->name = xstrdup (filename);
+  new = xmalloc (sizeof (struct dirfile));
   new->length = strlen (filename);
+  new->name = strcache_add_len (filename, new->length);
   new->impossible = 1;
   hash_insert (&dir->contents->dirfiles, new);
@@ -892 +893 @@
 
 int
-file_impossible_p (char *filename)
-{
-  char *dirend;
-  register char *p = filename;
-  register struct directory_contents *dir;
-  register struct dirfile *dirfile;
+file_impossible_p (const char *filename)
+{
+  const char *dirend;
+  const char *p = filename;
+  struct directory_contents *dir;
+  struct dirfile *dirfile;
   struct dirfile dirfile_key;
 
@@ -909 +910 @@
   /* Forward and backslashes might be mixed.  We need the rightmost one.  */
   {
-    char *bslash = strrchr(filename, '\\');
+    const char *bslash = strrchr(filename, '\\');
     if (!dirend || bslash > dirend)
       dirend = bslash;
@@ -926 +927 @@
   else
     {
-      char *dirname;
-      char *slash = dirend;
+      const char *dirname;
+      const char *slash = dirend;
       if (dirend == filename)
         dirname = "/";
       else
         {
+          char *cp;
 #ifdef HAVE_DOS_PATHS
           /* d:/ and d: are *very* different...  */
@@ -938 +940 @@
             dirend++;
 #endif
-          dirname = (char *) alloca (dirend - filename + 1);
-          bcopy (p, dirname, dirend - p);
-          dirname[dirend - p] = '\0';
+          cp = alloca (dirend - filename + 1);
+          memcpy (cp, p, dirend - p);
+          cp[dirend - p] = '\0';
+          dirname = cp;
         }
       dir = find_directory (dirname)->contents;
@@ -962 +965 @@
   dirfile_key.name = filename;
   dirfile_key.length = strlen (filename);
-  dirfile = (struct dirfile *) hash_find_item (&dir->dirfiles, &dirfile_key);
+  dirfile = hash_find_item (&dir->dirfiles, &dirfile_key);
   if (dirfile)
     return dirfile->impossible;
@@ -973 +976 @@
    directory hash table that matches DIR.  */
 
-char *
-dir_name (char *dir)
+const char *
+dir_name (const char *dir)
 {
   return find_directory (dir)->name;
@@ -985 +988 @@
 print_dir_data_base (void)
 {
-  register unsigned int files;
-  register unsigned int impossible;
-  register struct directory **dir_slot;
-  register struct directory **dir_end;
+  unsigned int files;
+  unsigned int impossible;
+  struct directory **dir_slot;
+  struct directory **dir_end;
 
   puts (_("\n# Directories\n"));
@@ -998 +1001 @@
   for ( ; dir_slot < dir_end; dir_slot++)
     {
-      register struct directory *dir = *dir_slot;
+      struct directory *dir = *dir_slot;
       if (! HASH_VACANT (dir))
         {
@@ -1023 +1026 @@
           else
             {
-              register unsigned int f = 0;
-              register unsigned int im = 0;
-              register struct dirfile **files_slot;
-              register struct dirfile **files_end;
+              unsigned int f = 0;
+              unsigned int im = 0;
+              struct dirfile **files_slot;
+              struct dirfile **files_end;
 
               files_slot = (struct dirfile **) dir->contents->dirfiles.ht_vec;
@@ -1032 +1035 @@
               for ( ; files_slot < files_end; files_slot++)
                 {
-                  register struct dirfile *df = *files_slot;
+                  struct dirfile *df = *files_slot;
                   if (! HASH_VACANT (df))
                     {
@@ -1103 +1106 @@
 
 /* Forward declarations.  */
-static __ptr_t open_dirstream PARAMS ((const char *));
-static struct dirent *read_dirstream PARAMS ((__ptr_t));
+static __ptr_t open_dirstream (const char *);
+static struct dirent *read_dirstream (__ptr_t);
 
 static __ptr_t
@@ -1110 +1113 @@
 {
   struct dirstream *new;
-  struct directory *dir = find_directory ((char *)directory);
+  struct directory *dir = find_directory (directory);
 
   if (dir->contents == 0 || dir->contents->dirfiles.ht_vec == 0)
@@ -1120 +1123 @@
      in being lazy, since glob will want to see every file anyway.  */
 
-  (void) dir_contents_file_exists_p (dir->contents, (char *) 0);
-
-  new = (struct dirstream *) xmalloc (sizeof (struct dirstream));
+  dir_contents_file_exists_p (dir->contents, 0);
+
+  new = xmalloc (sizeof (struct dirstream));
   new->contents = dir->contents;
   new->dirfile_slot = (struct dirfile **) new->contents->dirfiles.ht_vec;
@@ -1132 +1135 @@
 read_dirstream (__ptr_t stream)
 {
+  static char *buf;
+  static unsigned int bufsz;
+
   struct dirstream *const ds = (struct dirstream *) stream;
   struct directory_contents *dc = ds->contents;
   struct dirfile **dirfile_end = (struct dirfile **) dc->dirfiles.ht_vec + dc->dirfiles.ht_size;
-  static char *buf;
-  static unsigned int bufsz;
 
   while (ds->dirfile_slot < dirfile_end)
     {
-      register struct dirfile *df = *ds->dirfile_slot++;
+      struct dirfile *df = *ds->dirfile_slot++;
       if (! HASH_VACANT (df) && !df->impossible)
         {
-          /* The glob interface wants a `struct dirent',
-             so mock one up.  */
+          /* The glob interface wants a `struct dirent', so mock one up.  */
           struct dirent *d;
           unsigned int len = df->length + 1;
-          if (sizeof *d - sizeof d->d_name + len > bufsz)
+          unsigned int sz = sizeof (*d) - sizeof (d->d_name) + len;
+          if (sz > bufsz)
             {
-              if (buf != 0)
-                free (buf);
               bufsz *= 2;
-              if (sizeof *d - sizeof d->d_name + len > bufsz)
-                bufsz = sizeof *d - sizeof d->d_name + len;
-              buf = xmalloc (bufsz);
+              if (sz > bufsz)
+                bufsz = sz;
+              buf = xrealloc (buf, bufsz);
             }
           d = (struct dirent *) buf;
@@ -1191 +1193 @@
 #ifndef stat
 # ifndef VMS
-extern int stat PARAMS ((const char *path, struct stat *sbuf));
+int stat (const char *path, struct stat *sbuf);
 # endif
 # define local_stat stat
@@ -1208 +1210 @@
 dir_setup_glob (glob_t *gl)
 {
-  /* Bogus sunos4 compiler complains (!) about & before functions.  */
   gl->gl_opendir = open_dirstream;
   gl->gl_readdir = read_dirstream;
@@ -1223 +1224 @@
              directory_hash_1, directory_hash_2, directory_hash_cmp);
   hash_init (&directory_contents, DIRECTORY_BUCKETS,
-             directory_contents_hash_1, directory_contents_hash_2, directory_contents_hash_cmp);
-}
+             directory_contents_hash_1, directory_contents_hash_2,
+             directory_contents_hash_cmp);
+}