options/{posix,linux}: Relocate sys/{statfs.h,vfs.h} from the POSIX t…

…o the Linux option
managarm · Jan 29, 2024 · 02b1d0b · 02b1d0b
1 parent 0f39561
commit 02b1d0b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/options/posix/generic/sys-statfs-stubs.cpp → options/linux/generic/sys-statfs-stubs.cpp b/options/posix/generic/sys-statfs-stubs.cpp → options/linux/generic/sys-statfs-stubs.cpp
@@ -4,7 +4,7 @@
 #include <bits/ensure.h>
 
 #include <mlibc/debug.hpp>
-#include <mlibc/posix-sysdeps.hpp>
+#include <mlibc/linux-sysdeps.hpp>
 
 int statfs(const char *path, struct statfs *buf) {
 	MLIBC_CHECK_OR_ENOSYS(mlibc::sys_statfs, -1);

diff --git a/options/linux/include/mlibc/linux-sysdeps.hpp b/options/linux/include/mlibc/linux-sysdeps.hpp
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <sys/epoll.h>
 #include <sys/sysinfo.h>
+#include <sys/statfs.h>
 #include <poll.h>
 #include <abi-bits/pid_t.h>
 #include <abi-bits/mode_t.h>
@@ -73,6 +74,9 @@ int sys_ioctl(int fd, unsigned long request, void *arg, int *result);
 [[gnu::weak]] int sys_lremovexattr(const char *path, const char *name);
 [[gnu::weak]] int sys_fremovexattr(int fd, const char *name);
 
+[[gnu::weak]] int sys_statfs(const char *path, struct statfs *buf);
+[[gnu::weak]] int sys_fstatfs(int fd, struct statfs *buf);
+
 } // namespace mlibc
 
 #endif // MLIBX_LINUX_SYSDEPS
diff --git a/options/posix/include/sys/statfs.h → options/linux/include/sys/statfs.h b/options/posix/include/sys/statfs.h → options/linux/include/sys/statfs.h
diff --git a/options/posix/include/sys/vfs.h → options/linux/include/sys/vfs.h b/options/posix/include/sys/vfs.h → options/linux/include/sys/vfs.h
diff --git a/options/linux/meson.build b/options/linux/meson.build
@@ -31,6 +31,7 @@ libc_sources += files(
 	'generic/capabilities.cpp',
 	'generic/cpuset.cpp',
 	'generic/sys-swap.cpp',
+	'generic/sys-statfs-stubs.cpp',
 )
 
 if not no_headers
@@ -83,6 +84,8 @@ if not no_headers
 		'include/sys/xattr.h',
 		'include/sys/quota.h',
 		'include/sys/swap.h',
+		'include/sys/statfs.h',
+		'include/sys/vfs.h',
 		subdir: 'sys'
 	)
 	install_headers(

diff --git a/options/posix/include/mlibc/posix-sysdeps.hpp b/options/posix/include/mlibc/posix-sysdeps.hpp
@@ -22,7 +22,6 @@
 #include <sys/select.h>
 #include <sys/sem.h>
 #include <sys/statvfs.h>
-#include <sys/statfs.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sched.h>
@@ -191,8 +190,6 @@ int sys_vm_unmap(void *pointer, size_t size);
 [[gnu::weak]] int sys_sigsuspend(const sigset_t *set);
 [[gnu::weak]] int sys_sigpending(sigset_t *set);
 [[gnu::weak]] int sys_setgroups(size_t size, const gid_t *list);
-[[gnu::weak]] int sys_statfs(const char *path, struct statfs *buf);
-[[gnu::weak]] int sys_fstatfs(int fd, struct statfs *buf);
 [[gnu::weak]] int sys_memfd_create(const char *name, int flags, int *fd);
 [[gnu::weak]] int sys_madvise(void *addr, size_t length, int advice);
 [[gnu::weak]] int sys_msync(void *addr, size_t length, int flags);

diff --git a/options/posix/meson.build b/options/posix/meson.build
@@ -37,7 +37,6 @@ libc_sources += files(
 	'generic/sys-select-stubs.cpp',
 	'generic/sys-shm.cpp',
 	'generic/sys-socket-stubs.cpp',
-	'generic/sys-statfs-stubs.cpp',
 	'generic/sys-stat-stubs.cpp',
 	'generic/sys-statvfs-stubs.cpp',
 	'generic/sys-times.cpp',
@@ -135,7 +134,6 @@ if not no_headers
 		'include/sys/sem.h',
 		'include/sys/shm.h',
 		'include/sys/socket.h',
-		'include/sys/statfs.h',
 		'include/sys/stat.h',
 		'include/sys/statvfs.h',
 		'include/sys/termios.h',
@@ -146,7 +144,6 @@ if not no_headers
 		'include/sys/uio.h',
 		'include/sys/un.h',
 		'include/sys/utsname.h',
-		'include/sys/vfs.h',
 		'include/sys/wait.h',
 		'include/sys/syslog.h',
 		subdir: 'sys'