mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
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:
@ -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.
|
||||
|
||||
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)
|
||||
{
|
||||
dp = NULL;
|
||||
reclen = 0;
|
||||
/* Reclen != 0 signals that an error occurred. */
|
||||
reclen = bytes != 0;
|
||||
break;
|
||||
}
|
||||
dirp->size = (size_t) bytes;
|
||||
@ -96,12 +97,15 @@ readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user