lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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.
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)
{
dp = NULL;
reclen = 0;
/* Reclen != 0 signals that an error occurred. */
reclen = bytes != 0;
break;
}
dirp->size = (size_t) bytes;
@ -93,13 +94,16 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
#endif
/* Skip deleted files. */
} while (dp->d_ino == 0);
}
while (dp->d_ino == 0);
if (dp != NULL)
*result = memcpy (entry, dp, reclen);
else
*result = NULL;
__libc_lock_unlock (dirp->lock);
return dp != NULL ? 0 : errno;
return dp != NULL ? 0 : reclen ? errno : 0;
}
weak_alias (__readdir_r, readdir_r)