public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/bz23960] linux: Add __readdir_unlocked
@ 2020-10-02 13:53 Adhemerval Zanella
0 siblings, 0 replies; 5+ messages in thread
From: Adhemerval Zanella @ 2020-10-02 13:53 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=088fd8618422ae154ce7a5287dbfdc3678d7a6f5
commit 088fd8618422ae154ce7a5287dbfdc3678d7a6f5
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Apr 14 17:22:29 2020 -0300
linux: Add __readdir_unlocked
And use it on readdir_r implementation.
Checked on i686-linux-gnu.
Diff:
---
include/dirent.h | 1 +
sysdeps/unix/sysv/linux/readdir.c | 18 ++++++---
sysdeps/unix/sysv/linux/readdir_r.c | 79 ++++++++-----------------------------
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f1..8325a19e5f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
extern DIR *__fdopendir (int __fd) attribute_hidden;
extern int __closedir (DIR *__dirp) attribute_hidden;
extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
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
diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394..a01d2845a6 100644
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,44 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
- const int saved_errno = errno;
- int ret;
__libc_lock_lock (dirp->lock);
- do
+ while (1)
{
- if (dirp->offset >= dirp->size)
- {
- /* We've emptied out our buffer. Refill it. */
-
- size_t maxread = dirp->allocation;
- ssize_t bytes;
-
- maxread = dirp->allocation;
-
- bytes = __getdents (dirp->fd, dirp->data, maxread);
- if (bytes <= 0)
- {
- /* On some systems getdents fails with ENOENT when the
- open directory has been rmdir'd already. POSIX.1
- requires that we treat this condition like normal EOF. */
- if (bytes < 0 && errno == ENOENT)
- {
- bytes = 0;
- __set_errno (saved_errno);
- }
- if (bytes < 0)
- dirp->errcode = errno;
-
- dp = NULL;
- break;
- }
- dirp->size = (size_t) bytes;
-
- /* Reset the offset into the buffer. */
- dirp->offset = 0;
- }
-
- dp = (struct dirent *) &dirp->data[dirp->offset];
+ dp = __readdir_unlocked (dirp);
+ if (dp == NULL)
+ break;
reclen = dp->d_reclen;
+ if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ break;
- dirp->offset += reclen;
-
- dirp->filepos = dp->d_off;
-
- if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ /* The record is very long. It could still fit into the caller-supplied
+ buffer if we can skip padding at the end. */
+ size_t namelen = _D_EXACT_NAMLEN (dp);
+ if (namelen <= NAME_MAX)
{
- /* The record is very long. It could still fit into the
- caller-supplied buffer if we can skip padding at the
- end. */
- size_t namelen = _D_EXACT_NAMLEN (dp);
- if (namelen <= NAME_MAX)
- reclen = offsetof (struct dirent, d_name) + namelen + 1;
- else
- {
- /* The name is too long. Ignore this file. */
- dirp->errcode = ENAMETOOLONG;
- dp->d_ino = 0;
- continue;
- }
+ reclen = offsetof (struct dirent, d_name) + namelen + 1;
+ break;
}
- /* Skip deleted and ignored files. */
+ /* The name is too long. Ignore this file. */
+ dirp->errcode = ENAMETOOLONG;
+ dp->d_ino = 0;
}
- while (dp->d_ino == 0);
if (dp != NULL)
{
*result = memcpy (entry, dp, reclen);
entry->d_reclen = reclen;
- ret = 0;
}
else
- {
- *result = NULL;
- ret = dirp->errcode;
- }
+ *result = NULL;
__libc_lock_unlock (dirp->lock);
- return ret;
+ return dp != NULL ? 0 : dirp->errcode;
}
weak_alias (__readdir_r, readdir_r)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [glibc/azanella/bz23960] linux: Add __readdir_unlocked
@ 2020-04-17 13:22 Adhemerval Zanella
0 siblings, 0 replies; 5+ messages in thread
From: Adhemerval Zanella @ 2020-04-17 13:22 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b8dd86596b4e0518e4c7503ea6f032a022f473b
commit 0b8dd86596b4e0518e4c7503ea6f032a022f473b
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Apr 14 17:22:29 2020 -0300
linux: Add __readdir_unlocked
And use it on readdir_r implementation.
Checked on i686-linux-gnu.
Diff:
---
include/dirent.h | 1 +
sysdeps/unix/sysv/linux/readdir.c | 18 ++++++---
sysdeps/unix/sysv/linux/readdir_r.c | 79 ++++++++-----------------------------
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f1..8325a19e5f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
extern DIR *__fdopendir (int __fd) attribute_hidden;
extern int __closedir (DIR *__dirp) attribute_hidden;
extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
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
diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394..a01d2845a6 100644
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,44 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
- const int saved_errno = errno;
- int ret;
__libc_lock_lock (dirp->lock);
- do
+ while (1)
{
- if (dirp->offset >= dirp->size)
- {
- /* We've emptied out our buffer. Refill it. */
-
- size_t maxread = dirp->allocation;
- ssize_t bytes;
-
- maxread = dirp->allocation;
-
- bytes = __getdents (dirp->fd, dirp->data, maxread);
- if (bytes <= 0)
- {
- /* On some systems getdents fails with ENOENT when the
- open directory has been rmdir'd already. POSIX.1
- requires that we treat this condition like normal EOF. */
- if (bytes < 0 && errno == ENOENT)
- {
- bytes = 0;
- __set_errno (saved_errno);
- }
- if (bytes < 0)
- dirp->errcode = errno;
-
- dp = NULL;
- break;
- }
- dirp->size = (size_t) bytes;
-
- /* Reset the offset into the buffer. */
- dirp->offset = 0;
- }
-
- dp = (struct dirent *) &dirp->data[dirp->offset];
+ dp = __readdir_unlocked (dirp);
+ if (dp == NULL)
+ break;
reclen = dp->d_reclen;
+ if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ break;
- dirp->offset += reclen;
-
- dirp->filepos = dp->d_off;
-
- if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ /* The record is very long. It could still fit into the caller-supplied
+ buffer if we can skip padding at the end. */
+ size_t namelen = _D_EXACT_NAMLEN (dp);
+ if (namelen <= NAME_MAX)
{
- /* The record is very long. It could still fit into the
- caller-supplied buffer if we can skip padding at the
- end. */
- size_t namelen = _D_EXACT_NAMLEN (dp);
- if (namelen <= NAME_MAX)
- reclen = offsetof (struct dirent, d_name) + namelen + 1;
- else
- {
- /* The name is too long. Ignore this file. */
- dirp->errcode = ENAMETOOLONG;
- dp->d_ino = 0;
- continue;
- }
+ reclen = offsetof (struct dirent, d_name) + namelen + 1;
+ break;
}
- /* Skip deleted and ignored files. */
+ /* The name is too long. Ignore this file. */
+ dirp->errcode = ENAMETOOLONG;
+ dp->d_ino = 0;
}
- while (dp->d_ino == 0);
if (dp != NULL)
{
*result = memcpy (entry, dp, reclen);
entry->d_reclen = reclen;
- ret = 0;
}
else
- {
- *result = NULL;
- ret = dirp->errcode;
- }
+ *result = NULL;
__libc_lock_unlock (dirp->lock);
- return ret;
+ return dp != NULL ? 0 : dirp->errcode;
}
weak_alias (__readdir_r, readdir_r)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [glibc/azanella/bz23960] linux: Add __readdir_unlocked
@ 2020-04-16 13:20 Adhemerval Zanella
0 siblings, 0 replies; 5+ messages in thread
From: Adhemerval Zanella @ 2020-04-16 13:20 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bc08d27a4d7ead9fa87853b442463d79d4775e7e
commit bc08d27a4d7ead9fa87853b442463d79d4775e7e
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Apr 14 17:22:29 2020 -0300
linux: Add __readdir_unlocked
And use it on readdir_r implementation.
Checked on i686-linux-gnu.
Diff:
---
include/dirent.h | 1 +
sysdeps/unix/sysv/linux/readdir.c | 18 ++++++---
sysdeps/unix/sysv/linux/readdir_r.c | 79 ++++++++-----------------------------
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f1..8325a19e5f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
extern DIR *__fdopendir (int __fd) attribute_hidden;
extern int __closedir (DIR *__dirp) attribute_hidden;
extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
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
diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394..a01d2845a6 100644
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,44 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
- const int saved_errno = errno;
- int ret;
__libc_lock_lock (dirp->lock);
- do
+ while (1)
{
- if (dirp->offset >= dirp->size)
- {
- /* We've emptied out our buffer. Refill it. */
-
- size_t maxread = dirp->allocation;
- ssize_t bytes;
-
- maxread = dirp->allocation;
-
- bytes = __getdents (dirp->fd, dirp->data, maxread);
- if (bytes <= 0)
- {
- /* On some systems getdents fails with ENOENT when the
- open directory has been rmdir'd already. POSIX.1
- requires that we treat this condition like normal EOF. */
- if (bytes < 0 && errno == ENOENT)
- {
- bytes = 0;
- __set_errno (saved_errno);
- }
- if (bytes < 0)
- dirp->errcode = errno;
-
- dp = NULL;
- break;
- }
- dirp->size = (size_t) bytes;
-
- /* Reset the offset into the buffer. */
- dirp->offset = 0;
- }
-
- dp = (struct dirent *) &dirp->data[dirp->offset];
+ dp = __readdir_unlocked (dirp);
+ if (dp == NULL)
+ break;
reclen = dp->d_reclen;
+ if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ break;
- dirp->offset += reclen;
-
- dirp->filepos = dp->d_off;
-
- if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ /* The record is very long. It could still fit into the caller-supplied
+ buffer if we can skip padding at the end. */
+ size_t namelen = _D_EXACT_NAMLEN (dp);
+ if (namelen <= NAME_MAX)
{
- /* The record is very long. It could still fit into the
- caller-supplied buffer if we can skip padding at the
- end. */
- size_t namelen = _D_EXACT_NAMLEN (dp);
- if (namelen <= NAME_MAX)
- reclen = offsetof (struct dirent, d_name) + namelen + 1;
- else
- {
- /* The name is too long. Ignore this file. */
- dirp->errcode = ENAMETOOLONG;
- dp->d_ino = 0;
- continue;
- }
+ reclen = offsetof (struct dirent, d_name) + namelen + 1;
+ break;
}
- /* Skip deleted and ignored files. */
+ /* The name is too long. Ignore this file. */
+ dirp->errcode = ENAMETOOLONG;
+ dp->d_ino = 0;
}
- while (dp->d_ino == 0);
if (dp != NULL)
{
*result = memcpy (entry, dp, reclen);
entry->d_reclen = reclen;
- ret = 0;
}
else
- {
- *result = NULL;
- ret = dirp->errcode;
- }
+ *result = NULL;
__libc_lock_unlock (dirp->lock);
- return ret;
+ return dp != NULL ? 0 : dirp->errcode;
}
weak_alias (__readdir_r, readdir_r)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [glibc/azanella/bz23960] linux: Add __readdir_unlocked
@ 2020-04-15 14:14 Adhemerval Zanella
0 siblings, 0 replies; 5+ messages in thread
From: Adhemerval Zanella @ 2020-04-15 14:14 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=09a38c487d8012bac78f82c578489a87956005e3
commit 09a38c487d8012bac78f82c578489a87956005e3
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Apr 14 17:22:29 2020 -0300
linux: Add __readdir_unlocked
And use it on readdir_r implementation.
Checked on i686-linux-gnu.
Diff:
---
include/dirent.h | 1 +
sysdeps/unix/sysv/linux/readdir.c | 18 ++++++---
sysdeps/unix/sysv/linux/readdir_r.c | 79 ++++++++-----------------------------
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f1..8325a19e5f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
extern DIR *__fdopendir (int __fd) attribute_hidden;
extern int __closedir (DIR *__dirp) attribute_hidden;
extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
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
diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394..a01d2845a6 100644
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,44 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
- const int saved_errno = errno;
- int ret;
__libc_lock_lock (dirp->lock);
- do
+ while (1)
{
- if (dirp->offset >= dirp->size)
- {
- /* We've emptied out our buffer. Refill it. */
-
- size_t maxread = dirp->allocation;
- ssize_t bytes;
-
- maxread = dirp->allocation;
-
- bytes = __getdents (dirp->fd, dirp->data, maxread);
- if (bytes <= 0)
- {
- /* On some systems getdents fails with ENOENT when the
- open directory has been rmdir'd already. POSIX.1
- requires that we treat this condition like normal EOF. */
- if (bytes < 0 && errno == ENOENT)
- {
- bytes = 0;
- __set_errno (saved_errno);
- }
- if (bytes < 0)
- dirp->errcode = errno;
-
- dp = NULL;
- break;
- }
- dirp->size = (size_t) bytes;
-
- /* Reset the offset into the buffer. */
- dirp->offset = 0;
- }
-
- dp = (struct dirent *) &dirp->data[dirp->offset];
+ dp = __readdir_unlocked (dirp);
+ if (dp == NULL)
+ break;
reclen = dp->d_reclen;
+ if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ break;
- dirp->offset += reclen;
-
- dirp->filepos = dp->d_off;
-
- if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ /* The record is very long. It could still fit into the caller-supplied
+ buffer if we can skip padding at the end. */
+ size_t namelen = _D_EXACT_NAMLEN (dp);
+ if (namelen <= NAME_MAX)
{
- /* The record is very long. It could still fit into the
- caller-supplied buffer if we can skip padding at the
- end. */
- size_t namelen = _D_EXACT_NAMLEN (dp);
- if (namelen <= NAME_MAX)
- reclen = offsetof (struct dirent, d_name) + namelen + 1;
- else
- {
- /* The name is too long. Ignore this file. */
- dirp->errcode = ENAMETOOLONG;
- dp->d_ino = 0;
- continue;
- }
+ reclen = offsetof (struct dirent, d_name) + namelen + 1;
+ break;
}
- /* Skip deleted and ignored files. */
+ /* The name is too long. Ignore this file. */
+ dirp->errcode = ENAMETOOLONG;
+ dp->d_ino = 0;
}
- while (dp->d_ino == 0);
if (dp != NULL)
{
*result = memcpy (entry, dp, reclen);
entry->d_reclen = reclen;
- ret = 0;
}
else
- {
- *result = NULL;
- ret = dirp->errcode;
- }
+ *result = NULL;
__libc_lock_unlock (dirp->lock);
- return ret;
+ return dp != NULL ? 0 : dirp->errcode;
}
weak_alias (__readdir_r, readdir_r)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [glibc/azanella/bz23960] linux: Add __readdir_unlocked
@ 2020-04-14 21:09 Adhemerval Zanella
0 siblings, 0 replies; 5+ messages in thread
From: Adhemerval Zanella @ 2020-04-14 21:09 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=49ffe35ce28c12eec1000632f77dd715363638f7
commit 49ffe35ce28c12eec1000632f77dd715363638f7
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue Apr 14 17:22:29 2020 -0300
linux: Add __readdir_unlocked
And use on readdir_r implementation.
Checked on i686-linux-gnu.
Diff:
---
include/dirent.h | 1 +
sysdeps/unix/sysv/linux/readdir.c | 18 ++++++---
sysdeps/unix/sysv/linux/readdir_r.c | 79 ++++++++-----------------------------
3 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index fdf4c4a2f1..8325a19e5f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -20,6 +20,7 @@ extern DIR *__opendirat (int dfd, const char *__name) attribute_hidden;
extern DIR *__fdopendir (int __fd) attribute_hidden;
extern int __closedir (DIR *__dirp) attribute_hidden;
extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
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
diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c
index 0069041394..a01d2845a6 100644
--- a/sysdeps/unix/sysv/linux/readdir_r.c
+++ b/sysdeps/unix/sysv/linux/readdir_r.c
@@ -25,89 +25,44 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
- const int saved_errno = errno;
- int ret;
__libc_lock_lock (dirp->lock);
- do
+ while (1)
{
- if (dirp->offset >= dirp->size)
- {
- /* We've emptied out our buffer. Refill it. */
-
- size_t maxread = dirp->allocation;
- ssize_t bytes;
-
- maxread = dirp->allocation;
-
- bytes = __getdents (dirp->fd, dirp->data, maxread);
- if (bytes <= 0)
- {
- /* On some systems getdents fails with ENOENT when the
- open directory has been rmdir'd already. POSIX.1
- requires that we treat this condition like normal EOF. */
- if (bytes < 0 && errno == ENOENT)
- {
- bytes = 0;
- __set_errno (saved_errno);
- }
- if (bytes < 0)
- dirp->errcode = errno;
-
- dp = NULL;
- break;
- }
- dirp->size = (size_t) bytes;
-
- /* Reset the offset into the buffer. */
- dirp->offset = 0;
- }
-
- dp = (struct dirent *) &dirp->data[dirp->offset];
+ dp = __readdir_unlocked (dirp);
+ if (dp == NULL)
+ break;
reclen = dp->d_reclen;
+ if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ break;
- dirp->offset += reclen;
-
- dirp->filepos = dp->d_off;
-
- if (reclen > offsetof (struct dirent, d_name) + NAME_MAX + 1)
+ /* The record is very long. It could still fit into the caller-supplied
+ buffer if we can skip padding at the end. */
+ size_t namelen = _D_EXACT_NAMLEN (dp);
+ if (namelen <= NAME_MAX)
{
- /* The record is very long. It could still fit into the
- caller-supplied buffer if we can skip padding at the
- end. */
- size_t namelen = _D_EXACT_NAMLEN (dp);
- if (namelen <= NAME_MAX)
- reclen = offsetof (struct dirent, d_name) + namelen + 1;
- else
- {
- /* The name is too long. Ignore this file. */
- dirp->errcode = ENAMETOOLONG;
- dp->d_ino = 0;
- continue;
- }
+ reclen = offsetof (struct dirent, d_name) + namelen + 1;
+ break;
}
- /* Skip deleted and ignored files. */
+ /* The name is too long. Ignore this file. */
+ dirp->errcode = ENAMETOOLONG;
+ dp->d_ino = 0;
}
- while (dp->d_ino == 0);
if (dp != NULL)
{
*result = memcpy (entry, dp, reclen);
entry->d_reclen = reclen;
- ret = 0;
}
else
- {
- *result = NULL;
- ret = dirp->errcode;
- }
+ *result = NULL;
__libc_lock_unlock (dirp->lock);
- return ret;
+ return dp != NULL ? 0 : dirp->errcode;
}
weak_alias (__readdir_r, readdir_r)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-02 13:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 13:53 [glibc/azanella/bz23960] linux: Add __readdir_unlocked Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2020-04-17 13:22 Adhemerval Zanella
2020-04-16 13:20 Adhemerval Zanella
2020-04-15 14:14 Adhemerval Zanella
2020-04-14 21:09 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).