libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler_disk_file.cc (fhandler_cygdrive::set_drives): Incorporate . and .. 

processing here.
(fhandler_cygdrive::readdir): Assume .  and ..  are already in pdrive.
(fhandler_cygdrive::seekdir): Ditto.
This commit is contained in:
Christopher Faylor 2002-07-30 14:17:17 +00:00
parent b96332ce3c
commit 5ba08a9238
2 changed files with 20 additions and 15 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-07-30 Christopher Faylor <cgf@redhat.com>
* fhandler_disk_file.cc (fhandler_cygdrive::set_drives): Incorporate .
and .. processing here.
(fhandler_cygdrive::readdir): Assume . and .. are already in pdrive.
(fhandler_cygdrive::seekdir): Ditto.
2002-07-29 Christopher Faylor <cgf@redhat.com> 2002-07-29 Christopher Faylor <cgf@redhat.com>
* dcrt0.cc (dll_crt0_1): Move debug_fixup_after_fork_exec. * dcrt0.cc (dll_crt0_1): Move debug_fixup_after_fork_exec.

28
winsup/cygwin/fhandler_disk_file.cc
View File

@ -730,9 +730,13 @@ void
fhandler_cygdrive::set_drives () fhandler_cygdrive::set_drives ()
{ {
const int len = 1 + 26 * DRVSZ; const int len = 1 + 26 * DRVSZ;
char *p = (char *) crealloc ((void *) win32_path_name, len); char *p = (char *) crealloc ((void *) win32_path_name,
sizeof (".") + sizeof ("..") + len);
win32_path_name = pdrive = p; win32_path_name = pdrive = p;
strcpy (p, ".");
strcpy (p + sizeof ("."), "..");
p += sizeof (".") + sizeof ("..");
ndrives = GetLogicalDriveStrings (len, p) / DRVSZ; ndrives = GetLogicalDriveStrings (len, p) / DRVSZ;
} }
@ -770,28 +774,21 @@ fhandler_cygdrive::readdir (DIR *dir)
set_errno (ENMFILE); set_errno (ENMFILE);
return NULL; return NULL;
} }
if (dir->__d_position == 0) else if (dir->__d_position > 1
&& GetFileAttributes (pdrive) == INVALID_FILE_ATTRIBUTES)
{ {
*dir->__d_dirent->d_name = '.'; pdrive = strchr (pdrive, '\0') + 1;
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;
return readdir (dir); return readdir (dir);
} }
else if (*pdrive == '.')
strcpy (dir->__d_dirent->d_name, pdrive);
else else
{ {
*dir->__d_dirent->d_name = cyg_tolower (*pdrive); *dir->__d_dirent->d_name = cyg_tolower (*pdrive);
dir->__d_dirent->d_name[1] = '\0'; dir->__d_dirent->d_name[1] = '\0';
} }
dir->__d_position++; dir->__d_position++;
pdrive += DRVSZ; pdrive = strchr (pdrive, '\0') + 1;
syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir, syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,
dir->__d_dirent->d_name); dir->__d_dirent->d_name);
return dir->__d_dirent; return dir->__d_dirent;
@ -809,7 +806,8 @@ fhandler_cygdrive::seekdir (DIR *dir, __off64_t loc)
if (!iscygdrive_root ()) if (!iscygdrive_root ())
return fhandler_disk_file::seekdir (dir, loc); return fhandler_disk_file::seekdir (dir, loc);
for (pdrive = win32_path_name, dir->__d_position = -1; *pdrive; pdrive += DRVSZ) for (pdrive = win32_path_name, dir->__d_position = -1; *pdrive;
pdrive = strchr (pdrive, '\0') + 1)
if (++dir->__d_position >= loc) if (++dir->__d_position >= loc)
break; break;