tools/nolibc: move stat() and friends to sys/stat.h

This is the location regular userspace expects these definitions.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250416-nolibc-split-sys-v1-6-a069a3f1d145@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index ca8817e84c3a5b4df3d373e60a956945d2665b94..747d73b453680a32d1b8748640f2ebd1ae9b1fb4 100644 (file)
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -46,6 +46,7 @@ all_files := \
                sys.h \
                sys/auxv.h \
                sys/mman.h \
+               sys/stat.h \
                time.h \
                types.h \
                unistd.h \

diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index ffdf501db1b6faebe2f0d5f56bd3c31c1a8ec164..8296cbbeebe994aa335b561a2d9986e529e001a6 100644 (file)
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -98,6 +98,7 @@
 #include "sys.h"
 #include "sys/auxv.h"
 #include "sys/mman.h"
+#include "sys/stat.h"
 #include "ctype.h"
 #include "elf.h"
 #include "signal.h"

diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index 13e6b2479fbf8bcb36843072665e50046c5f41eb..c76dc80147281041afa1cb443d01897d186f7168 100644 (file)
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -968,62 +968,6 @@ pid_t setsid(void)
        return __sysret(sys_setsid());
 }
 
-/*
- * int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf);
- * int stat(const char *path, struct stat *buf);
- */
-
-static __attribute__((unused))
-int sys_statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf)
-{
-#ifdef __NR_statx
-       return my_syscall5(__NR_statx, fd, path, flags, mask, buf);
-#else
-       return __nolibc_enosys(__func__, fd, path, flags, mask, buf);
-#endif
-}
-
-static __attribute__((unused))
-int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf)
-{
-       return __sysret(sys_statx(fd, path, flags, mask, buf));
-}
-
-
-static __attribute__((unused))
-int stat(const char *path, struct stat *buf)
-{
-       struct statx statx;
-       long ret;
-
-       ret = __sysret(sys_statx(AT_FDCWD, path, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &statx));
-       if (ret == -1)
-               return ret;
-
-       buf->st_dev          = ((statx.stx_dev_minor & 0xff)
-                              | (statx.stx_dev_major << 8)
-                              | ((statx.stx_dev_minor & ~0xff) << 12));
-       buf->st_ino          = statx.stx_ino;
-       buf->st_mode         = statx.stx_mode;
-       buf->st_nlink        = statx.stx_nlink;
-       buf->st_uid          = statx.stx_uid;
-       buf->st_gid          = statx.stx_gid;
-       buf->st_rdev         = ((statx.stx_rdev_minor & 0xff)
-                              | (statx.stx_rdev_major << 8)
-                              | ((statx.stx_rdev_minor & ~0xff) << 12));
-       buf->st_size         = statx.stx_size;
-       buf->st_blksize      = statx.stx_blksize;
-       buf->st_blocks       = statx.stx_blocks;
-       buf->st_atim.tv_sec  = statx.stx_atime.tv_sec;
-       buf->st_atim.tv_nsec = statx.stx_atime.tv_nsec;
-       buf->st_mtim.tv_sec  = statx.stx_mtime.tv_sec;
-       buf->st_mtim.tv_nsec = statx.stx_mtime.tv_nsec;
-       buf->st_ctim.tv_sec  = statx.stx_ctime.tv_sec;
-       buf->st_ctim.tv_nsec = statx.stx_ctime.tv_nsec;
-
-       return 0;
-}
-
 
 /*
  * int symlink(const char *old, const char *new);

diff --git a/tools/include/nolibc/sys/stat.h b/tools/include/nolibc/sys/stat.h
new file mode 100644 (file)
index 0000000..0eaf549
--- /dev/null
+++ b/tools/include/nolibc/sys/stat.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * stat definition for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
+ */
+
+#ifndef _NOLIBC_SYS_STAT_H
+#define _NOLIBC_SYS_STAT_H
+
+#include "../arch.h"
+#include "../types.h"
+#include "../sys.h"
+
+/*
+ * int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf);
+ * int stat(const char *path, struct stat *buf);
+ */
+
+static __attribute__((unused))
+int sys_statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf)
+{
+#ifdef __NR_statx
+       return my_syscall5(__NR_statx, fd, path, flags, mask, buf);
+#else
+       return __nolibc_enosys(__func__, fd, path, flags, mask, buf);
+#endif
+}
+
+static __attribute__((unused))
+int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf)
+{
+       return __sysret(sys_statx(fd, path, flags, mask, buf));
+}
+
+
+static __attribute__((unused))
+int stat(const char *path, struct stat *buf)
+{
+       struct statx statx;
+       long ret;
+
+       ret = __sysret(sys_statx(AT_FDCWD, path, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &statx));
+       if (ret == -1)
+               return ret;
+
+       buf->st_dev          = ((statx.stx_dev_minor & 0xff)
+                              | (statx.stx_dev_major << 8)
+                              | ((statx.stx_dev_minor & ~0xff) << 12));
+       buf->st_ino          = statx.stx_ino;
+       buf->st_mode         = statx.stx_mode;
+       buf->st_nlink        = statx.stx_nlink;
+       buf->st_uid          = statx.stx_uid;
+       buf->st_gid          = statx.stx_gid;
+       buf->st_rdev         = ((statx.stx_rdev_minor & 0xff)
+                              | (statx.stx_rdev_major << 8)
+                              | ((statx.stx_rdev_minor & ~0xff) << 12));
+       buf->st_size         = statx.stx_size;
+       buf->st_blksize      = statx.stx_blksize;
+       buf->st_blocks       = statx.stx_blocks;
+       buf->st_atim.tv_sec  = statx.stx_atime.tv_sec;
+       buf->st_atim.tv_nsec = statx.stx_atime.tv_nsec;
+       buf->st_mtim.tv_sec  = statx.stx_mtime.tv_sec;
+       buf->st_mtim.tv_nsec = statx.stx_mtime.tv_nsec;
+       buf->st_ctim.tv_sec  = statx.stx_ctime.tv_sec;
+       buf->st_ctim.tv_nsec = statx.stx_ctime.tv_nsec;
+
+       return 0;
+}
+
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#endif /* _NOLIBC_SYS_STAT_H */