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

* include/sys/dirent.h: Change __deprecated_d_ino to __invalid_d_ino throughout

Browse Source 
to make things a little clearer.
* dir.cc (readdir_worker): Reflect above change.
This commit is contained in:
Christopher Faylor 2005-12-19 04:00:41 +00:00
parent ad02bb70e3
commit ca9271d1b6
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2005-12-18 Christopher Faylor <cgf@timesys.com>
* include/sys/dirent.h: Change __deprecated_d_ino to __invalid_d_ino
throughout to make things a little clearer.
* dir.cc (readdir_worker): Reflect above change.
2005-12-16 Christopher Faylor <cgf@timesys.com> 2005-12-16 Christopher Faylor <cgf@timesys.com>
* winsup.h (child_copy): Change prototype to match new functionality. * winsup.h (child_copy): Change prototype to match new functionality.

14
winsup/cygwin/dir.cc
View File

@ -103,18 +103,18 @@ readdir_worker (DIR *dir, dirent *de)
if (!res) if (!res)
if (!CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO) if (!CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO)
{ {
de->__deprecated_d_ino = 0; de->__invalid_d_ino = 0;
de->__ino32 = 0; de->__ino32 = 0;
} }
else else
{ {
/* Compute __deprecated_d_ino by combining filename hash with the directory hash /* Compute __invalid_d_ino by combining filename hash with the directory hash
(which was stored in dir->__d_dirhash when opendir was called). */ (which was stored in dir->__d_dirhash when opendir was called). */
if (de->d_name[0] == '.') if (de->d_name[0] == '.')
{ {
if (de->d_name[1] == '\0') if (de->d_name[1] == '\0')
{ {
de->__deprecated_d_ino = dir->__d_dirhash; de->__invalid_d_ino = dir->__d_dirhash;
dir->__flags |= dirent_saw_dot; dir->__flags |= dirent_saw_dot;
} }
else if (de->d_name[1] != '.' || de->d_name[2] != '\0') else if (de->d_name[1] != '.' || de->d_name[2] != '\0')
@ -128,11 +128,11 @@ readdir_worker (DIR *dir, dirent *de)
goto hashit; goto hashit;
*p = '\0'; *p = '\0';
if (!(p = strrchr (up, '\\'))) if (!(p = strrchr (up, '\\')))
de->__deprecated_d_ino = hash_path_name (0, "."); de->__invalid_d_ino = hash_path_name (0, ".");
else else
{ {
*p = '\0'; *p = '\0';
de->__deprecated_d_ino = hash_path_name (0, up); de->__invalid_d_ino = hash_path_name (0, up);
} }
} }
} }
@ -140,9 +140,9 @@ readdir_worker (DIR *dir, dirent *de)
{ {
hashit: hashit:
__ino64_t dino = hash_path_name (dir->__d_dirhash, "\\"); __ino64_t dino = hash_path_name (dir->__d_dirhash, "\\");
de->__deprecated_d_ino = hash_path_name (dino, de->d_name); de->__invalid_d_ino = hash_path_name (dino, de->d_name);
} }
de->__ino32 = de->__deprecated_d_ino; // for legacy applications de->__ino32 = de->__invalid_d_ino; // for legacy applications
} }
return res; return res;
} }

6
winsup/cygwin/include/sys/dirent.h
View File

@ -20,7 +20,7 @@
struct dirent struct dirent
{ {
long d_version; /* Used since Cygwin 1.3.3. */ long d_version; /* Used since Cygwin 1.3.3. */
__ino64_t __deprecated_d_ino; __ino64_t __invalid_d_ino;
long d_fd; /* File descriptor of open directory. long d_fd; /* File descriptor of open directory.
Used since Cygwin 1.3.3. */ Used since Cygwin 1.3.3. */
unsigned __ino32; unsigned __ino32;
@ -31,7 +31,7 @@ struct dirent
struct dirent struct dirent
{ {
long d_version; long d_version;
ino_t __deprecated_d_ino; ino_t __invalid_d_ino;
long d_fd; long d_fd;
unsigned long __ino32; unsigned long __ino32;
char d_name[256]; char d_name[256];
@ -42,7 +42,7 @@ struct dirent
long d_version; long d_version;
long d_reserved[2]; long d_reserved[2];
long d_fd; long d_fd;
ino_t __deprecated_d_ino; ino_t __invalid_d_ino;
char d_name[256]; char d_name[256];
}; };
#endif #endif