AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
1998-03-10 19:43  Matthias Urlichs <urlichs@noris.de>

	* sysdeps/unix/readdir_r.c: zero out *result on EOF.
	* sysdeps/unix/sysv/linux/readdir64_r.c: Likewise.
	* manual/filesys/texi: document this.
This commit is contained in:
Ulrich Drepper 1998-03-10 11:10:51 +00:00
parent 54fce91d60
commit c063ba610a
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
1998-03-10 19:43 Matthias Urlichs <urlichs@noris.de>
* sysdeps/unix/readdir_r.c: zero out *result on EOF.
* sysdeps/unix/sysv/linux/readdir64_r.c: Likewise.
* manual/filesys/texi: document this.
1998-03-10 10:49 Ulrich Drepper <drepper@cygnus.com> 1998-03-10 10:49 Ulrich Drepper <drepper@cygnus.com>
* manual/filesys.texi: Document the change below. * manual/filesys.texi: Document the change below.

3
manual/filesys.texi
View File

@ -354,6 +354,9 @@ successfully. In this case a pointer to the result is returned in
the function returns a value indicating the error (as described for the function returns a value indicating the error (as described for
@code{readdir}). @code{readdir}).
If there are no more directory entries, @code{readdir_r}'s return value is
@code{0}, and *@var{result} is set to @code{NULL}.
@strong{Portability Note:} On some systems, @code{readdir_r} may not @strong{Portability Note:} On some systems, @code{readdir_r} may not
return a terminated string as the file name even if no @code{d_reclen} return a terminated string as the file name even if no @code{d_reclen}
element is available in @code{struct dirent} and the file name as the element is available in @code{struct dirent} and the file name as the

12
sysdeps/unix/readdir_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. /* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -59,7 +59,8 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
if (bytes <= 0) if (bytes <= 0)
{ {
dp = NULL; dp = NULL;
reclen = 0; /* Reclen != 0 signals that an error occurred. */
reclen = bytes != 0;
break; break;
} }
dirp->size = (size_t) bytes; dirp->size = (size_t) bytes;
@ -93,13 +94,16 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
#endif #endif
/* Skip deleted files. */ /* Skip deleted files. */
} while (dp->d_ino == 0); }
while (dp->d_ino == 0);
if (dp != NULL) if (dp != NULL)
*result = memcpy (entry, dp, reclen); *result = memcpy (entry, dp, reclen);
else
*result = NULL;
__libc_lock_unlock (dirp->lock); __libc_lock_unlock (dirp->lock);
return dp != NULL ? 0 : errno; return dp != NULL ? 0 : reclen ? errno : 0;
} }
weak_alias (__readdir_r, readdir_r) weak_alias (__readdir_r, readdir_r)

12
sysdeps/unix/sysv/linux/readdir64_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997 Free Software Foundation, Inc. /* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -62,7 +62,8 @@ readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
if (bytes <= 0) if (bytes <= 0)
{ {
dp = NULL; dp = NULL;
reclen = 0; /* Reclen != 0 signals that an error occurred. */
reclen = bytes != 0;
break; break;
} }
dirp->size = (size_t) bytes; dirp->size = (size_t) bytes;
@ -96,12 +97,15 @@ readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
#endif #endif
/* Skip deleted files. */ /* Skip deleted files. */
} while (dp->d_ino == 0); }
while (dp->d_ino == 0);
if (dp != NULL) if (dp != NULL)
*result = memcpy (entry, dp, reclen); *result = memcpy (entry, dp, reclen);
else
*result = NULL;
__libc_lock_unlock (dirp->lock); __libc_lock_unlock (dirp->lock);
return dp != NULL ? 0 : errno; return dp != NULL ? 0 : reclen ? errno : 0;
} }