diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-04-14 17:22:29 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-10-16 14:19:23 -0300 |
| commit | 30d2e4a963db0b3fdb1aa2cf2e2942c7a62d6649 (patch) | |
| tree | 11a922ac445de129cefcf9625188226ee33b03b3 /sysdeps/unix/sysv/linux/readdir.c | |
| parent | 4b962c9e859de23b461d61f860dbd3f21311e83a (diff) | |
| download | glibc-30d2e4a963db0b3fdb1aa2cf2e2942c7a62d6649.tar.gz glibc-30d2e4a963db0b3fdb1aa2cf2e2942c7a62d6649.tar.xz glibc-30d2e4a963db0b3fdb1aa2cf2e2942c7a62d6649.zip | |
linux: Add __readdir_unlocked
And use it on readdir_r implementation. Checked on i686-linux-gnu.
Diffstat (limited to 'sysdeps/unix/sysv/linux/readdir.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/readdir.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c index 2e03e66e69..ca2a8964e9 100644 --- a/sysdeps/unix/sysv/linux/readdir.c +++ b/sysdeps/unix/sysv/linux/readdir.c @@ -23,15 +23,11 @@ /* Read a directory entry from DIRP. */ struct dirent * -__readdir (DIR *dirp) +__readdir_unlocked (DIR *dirp) { struct dirent *dp; int saved_errno = errno; -#if IS_IN (libc) - __libc_lock_lock (dirp->lock); -#endif - do { size_t reclen; @@ -75,6 +71,18 @@ __readdir (DIR *dirp) /* Skip deleted files. */ } while (dp->d_ino == 0); + return dp; +} + +struct dirent * +__readdir (DIR *dirp) +{ + struct dirent *dp; + +#if IS_IN (libc) + __libc_lock_lock (dirp->lock); +#endif + dp = __readdir_unlocked (dirp); #if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif |