github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-22 15:51:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/dir.c (dir_contents_file_exists_p): Show dir name in error.

Browse Source 
If we fail to read a directory show the directory name in the error
message.  Pass struct directory instead of directory_contents to
allow that.
(dir_file_exists_p): Change dir_contents_file_exists_p caller.
(open_dirstrem): Ditto.
This commit is contained in:
Paul Smith 2022-11-07 13:08:11 -05:00
parent 92ab2e642d
commit bb5df35133
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/dir.c
View File

@ -456,7 +456,7 @@ dirfile_hash_cmp (const void *xv, const void *yv)
#define DIRFILE_BUCKETS 107 #define DIRFILE_BUCKETS 107
#endif #endif
static int dir_contents_file_exists_p (struct directory_contents *dir, static int dir_contents_file_exists_p (struct directory *dir,
const char *filename); const char *filename);
static struct directory *find_directory (const char *name); static struct directory *find_directory (const char *name);
@ -623,7 +623,7 @@ find_directory (const char *name)
if (open_directories == MAX_OPEN_DIRECTORIES) if (open_directories == MAX_OPEN_DIRECTORIES)
/* We have too many directories open already. /* We have too many directories open already.
Read the entire directory and then close it. */ Read the entire directory and then close it. */
dir_contents_file_exists_p (dc, 0); dir_contents_file_exists_p (dir, 0);
} }
} }
@ -634,17 +634,18 @@ find_directory (const char *name)
FILENAME must contain no slashes. */ FILENAME must contain no slashes. */
static int static int
dir_contents_file_exists_p (struct directory_contents *dir, dir_contents_file_exists_p (struct directory *dir,
const char *filename) const char *filename)
{ {
struct dirfile *df; struct dirfile *df;
struct dirent *d; struct dirent *d;
struct directory_contents *dc = dir->contents;
#ifdef WINDOWS32 #ifdef WINDOWS32
struct stat st; struct stat st;
int rehash = 0; int rehash = 0;
#endif #endif
if (dir == 0 || dir->dirfiles.ht_vec == 0) if (dc == 0 || dc->dirfiles.ht_vec == 0)
/* The directory could not be stat'd or opened. */ /* The directory could not be stat'd or opened. */
return 0; return 0;
@ -671,7 +672,7 @@ dir_contents_file_exists_p (struct directory_contents *dir,
} }
dirfile_key.name = filename; dirfile_key.name = filename;
dirfile_key.length = strlen (filename); dirfile_key.length = strlen (filename);
df = hash_find_item (&dir->dirfiles, &dirfile_key); df = hash_find_item (&dc->dirfiles, &dirfile_key);
if (df) if (df)
return !df->impossible; return !df->impossible;
} }
@ -679,7 +680,7 @@ dir_contents_file_exists_p (struct directory_contents *dir,
/* The file was not found in the hashed list. /* The file was not found in the hashed list.
Try to read the directory further. */ Try to read the directory further. */
if (dir->dirstream == 0) if (dc->dirstream == 0)
{ {
#ifdef WINDOWS32 #ifdef WINDOWS32
/* /*
@ -687,17 +688,17 @@ dir_contents_file_exists_p (struct directory_contents *dir,
* filesystems force a rehash always as mtime does not change * filesystems force a rehash always as mtime does not change
* on directories (ugh!). * on directories (ugh!).
*/ */
if (dir->path_key) if (dc->path_key)
{ {
if ((dir->fs_flags & FS_FAT) != 0) if ((dc->fs_flags & FS_FAT) != 0)
{ {
dir->mtime = time ((time_t *) 0); dc->mtime = time ((time_t *) 0);
rehash = 1; rehash = 1;
} }
else if (stat (dir->path_key, &st) == 0 && st.st_mtime > dir->mtime) else if (stat (dc->path_key, &st) == 0 && st.st_mtime > dc->mtime)
{ {
/* reset date stamp to show most recent re-process. */ /* reset date stamp to show most recent re-process. */
dir->mtime = st.st_mtime; dc->mtime = st.st_mtime;
rehash = 1; rehash = 1;
} }
@ -706,8 +707,8 @@ dir_contents_file_exists_p (struct directory_contents *dir,
return 0; return 0;
/* make sure directory can still be opened; if not return. */ /* make sure directory can still be opened; if not return. */
dir->dirstream = opendir (dir->path_key); dc->dirstream = opendir (dc->path_key);
if (!dir->dirstream) if (!dc->dirstream)
return 0; return 0;
} }
else else
@ -723,11 +724,11 @@ dir_contents_file_exists_p (struct directory_contents *dir,
struct dirfile dirfile_key; struct dirfile dirfile_key;
struct dirfile **dirfile_slot; struct dirfile **dirfile_slot;
ENULLLOOP (d, readdir (dir->dirstream)); ENULLLOOP (d, readdir (dc->dirstream));
if (d == 0) if (d == 0)
{ {
if (errno) if (errno)
pfatal_with_name ("INTERNAL: readdir"); OSS (fatal, NILF, "readdir %s: %s", dir->name, strerror (errno));
break; break;
} }
@ -747,7 +748,7 @@ dir_contents_file_exists_p (struct directory_contents *dir,
len = NAMLEN (d); len = NAMLEN (d);
dirfile_key.name = d->d_name; dirfile_key.name = d->d_name;
dirfile_key.length = len; dirfile_key.length = len;
dirfile_slot = (struct dirfile **) hash_find_slot (&dir->dirfiles, &dirfile_key); dirfile_slot = (struct dirfile **) hash_find_slot (&dc->dirfiles, &dirfile_key);
#ifdef WINDOWS32 #ifdef WINDOWS32
/* /*
* If re-reading a directory, don't cache files that have * If re-reading a directory, don't cache files that have
@ -768,7 +769,7 @@ dir_contents_file_exists_p (struct directory_contents *dir,
#endif #endif
df->length = len; df->length = len;
df->impossible = 0; df->impossible = 0;
hash_insert_at (&dir->dirfiles, df, dirfile_slot); hash_insert_at (&dc->dirfiles, df, dirfile_slot);
} }
/* Check if the name matches the one we're searching for. */ /* Check if the name matches the one we're searching for. */
if (filename != 0 && patheq (d->d_name, filename)) if (filename != 0 && patheq (d->d_name, filename))
@ -777,12 +778,13 @@ dir_contents_file_exists_p (struct directory_contents *dir,
/* If the directory has been completely read in, /* If the directory has been completely read in,
close the stream and reset the pointer to nil. */ close the stream and reset the pointer to nil. */
if (d == 0) if (d == NULL)
{ {
--open_directories; --open_directories;
closedir (dir->dirstream); closedir (dc->dirstream);
dir->dirstream = 0; dc->dirstream = NULL;
} }
return 0; return 0;
} }
@ -794,15 +796,10 @@ int
dir_file_exists_p (const char *dirname, const char *filename) dir_file_exists_p (const char *dirname, const char *filename)
{ {
#ifdef VMS #ifdef VMS
if ((filename != NULL) && (dirname != NULL)) if (filename && dirname && strpbrk (dirname, ":<[") != NULL)
{ filename = vmsify (filename, 0);
int want_vmsify;
want_vmsify = (strpbrk (dirname, ":<[") != NULL);
if (want_vmsify)
filename = vmsify (filename, 0);
}
#endif #endif
return dir_contents_file_exists_p (find_directory (dirname)->contents, return dir_contents_file_exists_p (find_directory (dirname),
filename); filename);
} }
@ -1225,7 +1222,7 @@ open_dirstream (const char *directory)
/* Read all the contents of the directory now. There is no benefit /* Read all the contents of the directory now. There is no benefit
in being lazy, since glob will want to see every file anyway. */ in being lazy, since glob will want to see every file anyway. */
dir_contents_file_exists_p (dir->contents, 0); dir_contents_file_exists_p (dir, 0);
new = xmalloc (sizeof (struct dirstream)); new = xmalloc (sizeof (struct dirstream));
new->contents = dir->contents; new->contents = dir->contents;