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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2002-05-31 Christopher Faylor <cgf@redhat.com>
* fhandler_disk_file.cc (readdir): Move inode calculation into caller.
(fhandler_cygdrive::readdir): Add "." and "..".
* dir.cc (readdir): Move inode calculation here so that fhandler
readdirs can benefit.
2002-05-31 Christopher Faylor <cgf@redhat.com> 2002-05-31 Christopher Faylor <cgf@redhat.com>
* fhandler_console.cc (fhandler_console::open): Reinstate setting of * fhandler_console.cc (fhandler_console::open): Reinstate setting of

37
winsup/cygwin/dir.cc
View File

@ -113,7 +113,42 @@ readdir (DIR *dir)
return NULL; 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 extern "C" __off64_t

50
winsup/cygwin/fhandler_disk_file.cc
View File

@ -656,37 +656,6 @@ fhandler_disk_file::readdir (DIR *dir)
} }
} }
/* Compute d_ino by combining filename hash with the directory hash
(which was stored in dir->__d_dirhash when opendir was called). */
if (buf.cFileName[0] == '.')
{
if (buf.cFileName[1] == '\0')
dir->__d_dirent->d_ino = dir->__d_dirhash;
else if (buf.cFileName[1] != '.' || buf.cFileName[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, buf.cFileName);
}
dir->__d_position++; dir->__d_position++;
res = dir->__d_dirent; res = dir->__d_dirent;
syscall_printf ("%p = readdir (%p) (%s)", syscall_printf ("%p = readdir (%p) (%s)",
@ -784,13 +753,26 @@ fhandler_cygdrive::readdir (DIR *dir)
set_errno (ENMFILE); set_errno (ENMFILE);
return NULL; return NULL;
} }
if (GetFileAttributes (pdrive) == INVALID_FILE_ATTRIBUTES) if (dir->__d_position == 0)
{
*dir->__d_dirent->d_name = '.';
dir->__d_dirent->d_name[1] = '\0';
}
else if (dir->__d_position == 1)
{
dir->__d_dirent->d_name[0] = dir->__d_dirent->d_name[1] = '.';
dir->__d_dirent->d_name[2] = '\0';
}
else if (GetFileAttributes (pdrive) == INVALID_FILE_ATTRIBUTES)
{ {
pdrive += DRVSZ; pdrive += DRVSZ;
return readdir (dir); return readdir (dir);
} }
*dir->__d_dirent->d_name = cyg_tolower (*pdrive); else
dir->__d_dirent->d_name[1] = '\0'; {
*dir->__d_dirent->d_name = cyg_tolower (*pdrive);
dir->__d_dirent->d_name[1] = '\0';
}
dir->__d_position++; dir->__d_position++;
pdrive += DRVSZ; pdrive += DRVSZ;
syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir, syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,