From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
To: musl@lists.openwall.com
Cc: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Subject: [musl] [PATCH] dirent: implement getdents64
Date: Tue, 24 May 2022 16:07:04 +0800 [thread overview]
Message-ID: <20220524080704.70894-1-jiaqing.zhao@linux.intel.com> (raw)
In musl, getdents64 is an alias of getdents, but the type annotation
of these two functions are different according to man page[1], causing
compile errors. This patch implements the standard getdents64.
ssize_t getdents64(int fd, void *dirp, size_t count);
[1] https://man7.org/linux/man-pages/man2/getdents.2.html
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
---
include/dirent.h | 3 ++-
src/linux/getdents.c | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/dirent.h b/include/dirent.h
index 650ecf64..4c5367c2 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -11,6 +11,7 @@ extern "C" {
#define __NEED_off_t
#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
#define __NEED_size_t
+#define __NEED_ssize_t
#endif
#include <bits/alltypes.h>
@@ -50,6 +51,7 @@ long telldir(DIR *);
#define IFTODT(x) ((x)>>12 & 017)
#define DTTOIF(x) ((x)<<12)
int getdents(int, struct dirent *, size_t);
+ssize_t getdents64(int, void *, size_t);
#endif
#ifdef _GNU_SOURCE
@@ -65,7 +67,6 @@ int versionsort(const struct dirent **, const struct dirent **);
#define versionsort64 versionsort
#define off64_t off_t
#define ino64_t ino_t
-#define getdents64 getdents
#endif
#ifdef __cplusplus
diff --git a/src/linux/getdents.c b/src/linux/getdents.c
index 796c1e5c..923a8076 100644
--- a/src/linux/getdents.c
+++ b/src/linux/getdents.c
@@ -9,4 +9,8 @@ int getdents(int fd, struct dirent *buf, size_t len)
return syscall(SYS_getdents, fd, buf, len);
}
-weak_alias(getdents, getdents64);
+ssize_t getdents64(int fd, void *buf, size_t len)
+{
+ if (len>INT_MAX) len = INT_MAX;
+ return syscall(SYS_getdents64, fd, buf, len);
+}
--
2.34.1
next reply other threads:[~2022-05-24 8:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 8:07 Jiaqing Zhao [this message]
2022-05-24 12:27 ` Rich Felker
2022-05-24 13:31 ` Jiaqing Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220524080704.70894-1-jiaqing.zhao@linux.intel.com \
--to=jiaqing.zhao@linux.intel.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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 NNTP newsgroup(s).