From: Duncan Bellamy <dunk@denkimushi.com>
To: info@bnoordhuis.nl
Cc: musl@lists.openwall.com, Duncan Bellamy <dunk@denkimushi.com>
Subject: [musl] [PATCH 2/2] V2 src/stat/fstatat.c use new statx define
Date: Sun, 28 Aug 2022 00:11:43 +0100 [thread overview]
Message-ID: <20220827231143.3324909-3-dunk@denkimushi.com> (raw)
In-Reply-To: <20220827231143.3324909-1-dunk@denkimushi.com>
---
src/stat/fstatat.c | 30 +++---------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c
index 74c51cf5..6b44f48a 100644
--- a/src/stat/fstatat.c
+++ b/src/stat/fstatat.c
@@ -1,4 +1,5 @@
#define _BSD_SOURCE
+#define _GNU_SOURCE
#include <sys/stat.h>
#include <string.h>
#include <fcntl.h>
@@ -7,36 +8,11 @@
#include <sys/sysmacros.h>
#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){
@@ -152,6 +128,6 @@ int __fstatat(int fd, const char *restrict path, struct stat *restrict st, int f
weak_alias(__fstatat, fstatat);
-#if !_REDIR_TIME64
+#if !_REDIR_TIME64 && !defined(_GNU_SOURCE)
weak_alias(fstatat, fstatat64);
#endif
--
2.37.1
next prev parent reply other threads:[~2022-08-27 23:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 12:12 [musl] [PATCH] add statx Ben Noordhuis
2020-01-24 8:38 ` [musl] " Ben Noordhuis
2020-01-24 14:01 ` Rich Felker
2020-01-28 8:59 ` Ben Noordhuis
2020-01-28 13:39 ` Rich Felker
2020-01-24 14:00 ` [musl] " Rich Felker
2020-01-24 15:27 ` Florian Weimer
2020-01-24 15:54 ` Rich Felker
2020-01-24 16:12 ` Florian Weimer
2020-01-24 16:29 ` Rich Felker
2020-01-28 10:41 ` Florian Weimer
2020-01-28 13:18 ` Rich Felker
2020-02-17 9:10 ` Florian Weimer
2020-02-17 15:29 ` Rich Felker
2022-08-27 14:57 ` [musl] [PATCH 0/1] " Duncan Bellamy
2022-08-27 14:57 ` [musl] [PATCH 1/1] resubmitting old statx patch with changes Duncan Bellamy
2022-08-27 18:10 ` Rich Felker
2022-08-27 23:11 ` Dunk
2022-08-27 23:11 ` [musl] [PATCH 0/2] V2 Duncan Bellamy
2022-08-27 23:11 ` [musl] [PATCH 1/2] V2 resubmitting old statx patch with changes Duncan Bellamy
2022-08-29 13:50 ` [musl] " Dunk
2022-08-27 23:11 ` Duncan Bellamy [this message]
2022-08-31 19:07 ` [musl] [PATCH 0/2] V3 Duncan Bellamy
2022-08-31 19:07 ` [musl] [PATCH 1/2] V3 resubmitting old statx patch with changes Duncan Bellamy
2024-02-24 16:56 ` Rich Felker
2024-04-24 19:30 ` Rich Felker
2024-04-24 23:55 ` lolzery wowzery
2024-04-25 3:21 ` Markus Wichmann
2024-04-25 12:25 ` Rich Felker
2024-04-28 2:29 ` lolzery wowzery
2024-04-28 16:13 ` Rich Felker
2024-05-06 14:57 ` Rich Felker
2024-04-27 16:40 ` Rich Felker
2022-08-31 19:07 ` [musl] [PATCH 2/2] V3 src/stat/fstatat.c use new statx define Duncan Bellamy
2024-02-24 16:57 ` Rich Felker
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=20220827231143.3324909-3-dunk@denkimushi.com \
--to=dunk@denkimushi.com \
--cc=info@bnoordhuis.nl \
--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).