From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.2 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by inbox.vuxu.org (OpenSMTPD) with SMTP id 36238f3e for ; Fri, 24 Jan 2020 08:39:15 +0000 (UTC) Received: (qmail 27843 invoked by uid 550); 24 Jan 2020 08:39:13 -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 27811 invoked from network); 24 Jan 2020 08:39:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bnoordhuis-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=l+i1lmTswhAivtrVjY79ybTi/01/JccRBgkx3X+JoPk=; b=U/5CWM+0t0iytJvdJGi83jcioE5uJKUxkJ/UalWXNMAkD7wr0BYA5bF6y+Rt04a7El +p/k2RIqipokwIKRPeKWnK0MtKHmwhIWPVnFkvWXwDxVXXZmAX19ZCsFeoVkg2Qqeayf BxALhQ744VMpypPIoGhRI/a8DOrsW6jODzz8zgqErPlBgRXNA3IoPntG0czi4iKoEMPe Zt10fWH7wBAanSr+3pc2gAkeERv8J10V1jY7cA390SECMAxZmSX3/D9rXh4nU+4Rwlwf Bu73hQst6LvDj0RNkqkLnkhNkC4AMjSlKdWE7TK2hWteeSrjh1z7aoYeBYDT0epzmV5R J92w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=l+i1lmTswhAivtrVjY79ybTi/01/JccRBgkx3X+JoPk=; b=jB8d6oUyHe3vAjMqBrXcKR05vj/cy1mdoK3vyK9AWCrSnUhYw4SBpptBx8E29Wfjeg e9fHUBskxrPJhaHXKQAbPy0E1r9DbakfAhmoKnGo8zsIrtk7iariOHNQz9gidGziKoci knPEiWAra2C3QqcAYWS2jQQl3MYCe9N6gF06vUe0SboB3RcYwvSAkBYkvQDFpFXhi2jr bquMMYWOjXRYZPxJ/tuuKH4Q4yWrkl1X0QRiQFK/0WPlQOC6TueOTDvPzwVkigiio46a HLsz2fkY4D5zsg2y0q/NUNEJhKZtCmhjyxShv4JBzCh3zzBmeWPrV84zwZKRlYwPHzDV T4yw== X-Gm-Message-State: APjAAAUu+XxU8dc3R+rZaTAor1KRzNoBAQYfLYljPD/mBKDJNoqBLSJk exRV3gKKpA3con4c12fsA0sY4Nm3GoPhlruFuY3bdaSy X-Google-Smtp-Source: APXvYqy6wALRFd6VE51kZNaP4MXbqLqQsFgLTZr8VBexdWVckq/vgVHtCzY+hOUYhgTmt5p1C7Qo3Ros5bQexPmWNno= X-Received: by 2002:a05:6808:84:: with SMTP id s4mr1352245oic.60.1579855140444; Fri, 24 Jan 2020 00:39:00 -0800 (PST) MIME-Version: 1.0 References: <20200119121247.37310-1-info@bnoordhuis.nl> In-Reply-To: <20200119121247.37310-1-info@bnoordhuis.nl> From: Ben Noordhuis Date: Fri, 24 Jan 2020 09:38:49 +0100 Message-ID: To: musl@lists.openwall.com Content-Type: text/plain; charset="UTF-8" Subject: [musl] Re: [PATCH] add statx On Sun, Jan 19, 2020 at 1:13 PM Ben Noordhuis wrote: > > glibc exposes a wrapper for this system call. it's inconvenient that > musl doesn't so let's add one. > > ref: https://github.com/rust-lang/rust/pull/67774 > --- > include/fcntl.h | 15 +++++++++++++++ > include/sys/stat.h | 34 ++++++++++++++++++++++++++++++++++ > src/stat/fstatat.c | 27 +-------------------------- > src/stat/statx.c | 8 ++++++++ > 4 files changed, 58 insertions(+), 26 deletions(-) > create mode 100644 src/stat/statx.c > > diff --git a/include/fcntl.h b/include/fcntl.h > index b664cdc4..21050a65 100644 > --- a/include/fcntl.h > +++ b/include/fcntl.h > @@ -106,6 +106,21 @@ int posix_fallocate(int, off_t, off_t); > #define AT_STATX_DONT_SYNC 0x4000 > #define AT_RECURSIVE 0x8000 > > +#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 > + > #define FAPPEND O_APPEND > #define FFSYNC O_SYNC > #define FASYNC O_ASYNC > diff --git a/include/sys/stat.h b/include/sys/stat.h > index 10d446c4..5db71590 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,38 @@ extern "C" { > #define UTIME_NOW 0x3fffffff > #define UTIME_OMIT 0x3ffffffe > > +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > +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]; > +}; > +#endif > + > int stat(const char *__restrict, struct stat *__restrict); > int fstat(int, struct stat *); > int lstat(const char *__restrict, struct stat *__restrict); > @@ -93,6 +126,7 @@ int utimensat(int, const char *, const struct timespec [2], int); > > #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > int lchmod(const char *, mode_t); > +int statx(int, const char *__restrict, int, unsigned, struct statx *__restrict); > #define S_IREAD S_IRUSR > #define S_IWRITE S_IWUSR > #define S_IEXEC S_IXUSR > diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c > index de165b5c..ab22e4c6 100644 > --- a/src/stat/fstatat.c > +++ b/src/stat/fstatat.c > @@ -8,36 +8,11 @@ > #include "syscall.h" > #include "kstat.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..36b45d33 > --- /dev/null > +++ b/src/stat/statx.c > @@ -0,0 +1,8 @@ > +#define _GNU_SOURCE > +#include > +#include "syscall.h" > + > +int statx(int dirfd, const char *restrict path, int flags, unsigned mask, struct statx *restrict stx) > +{ > + return syscall(SYS_statx, dirfd, path, flags, mask, stx); > +} > -- > 2.23.0 > Can I get some feedback on this patch, even if it's just "no because"? Thanks.