[PATCH v3 1/3] tools/nolibc: Add internal __nolibc_dirfd() helper

[Daniel Palmer <daniel@thingy.jp>]

closedir() and readdir_r() both convert a DIR pointer back into
an fd. Move that logic into a single helper.

The helper does not set errno so that it can be used by
readdir_r() which returns its own error.

Signed-off-by: Daniel Palmer <daniel@thingy.jp>
---
 tools/include/nolibc/dirent.h | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
index 19857369de2a..7666dc69506f 100644
--- a/tools/include/nolibc/dirent.h
+++ b/tools/include/nolibc/dirent.h
@@ -27,6 +27,18 @@ typedef struct {
 	char dummy[1];
 } DIR;
 
+/* Internal dirfd() that does not set errno */
+static __attribute__((unused))
+int __nolibc_dirfd(DIR *dirp)
+{
+	intptr_t fd = ~(intptr_t)dirp;
+
+	if (fd < 0)
+		return -1;
+
+	return fd;
+}
+
 static __attribute__((unused))
 DIR *fdopendir(int fd)
 {
@@ -65,13 +77,13 @@ DIR *opendir(const char *name)
 static __attribute__((unused))
 int closedir(DIR *dirp)
 {
-	intptr_t i = (intptr_t)dirp;
+	int fd = __nolibc_dirfd(dirp);
 
-	if (i >= 0) {
+	if (fd < 0) {
 		SET_ERRNO(EBADF);
 		return -1;
 	}
-	return close(~i);
+	return close(fd);
 }
 
 static __attribute__((unused))
@@ -79,15 +91,13 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
 {
 	char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1] __nolibc_aligned_as(struct linux_dirent64);
 	struct linux_dirent64 *ldir = (void *)buf;
-	intptr_t i = (intptr_t)dirp;
 	int fd, ret;
 	off_t off;
 
-	if (i >= 0)
+	fd = __nolibc_dirfd(dirp);
+	if (fd < 0)
 		return EBADF;
 
-	fd = ~i;
-
 	ret = _sys_getdents64(fd, ldir, sizeof(buf));
 	if (ret < 0)
 		return -ret;
-- 
2.53.0