JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_disk_file.cc (readdir): Move inode calculation into caller.

Browse Source 
(fhandler_cygdrive::readdir): Add "." and "..".
* dir.cc (readdir): Move inode calculation here so that fhandler readdirs can
benefit.
This commit is contained in:
Christopher Faylor
2002-06-01 02:45:38 +00:00
parent 548e208b82
commit 28af03faed
3 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
winsup/cygwin/dir.cc
View File

@@ -113,7 +113,42 @@ readdir (DIR *dir)
return NULL;
}
return ((fhandler_base *) dir->__d_u.__d_data.__fh)->readdir (dir);
dirent *res = ((fhandler_base *) dir->__d_u.__d_data.__fh)->readdir (dir);
if (res)
{
/* Compute d_ino by combining filename hash with the directory hash
(which was stored in dir->__d_dirhash when opendir was called). */
if (res->d_name[0] == '.')
{
if (res->d_name[1] == '\0')
dir->__d_dirent->d_ino = dir->__d_dirhash;
else if (res->d_name[1] != '.' || res->d_name[2] != '\0')
goto hashit;
else
{
char *p, up[strlen (dir->__d_dirname) + 1];
strcpy (up, dir->__d_dirname);
if (!(p = strrchr (up, '\\')))
goto hashit;
*p = '\0';
if (!(p = strrchr (up, '\\')))
dir->__d_dirent->d_ino = hash_path_name (0, ".");
else
{
*p = '\0';
dir->__d_dirent->d_ino = hash_path_name (0, up);
}
}
}
else
{
hashit:
ino_t dino = hash_path_name (dir->__d_dirhash, "\\");
dir->__d_dirent->d_ino = hash_path_name (dino, res->d_name);
}
}
return res;
}
extern "C" __off64_t