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 20025 invoked from network); 27 Aug 2022 23:13:18 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 27 Aug 2022 23:13:18 -0000 Received: (qmail 9804 invoked by uid 550); 27 Aug 2022 23:13:11 -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 9704 invoked from network); 27 Aug 2022 23:13:10 -0000 From: Duncan Bellamy DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com; s=dkim; t=1661641978; 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=uiIEzlC8hj59cBNPseq7Beoy+XoFNtSdUEDPMpQkWWk=; b=R6D+SkLsIqMSGM/Tk5YnSYh/b43XUfxIePch1oFEJ/IwdDxM8+ra5hdIQ7FgG0YfJoJN4S pN5gW5ZhzcVltWrrI4BkDlm3nQsB1tYlSbVY1b6UcAnVWkE9QldH5eOPCue708LcGvFtCp cnyvOaWqHb7KssE4bylvBtVsnYe7lLY= To: info@bnoordhuis.nl Cc: musl@lists.openwall.com, Duncan Bellamy Date: Sun, 28 Aug 2022 00:11:42 +0100 Message-Id: <20220827231143.3324909-2-dunk@denkimushi.com> In-Reply-To: <20220827231143.3324909-1-dunk@denkimushi.com> References: <20200119121247.37310-1-info@bnoordhuis.nl> <20220827231143.3324909-1-dunk@denkimushi.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=dkim; d=denkimushi.com; t=1661641978; a=rsa-sha256; cv=none; b=B0YnMgc0qevivz+l64mpiFA6zqNqOznfW+ZJbyA+GcX/Zmigf5cMZ8l1Kc1C1hPS3rwOVQ +eDnSGJBIP/SVb7PULaK7wQZv0sElHPDjmETySC2B5kdmEAmyBlFqmJAXyTGWTHLbw11PE bjB3jR824FIX+pjD200dd9bndFXm6bE= 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=1661641978; 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=uiIEzlC8hj59cBNPseq7Beoy+XoFNtSdUEDPMpQkWWk=; b=rnvAXC5u20lyq0D2yEEKTrLU2Ux6PYH6VR63ybIl3GENwAlrEFcmvV62b5l7oAKZgWGksU s0cAW7aN9I7cFWl6fMn5xqMZZ4XiPSliua22iOCpzfiYPuOQSss66oqCphC5hV3zL6LZeg 8hXopkYonmhFE0ehBHI9aNenZTWCdPM= Subject: [musl] [PATCH 1/2] V2 resubmitting old statx patch with changes --- include/sys/stat.h | 49 ++++++++++++++++++++++++++++++++++++++++++++++ src/stat/statx.c | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 src/stat/statx.c diff --git a/include/sys/stat.h b/include/sys/stat.h index 10d446c4..21668a51 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -70,6 +70,55 @@ extern "C" { #define UTIME_NOW 0x3fffffff #define UTIME_OMIT 0x3ffffffe +#if defined(_GNU_SOURCE) +#include + +#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, __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/statx.c b/src/stat/statx.c new file mode 100644 index 00000000..6788476a --- /dev/null +++ b/src/stat/statx.c @@ -0,0 +1,39 @@ +#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) return __syscall_ret(ret); + + #if defined(SYS_fstatat) + struct stat st; + ret = fstatat(dirfd, path, &st, flags); + if (ret == -ENOSYS) return -1; + + 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 = (struct statx_timestamp){.tv_sec=0, .tv_nsec=0}; + stx->stx_mask = STATX_BASIC_STATS; + ret = EINVAL; + #endif + + return ret; +} -- 2.37.1