From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 21130 invoked from network); 27 Aug 2022 14:58:30 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 27 Aug 2022 14:58:30 -0000 Received: (qmail 5979 invoked by uid 550); 27 Aug 2022 14:58:21 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 5898 invoked from network); 27 Aug 2022 14:58:20 -0000 From: Duncan Bellamy DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com; s=dkim; t=1661612288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VpL9/obSf7kQZ/Sqd3xHmruFS4DdbuwhIZ6mSTNm218=; b=PqAVTpVUkvhvr5o/MI1lwZAbKeWcjj0LaPRuIXijC9NFju5L0RDgGmEugedkiNir0LRXyW KQU5+H5kJ7to18yA8WMJJQRYQb66Q5feYE1R51lLxsuKr/k424XBcBWTYDrehphiVE1XeL PWX3MjJK5GgOO1b0h5hFq0bn4PTTvXQ= To: info@bnoordhuis.nl Cc: musl@lists.openwall.com, Duncan Bellamy Date: Sat, 27 Aug 2022 15:57:52 +0100 Message-Id: <20220827145752.3133543-2-dunk@denkimushi.com> In-Reply-To: <20220827145752.3133543-1-dunk@denkimushi.com> References: <20200119121247.37310-1-info@bnoordhuis.nl> <20220827145752.3133543-1-dunk@denkimushi.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=dkim; d=denkimushi.com; t=1661612288; a=rsa-sha256; cv=none; b=Yt2eB6dJKDiKqGNsMBazyYQfDXg7wVxWZdt6L/AgKgdq+d1eLzXQHne4ispUFi09WzIkG7 BADmvOhH5NSPWo2p2xUBGFxlx4YXAuWXUWc/qd+wlqDYqpJ9JxdLSq+teVXUNB5KgkbHgF NlRbKqLpv+WqhpTMhWJB0Cdt8W1d0CE= ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=dunk@denkimushi.com smtp.mailfrom=dunk@denkimushi.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com; s=dkim; t=1661612288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VpL9/obSf7kQZ/Sqd3xHmruFS4DdbuwhIZ6mSTNm218=; b=OLrcDSPPsC6nNdLyL0nSc1Zf2eXGHswgwvPGqOs10b32sM1XXFtHzn3ll6R7uFixBuBh+A x6HdQvi6fFu12fNQ7D+VGgjqQWpmLg99YF2RC2DgReJw3JmgtbIbePiZLpp1271XDBqCP1 OFNasJ2F0/4MMptdaVL1AQ3N11IjrlQ= Subject: [musl] [PATCH 1/1] resubmitting old statx patch with changes --- include/sys/stat.h | 49 ++++++++++++++++++++++++++++++++++++++++++++++ src/stat/fstatat.c | 27 +------------------------ src/stat/statx.c | 35 +++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 26 deletions(-) create mode 100644 src/stat/statx.c diff --git a/include/sys/stat.h b/include/sys/stat.h index 10d446c4..81424462 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -5,6 +5,7 @@ extern "C" { #endif #include +#include #define __NEED_dev_t #define __NEED_ino_t @@ -70,6 +71,54 @@ extern "C" { #define UTIME_NOW 0x3fffffff #define UTIME_OMIT 0x3ffffffe +#if defined(_GNU_SOURCE) +#define STATX_TYPE 1U +#define STATX_MODE 2U +#define STATX_NLINK 4U +#define STATX_UID 8U +#define STATX_GID 0x10U +#define STATX_ATIME 0x20U +#define STATX_MTIME 0x40U +#define STATX_CTIME 0x80U +#define STATX_INO 0x100U +#define STATX_SIZE 0x200U +#define STATX_BLOCKS 0x400U +#define STATX_BASIC_STATS 0x7ffU +#define STATX_BTIME 0x800U +#define STATX_ALL 0xfffU + +struct statx_timestamp { + int64_t tv_sec; + uint32_t tv_nsec; + int32_t __pad; +}; + +struct statx { + uint32_t stx_mask; + uint32_t stx_blksize; + uint64_t stx_attributes; + uint32_t stx_nlink; + uint32_t stx_uid; + uint32_t stx_gid; + uint16_t stx_mode; + uint16_t __pad0[1]; + uint64_t stx_ino; + uint64_t stx_size; + uint64_t stx_blocks; + uint64_t stx_attributes_mask; + struct statx_timestamp stx_atime; + struct statx_timestamp stx_btime; + struct statx_timestamp stx_ctime; + struct statx_timestamp stx_mtime; + uint32_t stx_rdev_major; + uint32_t stx_rdev_minor; + uint32_t stx_dev_major; + uint32_t stx_dev_minor; + uint64_t __pad1[14]; +}; + +int statx(int, const char *__restrict, int, unsigned, struct statx *__restrict); +#endif int stat(const char *__restrict, struct stat *__restrict); int fstat(int, struct stat *); int lstat(const char *__restrict, struct stat *__restrict); diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c index 74c51cf5..5b2248a9 100644 --- a/src/stat/fstatat.c +++ b/src/stat/fstatat.c @@ -7,36 +7,11 @@ #include #include "syscall.h" -struct statx { - uint32_t stx_mask; - uint32_t stx_blksize; - uint64_t stx_attributes; - uint32_t stx_nlink; - uint32_t stx_uid; - uint32_t stx_gid; - uint16_t stx_mode; - uint16_t pad1; - uint64_t stx_ino; - uint64_t stx_size; - uint64_t stx_blocks; - uint64_t stx_attributes_mask; - struct { - int64_t tv_sec; - uint32_t tv_nsec; - int32_t pad; - } stx_atime, stx_btime, stx_ctime, stx_mtime; - uint32_t stx_rdev_major; - uint32_t stx_rdev_minor; - uint32_t stx_dev_major; - uint32_t stx_dev_minor; - uint64_t spare[14]; -}; - static int fstatat_statx(int fd, const char *restrict path, struct stat *restrict st, int flag) { struct statx stx; - int ret = __syscall(SYS_statx, fd, path, flag, 0x7ff, &stx); + int ret = __syscall(SYS_statx, fd, path, flag, STATX_BASIC_STATS, &stx); if (ret) return ret; *st = (struct stat){ diff --git a/src/stat/statx.c b/src/stat/statx.c new file mode 100644 index 00000000..ff49841b --- /dev/null +++ b/src/stat/statx.c @@ -0,0 +1,35 @@ +#define _GNU_SOURCE +#include +#include +#include +#include + +int statx(int dirfd, const char *restrict path, int flags, unsigned mask, struct statx *restrict stx) +{ + int ret = syscall(SYS_statx, dirfd, path, flags, mask, stx); + if (ret == ENOSYS) { + struct stat st; + fstatat(dir_fd, path, &st, flags); + stx.stx_dev_major = major(st.st_dev); + stx.stx_dev_minor = minor(st.st_dev); + stx.stx_ino = st.st_ino; + stx.stx_mode = st.st_mode; + stx.stx_nlink = st.st_nlink; + stx.stx_uid = st.st_uid; + stx.stx_gid = st.st_gid; + stx.stx_size = st.st_size; + stx.stx_blksize = st.st_blksize; + stx.stx_blocks = st.st_blocks; + stx.stx_atime.tv_sec = st.st_atim.tv_sec; + stx.stx_atime.tv_nsec = st.st_atim.tv_nsec; + stx.stx_mtime.tv_sec = st.st_mtim.tv_sec; + stx.stx_mtime.tv_nsec = st.st_mtim.tv_nsec; + stx.stx_ctime.tv_sec = st.st_ctim.tv_sec; + stx.stx_ctime.tv_nsec = st.st_ctim.tv_nsec; + stx.stx_btime = 0; + stx.stx_mask = STATX_BASIC_STATS; + ret = EINVAL; + } + + return ret; +} -- 2.34.1