From 99e67c348b9ac35e7ceecd4853da7371f5a275c7 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Mon, 23 May 2022 15:06:11 -0700 Subject: [PATCH] Reduce Makefile dependencies by 4% --- libc/calls/chdir-nt.c | 2 +- libc/calls/chdir.c | 3 +- libc/calls/chroot.c | 2 +- libc/calls/clock_gettime-nt.c | 1 - libc/calls/clock_gettime.c | 2 + libc/calls/close.c | 8 +- libc/calls/copyfile.c | 3 +- libc/calls/directmap-nt.c | 1 + libc/calls/directmap.c | 2 +- libc/calls/dup-nt.c | 2 + libc/calls/dup.c | 3 +- libc/calls/dup2.c | 3 +- libc/calls/dup3-sysv.c | 3 +- libc/calls/dup3.c | 3 +- libc/calls/execve-nt.greg.c | 1 + libc/calls/execve-sysv.c | 2 +- libc/calls/execve.c | 3 +- libc/calls/faccessat-nt.c | 2 +- libc/calls/faccessat.c | 3 +- libc/calls/fadvise-nt.c | 1 + libc/calls/fadvise.c | 3 +- libc/calls/fchdir-nt.c | 1 + libc/calls/fchdir.c | 3 +- libc/calls/fchmod.c | 2 +- libc/calls/fchmodat-nt.c | 2 +- libc/calls/fchmodat.c | 3 +- libc/calls/fchown.c | 2 +- libc/calls/fchownat.c | 2 +- libc/calls/fcntl-nt.c | 2 + libc/calls/fcntl-sysv.c | 3 +- libc/calls/fcntl.c | 2 + libc/calls/fdatasync.c | 3 +- libc/calls/fileexists.c | 3 +- libc/calls/fixenotdir.c | 2 +- libc/calls/fixupnewfd.c | 2 +- libc/calls/flock-nt.c | 1 + libc/calls/flock.c | 3 +- libc/calls/fstat-nt.c | 2 +- libc/calls/fstat-sysv.c | 3 + libc/calls/fstatat-nt.c | 2 + libc/calls/fstatat-sysv.c | 1 + libc/calls/fstatat.c | 1 + libc/calls/fsync.c | 3 +- libc/calls/ftruncate-nt.c | 2 +- libc/calls/ftruncate.c | 2 + libc/calls/g_sighandrvas.c | 1 - libc/calls/getcwd-nt.c | 2 +- libc/calls/getcwd-xnu.greg.c | 3 +- libc/calls/getcwd.greg.c | 4 +- libc/calls/getdomainname.c | 2 +- libc/calls/getegid.c | 2 +- libc/calls/geteuid.c | 2 +- libc/calls/getfiledescriptorsize.c | 1 + libc/calls/getfilesize.c | 1 - libc/calls/gethostname-linux.c | 1 - libc/calls/gethostname-nt.c | 3 +- libc/calls/gethostname.c | 2 +- libc/calls/getitimer.c | 1 + libc/calls/getpgid.c | 2 +- libc/calls/getpgrp.c | 2 +- libc/calls/getppid-nt.c | 1 - libc/calls/getppid.c | 3 +- libc/calls/getpriority-nt.c | 9 +- libc/calls/getpriority.c | 3 +- libc/calls/getprocaddressmodule.c | 1 - libc/calls/getprogramexecutablename.greg.c | 2 +- libc/calls/getresgid.c | 2 +- libc/calls/getresuid.c | 2 +- libc/calls/getrusage-nt.c | 3 +- libc/calls/getsid.c | 2 +- libc/calls/gettimeofday-nt.c | 1 - libc/calls/gettimeofday.c | 1 + libc/calls/getuid.c | 2 +- libc/calls/internal.h | 201 +----------------- libc/calls/interrupts-nt.c | 3 + libc/calls/ioctl_default.c | 2 + libc/calls/ioctl_fioclex.c | 1 + libc/calls/ioctl_siocgifconf-nt.c | 1 - libc/calls/ioctl_siocgifconf.c | 3 +- libc/calls/ioctl_tcgets.c | 2 + libc/calls/ioctl_tcsets.c | 1 + libc/calls/ioctl_tiocgwinsz-nt.c | 2 + libc/calls/ioctl_tiocgwinsz.c | 1 + libc/calls/ioctl_tiocswinsz-nt.c | 1 + libc/calls/ioctl_tiocswinsz.c | 1 + libc/calls/iovecsize.c | 1 + libc/calls/isatty.c | 2 + libc/calls/ischardev.c | 1 + libc/calls/isdirectory-nt.c | 2 +- libc/calls/isdirectory.c | 3 +- libc/calls/islinux.c | 1 - libc/calls/isregularfile-nt.c | 2 +- libc/calls/isregularfile.c | 3 +- libc/calls/issymlink-nt.c | 2 +- libc/calls/issymlink.c | 3 +- libc/calls/kill.c | 3 +- libc/calls/killpg.c | 2 +- libc/calls/lchown.c | 1 - libc/calls/link.c | 1 - libc/calls/linkat-nt.c | 2 +- libc/calls/linkat.c | 3 +- libc/calls/lseek-nt.c | 1 + libc/calls/lseek.c | 2 + libc/calls/madvise-nt.c | 2 +- libc/calls/madvise.c | 3 +- libc/calls/metaflock.c | 2 +- libc/calls/mincore.c | 2 +- libc/calls/mkdir.c | 2 +- libc/calls/mkdirat-nt.c | 2 +- libc/calls/mkdirat.c | 3 +- libc/calls/mkfifo.c | 2 +- libc/calls/mknod.c | 2 +- libc/calls/mkntpath.c | 2 +- libc/calls/mkntpathat.c | 1 + libc/calls/munmap-sysv.c | 2 +- libc/calls/nanosleep-nt.c | 1 + libc/calls/nanosleep.c | 1 + libc/calls/now.c | 2 + libc/calls/ntaccesscheck.c | 2 +- libc/calls/ntcontext2linux.c | 1 - libc/calls/ntreturn.c | 1 - libc/calls/ntsetprivilege.c | 1 - libc/calls/ntspawn.c | 2 +- libc/calls/offset2overlap.c | 2 +- libc/calls/oldbench.c | 2 +- libc/calls/open-nt.c | 37 ++-- libc/calls/openat-sysv.c | 2 +- libc/calls/openat.c | 3 + libc/calls/pause.c | 2 +- libc/calls/pipe-nt.c | 2 + libc/calls/pipe-sysv.c | 2 +- libc/calls/pipe.c | 3 +- libc/calls/pipe2-sysv.c | 3 +- libc/calls/pipe2.c | 3 +- libc/calls/poll-metal.c | 1 + libc/calls/poll-nt.c | 1 + libc/calls/poll.c | 1 - libc/calls/posix_openpt.c | 1 + libc/calls/pread.c | 1 + libc/calls/preadv.c | 2 + libc/calls/printfds.c | 1 + libc/calls/ptrace.c | 2 +- libc/calls/pwrite.c | 1 + libc/calls/pwritev.c | 1 + libc/calls/raise.c | 3 +- libc/calls/read-nt.c | 1 + libc/calls/read.c | 1 + libc/calls/readansi.c | 1 - libc/calls/readlinkat-nt.c | 2 +- libc/calls/readlinkat.c | 3 +- libc/calls/readv-nt.c | 1 + libc/calls/readv.c | 1 + libc/calls/reboot.c | 1 - libc/calls/renameat-nt.c | 2 +- libc/calls/renameat.c | 3 +- libc/calls/reservefd.c | 1 + libc/calls/rusage2linux.c | 1 + libc/calls/sched_getaffinity.c | 2 +- libc/calls/sched_setaffinity.c | 3 +- libc/calls/setgid.c | 2 +- libc/calls/setitimer-nt.c | 1 - libc/calls/setpgid.c | 3 +- libc/calls/setpriority-nt.c | 2 +- libc/calls/setpriority.c | 3 +- libc/calls/setregid.c | 2 +- libc/calls/setresgid.c | 2 +- libc/calls/setresuid.c | 2 +- libc/calls/setreuid.c | 2 +- libc/calls/setsid.c | 2 +- libc/calls/setuid.c | 2 +- libc/calls/sig.c | 2 +- libc/calls/sig2.c | 2 +- libc/calls/sigaction.c | 3 + libc/calls/sigaltstack.c | 2 +- libc/calls/sigchld-nt.c | 2 + libc/calls/sigenter-freebsd.c | 1 + libc/calls/sigenter-netbsd.c | 1 + libc/calls/sigenter-openbsd.c | 1 + libc/calls/sigenter-xnu.c | 1 + libc/calls/sigprocmask-sysv.greg.c | 1 + libc/calls/sleep.c | 1 - libc/calls/splice.c | 1 + libc/calls/stat2cosmo.c | 1 - libc/calls/state.internal.h | 16 ++ libc/calls/symlinkat-nt.c | 2 +- libc/calls/symlinkat.c | 3 +- libc/calls/sync-nt.c | 2 + libc/calls/sync.c | 3 +- libc/calls/sync_file_range.c | 2 +- libc/calls/sys_utimes_nt.c | 1 + libc/calls/syscall-nt.internal.h | 43 ++++ libc/calls/syscall-sysv.internal.h | 123 +++++++++++ libc/calls/syscall_support-nt.internal.h | 27 +++ libc/calls/syscall_support-sysv.internal.h | 25 +++ libc/calls/sysinfo-nt.c | 2 +- libc/calls/sysinfo.c | 7 +- libc/calls/tcdrain.c | 1 - libc/calls/tcflow.c | 3 +- libc/calls/tcflush.c | 2 +- libc/calls/tcgetsid.c | 2 +- libc/calls/tcsendbreak.c | 2 +- libc/calls/tgkill.c | 2 +- libc/calls/timecritical.c | 1 - libc/calls/tkill.c | 3 +- libc/calls/truncate-nt.c | 3 +- libc/calls/truncate.c | 4 +- libc/calls/ttyname_r.c | 1 + libc/calls/umask.c | 2 +- libc/calls/uname.c | 3 +- libc/calls/unlinkat-nt.c | 3 +- libc/calls/unlinkat.c | 4 +- libc/calls/usleep.c | 1 - libc/calls/utimensat-nt.c | 2 +- libc/calls/vdprintf.c | 1 + libc/calls/vdsofunc.greg.c | 1 - libc/calls/wait3.c | 1 - libc/calls/wait4-nt.c | 2 + libc/calls/wincrash.c | 1 + libc/calls/winerr.internal.h | 8 + libc/calls/write-nt.c | 1 + libc/calls/write.c | 1 + libc/calls/writev-metal.c | 1 + libc/calls/writev-serial.c | 1 + libc/calls/writev.c | 1 + libc/dns/getntnameservers.c | 2 +- libc/intrin/asan.c | 2 +- libc/intrin/closehandle.c | 2 +- libc/intrin/createdirectory.c | 2 +- libc/intrin/createfile.c | 2 +- libc/intrin/createfilemapping.c | 2 +- libc/intrin/createfilemappingnuma.c | 2 +- libc/intrin/createnamedpipe.c | 2 +- libc/intrin/createpipe.c | 2 +- libc/intrin/createprocess.c | 2 +- libc/intrin/createsymboliclink.c | 2 +- libc/intrin/createthread.c | 2 +- libc/intrin/deletefile.c | 2 +- .../describentsecurityattributes.greg.c | 2 +- libc/intrin/deviceiocontrol.greg.c | 2 +- libc/intrin/findclose.c | 2 +- libc/intrin/findfirstfile.c | 2 +- libc/intrin/findnextfile.c | 2 +- libc/intrin/flushfilebuffers.c | 2 +- libc/intrin/flushviewoffile.c | 2 +- libc/intrin/generateconsolectrlevent.c | 2 +- libc/intrin/getexitcodeprocess.c | 2 +- libc/intrin/getfileattributes.c | 2 +- libc/intrin/getpid.c | 3 +- libc/intrin/kprintf.greg.c | 2 +- libc/intrin/mapviewoffileex.c | 2 +- libc/intrin/mapviewoffileexnuma.c | 2 +- libc/intrin/movefileex.c | 2 +- libc/intrin/openprocess.c | 2 +- libc/intrin/prot2nt.greg.c | 1 - libc/intrin/releasefd.c | 1 + libc/intrin/removedirectory.c | 2 +- libc/intrin/reopenfile.c | 2 +- libc/intrin/setcurrentdirectory.c | 2 +- libc/intrin/terminateprocess.c | 2 +- libc/intrin/unmapviewoffile.c | 2 +- libc/intrin/vforked.c | 1 - libc/intrin/virtualprotect.c | 2 +- libc/intrin/waitformultipleobjects.c | 2 +- libc/intrin/waitforsingleobject.c | 2 +- libc/log/backtrace2.greg.c | 2 +- libc/log/libfatal.internal.h | 1 - libc/log/oncrash.c | 2 +- libc/log/restoretty.greg.c | 2 +- libc/mem/pledge.c | 31 +-- libc/rand/getrandom.c | 3 +- libc/runtime/arch_prctl.c | 2 +- libc/runtime/clone.c | 1 - libc/runtime/fork-nt.c | 2 + libc/runtime/fork.c | 4 +- libc/runtime/getinterpreterexecutablename.c | 2 +- libc/runtime/getmaxfd.c | 2 +- libc/runtime/hook.greg.c | 1 - libc/runtime/mmap.c | 1 + libc/runtime/mprotect.greg.c | 2 +- libc/runtime/mremap.c | 1 - libc/runtime/msync-nt.c | 1 - libc/runtime/msync.c | 3 +- libc/runtime/munmap.c | 3 +- libc/runtime/stackuse.c | 1 - libc/runtime/winmain.greg.c | 3 +- libc/sock/accept-nt.c | 9 +- libc/sock/accept4.c | 2 +- libc/sock/bind-nt.c | 5 +- libc/sock/bind.c | 1 + libc/sock/closesocket-nt.c | 1 + libc/sock/connect-nt.c | 2 +- libc/sock/connect.c | 1 + libc/sock/epoll.c | 2 + libc/sock/firewall.c | 1 + libc/sock/fixupnewsockfd.c | 2 +- libc/sock/gethostips.c | 6 +- libc/sock/getpeername-nt.c | 2 +- libc/sock/getpeername.c | 2 +- libc/sock/getsockname-nt.c | 4 +- libc/sock/getsockname.c | 2 +- libc/sock/getsockopt-nt.c | 5 +- libc/sock/getsockopt.c | 2 +- libc/sock/inet_pton.c | 1 + libc/sock/internal.h | 14 -- libc/sock/listen-nt.c | 3 +- libc/sock/listen.c | 1 + libc/sock/recv-nt.c | 2 +- libc/sock/recv.c | 1 + libc/sock/recvfrom-nt.c | 2 +- libc/sock/recvfrom.c | 2 +- libc/sock/recvmsg.c | 1 + libc/sock/select-nt.c | 1 + libc/sock/sendfile.c | 2 + libc/sock/sendfile.internal.h | 16 ++ libc/sock/setsockopt-nt.c | 1 + libc/sock/setsockopt.c | 1 + libc/sock/shutdown-nt.c | 2 +- libc/sock/shutdown.c | 1 + libc/sock/socket-nt.c | 1 + libc/sock/socketpair-nt.c | 3 + libc/sock/sys_sendfile_freebsd.S | 23 ++ libc/sock/sys_sendfile_xnu.S | 23 ++ libc/sock/syscall_fd.internal.h | 24 +++ libc/sock/wsablock.c | 1 + libc/stdio/dirstream.c | 1 + libc/testlib/testmain.c | 2 +- libc/testlib/testrunner.c | 2 +- libc/thread/exit.c | 2 +- libc/time/times.c | 2 +- libc/zipos/close.c | 2 + libc/zipos/open.c | 1 + libc/zipos/read.c | 1 - test/libc/calls/mkntpath_test.c | 1 + test/libc/calls/read_test.c | 1 + test/libc/calls/seccomp_test.c | 1 + test/libc/calls/vfork_test.c | 1 + test/libc/calls/write_test.c | 1 + test/libc/mem/pledge_test.c | 1 + third_party/python/Modules/posixmodule.c | 2 + 339 files changed, 756 insertions(+), 499 deletions(-) create mode 100644 libc/calls/state.internal.h create mode 100644 libc/calls/syscall-nt.internal.h create mode 100644 libc/calls/syscall-sysv.internal.h create mode 100644 libc/calls/syscall_support-nt.internal.h create mode 100644 libc/calls/syscall_support-sysv.internal.h create mode 100644 libc/calls/winerr.internal.h create mode 100644 libc/sock/sendfile.internal.h create mode 100644 libc/sock/sys_sendfile_freebsd.S create mode 100644 libc/sock/sys_sendfile_xnu.S create mode 100644 libc/sock/syscall_fd.internal.h diff --git a/libc/calls/chdir-nt.c b/libc/calls/chdir-nt.c index 65c027ce5..75a3e0ad0 100644 --- a/libc/calls/chdir-nt.c +++ b/libc/calls/chdir-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/macros.internal.h" #include "libc/nt/errors.h" diff --git a/libc/calls/chdir.c b/libc/calls/chdir.c index 0b42d5a95..8afec0deb 100644 --- a/libc/calls/chdir.c +++ b/libc/calls/chdir.c @@ -16,8 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/chroot.c b/libc/calls/chroot.c index 2f654f7a4..0ea2f439e 100644 --- a/libc/calls/chroot.c +++ b/libc/calls/chroot.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Changes root directory. diff --git a/libc/calls/clock_gettime-nt.c b/libc/calls/clock_gettime-nt.c index 2d7ecef12..e9bca40f2 100644 --- a/libc/calls/clock_gettime-nt.c +++ b/libc/calls/clock_gettime-nt.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/fmt/conv.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/nt/synchronization.h" diff --git a/libc/calls/clock_gettime.c b/libc/calls/clock_gettime.c index f7deab6e6..ab086c746 100644 --- a/libc/calls/clock_gettime.c +++ b/libc/calls/clock_gettime.c @@ -18,8 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/timeval.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/fmt/conv.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/close.c b/libc/calls/close.c index ef1a248fe..1a241f007 100644 --- a/libc/calls/close.c +++ b/libc/calls/close.c @@ -17,13 +17,13 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" -#include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" -#include "libc/intrin/kprintf.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/intrin/spinlock.h" -#include "libc/macros.internal.h" -#include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/copyfile.c b/libc/calls/copyfile.c index 270532537..31cd2422f 100644 --- a/libc/calls/copyfile.c +++ b/libc/calls/copyfile.c @@ -16,9 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" #include "libc/calls/copyfile.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/nt/createfile.h" diff --git a/libc/calls/directmap-nt.c b/libc/calls/directmap-nt.c index e8f015ede..fb4921776 100644 --- a/libc/calls/directmap-nt.c +++ b/libc/calls/directmap-nt.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/kprintf.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/enum/pageflags.h" diff --git a/libc/calls/directmap.c b/libc/calls/directmap.c index 7c8a12d6d..502f0fbd4 100644 --- a/libc/calls/directmap.c +++ b/libc/calls/directmap.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/errno.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/dup-nt.c b/libc/calls/dup-nt.c index e819fb3a6..8e5894427 100644 --- a/libc/calls/dup-nt.c +++ b/libc/calls/dup-nt.c @@ -20,6 +20,8 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/spinlock.h" #include "libc/mem/mem.h" #include "libc/nt/files.h" diff --git a/libc/calls/dup.c b/libc/calls/dup.c index 84ce876ee..4bcea1e12 100644 --- a/libc/calls/dup.c +++ b/libc/calls/dup.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/dup2.c b/libc/calls/dup2.c index ab8b79449..bb78e74dd 100644 --- a/libc/calls/dup2.c +++ b/libc/calls/dup2.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/dup3-sysv.c b/libc/calls/dup3-sysv.c index ec9f64650..2bbea134c 100644 --- a/libc/calls/dup3-sysv.c +++ b/libc/calls/dup3-sysv.c @@ -16,8 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/errno.h" int32_t sys_dup3(int32_t oldfd, int32_t newfd, int flags) { diff --git a/libc/calls/dup3.c b/libc/calls/dup3.c index f19dccab9..05128a0a5 100644 --- a/libc/calls/dup3.c +++ b/libc/calls/dup3.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/execve-nt.greg.c b/libc/calls/execve-nt.greg.c index 003a761dd..3418744c3 100644 --- a/libc/calls/execve-nt.greg.c +++ b/libc/calls/execve-nt.greg.c @@ -22,6 +22,7 @@ #include "libc/calls/internal.h" #include "libc/calls/ntspawn.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" #include "libc/mem/alloca.h" #include "libc/nt/accounting.h" #include "libc/nt/console.h" diff --git a/libc/calls/execve-sysv.c b/libc/calls/execve-sysv.c index 60c4f5189..7c39f32c0 100644 --- a/libc/calls/execve-sysv.c +++ b/libc/calls/execve-sysv.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/errno.h" #include "libc/mem/alloca.h" #include "libc/paths.h" diff --git a/libc/calls/execve.c b/libc/calls/execve.c index ab4ac6ac7..df59f26fa 100644 --- a/libc/calls/execve.c +++ b/libc/calls/execve.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/calls/faccessat-nt.c b/libc/calls/faccessat-nt.c index 2630da0fb..96b717084 100644 --- a/libc/calls/faccessat-nt.c +++ b/libc/calls/faccessat-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/faccessat.c b/libc/calls/faccessat.c index 2e602e121..e682d4f83 100644 --- a/libc/calls/faccessat.c +++ b/libc/calls/faccessat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/fadvise-nt.c b/libc/calls/fadvise-nt.c index 82d818be8..9c8cae641 100644 --- a/libc/calls/fadvise-nt.c +++ b/libc/calls/fadvise-nt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/enum/filesharemode.h" diff --git a/libc/calls/fadvise.c b/libc/calls/fadvise.c index 31044b604..31425e4f7 100644 --- a/libc/calls/fadvise.c +++ b/libc/calls/fadvise.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/fchdir-nt.c b/libc/calls/fchdir-nt.c index ab8db742c..f01d804b3 100644 --- a/libc/calls/fchdir-nt.c +++ b/libc/calls/fchdir-nt.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/nt/files.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/fchdir.c b/libc/calls/fchdir.c index 614a7fb57..83f7ad7d2 100644 --- a/libc/calls/fchdir.c +++ b/libc/calls/fchdir.c @@ -17,7 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/fchmod.c b/libc/calls/fchmod.c index 39baf82e0..27996c8fb 100644 --- a/libc/calls/fchmod.c +++ b/libc/calls/fchmod.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/fchmodat-nt.c b/libc/calls/fchmodat-nt.c index 7b0ba5f7c..ee9966a9f 100644 --- a/libc/calls/fchmodat-nt.c +++ b/libc/calls/fchmodat-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" diff --git a/libc/calls/fchmodat.c b/libc/calls/fchmodat.c index f8b617442..5ea267d00 100644 --- a/libc/calls/fchmodat.c +++ b/libc/calls/fchmodat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/fchown.c b/libc/calls/fchown.c index 6f7f5f1c5..f447de5fe 100644 --- a/libc/calls/fchown.c +++ b/libc/calls/fchown.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/sysv/consts/at.h" /** diff --git a/libc/calls/fchownat.c b/libc/calls/fchownat.c index cec5ab92b..bf743aa5c 100644 --- a/libc/calls/fchownat.c +++ b/libc/calls/fchownat.c @@ -18,8 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/fcntl-nt.c b/libc/calls/fcntl-nt.c index d51cdc0a9..3eaf7fb6a 100644 --- a/libc/calls/fcntl-nt.c +++ b/libc/calls/fcntl-nt.c @@ -19,6 +19,8 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/flock.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/kprintf.h" #include "libc/macros.internal.h" diff --git a/libc/calls/fcntl-sysv.c b/libc/calls/fcntl-sysv.c index 0e9a04ff2..9e9bca098 100644 --- a/libc/calls/fcntl-sysv.c +++ b/libc/calls/fcntl-sysv.c @@ -16,8 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/flock.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/sysv/consts/f.h" int sys_fcntl(int fd, int cmd, uintptr_t arg) { diff --git a/libc/calls/fcntl.c b/libc/calls/fcntl.c index 44d469619..b87653c85 100644 --- a/libc/calls/fcntl.c +++ b/libc/calls/fcntl.c @@ -20,6 +20,8 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/errfuns.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/fdatasync.c b/libc/calls/fdatasync.c index 6e72c1c2c..c2c12dd81 100644 --- a/libc/calls/fdatasync.c +++ b/libc/calls/fdatasync.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/fileexists.c b/libc/calls/fileexists.c index 876a1cac9..f5301a8fb 100644 --- a/libc/calls/fileexists.c +++ b/libc/calls/fileexists.c @@ -18,10 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metastat.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/fixenotdir.c b/libc/calls/fixenotdir.c index 8b982fca4..5b9146b38 100644 --- a/libc/calls/fixenotdir.c +++ b/libc/calls/fixenotdir.c @@ -16,11 +16,11 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/errno.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/errors.h" #include "libc/nt/files.h" +#include "libc/str/str.h" static textwindows bool SubpathExistsThatsNotDirectory(char16_t *path) { int e; diff --git a/libc/calls/fixupnewfd.c b/libc/calls/fixupnewfd.c index c7a65c920..93911893a 100644 --- a/libc/calls/fixupnewfd.c +++ b/libc/calls/fixupnewfd.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/sysv/consts/f.h" #include "libc/sysv/consts/fd.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/flock-nt.c b/libc/calls/flock-nt.c index 85a9a879d..764905d20 100644 --- a/libc/calls/flock-nt.c +++ b/libc/calls/flock-nt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/runtime.h" #include "libc/nt/struct/byhandlefileinformation.h" diff --git a/libc/calls/flock.c b/libc/calls/flock.c index b48232f7e..2f0afbdb3 100644 --- a/libc/calls/flock.c +++ b/libc/calls/flock.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c index 125ef8e09..c869fb6d9 100644 --- a/libc/calls/fstat-nt.c +++ b/libc/calls/fstat-nt.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/conv.h" #include "libc/intrin/kprintf.h" #include "libc/macros.internal.h" diff --git a/libc/calls/fstat-sysv.c b/libc/calls/fstat-sysv.c index e05714552..22c4cd7f7 100644 --- a/libc/calls/fstat-sysv.c +++ b/libc/calls/fstat-sysv.c @@ -17,6 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/metastat.internal.h" +#include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/fstatat-nt.c b/libc/calls/fstatat-nt.c index 468752e70..853744b91 100644 --- a/libc/calls/fstatat-nt.c +++ b/libc/calls/fstatat-nt.c @@ -17,6 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/stat.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/creationdisposition.h" diff --git a/libc/calls/fstatat-sysv.c b/libc/calls/fstatat-sysv.c index 4c64f3986..45a9f78f3 100644 --- a/libc/calls/fstatat-sysv.c +++ b/libc/calls/fstatat-sysv.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/struct/metastat.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/fstatat.c b/libc/calls/fstatat.c index 0a13947a1..b59ca4639 100644 --- a/libc/calls/fstatat.c +++ b/libc/calls/fstatat.c @@ -19,6 +19,7 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/errno.h" diff --git a/libc/calls/fsync.c b/libc/calls/fsync.c index e3b251fbf..859c858f6 100644 --- a/libc/calls/fsync.c +++ b/libc/calls/fsync.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/runtime/runtime.h" diff --git a/libc/calls/ftruncate-nt.c b/libc/calls/ftruncate-nt.c index 9c1e79288..46574efa2 100644 --- a/libc/calls/ftruncate-nt.c +++ b/libc/calls/ftruncate-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/enum/filemovemethod.h" #include "libc/nt/files.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/ftruncate.c b/libc/calls/ftruncate.c index 5c17d5780..109c7b2f6 100644 --- a/libc/calls/ftruncate.c +++ b/libc/calls/ftruncate.c @@ -19,6 +19,8 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/g_sighandrvas.c b/libc/calls/g_sighandrvas.c index e7b259cb7..e1da914a5 100644 --- a/libc/calls/g_sighandrvas.c +++ b/libc/calls/g_sighandrvas.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" _Alignas(64) int __sig_lock; unsigned __sighandrvas[NSIG]; diff --git a/libc/calls/getcwd-nt.c b/libc/calls/getcwd-nt.c index 475824679..ed6c962d6 100644 --- a/libc/calls/getcwd-nt.c +++ b/libc/calls/getcwd-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/str/str.h" diff --git a/libc/calls/getcwd-xnu.greg.c b/libc/calls/getcwd-xnu.greg.c index 63bfac438..7d3cb5b19 100644 --- a/libc/calls/getcwd-xnu.greg.c +++ b/libc/calls/getcwd-xnu.greg.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/struct/metastat.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/getcwd.greg.c b/libc/calls/getcwd.greg.c index 158185a56..52dacfbe3 100644 --- a/libc/calls/getcwd.greg.c +++ b/libc/calls/getcwd.greg.c @@ -19,8 +19,10 @@ #include "libc/assert.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/log/backtrace.internal.h" #include "libc/mem/mem.h" diff --git a/libc/calls/getdomainname.c b/libc/calls/getdomainname.c index 87dd1d748..691d08b7d 100644 --- a/libc/calls/getdomainname.c +++ b/libc/calls/getdomainname.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/utsname.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/nt/enum/computernameformat.h" diff --git a/libc/calls/getegid.c b/libc/calls/getegid.c index e142d34f1..e4516baca 100644 --- a/libc/calls/getegid.c +++ b/libc/calls/getegid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/geteuid.c b/libc/calls/geteuid.c index ad16d7419..4db32a100 100644 --- a/libc/calls/geteuid.c +++ b/libc/calls/geteuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Returns effective user ID of calling process. diff --git a/libc/calls/getfiledescriptorsize.c b/libc/calls/getfiledescriptorsize.c index 045e3ecd0..8011608cd 100644 --- a/libc/calls/getfiledescriptorsize.c +++ b/libc/calls/getfiledescriptorsize.c @@ -22,6 +22,7 @@ #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metastat.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/limits.h" #include "libc/nt/enum/fileinfobyhandleclass.h" diff --git a/libc/calls/getfilesize.c b/libc/calls/getfilesize.c index 8ef96630c..69da98ad1 100644 --- a/libc/calls/getfilesize.c +++ b/libc/calls/getfilesize.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/stat.h" #include "libc/dce.h" #include "libc/limits.h" diff --git a/libc/calls/gethostname-linux.c b/libc/calls/gethostname-linux.c index fac5b9b9c..979cfb6e2 100644 --- a/libc/calls/gethostname-linux.c +++ b/libc/calls/gethostname-linux.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/utsname.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/gethostname-nt.c b/libc/calls/gethostname-nt.c index 2cdf8c0f6..906d29980 100644 --- a/libc/calls/gethostname-nt.c +++ b/libc/calls/gethostname-nt.c @@ -17,7 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" +#include "libc/macros.internal.h" #include "libc/nt/enum/computernameformat.h" #include "libc/nt/systeminfo.h" #include "libc/str/str.h" diff --git a/libc/calls/gethostname.c b/libc/calls/gethostname.c index eaafb2b43..743525483 100644 --- a/libc/calls/gethostname.c +++ b/libc/calls/gethostname.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/nt/enum/computernameformat.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/getitimer.c b/libc/calls/getitimer.c index 57b8937a9..0467eb522 100644 --- a/libc/calls/getitimer.c +++ b/libc/calls/getitimer.c @@ -19,6 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/struct/itimerval.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/getpgid.c b/libc/calls/getpgid.c index 8ae485a7e..a072d98c1 100644 --- a/libc/calls/getpgid.c +++ b/libc/calls/getpgid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/getpgrp.c b/libc/calls/getpgrp.c index 9a15d1c6e..d083b42c3 100644 --- a/libc/calls/getpgrp.c +++ b/libc/calls/getpgrp.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/getppid-nt.c b/libc/calls/getppid-nt.c index b6f7c0d5a..0410b704a 100644 --- a/libc/calls/getppid-nt.c +++ b/libc/calls/getppid-nt.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/nt/nt/process.h" #include "libc/nt/ntdll.h" diff --git a/libc/calls/getppid.c b/libc/calls/getppid.c index d997f6134..2d6c24133 100644 --- a/libc/calls/getppid.c +++ b/libc/calls/getppid.c @@ -16,8 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Returns parent process id. diff --git a/libc/calls/getpriority-nt.c b/libc/calls/getpriority-nt.c index 3f89a9401..5bd4a2b98 100644 --- a/libc/calls/getpriority-nt.c +++ b/libc/calls/getpriority-nt.c @@ -16,20 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/bits.h" -#include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/kntprioritycombos.internal.h" -#include "libc/fmt/conv.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nexgen32e/ffs.h" -#include "libc/nt/enum/processcreationflags.h" -#include "libc/nt/enum/threadpriority.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" #include "libc/nt/thread.h" #include "libc/runtime/runtime.h" -#include "libc/sysv/consts/prio.h" -#include "libc/sysv/errfuns.h" textwindows int sys_getpriority_nt(int ignored) { size_t i; diff --git a/libc/calls/getpriority.c b/libc/calls/getpriority.c index 6a65f48d1..fb7a61967 100644 --- a/libc/calls/getpriority.c +++ b/libc/calls/getpriority.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Returns nice value of thing. diff --git a/libc/calls/getprocaddressmodule.c b/libc/calls/getprocaddressmodule.c index cba122484..f45c39471 100644 --- a/libc/calls/getprocaddressmodule.c +++ b/libc/calls/getprocaddressmodule.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/nt/dll.h" /** diff --git a/libc/calls/getprogramexecutablename.greg.c b/libc/calls/getprogramexecutablename.greg.c index b6ab8a1e6..3c34e73c1 100644 --- a/libc/calls/getprogramexecutablename.greg.c +++ b/libc/calls/getprogramexecutablename.greg.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/macros.internal.h" diff --git a/libc/calls/getresgid.c b/libc/calls/getresgid.c index 1760de051..36aa25dd8 100644 --- a/libc/calls/getresgid.c +++ b/libc/calls/getresgid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/getresuid.c b/libc/calls/getresuid.c index 80a0f10a7..d67c4c28a 100644 --- a/libc/calls/getresuid.c +++ b/libc/calls/getresuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/getrusage-nt.c b/libc/calls/getrusage-nt.c index 35bb44e50..8c4fa79c8 100644 --- a/libc/calls/getrusage-nt.c +++ b/libc/calls/getrusage-nt.c @@ -17,9 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/rusage.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/conv.h" #include "libc/intrin/spinlock.h" #include "libc/nt/accounting.h" diff --git a/libc/calls/getsid.c b/libc/calls/getsid.c index 1d199e2b0..057aeb54e 100644 --- a/libc/calls/getsid.c +++ b/libc/calls/getsid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Creates session and sets the process group id. diff --git a/libc/calls/gettimeofday-nt.c b/libc/calls/gettimeofday-nt.c index cf113f721..8b808db05 100644 --- a/libc/calls/gettimeofday-nt.c +++ b/libc/calls/gettimeofday-nt.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/timeval.h" #include "libc/fmt/conv.h" #include "libc/nt/struct/filetime.h" diff --git a/libc/calls/gettimeofday.c b/libc/calls/gettimeofday.c index 927e785a4..5698a2370 100644 --- a/libc/calls/gettimeofday.c +++ b/libc/calls/gettimeofday.c @@ -19,6 +19,7 @@ #include "libc/assert.h" #include "libc/calls/internal.h" #include "libc/calls/struct/timeval.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c index 4c0d49be4..4136a304e 100644 --- a/libc/calls/getuid.c +++ b/libc/calls/getuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/nt/accounting.h" diff --git a/libc/calls/internal.h b/libc/calls/internal.h index 44e6fa79a..482ff1476 100644 --- a/libc/calls/internal.h +++ b/libc/calls/internal.h @@ -1,7 +1,6 @@ #ifndef COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_ #define COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/itimerval.h" #include "libc/calls/struct/metastat.internal.h" @@ -72,16 +71,8 @@ struct Fds { struct Fd __init_p[OPEN_MAX]; }; -extern const struct Fd kEmptyFd; - -hidden extern int __vforked; -hidden extern int __fds_lock; -hidden extern int __sig_lock; -hidden extern bool __time_critical; -hidden extern unsigned __sighandrvas[NSIG]; -hidden extern unsigned __sighandflags[NSIG]; hidden extern struct Fds g_fds; -hidden extern const struct NtSecurityAttributes kNtIsInheritable; +hidden extern const struct Fd kEmptyFd; int __reservefd(int) hidden; int __reservefd_unlocked(int) hidden; @@ -121,254 +112,78 @@ forceinline size_t _clampio(size_t size) { │ cosmopolitan § syscalls » system five » synthetic jump slots ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -axdx_t __sys_pipe(i32[hasatleast 2], i32) hidden; -axdx_t sys_fork(void) hidden; -axdx_t sys_getpid(void) hidden; axdx_t sys_gettimeofday(struct timeval *, struct timezone *, void *) hidden; -char *sys_getcwd(char *, u64) hidden; -char *sys_getcwd_xnu(char *, u64) hidden; -i32 __sys_dup3(i32, i32, i32) hidden; -i32 __sys_execve(const char *, char *const[], char *const[]) hidden; -i32 __sys_fcntl(i32, i32, ...) hidden; -i32 __sys_fstat(i32, void *) hidden; -i32 __sys_fstatat(i32, const char *, void *, i32) hidden; i32 __sys_getrusage(i32, struct rusage *) hidden; -i32 __sys_munmap(void *, u64) hidden; -i32 __sys_openat(i32, const char *, i32, u32) hidden; -i32 __sys_pipe2(i32[hasatleast 2], u32) hidden; i32 __sys_sigprocmask(i32, const sigset *, sigset *, u64) hidden; i32 __sys_utimensat(i32, const char *, const struct timespec *, i32) hidden; i32 __sys_wait4(i32, i32 *, i32, struct rusage *) hidden; -i32 sys_arch_prctl(i32, i64) hidden; -i32 sys_chdir(const char *) hidden; -i32 sys_chroot(const char *) hidden; i32 sys_clock_gettime(i32, struct timespec *) hidden; -i32 sys_close(i32) hidden; -i32 sys_dup(i32) hidden; -i32 sys_dup2(i32, i32) hidden; -i32 sys_dup3(i32, i32, i32) hidden; -i32 sys_execve(const char *, char *const[], char *const[]) hidden; -i32 sys_faccessat(i32, const char *, i32, u32) hidden; -i32 sys_fadvise(i32, i64, i64, i32) hidden; -i32 sys_fchdir(i32) hidden; -i32 sys_fchmod(i32, u32) hidden; -i32 sys_fchmodat(i32, const char *, u32, u32) hidden; -i32 sys_fchown(i64, u32, u32) hidden; -i32 sys_fchownat(i32, const char *, u32, u32, u32) hidden; -i32 sys_fcntl(i32, i32, u64) hidden; -i32 sys_fdatasync(i32) hidden; -i32 sys_flock(i32, i32) hidden; i32 sys_fstat(i32, struct stat *) hidden; i32 sys_fstatat(i32, const char *, struct stat *, i32) hidden; -i32 sys_fsync(i32) hidden; -i32 sys_ftruncate(i32, i64, i64) hidden; i32 sys_futimes(i32, const struct timeval *) hidden; i32 sys_futimesat(i32, const char *, const struct timeval *) hidden; -i32 sys_getcontext(void *) hidden; i32 sys_getitimer(i32, struct itimerval *) hidden; -i32 sys_getpgid(i32) hidden; -i32 sys_getpgrp(void) hidden; -i32 sys_getppid(void) hidden; -i32 sys_getpriority(i32, u32) hidden; -i32 sys_getresgid(u32 *, u32 *, u32 *); -i32 sys_getresuid(u32 *, u32 *, u32 *); i32 sys_getrlimit(i32, struct rlimit *) hidden; i32 sys_getrusage(i32, struct rusage *) hidden; -i32 sys_getsid(int) hidden; -i32 sys_ioctl(i32, u64, ...) hidden; -i32 sys_kill(i32, i32, i32) hidden; -i32 sys_linkat(i32, const char *, i32, const char *, i32) hidden; -i32 sys_lseek(i32, i64, i64, i64) hidden; i32 sys_lutimes(const char *, const struct timeval *) hidden; -i32 sys_madvise(void *, size_t, i32) hidden; -i32 sys_memfd_create(const char *, u32) hidden; -i32 sys_mincore(void *, u64, unsigned char *) hidden; -i32 sys_mkdirat(i32, const char *, u32) hidden; -i32 sys_mkfifo(const char *, u32) hidden; -i32 sys_mknod(const char *, u32, u64) hidden; -i32 sys_mprotect(void *, u64, i32) hidden; -i32 sys_msync(void *, u64, i32) hidden; -i32 sys_munmap(void *, u64) hidden; i32 sys_nanosleep(const struct timespec *, struct timespec *) hidden; -i32 sys_openat(i32, const char *, i32, u32) hidden; -i32 sys_pause(void) hidden; -i32 sys_pipe(i32[hasatleast 2]) hidden; -i32 sys_pipe2(i32[hasatleast 2], u32) hidden; -i32 sys_pledge(const char *, const char *) hidden; -i32 sys_posix_openpt(i32) hidden; -i32 sys_renameat(i32, const char *, i32, const char *) hidden; -i32 sys_sched_setaffinity(i32, u64, const void *) hidden; -i32 sys_sched_yield(void) hidden; -i32 sys_setgid(i32) hidden; i32 sys_setitimer(i32, const struct itimerval *, struct itimerval *) hidden; -i32 sys_setpgid(i32, i32) hidden; -i32 sys_setpriority(i32, u32, i32) hidden; -i32 sys_setregid(u32, u32) hidden; -i32 sys_setresgid(u32, u32, u32) hidden; -i32 sys_setresuid(u32, u32, u32) hidden; -i32 sys_setreuid(u32, u32) hidden; i32 sys_setrlimit(i32, const struct rlimit *) hidden; -i32 sys_setsid(void) hidden; -i32 sys_setuid(i32) hidden; -i32 sys_sigaction(i32, const void *, void *, i64, i64) hidden; -i32 sys_sigaltstack(const void *, void *) hidden; i32 sys_sigprocmask(i32, const sigset *, sigset *) hidden; i32 sys_sigqueue(i32, i32, const union sigval) hidden; i32 sys_sigqueueinfo(i32, const siginfo_t *) hidden; i32 sys_sigsuspend(const sigset *, u64) hidden; -i32 sys_symlinkat(const char *, i32, const char *) hidden; -i32 sys_sync(void) hidden; -i32 sys_sync_file_range(i32, i64, i64, u32) hidden; i32 sys_sysinfo(struct sysinfo *) hidden; -i32 sys_tgkill(i32, i32, i32) hidden; -i32 sys_tkill(i32, i32, void *) hidden; -i32 sys_truncate(const char *, u64, u64) hidden; -i32 sys_uname(char *) hidden; -i32 sys_unlinkat(i32, const char *, i32) hidden; i32 sys_utime(const char *, const struct utimbuf *) hidden; i32 sys_utimensat(i32, const char *, const struct timespec *, i32) hidden; i32 sys_utimes(const char *, const struct timeval *) hidden; i32 sys_wait4(i32, i32 *, i32, struct rusage *) hidden; -i64 sys_copy_file_range(i32, long *, i32, long *, u64, u32) hidden; -i64 sys_getrandom(void *, u64, u32) hidden; -i64 sys_pread(i32, void *, u64, i64, i64) hidden; i64 sys_preadv(i32, struct iovec *, i32, i64, i64) hidden; -i64 sys_ptrace(int, i32, void *, void *) hidden; -i64 sys_pwrite(i32, const void *, u64, i64, i64) hidden; i64 sys_pwritev(i32, const struct iovec *, i32, i64, i64) hidden; -i64 sys_read(i32, void *, u64) hidden; -i64 sys_readlink(const char *, char *, u64) hidden; -i64 sys_readlinkat(int, const char *, char *, u64) hidden; -i64 sys_sched_getaffinity(i32, u64, void *) hidden; -i64 sys_sendfile(i32, i32, i64 *, u64) hidden; -i64 sys_splice(i32, i64 *, i32, i64 *, u64, u32) hidden; i64 sys_vmsplice(i32, const struct iovec *, i64, u32) hidden; -i64 sys_write(i32, const void *, u64) hidden; -u32 sys_getegid(void) hidden; -u32 sys_geteuid(void) hidden; -u32 sys_getgid(void) hidden; -u32 sys_gettid(void) hidden; -u32 sys_getuid(void) hidden; -u32 sys_umask(u32) hidden; -void *__sys_mmap(void *, u64, u32, u32, i64, i64, i64) hidden; -void *sys_mremap(void *, u64, u64, i32, void *) hidden; -void sys_exit(int) hidden; /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § syscalls » system five » support ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -void __onfork(void) hidden; -void *__vdsofunc(const char *) hidden; -void *__get_clock_gettime(void) hidden; -i32 __fixupnewfd(i32, i32) hidden; -void __restore_rt() hidden; -int sys_utimensat_xnu(int, const char *, const struct timespec *, int) hidden; int sys_nanosleep_xnu(const struct timespec *, struct timespec *) hidden; -void __stat2cosmo(struct stat *restrict, const union metastat *) hidden; -void __restore_rt_netbsd(void) hidden; +int sys_utimensat_xnu(int, const char *, const struct timespec *, int) hidden; +size_t __iovec_size(const struct iovec *, size_t) hidden; +ssize_t WritevUninterruptible(int, struct iovec *, int); +void __rusage2linux(struct rusage *) hidden; void __sigenter_xnu(void *, i32, i32, struct siginfo_xnu *, struct __darwin_ucontext *) hidden; -int gethostname_linux(char *, size_t) hidden; -int gethostname_bsd(char *, size_t) hidden; -int gethostname_nt(char *, size_t, int) hidden; -size_t __iovec_size(const struct iovec *, size_t) hidden; -void __rusage2linux(struct rusage *) hidden; -int __notziposat(int, const char *); -ssize_t WritevUninterruptible(int, struct iovec *, int); -void flock2cosmo(uintptr_t); -void cosmo2flock(uintptr_t); - -int sys_sendfile_xnu(int32_t infd, int32_t outfd, int64_t offset, - int64_t *out_opt_sbytes, const void *opt_hdtr, - int32_t flags) asm("sys_sendfile") hidden; -int sys_sendfile_freebsd(int32_t infd, int32_t outfd, int64_t offset, - size_t nbytes, const void *opt_hdtr, - int64_t *out_opt_sbytes, - int32_t flags) asm("sys_sendfile") hidden; +void __stat2cosmo(struct stat *restrict, const union metastat *) hidden; /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § syscalls » windows nt » veneers ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -bool32 sys_isatty_nt(int) hidden; -char *sys_getcwd_nt(char *, size_t) hidden; -i64 sys_lseek_nt(int, i64, int) hidden; -int sys_chdir_nt(const char *) hidden; -int sys_close_epoll_nt(int) hidden; +int ioctl_tiocgwinsz_nt(struct Fd *, struct winsize *) hidden; int sys_close_nt(struct Fd *) hidden; -int sys_dup_nt(int, int, int, int) hidden; -int sys_execve_nt(const char *, char *const[], char *const[]) hidden; -int sys_faccessat_nt(int, const char *, int, uint32_t) hidden; -int sys_fadvise_nt(int, u64, u64, int) hidden; -int sys_fchdir_nt(int) hidden; -int sys_fchmodat_nt(int, const char *, uint32_t, int) hidden; -int sys_fcntl_nt(int, int, uintptr_t) hidden; -int sys_fdatasync_nt(int) hidden; -int sys_flock_nt(int, int) hidden; -int sys_fork_nt(void) hidden; int sys_fstat_nt(i64, struct stat *) hidden; int sys_fstatat_nt(int, const char *, struct stat *, int) hidden; -int sys_ftruncate_nt(i64, u64) hidden; -int sys_getppid_nt(void) hidden; -int sys_getpriority_nt(int) hidden; int sys_getrusage_nt(int, struct rusage *) hidden; int sys_gettimeofday_nt(struct timeval *, struct timezone *) hidden; -int sys_kill_nt(int, int) hidden; -int sys_linkat_nt(int, const char *, int, const char *) hidden; int sys_lstat_nt(const char *, struct stat *) hidden; -int sys_madvise_nt(void *, size_t, int) hidden; -int sys_mkdirat_nt(int, const char *, uint32_t) hidden; -int sys_msync_nt(char *, size_t, int) hidden; int sys_nanosleep_nt(const struct timespec *, struct timespec *) hidden; -int sys_pipe_nt(int[hasatleast 2], unsigned) hidden; -int sys_renameat_nt(int, const char *, int, const char *) hidden; -int sys_sched_yield_nt(void) hidden; int sys_setitimer_nt(int, const struct itimerval *, struct itimerval *) hidden; -int sys_setpriority_nt(int) hidden; -int sys_symlinkat_nt(const char *, int, const char *) hidden; -int sys_sync_nt(void) hidden; -int sys_sysinfo_nt(struct sysinfo *) hidden; -int sys_truncate_nt(const char *, u64) hidden; -int sys_unlinkat_nt(int, const char *, int) hidden; int sys_setrlimit_nt(int, const struct rlimit *) hidden; +int sys_sysinfo_nt(struct sysinfo *) hidden; int sys_utimensat_nt(int, const char *, const struct timespec *, int) hidden; int sys_utimes_nt(const char *, const struct timeval[2]) hidden; -ssize_t sys_open_nt(int, const char *, u32, i32) dontdiscard hidden; ssize_t sys_read_nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden; -ssize_t sys_readlinkat_nt(int, const char *, char *, size_t) hidden; ssize_t sys_write_nt(int, const struct iovec *, size_t, ssize_t) hidden; -int ioctl_tiocgwinsz_nt(struct Fd *, struct winsize *) hidden; /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § syscalls » windows nt » support ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -bool __is_linux_2_6_23(void) hidden; -int64_t __fix_enotdir(int64_t, char16_t *) hidden; -int64_t __fix_enotdir3(int64_t, char16_t *, char16_t *) hidden; bool _check_interrupts(bool, struct Fd *) hidden; -void _check_sigchld(void) hidden; -void _check_sigalrm(void) hidden; -int __sample_pids(int[hasatleast 64], int64_t[hasatleast 64], bool) hidden; -bool isdirectory_nt(const char *) hidden; -bool isregularfile_nt(const char *) hidden; -bool issymlink_nt(const char *) hidden; -bool32 ntsetprivilege(i64, const char16_t *, u32) hidden; -char16_t *CreatePipeName(char16_t *) hidden; -int __mkntpath(const char *, char16_t[hasatleast PATH_MAX]) hidden; -int __mkntpath2(const char *, char16_t[hasatleast PATH_MAX], int) hidden; -int __mkntpathat(int, const char *, int, char16_t[hasatleast PATH_MAX]) hidden; int sys_clock_gettime_nt(int, struct timespec *) hidden; -int ntaccesscheck(const char16_t *, u32) paramsnonnull() hidden; -int sys_getsetpriority_nt(int, int, int, int (*)(int)); -int64_t __winerr(void) nocallback privileged; -int64_t ntreturn(uint32_t); ssize_t sys_readv_nt(struct Fd *, const struct iovec *, int) hidden; ssize_t sys_writev_nt(int, const struct iovec *, int) hidden; unsigned __wincrash_nt(struct NtExceptionPointers *); -void *GetProcAddressModule(const char *, const char *) hidden; -void WinMainForked(void) hidden; void _ntcontext2linux(struct ucontext *, const struct NtContext *) hidden; void _ntlinux2context(struct NtContext *, const ucontext_t *) hidden; struct NtOverlapped *_offset2overlap(int64_t, int64_t, diff --git a/libc/calls/interrupts-nt.c b/libc/calls/interrupts-nt.c index 1e103539b..458f5a93a 100644 --- a/libc/calls/interrupts-nt.c +++ b/libc/calls/interrupts-nt.c @@ -18,10 +18,13 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/bits/weaken.h" +#include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigaction.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/lockcmpxchgp.h" #include "libc/nexgen32e/threaded.h" diff --git a/libc/calls/ioctl_default.c b/libc/calls/ioctl_default.c index 11886fb1a..9df7412fa 100644 --- a/libc/calls/ioctl_default.c +++ b/libc/calls/ioctl_default.c @@ -19,6 +19,8 @@ #include "libc/bits/weaken.h" #include "libc/calls/internal.h" #include "libc/calls/ioctl.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/dce.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/ioctl_fioclex.c b/libc/calls/ioctl_fioclex.c index 8c0de779c..9eca2f40a 100644 --- a/libc/calls/ioctl_fioclex.c +++ b/libc/calls/ioctl_fioclex.c @@ -19,6 +19,7 @@ #include "libc/calls/internal.h" #include "libc/calls/ioctl.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/ioctl_siocgifconf-nt.c b/libc/calls/ioctl_siocgifconf-nt.c index d693df24c..05ef547a0 100644 --- a/libc/calls/ioctl_siocgifconf-nt.c +++ b/libc/calls/ioctl_siocgifconf-nt.c @@ -19,7 +19,6 @@ #include "libc/assert.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/intrin/cmpxchg.h" #include "libc/nt/errors.h" #include "libc/nt/iphlpapi.h" diff --git a/libc/calls/ioctl_siocgifconf.c b/libc/calls/ioctl_siocgifconf.c index 4f395736c..d9752d391 100644 --- a/libc/calls/ioctl_siocgifconf.c +++ b/libc/calls/ioctl_siocgifconf.c @@ -19,9 +19,10 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/bits/weaken.h" -#include "libc/calls/internal.h" #include "libc/calls/ioctl.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/mem/mem.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/str/str.h" diff --git a/libc/calls/ioctl_tcgets.c b/libc/calls/ioctl_tcgets.c index 14860ee24..2a27d4987 100644 --- a/libc/calls/ioctl_tcgets.c +++ b/libc/calls/ioctl_tcgets.c @@ -20,10 +20,12 @@ #include "libc/calls/ioctl.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metatermios.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.internal.h" #include "libc/calls/ttydefaults.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" +#include "libc/str/str.h" #include "libc/sysv/consts/termios.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/ioctl_tcsets.c b/libc/calls/ioctl_tcsets.c index 34e2592fa..77fc8b76e 100644 --- a/libc/calls/ioctl_tcsets.c +++ b/libc/calls/ioctl_tcsets.c @@ -20,6 +20,7 @@ #include "libc/calls/ioctl.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metatermios.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/ioctl_tiocgwinsz-nt.c b/libc/calls/ioctl_tiocgwinsz-nt.c index 53dafe89c..c6805d11b 100644 --- a/libc/calls/ioctl_tiocgwinsz-nt.c +++ b/libc/calls/ioctl_tiocgwinsz-nt.c @@ -19,9 +19,11 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/termios.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/spinlock.h" #include "libc/log/log.h" #include "libc/nt/console.h" diff --git a/libc/calls/ioctl_tiocgwinsz.c b/libc/calls/ioctl_tiocgwinsz.c index 91abae9f8..62bc117ae 100644 --- a/libc/calls/ioctl_tiocgwinsz.c +++ b/libc/calls/ioctl_tiocgwinsz.c @@ -20,6 +20,7 @@ #include "libc/calls/ioctl.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/consts/termios.h" diff --git a/libc/calls/ioctl_tiocswinsz-nt.c b/libc/calls/ioctl_tiocswinsz-nt.c index 1b80cd24f..658638c7f 100644 --- a/libc/calls/ioctl_tiocswinsz-nt.c +++ b/libc/calls/ioctl_tiocswinsz-nt.c @@ -20,6 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/termios.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/console.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/ioctl_tiocswinsz.c b/libc/calls/ioctl_tiocswinsz.c index dd0db0000..d6bb7b341 100644 --- a/libc/calls/ioctl_tiocswinsz.c +++ b/libc/calls/ioctl_tiocswinsz.c @@ -19,6 +19,7 @@ #include "libc/calls/internal.h" #include "libc/calls/ioctl.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/consts/termios.h" diff --git a/libc/calls/iovecsize.c b/libc/calls/iovecsize.c index 21b71dcd3..d4366a32c 100644 --- a/libc/calls/iovecsize.c +++ b/libc/calls/iovecsize.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/iovec.h" size_t __iovec_size(const struct iovec *v, size_t n) { size_t i, sum; diff --git a/libc/calls/isatty.c b/libc/calls/isatty.c index 3498b7bc3..63e669867 100644 --- a/libc/calls/isatty.c +++ b/libc/calls/isatty.c @@ -20,6 +20,8 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/sysv/consts/termios.h" diff --git a/libc/calls/ischardev.c b/libc/calls/ischardev.c index a310e958f..9e51bf4c8 100644 --- a/libc/calls/ischardev.c +++ b/libc/calls/ischardev.c @@ -19,6 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/metastat.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/nt/enum/filetype.h" diff --git a/libc/calls/isdirectory-nt.c b/libc/calls/isdirectory-nt.c index d0579a967..a986333e4 100644 --- a/libc/calls/isdirectory-nt.c +++ b/libc/calls/isdirectory-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" diff --git a/libc/calls/isdirectory.c b/libc/calls/isdirectory.c index c68af54d4..84262b49d 100644 --- a/libc/calls/isdirectory.c +++ b/libc/calls/isdirectory.c @@ -18,10 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metastat.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/islinux.c b/libc/calls/islinux.c index 1209f959e..536545fcc 100644 --- a/libc/calls/islinux.c +++ b/libc/calls/islinux.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/sysv/consts/pr.h" diff --git a/libc/calls/isregularfile-nt.c b/libc/calls/isregularfile-nt.c index 45614ef64..959623e00 100644 --- a/libc/calls/isregularfile-nt.c +++ b/libc/calls/isregularfile-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" diff --git a/libc/calls/isregularfile.c b/libc/calls/isregularfile.c index 35b145b9c..b7112bced 100644 --- a/libc/calls/isregularfile.c +++ b/libc/calls/isregularfile.c @@ -18,9 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metastat.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/issymlink-nt.c b/libc/calls/issymlink-nt.c index 4c074cadb..a474d4134 100644 --- a/libc/calls/issymlink-nt.c +++ b/libc/calls/issymlink-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" diff --git a/libc/calls/issymlink.c b/libc/calls/issymlink.c index 2e2ddcfb5..9ff983f40 100644 --- a/libc/calls/issymlink.c +++ b/libc/calls/issymlink.c @@ -18,10 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metastat.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/kill.c b/libc/calls/kill.c index a77ff7564..58caee509 100644 --- a/libc/calls/kill.c +++ b/libc/calls/kill.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/str/str.h" diff --git a/libc/calls/killpg.c b/libc/calls/killpg.c index 6808fcd13..4749efe45 100644 --- a/libc/calls/killpg.c +++ b/libc/calls/killpg.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" #include "libc/dce.h" -#include "libc/calls/internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/calls/lchown.c b/libc/calls/lchown.c index fabb0b4c2..b435d42f1 100644 --- a/libc/calls/lchown.c +++ b/libc/calls/lchown.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/sysv/consts/at.h" /** diff --git a/libc/calls/link.c b/libc/calls/link.c index 4ce59ad65..237a3643d 100644 --- a/libc/calls/link.c +++ b/libc/calls/link.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/sysv/consts/at.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/linkat-nt.c b/libc/calls/linkat-nt.c index 072c203f6..94d6efae1 100644 --- a/libc/calls/linkat-nt.c +++ b/libc/calls/linkat-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/linkat.c b/libc/calls/linkat.c index 7b6b86888..4f02f6286 100644 --- a/libc/calls/linkat.c +++ b/libc/calls/linkat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/lseek-nt.c b/libc/calls/lseek-nt.c index da27f64cf..ca5c3cbf5 100644 --- a/libc/calls/lseek-nt.c +++ b/libc/calls/lseek-nt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/enum/filetype.h" #include "libc/nt/files.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/lseek.c b/libc/calls/lseek.c index 07961309f..7b8daec86 100644 --- a/libc/calls/lseek.c +++ b/libc/calls/lseek.c @@ -20,6 +20,8 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/log/backtrace.internal.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/madvise-nt.c b/libc/calls/madvise-nt.c index ce50c0002..6686a4d5f 100644 --- a/libc/calls/madvise-nt.c +++ b/libc/calls/madvise-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/macros.internal.h" #include "libc/nt/enum/offerpriority.h" #include "libc/nt/memory.h" diff --git a/libc/calls/madvise.c b/libc/calls/madvise.c index d4f2c7b51..2610d9968 100644 --- a/libc/calls/madvise.c +++ b/libc/calls/madvise.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/metaflock.c b/libc/calls/metaflock.c index a13b891cc..2874c77e4 100644 --- a/libc/calls/metaflock.c +++ b/libc/calls/metaflock.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/flock.h" +#include "libc/dce.h" union metaflock { struct flock cosmo; diff --git a/libc/calls/mincore.c b/libc/calls/mincore.c index 16b9cf1f4..053fbd4e1 100644 --- a/libc/calls/mincore.c +++ b/libc/calls/mincore.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Tells you which pages are resident in memory. diff --git a/libc/calls/mkdir.c b/libc/calls/mkdir.c index d41c67814..01a42f386 100644 --- a/libc/calls/mkdir.c +++ b/libc/calls/mkdir.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/nt/files.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/mkdirat-nt.c b/libc/calls/mkdirat-nt.c index 16133342a..5faa232e8 100644 --- a/libc/calls/mkdirat-nt.c +++ b/libc/calls/mkdirat-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/mkdirat.c b/libc/calls/mkdirat.c index 67c5536fc..cc42bbeb5 100644 --- a/libc/calls/mkdirat.c +++ b/libc/calls/mkdirat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/mkfifo.c b/libc/calls/mkfifo.c index 2f85e7251..fece40a90 100644 --- a/libc/calls/mkfifo.c +++ b/libc/calls/mkfifo.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/nt/ipc.h" diff --git a/libc/calls/mknod.c b/libc/calls/mknod.c index 63d2b9715..c677fa0cc 100644 --- a/libc/calls/mknod.c +++ b/libc/calls/mknod.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/consts/s.h" diff --git a/libc/calls/mkntpath.c b/libc/calls/mkntpath.c index a2a36a28a..e69732c60 100644 --- a/libc/calls/mkntpath.c +++ b/libc/calls/mkntpath.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/ntmagicpaths.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/macros.internal.h" #include "libc/nt/systeminfo.h" #include "libc/str/oldutf16.internal.h" diff --git a/libc/calls/mkntpathat.c b/libc/calls/mkntpathat.c index f2258721b..204db959a 100644 --- a/libc/calls/mkntpathat.c +++ b/libc/calls/mkntpathat.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/macros.internal.h" #include "libc/nt/files.h" #include "libc/str/str.h" diff --git a/libc/calls/munmap-sysv.c b/libc/calls/munmap-sysv.c index d2ea45e00..95b697034 100644 --- a/libc/calls/munmap-sysv.c +++ b/libc/calls/munmap-sysv.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/runtime/directmap.internal.h" #include "libc/runtime/memtrack.internal.h" diff --git a/libc/calls/nanosleep-nt.c b/libc/calls/nanosleep-nt.c index 275bf3086..4de595513 100644 --- a/libc/calls/nanosleep-nt.c +++ b/libc/calls/nanosleep-nt.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/errno.h" #include "libc/limits.h" diff --git a/libc/calls/nanosleep.c b/libc/calls/nanosleep.c index 226eeba81..da5f71860 100644 --- a/libc/calls/nanosleep.c +++ b/libc/calls/nanosleep.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/now.c b/libc/calls/now.c index e32879fd5..3db0d9625 100644 --- a/libc/calls/now.c +++ b/libc/calls/now.c @@ -21,7 +21,9 @@ #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/nexgen32e/rdtsc.h" diff --git a/libc/calls/ntaccesscheck.c b/libc/calls/ntaccesscheck.c index a06f7188b..b0769a6a6 100644 --- a/libc/calls/ntaccesscheck.c +++ b/libc/calls/ntaccesscheck.c @@ -18,8 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/fmt.h" #include "libc/mem/mem.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/ntcontext2linux.c b/libc/calls/ntcontext2linux.c index e21204e6f..8d527ee9e 100644 --- a/libc/calls/ntcontext2linux.c +++ b/libc/calls/ntcontext2linux.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/ucontext.h" #include "libc/log/libfatal.internal.h" #include "libc/nt/struct/context.h" diff --git a/libc/calls/ntreturn.c b/libc/calls/ntreturn.c index da63a2f0f..f6301a6b1 100644 --- a/libc/calls/ntreturn.c +++ b/libc/calls/ntreturn.c @@ -19,7 +19,6 @@ #include "libc/errno.h" #include "libc/nt/errors.h" #include "libc/nt/ntdll.h" -#include "libc/calls/internal.h" /** * Exitpoint for Windows NT system calls. diff --git a/libc/calls/ntsetprivilege.c b/libc/calls/ntsetprivilege.c index 8dd6994a4..79c36083f 100644 --- a/libc/calls/ntsetprivilege.c +++ b/libc/calls/ntsetprivilege.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/nt/privilege.h" #include "libc/nt/struct/tokenprivileges.h" diff --git a/libc/calls/ntspawn.c b/libc/calls/ntspawn.c index fe63fa82a..19a7c560e 100644 --- a/libc/calls/ntspawn.c +++ b/libc/calls/ntspawn.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/pushpop.h" -#include "libc/calls/internal.h" #include "libc/calls/ntspawn.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/macros.internal.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/enum/pageflags.h" diff --git a/libc/calls/offset2overlap.c b/libc/calls/offset2overlap.c index e50d99811..0b5eb2961 100644 --- a/libc/calls/offset2overlap.c +++ b/libc/calls/offset2overlap.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/nt/struct/overlapped.h" +#include "libc/str/str.h" textwindows struct NtOverlapped *_offset2overlap(int64_t handle, int64_t opt_offset, diff --git a/libc/calls/oldbench.c b/libc/calls/oldbench.c index ee1ab4c41..3f233e32a 100644 --- a/libc/calls/oldbench.c +++ b/libc/calls/oldbench.c @@ -20,7 +20,7 @@ #include "libc/bits/initializer.internal.h" #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" diff --git a/libc/calls/open-nt.c b/libc/calls/open-nt.c index 706edddf3..f2b6001d3 100644 --- a/libc/calls/open-nt.c +++ b/libc/calls/open-nt.c @@ -16,29 +16,20 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/assert.h" #include "libc/calls/internal.h" #include "libc/calls/ntmagicpaths.internal.h" -#include "libc/calls/strace.internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/spinlock.h" #include "libc/nt/createfile.h" -#include "libc/nt/enum/accessmask.h" -#include "libc/nt/enum/creationdisposition.h" -#include "libc/nt/enum/fileflagandattributes.h" -#include "libc/nt/enum/filesharemode.h" #include "libc/nt/enum/filetype.h" -#include "libc/nt/enum/fsctl.h" -#include "libc/nt/errors.h" #include "libc/nt/files.h" -#include "libc/nt/runtime.h" -#include "libc/str/str.h" -#include "libc/sysv/consts/at.h" #include "libc/sysv/consts/fileno.h" #include "libc/sysv/consts/o.h" -#include "libc/sysv/errfuns.h" -static textwindows int64_t sys_open_nt_impl(int dirfd, const char *path, - uint32_t flags, int32_t mode) { +static textwindows int sys_open_nt_impl(int dirfd, const char *path, + uint32_t flags, int32_t mode) { char16_t path16[PATH_MAX]; uint32_t perm, share, disp, attr; if (__mkntpathat(dirfd, path, flags, path16) == -1) return -1; @@ -48,10 +39,10 @@ static textwindows int64_t sys_open_nt_impl(int dirfd, const char *path, path16); } -static textwindows ssize_t sys_open_nt_console(int dirfd, - const struct NtMagicPaths *mp, - uint32_t flags, int32_t mode, - size_t fd) { +static textwindows int sys_open_nt_console(int dirfd, + const struct NtMagicPaths *mp, + uint32_t flags, int32_t mode, + size_t fd) { if (GetFileType(g_fds.p[STDIN_FILENO].handle) == kNtFileTypeChar && GetFileType(g_fds.p[STDOUT_FILENO].handle) == kNtFileTypeChar) { g_fds.p[fd].handle = g_fds.p[STDIN_FILENO].handle; @@ -71,9 +62,9 @@ static textwindows ssize_t sys_open_nt_console(int dirfd, return fd; } -static textwindows ssize_t sys_open_nt_file(int dirfd, const char *file, - uint32_t flags, int32_t mode, - size_t fd) { +static textwindows int sys_open_nt_file(int dirfd, const char *file, + uint32_t flags, int32_t mode, + size_t fd) { if ((g_fds.p[fd].handle = sys_open_nt_impl(dirfd, file, flags, mode)) != -1) { g_fds.p[fd].kind = kFdFile; g_fds.p[fd].flags = flags; @@ -84,8 +75,8 @@ static textwindows ssize_t sys_open_nt_file(int dirfd, const char *file, } } -textwindows ssize_t sys_open_nt(int dirfd, const char *file, uint32_t flags, - int32_t mode) { +textwindows int sys_open_nt(int dirfd, const char *file, uint32_t flags, + int32_t mode) { int fd; ssize_t rc; _spinlock(&__fds_lock); diff --git a/libc/calls/openat-sysv.c b/libc/calls/openat-sysv.c index d9c3bc659..8088d5e59 100644 --- a/libc/calls/openat-sysv.c +++ b/libc/calls/openat-sysv.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/str/str.h" diff --git a/libc/calls/openat.c b/libc/calls/openat.c index 19968a080..0ce7c46f6 100644 --- a/libc/calls/openat.c +++ b/libc/calls/openat.c @@ -19,7 +19,10 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/pause.c b/libc/calls/pause.c index b58303702..23886a070 100644 --- a/libc/calls/pause.c +++ b/libc/calls/pause.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigset.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/nt/synchronization.h" diff --git a/libc/calls/pipe-nt.c b/libc/calls/pipe-nt.c index b8d554b57..c38e6c8c7 100644 --- a/libc/calls/pipe-nt.c +++ b/libc/calls/pipe-nt.c @@ -17,6 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/spinlock.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/pipe-sysv.c b/libc/calls/pipe-sysv.c index 575337099..eb9da6ada 100644 --- a/libc/calls/pipe-sysv.c +++ b/libc/calls/pipe-sysv.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" int sys_pipe(int fds[2]) { diff --git a/libc/calls/pipe.c b/libc/calls/pipe.c index bbced47d4..94f65eed1 100644 --- a/libc/calls/pipe.c +++ b/libc/calls/pipe.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/pipe2-sysv.c b/libc/calls/pipe2-sysv.c index 34cb734ae..526917b8b 100644 --- a/libc/calls/pipe2-sysv.c +++ b/libc/calls/pipe2-sysv.c @@ -16,7 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/pipe2.c b/libc/calls/pipe2.c index 2c916775a..738260ae4 100644 --- a/libc/calls/pipe2.c +++ b/libc/calls/pipe2.c @@ -16,8 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sysv/consts/o.h" diff --git a/libc/calls/poll-metal.c b/libc/calls/poll-metal.c index 60c77a423..d3f9c93a7 100644 --- a/libc/calls/poll-metal.c +++ b/libc/calls/poll-metal.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/safemacros.internal.h" +#include "libc/calls/internal.h" #include "libc/nexgen32e/rdtsc.h" #include "libc/nexgen32e/uart.internal.h" #include "libc/runtime/pc.internal.h" diff --git a/libc/calls/poll-nt.c b/libc/calls/poll-nt.c index c1a282992..c6b575f88 100644 --- a/libc/calls/poll-nt.c +++ b/libc/calls/poll-nt.c @@ -22,6 +22,7 @@ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigaction.h" #include "libc/errno.h" diff --git a/libc/calls/poll.c b/libc/calls/poll.c index 6fb4d8ae0..052674750 100644 --- a/libc/calls/poll.c +++ b/libc/calls/poll.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/errno.h" diff --git a/libc/calls/posix_openpt.c b/libc/calls/posix_openpt.c index 13fedf2f2..93bd3309f 100644 --- a/libc/calls/posix_openpt.c +++ b/libc/calls/posix_openpt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" #include "libc/dce.h" #include "libc/errno.h" diff --git a/libc/calls/pread.c b/libc/calls/pread.c index 1f4370e63..6361e17b3 100644 --- a/libc/calls/pread.c +++ b/libc/calls/pread.c @@ -22,6 +22,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/macros.internal.h" diff --git a/libc/calls/preadv.c b/libc/calls/preadv.c index 4b527d88c..2a8d7c0ce 100644 --- a/libc/calls/preadv.c +++ b/libc/calls/preadv.c @@ -20,8 +20,10 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/printfds.c b/libc/calls/printfds.c index d9ff0a691..f3a45a039 100644 --- a/libc/calls/printfds.c +++ b/libc/calls/printfds.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/spinlock.h" diff --git a/libc/calls/ptrace.c b/libc/calls/ptrace.c index 8eb15c3c9..a2e8d2c62 100644 --- a/libc/calls/ptrace.c +++ b/libc/calls/ptrace.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/sysv/consts/ptrace.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c index 0335cbe28..c202ae0f8 100644 --- a/libc/calls/pwrite.c +++ b/libc/calls/pwrite.c @@ -21,6 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/macros.internal.h" diff --git a/libc/calls/pwritev.c b/libc/calls/pwritev.c index 3d8744415..4a90d8201 100644 --- a/libc/calls/pwritev.c +++ b/libc/calls/pwritev.c @@ -21,6 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/raise.c b/libc/calls/raise.c index 6b47956d6..57481ec80 100644 --- a/libc/calls/raise.c +++ b/libc/calls/raise.c @@ -18,9 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/getconsolectrlevent.internal.h" -#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/kprintf.h" #include "libc/nt/console.h" #include "libc/nt/errors.h" diff --git a/libc/calls/read-nt.c b/libc/calls/read-nt.c index 9c2d44692..6bbc9ded3 100644 --- a/libc/calls/read-nt.c +++ b/libc/calls/read-nt.c @@ -19,6 +19,7 @@ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/enum/filetype.h" #include "libc/nt/errors.h" #include "libc/nt/files.h" diff --git a/libc/calls/read.c b/libc/calls/read.c index 31ffff570..2f42ea22a 100644 --- a/libc/calls/read.c +++ b/libc/calls/read.c @@ -21,6 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/calls/readansi.c b/libc/calls/readansi.c index e7ee617fb..854ad59cd 100644 --- a/libc/calls/readansi.c +++ b/libc/calls/readansi.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/str/thompike.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/readlinkat-nt.c b/libc/calls/readlinkat-nt.c index e55136d35..e8f730dc2 100644 --- a/libc/calls/readlinkat-nt.c +++ b/libc/calls/readlinkat-nt.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/mem/alloca.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/creationdisposition.h" diff --git a/libc/calls/readlinkat.c b/libc/calls/readlinkat.c index 4e90745ab..b06d285e3 100644 --- a/libc/calls/readlinkat.c +++ b/libc/calls/readlinkat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/bits/weaken.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/readv-nt.c b/libc/calls/readv-nt.c index a9b55edd5..e4aa2ebf7 100644 --- a/libc/calls/readv-nt.c +++ b/libc/calls/readv-nt.c @@ -19,6 +19,7 @@ #include "libc/bits/weaken.h" #include "libc/calls/internal.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" textwindows ssize_t sys_readv_nt(struct Fd *fd, const struct iovec *iov, diff --git a/libc/calls/readv.c b/libc/calls/readv.c index 54ae7ee12..d54ddbe48 100644 --- a/libc/calls/readv.c +++ b/libc/calls/readv.c @@ -21,6 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/calls/reboot.c b/libc/calls/reboot.c index 3077f7be5..6f422393c 100644 --- a/libc/calls/reboot.c +++ b/libc/calls/reboot.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/framebuffervirtualscreeninfo.h" #include "libc/dce.h" #include "libc/nt/enum/version.h" diff --git a/libc/calls/renameat-nt.c b/libc/calls/renameat-nt.c index 949d05d84..8b094783d 100644 --- a/libc/calls/renameat-nt.c +++ b/libc/calls/renameat-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/enum/movefileexflags.h" #include "libc/nt/files.h" diff --git a/libc/calls/renameat.c b/libc/calls/renameat.c index 107ef3b69..f3084e9bc 100644 --- a/libc/calls/renameat.c +++ b/libc/calls/renameat.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/reservefd.c b/libc/calls/reservefd.c index 81a0d45c9..528b25e4b 100644 --- a/libc/calls/reservefd.c +++ b/libc/calls/reservefd.c @@ -20,6 +20,7 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/spinlock.h" diff --git a/libc/calls/rusage2linux.c b/libc/calls/rusage2linux.c index 855fd8dbe..d1b62b8e9 100644 --- a/libc/calls/rusage2linux.c +++ b/libc/calls/rusage2linux.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/rusage.h" void __rusage2linux(struct rusage *ru) { if (IsXnu()) { diff --git a/libc/calls/sched_getaffinity.c b/libc/calls/sched_getaffinity.c index 023b217c3..cc9362e95 100644 --- a/libc/calls/sched_getaffinity.c +++ b/libc/calls/sched_getaffinity.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/str/str.h" /** diff --git a/libc/calls/sched_setaffinity.c b/libc/calls/sched_setaffinity.c index 99d6db694..3d917e045 100644 --- a/libc/calls/sched_setaffinity.c +++ b/libc/calls/sched_setaffinity.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/limits.h" #include "libc/nt/enum/processaccess.h" diff --git a/libc/calls/setgid.c b/libc/calls/setgid.c index 93431f3a4..35cbe11f8 100644 --- a/libc/calls/setgid.c +++ b/libc/calls/setgid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets group id of current process. diff --git a/libc/calls/setitimer-nt.c b/libc/calls/setitimer-nt.c index 3dd838e30..32e8e4fa4 100644 --- a/libc/calls/setitimer-nt.c +++ b/libc/calls/setitimer-nt.c @@ -19,7 +19,6 @@ #include "libc/assert.h" #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/itimerval.h" diff --git a/libc/calls/setpgid.c b/libc/calls/setpgid.c index 36a2aad4c..24f6591fd 100644 --- a/libc/calls/setpgid.c +++ b/libc/calls/setpgid.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/nt/console.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/setpriority-nt.c b/libc/calls/setpriority-nt.c index cb762d0eb..aadb52c2e 100644 --- a/libc/calls/setpriority-nt.c +++ b/libc/calls/setpriority-nt.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/safemacros.internal.h" -#include "libc/calls/internal.h" #include "libc/calls/kntprioritycombos.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" #include "libc/nt/thread.h" diff --git a/libc/calls/setpriority.c b/libc/calls/setpriority.c index 682e62e54..10d8bd26a 100644 --- a/libc/calls/setpriority.c +++ b/libc/calls/setpriority.c @@ -17,7 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets nice value of thing. diff --git a/libc/calls/setregid.c b/libc/calls/setregid.c index e2ee4dc94..0134b45f6 100644 --- a/libc/calls/setregid.c +++ b/libc/calls/setregid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets real and/or effective group ids. diff --git a/libc/calls/setresgid.c b/libc/calls/setresgid.c index 846df7a93..04601eccd 100644 --- a/libc/calls/setresgid.c +++ b/libc/calls/setresgid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets real, effective, and "saved" group ids. diff --git a/libc/calls/setresuid.c b/libc/calls/setresuid.c index a585dc91c..8e05da8cf 100644 --- a/libc/calls/setresuid.c +++ b/libc/calls/setresuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets real, effective, and "saved" user ids. diff --git a/libc/calls/setreuid.c b/libc/calls/setreuid.c index e3ff17143..9e9e4f14c 100644 --- a/libc/calls/setreuid.c +++ b/libc/calls/setreuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets real and/or effective user ids. diff --git a/libc/calls/setsid.c b/libc/calls/setsid.c index adcfff21b..c63b255cf 100644 --- a/libc/calls/setsid.c +++ b/libc/calls/setsid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Creates session and sets the process group id. diff --git a/libc/calls/setuid.c b/libc/calls/setuid.c index f46735559..abaa567b8 100644 --- a/libc/calls/setuid.c +++ b/libc/calls/setuid.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Sets user id of current process. diff --git a/libc/calls/sig.c b/libc/calls/sig.c index 5412f0bf5..9c8717b6d 100644 --- a/libc/calls/sig.c +++ b/libc/calls/sig.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/spinlock.h" #include "libc/macros.internal.h" #include "libc/sysv/consts/sig.h" diff --git a/libc/calls/sig2.c b/libc/calls/sig2.c index d94d02e18..2aba4946f 100644 --- a/libc/calls/sig2.c +++ b/libc/calls/sig2.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/intrin/cmpxchg.h" #include "libc/intrin/lockcmpxchg.h" diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c index 73f8fd4d3..0270839d6 100644 --- a/libc/calls/sigaction.c +++ b/libc/calls/sigaction.c @@ -22,6 +22,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigaction-freebsd.internal.h" #include "libc/calls/struct/sigaction-linux.internal.h" @@ -29,6 +30,8 @@ #include "libc/calls/struct/sigaction-openbsd.internal.h" #include "libc/calls/struct/sigaction-xnu.internal.h" #include "libc/calls/struct/sigaction.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" #include "libc/dce.h" diff --git a/libc/calls/sigaltstack.c b/libc/calls/sigaltstack.c index 4839b9dc3..d150d27ac 100644 --- a/libc/calls/sigaltstack.c +++ b/libc/calls/sigaltstack.c @@ -16,10 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/metasigaltstack.h" #include "libc/calls/struct/sigaltstack.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/sigchld-nt.c b/libc/calls/sigchld-nt.c index c17804392..14c278bcc 100644 --- a/libc/calls/sigchld-nt.c +++ b/libc/calls/sigchld-nt.c @@ -19,7 +19,9 @@ #include "libc/assert.h" #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/spinlock.h" #include "libc/nt/enum/wait.h" diff --git a/libc/calls/sigenter-freebsd.c b/libc/calls/sigenter-freebsd.c index 7afbb42d5..4bc1d2aa9 100644 --- a/libc/calls/sigenter-freebsd.c +++ b/libc/calls/sigenter-freebsd.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/sigaction-freebsd.internal.h" #include "libc/calls/struct/siginfo-freebsd.internal.h" #include "libc/calls/struct/siginfo.h" diff --git a/libc/calls/sigenter-netbsd.c b/libc/calls/sigenter-netbsd.c index 50a1a93d8..b1531596c 100644 --- a/libc/calls/sigenter-netbsd.c +++ b/libc/calls/sigenter-netbsd.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/sigaction-freebsd.internal.h" #include "libc/calls/struct/siginfo-netbsd.internal.h" #include "libc/calls/struct/siginfo.h" diff --git a/libc/calls/sigenter-openbsd.c b/libc/calls/sigenter-openbsd.c index 253d61f50..cd503f4de 100644 --- a/libc/calls/sigenter-openbsd.c +++ b/libc/calls/sigenter-openbsd.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/sigaction-freebsd.internal.h" #include "libc/calls/struct/siginfo-openbsd.internal.h" #include "libc/calls/struct/siginfo.h" diff --git a/libc/calls/sigenter-xnu.c b/libc/calls/sigenter-xnu.c index 46a2fb831..03fdc9a97 100644 --- a/libc/calls/sigenter-xnu.c +++ b/libc/calls/sigenter-xnu.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/metasigaltstack.h" #include "libc/calls/struct/siginfo-xnu.internal.h" #include "libc/calls/struct/siginfo.h" diff --git a/libc/calls/sigprocmask-sysv.greg.c b/libc/calls/sigprocmask-sysv.greg.c index 7f6ce2b41..625808d8e 100644 --- a/libc/calls/sigprocmask-sysv.greg.c +++ b/libc/calls/sigprocmask-sysv.greg.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/sigset.h" int sys_sigprocmask(int how, const sigset_t *opt_set, sigset_t *opt_out_oldset) { diff --git a/libc/calls/sleep.c b/libc/calls/sleep.c index 19810c82f..f4dea02a5 100644 --- a/libc/calls/sleep.c +++ b/libc/calls/sleep.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/timespec.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/splice.c b/libc/calls/splice.c index 08cf2d8fc..35f8a0710 100644 --- a/libc/calls/splice.c +++ b/libc/calls/splice.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/stat2cosmo.c b/libc/calls/stat2cosmo.c index c4e28281e..4d5e3e850 100644 --- a/libc/calls/stat2cosmo.c +++ b/libc/calls/stat2cosmo.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/metastat.internal.h" #include "libc/dce.h" diff --git a/libc/calls/state.internal.h b/libc/calls/state.internal.h new file mode 100644 index 000000000..b7a14781f --- /dev/null +++ b/libc/calls/state.internal.h @@ -0,0 +1,16 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_STATE_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_STATE_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +hidden extern int __vforked; +hidden extern int __fds_lock; +hidden extern int __sig_lock; +hidden extern bool __time_critical; +hidden extern unsigned __sighandrvas[NSIG]; +hidden extern unsigned __sighandflags[NSIG]; +hidden extern const struct NtSecurityAttributes kNtIsInheritable; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_STATE_INTERNAL_H_ */ diff --git a/libc/calls/symlinkat-nt.c b/libc/calls/symlinkat-nt.c index 1cbcc3907..ad5149afa 100644 --- a/libc/calls/symlinkat-nt.c +++ b/libc/calls/symlinkat-nt.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/intrin/once.h" #include "libc/intrin/spinlock.h" diff --git a/libc/calls/symlinkat.c b/libc/calls/symlinkat.c index de4540654..cfc877f2d 100644 --- a/libc/calls/symlinkat.c +++ b/libc/calls/symlinkat.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/calls/sync-nt.c b/libc/calls/sync-nt.c index 31dbc395b..4657e92d4 100644 --- a/libc/calls/sync-nt.c +++ b/libc/calls/sync-nt.c @@ -18,6 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/creationdisposition.h" diff --git a/libc/calls/sync.c b/libc/calls/sync.c index 842df3762..9586a1b43 100644 --- a/libc/calls/sync.c +++ b/libc/calls/sync.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/sync_file_range.c b/libc/calls/sync_file_range.c index 54110b570..5c020e472 100644 --- a/libc/calls/sync_file_range.c +++ b/libc/calls/sync_file_range.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/errno.h" /** diff --git a/libc/calls/sys_utimes_nt.c b/libc/calls/sys_utimes_nt.c index 8a7638a14..225ecd90d 100644 --- a/libc/calls/sys_utimes_nt.c +++ b/libc/calls/sys_utimes_nt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/timeval.h" #include "libc/sysv/consts/at.h" textwindows int sys_utimes_nt(const char *path, const struct timeval tv[2]) { diff --git a/libc/calls/syscall-nt.internal.h b/libc/calls/syscall-nt.internal.h new file mode 100644 index 000000000..51bba6286 --- /dev/null +++ b/libc/calls/syscall-nt.internal.h @@ -0,0 +1,43 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +bool32 sys_isatty_nt(int) hidden; +char *sys_getcwd_nt(char *, size_t) hidden; +int sys_chdir_nt(const char *) hidden; +int sys_close_epoll_nt(int) hidden; +int sys_dup_nt(int, int, int, int) hidden; +int sys_execve_nt(const char *, char *const[], char *const[]) hidden; +int sys_faccessat_nt(int, const char *, int, uint32_t) hidden; +int sys_fadvise_nt(int, uint64_t, uint64_t, int) hidden; +int sys_fchdir_nt(int) hidden; +int sys_fchmodat_nt(int, const char *, uint32_t, int) hidden; +int sys_fcntl_nt(int, int, uintptr_t) hidden; +int sys_fdatasync_nt(int) hidden; +int sys_flock_nt(int, int) hidden; +int sys_fork_nt(void) hidden; +int sys_ftruncate_nt(int64_t, uint64_t) hidden; +int sys_getppid_nt(void) hidden; +int sys_getpriority_nt(int) hidden; +int sys_getsetpriority_nt(int, int, int, int (*)(int)); +int sys_kill_nt(int, int) hidden; +int sys_linkat_nt(int, const char *, int, const char *) hidden; +int sys_madvise_nt(void *, size_t, int) hidden; +int sys_mkdirat_nt(int, const char *, uint32_t) hidden; +int sys_msync_nt(char *, size_t, int) hidden; +int sys_open_nt(int, const char *, uint32_t, int32_t) dontdiscard hidden; +int sys_pipe_nt(int[hasatleast 2], unsigned) hidden; +int sys_renameat_nt(int, const char *, int, const char *) hidden; +int sys_sched_yield_nt(void) hidden; +int sys_setpriority_nt(int) hidden; +int sys_symlinkat_nt(const char *, int, const char *) hidden; +int sys_sync_nt(void) hidden; +int sys_truncate_nt(const char *, uint64_t) hidden; +int sys_unlinkat_nt(int, const char *, int) hidden; +int64_t sys_lseek_nt(int, int64_t, int) hidden; +ssize_t sys_readlinkat_nt(int, const char *, char *, size_t) hidden; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_NT_INTERNAL_H_ */ diff --git a/libc/calls/syscall-sysv.internal.h b/libc/calls/syscall-sysv.internal.h new file mode 100644 index 000000000..479b6c6ed --- /dev/null +++ b/libc/calls/syscall-sysv.internal.h @@ -0,0 +1,123 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ +#define i32 int32_t +#define i64 int64_t +#define u32 uint32_t +#define u64 uint64_t +/*───────────────────────────────────────────────────────────────────────────│─╗ +│ cosmopolitan § syscalls » system five » structless synthetic jump slots ─╬─│┼ +╚────────────────────────────────────────────────────────────────────────────│*/ + +axdx_t __sys_pipe(i32[hasatleast 2], i32) hidden; +axdx_t sys_fork(void) hidden; +axdx_t sys_getpid(void) hidden; +char *sys_getcwd(char *, u64) hidden; +char *sys_getcwd_xnu(char *, u64) hidden; +i32 __sys_dup3(i32, i32, i32) hidden; +i32 __sys_execve(const char *, char *const[], char *const[]) hidden; +i32 __sys_fcntl(i32, i32, ...) hidden; +i32 __sys_fstat(i32, void *) hidden; +i32 __sys_fstatat(i32, const char *, void *, i32) hidden; +i32 __sys_munmap(void *, u64) hidden; +i32 __sys_openat(i32, const char *, i32, u32) hidden; +i32 __sys_pipe2(i32[hasatleast 2], u32) hidden; +i32 sys_arch_prctl(i32, i64) hidden; +i32 sys_chdir(const char *) hidden; +i32 sys_chroot(const char *) hidden; +i32 sys_close(i32) hidden; +i32 sys_dup(i32) hidden; +i32 sys_dup2(i32, i32) hidden; +i32 sys_dup3(i32, i32, i32) hidden; +i32 sys_execve(const char *, char *const[], char *const[]) hidden; +i32 sys_faccessat(i32, const char *, i32, u32) hidden; +i32 sys_fadvise(i32, i64, i64, i32) hidden; +i32 sys_fchdir(i32) hidden; +i32 sys_fchmod(i32, u32) hidden; +i32 sys_fchmodat(i32, const char *, u32, u32) hidden; +i32 sys_fchown(i64, u32, u32) hidden; +i32 sys_fchownat(i32, const char *, u32, u32, u32) hidden; +i32 sys_fcntl(i32, i32, u64) hidden; +i32 sys_fdatasync(i32) hidden; +i32 sys_flock(i32, i32) hidden; +i32 sys_fsync(i32) hidden; +i32 sys_ftruncate(i32, i64, i64) hidden; +i32 sys_getcontext(void *) hidden; +i32 sys_getpgid(i32) hidden; +i32 sys_getpgrp(void) hidden; +i32 sys_getppid(void) hidden; +i32 sys_getpriority(i32, u32) hidden; +i32 sys_getresgid(u32 *, u32 *, u32 *); +i32 sys_getresuid(u32 *, u32 *, u32 *); +i32 sys_getsid(int) hidden; +i32 sys_ioctl(i32, u64, ...) hidden; +i32 sys_kill(i32, i32, i32) hidden; +i32 sys_linkat(i32, const char *, i32, const char *, i32) hidden; +i32 sys_lseek(i32, i64, i64, i64) hidden; +i32 sys_madvise(void *, size_t, i32) hidden; +i32 sys_memfd_create(const char *, u32) hidden; +i32 sys_mincore(void *, u64, unsigned char *) hidden; +i32 sys_mkdirat(i32, const char *, u32) hidden; +i32 sys_mkfifo(const char *, u32) hidden; +i32 sys_mknod(const char *, u32, u64) hidden; +i32 sys_mprotect(void *, u64, i32) hidden; +i32 sys_msync(void *, u64, i32) hidden; +i32 sys_munmap(void *, u64) hidden; +i32 sys_openat(i32, const char *, i32, u32) hidden; +i32 sys_pause(void) hidden; +i32 sys_pipe(i32[hasatleast 2]) hidden; +i32 sys_pipe2(i32[hasatleast 2], u32) hidden; +i32 sys_pledge(const char *, const char *) hidden; +i32 sys_posix_openpt(i32) hidden; +i32 sys_renameat(i32, const char *, i32, const char *) hidden; +i32 sys_sched_setaffinity(i32, u64, const void *) hidden; +i32 sys_sched_yield(void) hidden; +i32 sys_setgid(i32) hidden; +i32 sys_setpgid(i32, i32) hidden; +i32 sys_setpriority(i32, u32, i32) hidden; +i32 sys_setregid(u32, u32) hidden; +i32 sys_setresgid(u32, u32, u32) hidden; +i32 sys_setresuid(u32, u32, u32) hidden; +i32 sys_setreuid(u32, u32) hidden; +i32 sys_setsid(void) hidden; +i32 sys_setuid(i32) hidden; +i32 sys_sigaction(i32, const void *, void *, i64, i64) hidden; +i32 sys_sigaltstack(const void *, void *) hidden; +i32 sys_symlinkat(const char *, i32, const char *) hidden; +i32 sys_sync(void) hidden; +i32 sys_sync_file_range(i32, i64, i64, u32) hidden; +i32 sys_tgkill(i32, i32, i32) hidden; +i32 sys_tkill(i32, i32, void *) hidden; +i32 sys_truncate(const char *, u64, u64) hidden; +i32 sys_uname(char *) hidden; +i32 sys_unlinkat(i32, const char *, i32) hidden; +i64 sys_copy_file_range(i32, long *, i32, long *, u64, u32) hidden; +i64 sys_getrandom(void *, u64, u32) hidden; +i64 sys_pread(i32, void *, u64, i64, i64) hidden; +i64 sys_ptrace(int, i32, void *, void *) hidden; +i64 sys_pwrite(i32, const void *, u64, i64, i64) hidden; +i64 sys_read(i32, void *, u64) hidden; +i64 sys_readlink(const char *, char *, u64) hidden; +i64 sys_readlinkat(int, const char *, char *, u64) hidden; +i64 sys_sched_getaffinity(i32, u64, void *) hidden; +i64 sys_sendfile(i32, i32, i64 *, u64) hidden; +i64 sys_splice(i32, i64 *, i32, i64 *, u64, u32) hidden; +i64 sys_write(i32, const void *, u64) hidden; +u32 sys_getegid(void) hidden; +u32 sys_geteuid(void) hidden; +u32 sys_getgid(void) hidden; +u32 sys_gettid(void) hidden; +u32 sys_getuid(void) hidden; +u32 sys_umask(u32) hidden; +void *__sys_mmap(void *, u64, u32, u32, i64, i64, i64) hidden; +void *sys_mremap(void *, u64, u64, i32, void *) hidden; +void sys_exit(int) hidden; + +#undef i32 +#undef i64 +#undef u32 +#undef u64 +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SYSV_INTERNAL_H_ */ diff --git a/libc/calls/syscall_support-nt.internal.h b/libc/calls/syscall_support-nt.internal.h new file mode 100644 index 000000000..d4beaee79 --- /dev/null +++ b/libc/calls/syscall_support-nt.internal.h @@ -0,0 +1,27 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_NT_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_NT_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +bool isdirectory_nt(const char *) hidden; +bool isregularfile_nt(const char *) hidden; +bool issymlink_nt(const char *) hidden; +bool32 ntsetprivilege(int64_t, const char16_t *, uint32_t) hidden; +char16_t *CreatePipeName(char16_t *) hidden; +int __mkntpath(const char *, char16_t[hasatleast PATH_MAX]) hidden; +int __mkntpath2(const char *, char16_t[hasatleast PATH_MAX], int) hidden; +int __mkntpathat(int, const char *, int, char16_t[hasatleast PATH_MAX]) hidden; +int __sample_pids(int[hasatleast 64], int64_t[hasatleast 64], bool) hidden; +int ntaccesscheck(const char16_t *, uint32_t) paramsnonnull() hidden; +int64_t __fix_enotdir(int64_t, char16_t *) hidden; +int64_t __fix_enotdir3(int64_t, char16_t *, char16_t *) hidden; +int64_t __winerr(void) nocallback privileged; +int64_t ntreturn(uint32_t); +void *GetProcAddressModule(const char *, const char *) hidden; +void WinMainForked(void) hidden; +void _check_sigalrm(void) hidden; +void _check_sigchld(void) hidden; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_NT_INTERNAL_H_ */ diff --git a/libc/calls/syscall_support-sysv.internal.h b/libc/calls/syscall_support-sysv.internal.h new file mode 100644 index 000000000..f39cf80bd --- /dev/null +++ b/libc/calls/syscall_support-sysv.internal.h @@ -0,0 +1,25 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ +/*───────────────────────────────────────────────────────────────────────────│─╗ +│ cosmopolitan § syscalls » system five » structless support ─╬─│┼ +╚────────────────────────────────────────────────────────────────────────────│*/ + +bool __is_linux_2_6_23(void) hidden; +int __fixupnewfd(int, int) hidden; +int __notziposat(int, const char *); +int gethostname_bsd(char *, size_t) hidden; +int gethostname_linux(char *, size_t) hidden; +int gethostname_nt(char *, size_t, int) hidden; +void *__get_clock_gettime(void) hidden; +void *__vdsofunc(const char *) hidden; +void __onfork(void) hidden; +void __restore_rt() hidden; +void __restore_rt_netbsd(void) hidden; +void cosmo2flock(uintptr_t); +void flock2cosmo(uintptr_t); + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_SYSCALL_SUPPORT_SYSV_INTERNAL_H_ */ diff --git a/libc/calls/sysinfo-nt.c b/libc/calls/sysinfo-nt.c index 934d4fafc..2ee862ca9 100644 --- a/libc/calls/sysinfo-nt.c +++ b/libc/calls/sysinfo-nt.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/loadavg.internal.h" #include "libc/calls/struct/sysinfo.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/accounting.h" #include "libc/nt/struct/memorystatusex.h" #include "libc/nt/struct/systeminfo.h" diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c index 18b33083a..d04038f10 100644 --- a/libc/calls/sysinfo.c +++ b/libc/calls/sysinfo.c @@ -16,16 +16,11 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/bits.h" -#include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/sysinfo.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" -#include "libc/nt/accounting.h" -#include "libc/nt/runtime.h" -#include "libc/nt/struct/memorystatusex.h" -#include "libc/nt/systeminfo.h" +#include "libc/macros.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/tcdrain.c b/libc/calls/tcdrain.c index f6220eb98..c7ca74c3a 100644 --- a/libc/calls/tcdrain.c +++ b/libc/calls/tcdrain.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/termios.h" int tcdrain(int fd) { diff --git a/libc/calls/tcflow.c b/libc/calls/tcflow.c index 9468cafb3..ec1152d90 100644 --- a/libc/calls/tcflow.c +++ b/libc/calls/tcflow.c @@ -16,9 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/termios.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" +#include "libc/dce.h" #include "libc/sysv/consts/termios.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/tcflush.c b/libc/calls/tcflush.c index fcef3676d..6229b6c68 100644 --- a/libc/calls/tcflush.c +++ b/libc/calls/tcflush.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" /** diff --git a/libc/calls/tcgetsid.c b/libc/calls/tcgetsid.c index 8bdbdc04c..d69a1aa6e 100644 --- a/libc/calls/tcgetsid.c +++ b/libc/calls/tcgetsid.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" #include "libc/sysv/consts/termios.h" diff --git a/libc/calls/tcsendbreak.c b/libc/calls/tcsendbreak.c index 2f8299a9d..8a9e5228f 100644 --- a/libc/calls/tcsendbreak.c +++ b/libc/calls/tcsendbreak.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" #include "libc/dce.h" #include "libc/sysv/consts/termios.h" diff --git a/libc/calls/tgkill.c b/libc/calls/tgkill.c index a729b4c6d..214be57e8 100644 --- a/libc/calls/tgkill.c +++ b/libc/calls/tgkill.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" /** * Kills thread group. diff --git a/libc/calls/timecritical.c b/libc/calls/timecritical.c index 7f32a4b50..8215b1eec 100644 --- a/libc/calls/timecritical.c +++ b/libc/calls/timecritical.c @@ -16,6 +16,5 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" bool __time_critical; diff --git a/libc/calls/tkill.c b/libc/calls/tkill.c index 69c9576ae..0d20432de 100644 --- a/libc/calls/tkill.c +++ b/libc/calls/tkill.c @@ -17,8 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/nt/enum/threadaccess.h" diff --git a/libc/calls/truncate-nt.c b/libc/calls/truncate-nt.c index 29c0819b5..71f9c2f4f 100644 --- a/libc/calls/truncate-nt.c +++ b/libc/calls/truncate-nt.c @@ -16,7 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" #include "libc/nt/enum/creationdisposition.h" diff --git a/libc/calls/truncate.c b/libc/calls/truncate.c index a8c3f75f1..752116066 100644 --- a/libc/calls/truncate.c +++ b/libc/calls/truncate.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" -#include "libc/sysv/errfuns.h" /** * Reduces or extends underlying physical medium of file. diff --git a/libc/calls/ttyname_r.c b/libc/calls/ttyname_r.c index fcef19b89..900895c48 100644 --- a/libc/calls/ttyname_r.c +++ b/libc/calls/ttyname_r.c @@ -21,6 +21,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/stat.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" diff --git a/libc/calls/umask.c b/libc/calls/umask.c index a6a439f8c..b1b932ecd 100644 --- a/libc/calls/umask.c +++ b/libc/calls/umask.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" /** diff --git a/libc/calls/uname.c b/libc/calls/uname.c index a7b22023e..24f88ff51 100644 --- a/libc/calls/uname.c +++ b/libc/calls/uname.c @@ -18,9 +18,10 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/utsname.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/fmt/itoa.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/calls/unlinkat-nt.c b/libc/calls/unlinkat-nt.c index 3b8555f03..370afe79e 100644 --- a/libc/calls/unlinkat-nt.c +++ b/libc/calls/unlinkat-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" @@ -30,6 +30,7 @@ #include "libc/nt/struct/win32fileattributedata.h" #include "libc/nt/struct/win32finddata.h" #include "libc/nt/synchronization.h" +#include "libc/str/str.h" #include "libc/sysv/consts/at.h" /** diff --git a/libc/calls/unlinkat.c b/libc/calls/unlinkat.c index edc626d35..996bc6962 100644 --- a/libc/calls/unlinkat.c +++ b/libc/calls/unlinkat.c @@ -18,12 +18,12 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" -#include "libc/sysv/consts/at.h" #include "libc/sysv/errfuns.h" #include "libc/zipos/zipos.internal.h" diff --git a/libc/calls/usleep.c b/libc/calls/usleep.c index c51e26fcb..5160fb372 100644 --- a/libc/calls/usleep.c +++ b/libc/calls/usleep.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/timespec.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/utimensat-nt.c b/libc/calls/utimensat-nt.c index 0a5972cde..00b3e6d3d 100644 --- a/libc/calls/utimensat-nt.c +++ b/libc/calls/utimensat-nt.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/conv.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/calls/vdprintf.c b/libc/calls/vdprintf.c index cf4e92fdd..652d9b9dc 100644 --- a/libc/calls/vdprintf.c +++ b/libc/calls/vdprintf.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/iovec.h" #include "libc/dce.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" diff --git a/libc/calls/vdsofunc.greg.c b/libc/calls/vdsofunc.greg.c index 843b45822..9e1e1fa40 100644 --- a/libc/calls/vdsofunc.greg.c +++ b/libc/calls/vdsofunc.greg.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/elf/scalar.h" #include "libc/elf/struct/ehdr.h" #include "libc/elf/struct/shdr.h" diff --git a/libc/calls/wait3.c b/libc/calls/wait3.c index c236e77af..2f9e44c3d 100644 --- a/libc/calls/wait3.c +++ b/libc/calls/wait3.c @@ -17,7 +17,6 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/sysv/errfuns.h" diff --git a/libc/calls/wait4-nt.c b/libc/calls/wait4-nt.c index 0d4fc2f5e..7bd1990b6 100644 --- a/libc/calls/wait4-nt.c +++ b/libc/calls/wait4-nt.c @@ -21,8 +21,10 @@ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/rusage.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/conv.h" #include "libc/intrin/kprintf.h" #include "libc/intrin/spinlock.h" diff --git a/libc/calls/wincrash.c b/libc/calls/wincrash.c index 7c850d6ec..d79500212 100644 --- a/libc/calls/wincrash.c +++ b/libc/calls/wincrash.c @@ -19,6 +19,7 @@ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/typedef/sigaction_f.h" #include "libc/calls/ucontext.h" diff --git a/libc/calls/winerr.internal.h b/libc/calls/winerr.internal.h new file mode 100644 index 000000000..e71eb74a9 --- /dev/null +++ b/libc/calls/winerr.internal.h @@ -0,0 +1,8 @@ +#ifndef COSMOPOLITAN_LIBC_CALLS_WINERR_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_CALLS_WINERR_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_CALLS_WINERR_INTERNAL_H_ */ diff --git a/libc/calls/write-nt.c b/libc/calls/write-nt.c index 5ddc51988..46110e534 100644 --- a/libc/calls/write-nt.c +++ b/libc/calls/write-nt.c @@ -20,6 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/errno.h" #include "libc/nt/errors.h" #include "libc/nt/runtime.h" diff --git a/libc/calls/write.c b/libc/calls/write.c index 7bcc3a7d5..5cfbcc581 100644 --- a/libc/calls/write.c +++ b/libc/calls/write.c @@ -20,6 +20,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sock/sock.h" diff --git a/libc/calls/writev-metal.c b/libc/calls/writev-metal.c index 3788b103f..596a564e8 100644 --- a/libc/calls/writev-metal.c +++ b/libc/calls/writev-metal.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/iovec.h" #include "libc/sysv/errfuns.h" ssize_t sys_writev_metal(struct Fd *fd, const struct iovec *iov, int iovlen) { diff --git a/libc/calls/writev-serial.c b/libc/calls/writev-serial.c index 0fc1e5aaf..022df1d5f 100644 --- a/libc/calls/writev-serial.c +++ b/libc/calls/writev-serial.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/struct/iovec.h" #include "libc/nexgen32e/uart.internal.h" #include "libc/runtime/pc.internal.h" diff --git a/libc/calls/writev.c b/libc/calls/writev.c index 0f574b732..e2998dfc3 100644 --- a/libc/calls/writev.c +++ b/libc/calls/writev.c @@ -20,6 +20,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/dns/getntnameservers.c b/libc/dns/getntnameservers.c index 7181cb13d..b906cd7a8 100644 --- a/libc/dns/getntnameservers.c +++ b/libc/dns/getntnameservers.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/arraylist.internal.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dns/dns.h" #include "libc/dns/resolvconf.h" #include "libc/nt/enum/keyaccess.h" diff --git a/libc/intrin/asan.c b/libc/intrin/asan.c index 664f7e396..cb789cc0c 100644 --- a/libc/intrin/asan.c +++ b/libc/intrin/asan.c @@ -21,7 +21,7 @@ #include "libc/bits/likely.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" #include "libc/dce.h" diff --git a/libc/intrin/closehandle.c b/libc/intrin/closehandle.c index dfd278caf..5d32fc810 100644 --- a/libc/intrin/closehandle.c +++ b/libc/intrin/closehandle.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/log/log.h" #include "libc/nt/runtime.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/createdirectory.c b/libc/intrin/createdirectory.c index f0a8efd10..1a3884279 100644 --- a/libc/intrin/createdirectory.c +++ b/libc/intrin/createdirectory.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/createfile.c b/libc/intrin/createfile.c index 6290f7381..31e3fef92 100644 --- a/libc/intrin/createfile.c +++ b/libc/intrin/createfile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/createfile.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/createfilemapping.c b/libc/intrin/createfilemapping.c index a8a5ea4aa..7e149b5e8 100644 --- a/libc/intrin/createfilemapping.c +++ b/libc/intrin/createfilemapping.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/memory.h" #include "libc/nt/struct/securityattributes.h" diff --git a/libc/intrin/createfilemappingnuma.c b/libc/intrin/createfilemappingnuma.c index 7da20c4fc..33a51289e 100644 --- a/libc/intrin/createfilemappingnuma.c +++ b/libc/intrin/createfilemappingnuma.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/memory.h" diff --git a/libc/intrin/createnamedpipe.c b/libc/intrin/createnamedpipe.c index 7e70683e1..4c6d7a7ea 100644 --- a/libc/intrin/createnamedpipe.c +++ b/libc/intrin/createnamedpipe.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/ipc.h" #include "libc/nt/struct/securityattributes.h" diff --git a/libc/intrin/createpipe.c b/libc/intrin/createpipe.c index 4e295530a..a8bb75b2e 100644 --- a/libc/intrin/createpipe.c +++ b/libc/intrin/createpipe.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/ipc.h" #include "libc/nt/struct/securityattributes.h" diff --git a/libc/intrin/createprocess.c b/libc/intrin/createprocess.c index e18232d85..13a7b05c2 100644 --- a/libc/intrin/createprocess.c +++ b/libc/intrin/createprocess.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/process.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/createsymboliclink.c b/libc/intrin/createsymboliclink.c index ddbe879a0..18bc51c8b 100644 --- a/libc/intrin/createsymboliclink.c +++ b/libc/intrin/createsymboliclink.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/files.h" diff --git a/libc/intrin/createthread.c b/libc/intrin/createthread.c index 77992f157..d9ebf9650 100644 --- a/libc/intrin/createthread.c +++ b/libc/intrin/createthread.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/struct/securityattributes.h" #include "libc/nt/thread.h" diff --git a/libc/intrin/deletefile.c b/libc/intrin/deletefile.c index bf30eb534..c9284a6de 100644 --- a/libc/intrin/deletefile.c +++ b/libc/intrin/deletefile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/describentsecurityattributes.greg.c b/libc/intrin/describentsecurityattributes.greg.c index 192fb72f0..141483677 100644 --- a/libc/intrin/describentsecurityattributes.greg.c +++ b/libc/intrin/describentsecurityattributes.greg.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/struct/securityattributes.h" diff --git a/libc/intrin/deviceiocontrol.greg.c b/libc/intrin/deviceiocontrol.greg.c index 903137913..456f8026f 100644 --- a/libc/intrin/deviceiocontrol.greg.c +++ b/libc/intrin/deviceiocontrol.greg.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/struct/overlapped.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/findclose.c b/libc/intrin/findclose.c index 17fe27fe7..652d4f9cd 100644 --- a/libc/intrin/findclose.c +++ b/libc/intrin/findclose.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/findfirstfile.c b/libc/intrin/findfirstfile.c index 76936932d..02a431208 100644 --- a/libc/intrin/findfirstfile.c +++ b/libc/intrin/findfirstfile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/files.h" #include "libc/nt/memory.h" diff --git a/libc/intrin/findnextfile.c b/libc/intrin/findnextfile.c index 750ea2138..5f3f0b08b 100644 --- a/libc/intrin/findnextfile.c +++ b/libc/intrin/findnextfile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/errors.h" #include "libc/nt/files.h" diff --git a/libc/intrin/flushfilebuffers.c b/libc/intrin/flushfilebuffers.c index e6b4c90e4..918f5d321 100644 --- a/libc/intrin/flushfilebuffers.c +++ b/libc/intrin/flushfilebuffers.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" __msabi extern typeof(FlushFileBuffers) *const __imp_FlushFileBuffers; diff --git a/libc/intrin/flushviewoffile.c b/libc/intrin/flushviewoffile.c index e8ad6082c..9912b3534 100644 --- a/libc/intrin/flushviewoffile.c +++ b/libc/intrin/flushviewoffile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/memory.h" __msabi extern typeof(FlushViewOfFile) *const __imp_FlushViewOfFile; diff --git a/libc/intrin/generateconsolectrlevent.c b/libc/intrin/generateconsolectrlevent.c index 4617973d2..31cfbf60f 100644 --- a/libc/intrin/generateconsolectrlevent.c +++ b/libc/intrin/generateconsolectrlevent.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/console.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/getexitcodeprocess.c b/libc/intrin/getexitcodeprocess.c index 9fd02ea1e..8a783e3a7 100644 --- a/libc/intrin/getexitcodeprocess.c +++ b/libc/intrin/getexitcodeprocess.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/accounting.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/getfileattributes.c b/libc/intrin/getfileattributes.c index c7dcc4c00..943ce0f9e 100644 --- a/libc/intrin/getfileattributes.c +++ b/libc/intrin/getfileattributes.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/enum/fileflagandattributes.h" #include "libc/nt/files.h" diff --git a/libc/intrin/getpid.c b/libc/intrin/getpid.c index d45b03254..a0d0c032d 100644 --- a/libc/intrin/getpid.c +++ b/libc/intrin/getpid.c @@ -17,7 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/runtime/internal.h" /** diff --git a/libc/intrin/kprintf.greg.c b/libc/intrin/kprintf.greg.c index bf7b7021e..82f3395f2 100644 --- a/libc/intrin/kprintf.greg.c +++ b/libc/intrin/kprintf.greg.c @@ -22,7 +22,7 @@ #include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/divmod10.internal.h" diff --git a/libc/intrin/mapviewoffileex.c b/libc/intrin/mapviewoffileex.c index 778e56497..3542063d1 100644 --- a/libc/intrin/mapviewoffileex.c +++ b/libc/intrin/mapviewoffileex.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/enum/filemapflags.h" #include "libc/nt/memory.h" diff --git a/libc/intrin/mapviewoffileexnuma.c b/libc/intrin/mapviewoffileexnuma.c index dbbe9e3e5..9ec6faae3 100644 --- a/libc/intrin/mapviewoffileexnuma.c +++ b/libc/intrin/mapviewoffileexnuma.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/enum/filemapflags.h" diff --git a/libc/intrin/movefileex.c b/libc/intrin/movefileex.c index 8f497ab8c..5eb10ab26 100644 --- a/libc/intrin/movefileex.c +++ b/libc/intrin/movefileex.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/files.h" #include "libc/nt/memory.h" diff --git a/libc/intrin/openprocess.c b/libc/intrin/openprocess.c index 897d4f7c9..44f570c19 100644 --- a/libc/intrin/openprocess.c +++ b/libc/intrin/openprocess.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/memory.h" #include "libc/nt/process.h" diff --git a/libc/intrin/prot2nt.greg.c b/libc/intrin/prot2nt.greg.c index 4547a57ee..80b7a78a3 100644 --- a/libc/intrin/prot2nt.greg.c +++ b/libc/intrin/prot2nt.greg.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/nt/enum/pageflags.h" #include "libc/runtime/directmap.internal.h" #include "libc/sysv/consts/prot.h" diff --git a/libc/intrin/releasefd.c b/libc/intrin/releasefd.c index ef08101db..48124c3cb 100644 --- a/libc/intrin/releasefd.c +++ b/libc/intrin/releasefd.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/spinlock.h" #include "libc/macros.internal.h" diff --git a/libc/intrin/removedirectory.c b/libc/intrin/removedirectory.c index 6f6035c54..6d1709fe8 100644 --- a/libc/intrin/removedirectory.c +++ b/libc/intrin/removedirectory.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/reopenfile.c b/libc/intrin/reopenfile.c index b20292ae6..2aef55ebd 100644 --- a/libc/intrin/reopenfile.c +++ b/libc/intrin/reopenfile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/nt/files.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/setcurrentdirectory.c b/libc/intrin/setcurrentdirectory.c index 28f0f9516..9045f7277 100644 --- a/libc/intrin/setcurrentdirectory.c +++ b/libc/intrin/setcurrentdirectory.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/files.h" #include "libc/nt/memory.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/terminateprocess.c b/libc/intrin/terminateprocess.c index 5f308f7cf..c658f1a34 100644 --- a/libc/intrin/terminateprocess.c +++ b/libc/intrin/terminateprocess.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/console.h" #include "libc/nt/runtime.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/unmapviewoffile.c b/libc/intrin/unmapviewoffile.c index aa7684fa0..455db63d3 100644 --- a/libc/intrin/unmapviewoffile.c +++ b/libc/intrin/unmapviewoffile.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/memory.h" __msabi extern typeof(UnmapViewOfFile) *const __imp_UnmapViewOfFile; diff --git a/libc/intrin/vforked.c b/libc/intrin/vforked.c index 4cb33868a..a93441dd4 100644 --- a/libc/intrin/vforked.c +++ b/libc/intrin/vforked.c @@ -16,6 +16,5 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" int __vforked; diff --git a/libc/intrin/virtualprotect.c b/libc/intrin/virtualprotect.c index a71842dc5..d43cf2ab3 100644 --- a/libc/intrin/virtualprotect.c +++ b/libc/intrin/virtualprotect.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/describeflags.internal.h" #include "libc/log/libfatal.internal.h" #include "libc/nt/memory.h" diff --git a/libc/intrin/waitformultipleobjects.c b/libc/intrin/waitformultipleobjects.c index 2b6aa0be0..6a7ae4938 100644 --- a/libc/intrin/waitformultipleobjects.c +++ b/libc/intrin/waitformultipleobjects.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/synchronization.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/intrin/waitforsingleobject.c b/libc/intrin/waitforsingleobject.c index d345ef17b..bde8762ef 100644 --- a/libc/intrin/waitforsingleobject.c +++ b/libc/intrin/waitforsingleobject.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/nt/synchronization.h" #include "libc/nt/thunk/msabi.h" diff --git a/libc/log/backtrace2.greg.c b/libc/log/backtrace2.greg.c index 8512da804..d6646c18b 100644 --- a/libc/log/backtrace2.greg.c +++ b/libc/log/backtrace2.greg.c @@ -21,9 +21,9 @@ #include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sigbits.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/conv.h" diff --git a/libc/log/libfatal.internal.h b/libc/log/libfatal.internal.h index eb723f5e6..6e5585e03 100644 --- a/libc/log/libfatal.internal.h +++ b/libc/log/libfatal.internal.h @@ -6,7 +6,6 @@ #include "libc/nexgen32e/bsr.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" -#include "libc/runtime/runtime.h" #include "libc/sysv/consts/nr.h" #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ diff --git a/libc/log/oncrash.c b/libc/log/oncrash.c index 35b26d413..b83fbc8bf 100644 --- a/libc/log/oncrash.c +++ b/libc/log/oncrash.c @@ -18,8 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sigbits.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigaction.h" #include "libc/errno.h" diff --git a/libc/log/restoretty.greg.c b/libc/log/restoretty.greg.c index 3175a7b3c..2b43b90d7 100644 --- a/libc/log/restoretty.greg.c +++ b/libc/log/restoretty.greg.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/metatermios.internal.h" #include "libc/calls/struct/termios.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" #include "libc/dce.h" #include "libc/errno.h" diff --git a/libc/mem/pledge.c b/libc/mem/pledge.c index 929519fd7..18da884d9 100644 --- a/libc/mem/pledge.c +++ b/libc/mem/pledge.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/filter.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/kprintf.h" #include "libc/macros.internal.h" @@ -238,20 +238,20 @@ static const struct Pledges { const size_t len; } kPledgeLinux[] = { {"default", PLEDGELEN(kPledgeLinuxDefault)}, // - {"stdio", PLEDGELEN(kPledgeLinuxStdio)}, // - {"rpath", PLEDGELEN(kPledgeLinuxRpath)}, // - {"wpath", PLEDGELEN(kPledgeLinuxWpath)}, // - {"cpath", PLEDGELEN(kPledgeLinuxCpath)}, // - {"dpath", PLEDGELEN(kPledgeLinuxDpath)}, // + {"stdio", PLEDGELEN(kPledgeLinuxStdio)}, // + {"rpath", PLEDGELEN(kPledgeLinuxRpath)}, // + {"wpath", PLEDGELEN(kPledgeLinuxWpath)}, // + {"cpath", PLEDGELEN(kPledgeLinuxCpath)}, // + {"dpath", PLEDGELEN(kPledgeLinuxDpath)}, // {"tmppath", PLEDGELEN(kPledgeLinuxTmppath)}, // - {"inet", PLEDGELEN(kPledgeLinuxInet)}, // - {"fattr", PLEDGELEN(kPledgeLinuxFattr)}, // - {"unix", PLEDGELEN(kPledgeLinuxUnix)}, // - {"dns", PLEDGELEN(kPledgeLinuxDns)}, // - {"proc", PLEDGELEN(kPledgeLinuxProc)}, // - {"exec", PLEDGELEN(kPledgeLinuxExec)}, // - {"id", PLEDGELEN(kPledgeLinuxId)}, // - {0}, // + {"inet", PLEDGELEN(kPledgeLinuxInet)}, // + {"fattr", PLEDGELEN(kPledgeLinuxFattr)}, // + {"unix", PLEDGELEN(kPledgeLinuxUnix)}, // + {"dns", PLEDGELEN(kPledgeLinuxDns)}, // + {"proc", PLEDGELEN(kPledgeLinuxProc)}, // + {"exec", PLEDGELEN(kPledgeLinuxExec)}, // + {"id", PLEDGELEN(kPledgeLinuxId)}, // + {0}, // }; static const struct sock_filter kFilterStart[] = { @@ -290,7 +290,8 @@ static bool AppendPledge(struct Filter *f, const uint16_t *p, size_t len) { return true; } -static const uint16_t *FindPledge(const struct Pledges *p, const char *name, size_t *len) { +static const uint16_t *FindPledge(const struct Pledges *p, const char *name, + size_t *len) { int i; for (i = 0; p[i].name; ++i) { if (!strcasecmp(name, p[i].name)) { diff --git a/libc/rand/getrandom.c b/libc/rand/getrandom.c index 866dd671e..5b9f234b6 100644 --- a/libc/rand/getrandom.c +++ b/libc/rand/getrandom.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/nexgen32e/kcpuids.h" diff --git a/libc/runtime/arch_prctl.c b/libc/runtime/arch_prctl.c index f2f454430..2c958c5fb 100644 --- a/libc/runtime/arch_prctl.c +++ b/libc/runtime/arch_prctl.c @@ -19,7 +19,7 @@ #include "libc/bits/asmflag.h" #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/nexgen32e/msr.h" #include "libc/nexgen32e/x86feature.h" diff --git a/libc/runtime/clone.c b/libc/runtime/clone.c index e15daea30..35b45eac4 100644 --- a/libc/runtime/clone.c +++ b/libc/runtime/clone.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/ucontext-netbsd.internal.h" #include "libc/dce.h" diff --git a/libc/runtime/fork-nt.c b/libc/runtime/fork-nt.c index 39b464562..7ef8b4ac0 100644 --- a/libc/runtime/fork-nt.c +++ b/libc/runtime/fork-nt.c @@ -19,7 +19,9 @@ #include "libc/bits/weaken.h" #include "libc/calls/internal.h" #include "libc/calls/ntspawn.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/fmt/itoa.h" #include "libc/intrin/kprintf.h" #include "libc/macros.internal.h" diff --git a/libc/runtime/fork.c b/libc/runtime/fork.c index ae9d242f3..252f5a1a3 100644 --- a/libc/runtime/fork.c +++ b/libc/runtime/fork.c @@ -19,8 +19,10 @@ #include "libc/bits/bits.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/nt/process.h" #include "libc/runtime/internal.h" diff --git a/libc/runtime/getinterpreterexecutablename.c b/libc/runtime/getinterpreterexecutablename.c index 898731a1f..f31ec9c7b 100644 --- a/libc/runtime/getinterpreterexecutablename.c +++ b/libc/runtime/getinterpreterexecutablename.c @@ -17,7 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/getmaxfd.c b/libc/runtime/getmaxfd.c index 81b8c06ae..59704886e 100644 --- a/libc/runtime/getmaxfd.c +++ b/libc/runtime/getmaxfd.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/rlimit.h" diff --git a/libc/runtime/hook.greg.c b/libc/runtime/hook.greg.c index 61634c593..8ba9cda96 100644 --- a/libc/runtime/hook.greg.c +++ b/libc/runtime/hook.greg.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sigbits.h" #include "libc/calls/struct/sigset.h" #include "libc/dce.h" diff --git a/libc/runtime/mmap.c b/libc/runtime/mmap.c index 32f0eade1..34f5f507f 100644 --- a/libc/runtime/mmap.c +++ b/libc/runtime/mmap.c @@ -22,6 +22,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/runtime/mprotect.greg.c b/libc/runtime/mprotect.greg.c index ad024e18a..5b38ba2e4 100644 --- a/libc/runtime/mprotect.greg.c +++ b/libc/runtime/mprotect.greg.c @@ -17,8 +17,8 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/likely.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/describeflags.internal.h" diff --git a/libc/runtime/mremap.c b/libc/runtime/mremap.c index 0233e962d..1ff4a3a84 100644 --- a/libc/runtime/mremap.c +++ b/libc/runtime/mremap.c @@ -20,7 +20,6 @@ #include "libc/bits/likely.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/runtime/msync-nt.c b/libc/runtime/msync-nt.c index 22e680587..d20221144 100644 --- a/libc/runtime/msync-nt.c +++ b/libc/runtime/msync-nt.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/intrin/spinlock.h" #include "libc/macros.internal.h" #include "libc/nt/files.h" diff --git a/libc/runtime/msync.c b/libc/runtime/msync.c index b23370cf3..4547c4e97 100644 --- a/libc/runtime/msync.c +++ b/libc/runtime/msync.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-nt.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/macros.internal.h" #include "libc/sysv/consts/msync.h" diff --git a/libc/runtime/munmap.c b/libc/runtime/munmap.c index 51c43e546..b929d9648 100644 --- a/libc/runtime/munmap.c +++ b/libc/runtime/munmap.c @@ -19,8 +19,9 @@ #include "libc/assert.h" #include "libc/bits/likely.h" #include "libc/bits/weaken.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/asan.internal.h" diff --git a/libc/runtime/stackuse.c b/libc/runtime/stackuse.c index dbb1cb51a..def93da70 100644 --- a/libc/runtime/stackuse.c +++ b/libc/runtime/stackuse.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/atomic.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/fmt/itoa.h" #include "libc/intrin/kprintf.h" diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index 12e599b0d..de60e3d78 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -19,8 +19,9 @@ #include "libc/bits/bits.h" #include "libc/bits/pushpop.h" #include "libc/bits/weaken.h" -#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/elf/pf2prot.internal.h" #include "libc/errno.h" diff --git a/libc/sock/accept-nt.c b/libc/sock/accept-nt.c index 42b5d937b..e0c667bd8 100644 --- a/libc/sock/accept-nt.c +++ b/libc/sock/accept-nt.c @@ -18,21 +18,16 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" -#include "libc/intrin/kprintf.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/spinlock.h" #include "libc/mem/mem.h" -#include "libc/nt/files.h" -#include "libc/nt/struct/pollfd.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" -#include "libc/sock/yoink.inc" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/consts/fio.h" -#include "libc/sysv/consts/ipproto.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/poll.h" -#include "libc/sysv/consts/so.h" #include "libc/sysv/consts/sock.h" -#include "libc/sysv/consts/sol.h" #include "libc/sysv/errfuns.h" textwindows int sys_accept_nt(struct Fd *fd, void *addr, uint32_t *addrsize, diff --git a/libc/sock/accept4.c b/libc/sock/accept4.c index 168ca77b7..94120bfb2 100644 --- a/libc/sock/accept4.c +++ b/libc/sock/accept4.c @@ -16,13 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sock/sockdebug.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/bind-nt.c b/libc/sock/bind-nt.c index 616a60220..d48c7a38a 100644 --- a/libc/sock/bind-nt.c +++ b/libc/sock/bind-nt.c @@ -17,13 +17,14 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sock/yoink.inc" #include "libc/sysv/errfuns.h" -textwindows int sys_bind_nt(struct Fd *fd, const void *addr, uint32_t addrsize) { +textwindows int sys_bind_nt(struct Fd *fd, const void *addr, + uint32_t addrsize) { assert(fd->kind == kFdSocket); if (__sys_bind_nt(fd->handle, addr, addrsize) != -1) { return 0; diff --git a/libc/sock/bind.c b/libc/sock/bind.c index a269b21a0..0a9074278 100644 --- a/libc/sock/bind.c +++ b/libc/sock/bind.c @@ -24,6 +24,7 @@ #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sock/sockdebug.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/closesocket-nt.c b/libc/sock/closesocket-nt.c index fc7232c54..435017b23 100644 --- a/libc/sock/closesocket-nt.c +++ b/libc/sock/closesocket-nt.c @@ -21,6 +21,7 @@ #include "libc/log/backtrace.internal.h" #include "libc/mem/mem.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" /** * Closes socket on Windows. diff --git a/libc/sock/connect-nt.c b/libc/sock/connect-nt.c index 1481edfcf..bd66fe80c 100644 --- a/libc/sock/connect-nt.c +++ b/libc/sock/connect-nt.c @@ -17,9 +17,9 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sock/yoink.inc" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/connect.c b/libc/sock/connect.c index 814cc18d4..71cf4c0c3 100644 --- a/libc/sock/connect.c +++ b/libc/sock/connect.c @@ -21,6 +21,7 @@ #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sockdebug.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c index c0e174ec4..14112e1a8 100644 --- a/libc/sock/epoll.c +++ b/libc/sock/epoll.c @@ -34,6 +34,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/intrin/spinlock.h" diff --git a/libc/sock/firewall.c b/libc/sock/firewall.c index 738eaa21a..10bdfb4b7 100644 --- a/libc/sock/firewall.c +++ b/libc/sock/firewall.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/weaken.h" +#include "libc/calls/calls.h" #include "libc/dce.h" #include "libc/log/log.h" #include "libc/sock/internal.h" diff --git a/libc/sock/fixupnewsockfd.c b/libc/sock/fixupnewsockfd.c index f73bc85c6..c4116a9af 100644 --- a/libc/sock/fixupnewsockfd.c +++ b/libc/sock/fixupnewsockfd.c @@ -16,7 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/sock/internal.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/sock.h" diff --git a/libc/sock/gethostips.c b/libc/sock/gethostips.c index f0fa33a4a..7b47f901f 100644 --- a/libc/sock/gethostips.c +++ b/libc/sock/gethostips.c @@ -17,7 +17,11 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/bits/bits.h" -#include "libc/calls/internal.h" +#include "libc/calls/calls.h" +#include "libc/calls/syscall-sysv.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" +#include "libc/dce.h" +#include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nt/errors.h" #include "libc/nt/iphlpapi.h" diff --git a/libc/sock/getpeername-nt.c b/libc/sock/getpeername-nt.c index e21462a78..8ed54e952 100644 --- a/libc/sock/getpeername-nt.c +++ b/libc/sock/getpeername-nt.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sock/yoink.inc" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/getpeername.c b/libc/sock/getpeername.c index 677a2e5cf..db25832c0 100644 --- a/libc/sock/getpeername.c +++ b/libc/sock/getpeername.c @@ -16,13 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sock/sockdebug.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/getsockname-nt.c b/libc/sock/getsockname-nt.c index 765c3357a..e8e1cb6e4 100644 --- a/libc/sock/getsockname-nt.c +++ b/libc/sock/getsockname-nt.c @@ -17,15 +17,15 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/calls/internal.h" #include "libc/dce.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sock/yoink.inc" #include "libc/sysv/errfuns.h" textwindows int sys_getsockname_nt(struct Fd *fd, void *out_addr, - uint32_t *out_addrsize) { + uint32_t *out_addrsize) { assert(fd->kind == kFdSocket); if (__sys_getsockname_nt(fd->handle, out_addr, out_addrsize) != -1) { return 0; diff --git a/libc/sock/getsockname.c b/libc/sock/getsockname.c index 3def705a9..9add6709f 100644 --- a/libc/sock/getsockname.c +++ b/libc/sock/getsockname.c @@ -16,13 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sock/sockdebug.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/getsockopt-nt.c b/libc/sock/getsockopt-nt.c index d64f6c5f6..41e521ed9 100644 --- a/libc/sock/getsockopt-nt.c +++ b/libc/sock/getsockopt-nt.c @@ -17,18 +17,15 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" -#include "libc/bits/bits.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/timeval.h" #include "libc/nt/struct/linger.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" -#include "libc/sock/yoink.inc" +#include "libc/sock/syscall_fd.internal.h" #include "libc/str/str.h" #include "libc/sysv/consts/so.h" #include "libc/sysv/consts/sol.h" -#include "libc/sysv/errfuns.h" textwindows int sys_getsockopt_nt(struct Fd *fd, int level, int optname, void *out_opt_optval, diff --git a/libc/sock/getsockopt.c b/libc/sock/getsockopt.c index d60d8d601..105d7ff26 100644 --- a/libc/sock/getsockopt.c +++ b/libc/sock/getsockopt.c @@ -16,13 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/dce.h" #include "libc/fmt/magnumstrs.internal.h" #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/inet_pton.c b/libc/sock/inet_pton.c index baa0ce034..feba1780d 100644 --- a/libc/sock/inet_pton.c +++ b/libc/sock/inet_pton.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/fmt.h" +#include "libc/macros.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" #include "libc/sysv/consts/af.h" diff --git a/libc/sock/internal.h b/libc/sock/internal.h index 50486fb8a..29f130f11 100644 --- a/libc/sock/internal.h +++ b/libc/sock/internal.h @@ -1,6 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_ #define COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_ -#include "libc/calls/internal.h" #include "libc/nt/struct/overlapped.h" #include "libc/nt/thunk/msabi.h" #include "libc/nt/winsock.h" @@ -114,14 +113,6 @@ int32_t sys_epoll_wait(int32_t, void *, int32_t, int32_t) hidden; int sys_poll_metal(struct pollfd *, size_t, unsigned); int sys_poll_nt(struct pollfd *, uint64_t, uint64_t *) hidden; -int sys_getsockopt_nt(struct Fd *, int, int, void *, uint32_t *) hidden; -int sys_getsockname_nt(struct Fd *, void *, uint32_t *) hidden; -int sys_getpeername_nt(struct Fd *, void *, uint32_t *) hidden; -int sys_listen_nt(struct Fd *, int) hidden; -int sys_connect_nt(struct Fd *, const void *, uint32_t) hidden; -int sys_bind_nt(struct Fd *, const void *, uint32_t); -int sys_accept_nt(struct Fd *, void *, uint32_t *, int) hidden; -int sys_closesocket_nt(struct Fd *) hidden; int sys_socket_nt(int, int, int) hidden; /* int sys_socketpair_nt_stream(int, int, int, int[2]) hidden; @@ -129,18 +120,13 @@ int sys_socketpair_nt_dgram(int, int, int, int[2]) hidden; */ int sys_socketpair_nt(int, int, int, int[2]) hidden; int sys_select_nt(int, fd_set *, fd_set *, fd_set *, struct timeval *) hidden; -int sys_shutdown_nt(struct Fd *, int) hidden; -int sys_setsockopt_nt(struct Fd *, int, int, const void *, uint32_t) hidden; bool __asan_is_valid_msghdr(const struct msghdr *); ssize_t sys_send_nt(int, const struct iovec *, size_t, uint32_t) hidden; -ssize_t sys_recv_nt(struct Fd *, const struct iovec *, size_t, uint32_t) hidden; size_t __iovec2nt(struct NtIovec[hasatleast 16], const struct iovec *, size_t) hidden; ssize_t sys_sendto_nt(int, const struct iovec *, size_t, uint32_t, void *, uint32_t) hidden; -ssize_t sys_recvfrom_nt(struct Fd *, const struct iovec *, size_t, uint32_t, - void *, uint32_t *) hidden; void WinSockInit(void) hidden; int64_t __winsockerr(void) nocallback hidden; diff --git a/libc/sock/listen-nt.c b/libc/sock/listen-nt.c index be8800b4f..1816e5223 100644 --- a/libc/sock/listen-nt.c +++ b/libc/sock/listen-nt.c @@ -20,8 +20,7 @@ #include "libc/calls/internal.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" -#include "libc/sock/yoink.inc" -#include "libc/sysv/errfuns.h" +#include "libc/sock/syscall_fd.internal.h" textwindows int sys_listen_nt(struct Fd *fd, int backlog) { assert(fd->kind == kFdSocket); diff --git a/libc/sock/listen.c b/libc/sock/listen.c index c452a2ae9..a883ba7ff 100644 --- a/libc/sock/listen.c +++ b/libc/sock/listen.c @@ -21,6 +21,7 @@ #include "libc/dce.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/recv-nt.c b/libc/sock/recv-nt.c index 5c2e0bc99..46dc83ebe 100644 --- a/libc/sock/recv-nt.c +++ b/libc/sock/recv-nt.c @@ -16,11 +16,11 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/nt/struct/overlapped.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/recv.c b/libc/sock/recv.c index c818bcd83..79993705f 100644 --- a/libc/sock/recv.c +++ b/libc/sock/recv.c @@ -22,6 +22,7 @@ #include "libc/intrin/asan.internal.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/recvfrom-nt.c b/libc/sock/recvfrom-nt.c index 6ce60ca11..ba229096d 100644 --- a/libc/sock/recvfrom-nt.c +++ b/libc/sock/recvfrom-nt.c @@ -16,11 +16,11 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/nt/struct/overlapped.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/recvfrom.c b/libc/sock/recvfrom.c index 7dde89a4a..3ff010a06 100644 --- a/libc/sock/recvfrom.c +++ b/libc/sock/recvfrom.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/iovec.h" #include "libc/dce.h" @@ -24,6 +23,7 @@ #include "libc/nt/winsock.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/recvmsg.c b/libc/sock/recvmsg.c index 3c70b0e47..644f61886 100644 --- a/libc/sock/recvmsg.c +++ b/libc/sock/recvmsg.c @@ -22,6 +22,7 @@ #include "libc/dce.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/select-nt.c b/libc/sock/select-nt.c index c2080efad..dfd1bd08f 100644 --- a/libc/sock/select-nt.c +++ b/libc/sock/select-nt.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/internal.h" #include "libc/calls/struct/timeval.h" #include "libc/macros.internal.h" #include "libc/sock/internal.h" diff --git a/libc/sock/sendfile.c b/libc/sock/sendfile.c index 6cba06075..01291b628 100644 --- a/libc/sock/sendfile.c +++ b/libc/sock/sendfile.c @@ -19,9 +19,11 @@ #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/sendfile.internal.h" #include "libc/str/str.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/sendfile.internal.h b/libc/sock/sendfile.internal.h new file mode 100644 index 000000000..b8b237226 --- /dev/null +++ b/libc/sock/sendfile.internal.h @@ -0,0 +1,16 @@ +#ifndef COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +int sys_sendfile_xnu(int32_t infd, int32_t outfd, int64_t offset, + int64_t *out_opt_sbytes, const void *opt_hdtr, + int32_t flags) hidden; + +int sys_sendfile_freebsd(int32_t infd, int32_t outfd, int64_t offset, + size_t nbytes, const void *opt_hdtr, + int64_t *out_opt_sbytes, int32_t flags) hidden; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_SOCK_SENDFILE_INTERNAL_H_ */ diff --git a/libc/sock/setsockopt-nt.c b/libc/sock/setsockopt-nt.c index 4f637d8cd..3b4106875 100644 --- a/libc/sock/setsockopt-nt.c +++ b/libc/sock/setsockopt-nt.c @@ -21,6 +21,7 @@ #include "libc/macros.internal.h" #include "libc/nt/struct/linger.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/consts/so.h" #include "libc/sysv/consts/sol.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/setsockopt.c b/libc/sock/setsockopt.c index c66b078eb..181f67703 100644 --- a/libc/sock/setsockopt.c +++ b/libc/sock/setsockopt.c @@ -25,6 +25,7 @@ #include "libc/nt/winsock.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/consts/so.h" #include "libc/sysv/errfuns.h" diff --git a/libc/sock/shutdown-nt.c b/libc/sock/shutdown-nt.c index d6433526b..c4582d02f 100644 --- a/libc/sock/shutdown-nt.c +++ b/libc/sock/shutdown-nt.c @@ -16,9 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/nt/winsock.h" #include "libc/sock/internal.h" +#include "libc/sock/syscall_fd.internal.h" textwindows int sys_shutdown_nt(struct Fd *fd, int how) { if (__sys_shutdown_nt(fd->handle, how) != -1) { diff --git a/libc/sock/shutdown.c b/libc/sock/shutdown.c index 47b0ade0f..1f35fe3af 100644 --- a/libc/sock/shutdown.c +++ b/libc/sock/shutdown.c @@ -21,6 +21,7 @@ #include "libc/dce.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" +#include "libc/sock/syscall_fd.internal.h" #include "libc/sysv/errfuns.h" /** diff --git a/libc/sock/socket-nt.c b/libc/sock/socket-nt.c index 5c069acbf..ab043b905 100644 --- a/libc/sock/socket-nt.c +++ b/libc/sock/socket-nt.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/intrin/spinlock.h" #include "libc/mem/mem.h" #include "libc/nt/enum/fileflagandattributes.h" diff --git a/libc/sock/socketpair-nt.c b/libc/sock/socketpair-nt.c index 7ee42b8e9..f490916db 100644 --- a/libc/sock/socketpair-nt.c +++ b/libc/sock/socketpair-nt.c @@ -16,6 +16,9 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/intrin/spinlock.h" #include "libc/nt/createfile.h" #include "libc/nt/enum/accessmask.h" diff --git a/libc/sock/sys_sendfile_freebsd.S b/libc/sock/sys_sendfile_freebsd.S new file mode 100644 index 000000000..286aa09b9 --- /dev/null +++ b/libc/sock/sys_sendfile_freebsd.S @@ -0,0 +1,23 @@ +/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ +│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2022 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/macros.internal.h" + +sys_sendfile_freebsd: + jmp sys_sendfile + .endfn sys_sendfile_freebsd,globl diff --git a/libc/sock/sys_sendfile_xnu.S b/libc/sock/sys_sendfile_xnu.S new file mode 100644 index 000000000..ea1fa7400 --- /dev/null +++ b/libc/sock/sys_sendfile_xnu.S @@ -0,0 +1,23 @@ +/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ +│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2022 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/macros.internal.h" + +sys_sendfile_xnu: + jmp sys_sendfile + .endfn sys_sendfile_xnu,globl diff --git a/libc/sock/syscall_fd.internal.h b/libc/sock/syscall_fd.internal.h new file mode 100644 index 000000000..6b5db464e --- /dev/null +++ b/libc/sock/syscall_fd.internal.h @@ -0,0 +1,24 @@ +#ifndef COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_ +#define COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_ +#include "libc/calls/internal.h" +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +int sys_accept_nt(struct Fd *, void *, uint32_t *, int) hidden; +int sys_bind_nt(struct Fd *, const void *, uint32_t); +int sys_closesocket_nt(struct Fd *) hidden; +int sys_connect_nt(struct Fd *, const void *, uint32_t) hidden; +int sys_getpeername_nt(struct Fd *, void *, uint32_t *) hidden; +int sys_getsockname_nt(struct Fd *, void *, uint32_t *) hidden; +int sys_getsockopt_nt(struct Fd *, int, int, void *, uint32_t *) hidden; +int sys_listen_nt(struct Fd *, int) hidden; +int sys_setsockopt_nt(struct Fd *, int, int, const void *, uint32_t) hidden; +int sys_shutdown_nt(struct Fd *, int) hidden; +ssize_t sys_recv_nt(struct Fd *, const struct iovec *, size_t, uint32_t) hidden; + +ssize_t sys_recvfrom_nt(struct Fd *, const struct iovec *, size_t, uint32_t, + void *, uint32_t *) hidden; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_ */ diff --git a/libc/sock/wsablock.c b/libc/sock/wsablock.c index 16883b76d..d7ac994b3 100644 --- a/libc/sock/wsablock.c +++ b/libc/sock/wsablock.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/internal.h" #include "libc/calls/sig.internal.h" #include "libc/calls/strace.internal.h" #include "libc/nt/enum/wait.h" diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c index be831b5c8..364c0bf08 100644 --- a/libc/stdio/dirstream.c +++ b/libc/stdio/dirstream.c @@ -23,6 +23,7 @@ #include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/dirent.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c index cfe23c8e2..c29258e57 100644 --- a/libc/testlib/testmain.c +++ b/libc/testlib/testmain.c @@ -20,12 +20,12 @@ #include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sigbits.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/rlimit.h" #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/sigset.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/intrin/asan.internal.h" #include "libc/intrin/kprintf.h" diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c index b9fdfbfda..090f7e656 100644 --- a/libc/testlib/testrunner.c +++ b/libc/testlib/testrunner.c @@ -19,11 +19,11 @@ #include "libc/assert.h" #include "libc/bits/weaken.h" #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/sigbits.h" #include "libc/calls/strace.internal.h" #include "libc/calls/struct/sigaction.h" #include "libc/calls/struct/sigset.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" diff --git a/libc/thread/exit.c b/libc/thread/exit.c index 268514128..459b0f713 100644 --- a/libc/thread/exit.c +++ b/libc/thread/exit.c @@ -16,8 +16,8 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/internal.h" #include "libc/calls/strace.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/intrin/lockxadd.h" #include "libc/runtime/runtime.h" #include "libc/thread/descriptor.h" diff --git a/libc/time/times.c b/libc/time/times.c index 2ff442c98..d31759135 100644 --- a/libc/time/times.c +++ b/libc/time/times.c @@ -17,10 +17,10 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/rusage.h" #include "libc/calls/struct/timeval.h" #include "libc/calls/struct/tms.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/dce.h" #include "libc/fmt/conv.h" #include "libc/nt/accounting.h" diff --git a/libc/zipos/close.c b/libc/zipos/close.c index 98fb0b3c6..cbde1e7eb 100644 --- a/libc/zipos/close.c +++ b/libc/zipos/close.c @@ -18,6 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/mem/mem.h" #include "libc/nt/runtime.h" #include "libc/zip.h" diff --git a/libc/zipos/open.c b/libc/zipos/open.c index 7a5401e86..70fe52fe9 100644 --- a/libc/zipos/open.c +++ b/libc/zipos/open.c @@ -21,6 +21,7 @@ #include "libc/bits/weaken.h" #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/calls/struct/sigset.h" #include "libc/calls/struct/stat.h" #include "libc/dce.h" diff --git a/libc/zipos/read.c b/libc/zipos/read.c index 2767dd10c..00d595881 100644 --- a/libc/zipos/read.c +++ b/libc/zipos/read.c @@ -18,7 +18,6 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" #include "libc/bits/safemacros.internal.h" -#include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/str/str.h" #include "libc/zip.h" diff --git a/test/libc/calls/mkntpath_test.c b/test/libc/calls/mkntpath_test.c index b051955b8..961e81ab1 100644 --- a/test/libc/calls/mkntpath_test.c +++ b/test/libc/calls/mkntpath_test.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-nt.internal.h" #include "libc/runtime/gc.internal.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/calls/read_test.c b/test/libc/calls/read_test.c index 20db7ebb4..bbb5bb866 100644 --- a/test/libc/calls/read_test.c +++ b/test/libc/calls/read_test.c @@ -19,6 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/sock/internal.h" #include "libc/sysv/consts/nr.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/calls/seccomp_test.c b/test/libc/calls/seccomp_test.c index 3fe4a74b8..3ca8f0566 100644 --- a/test/libc/calls/seccomp_test.c +++ b/test/libc/calls/seccomp_test.c @@ -22,6 +22,7 @@ #include "libc/calls/struct/filter.h" #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/seccomp.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/errno.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" diff --git a/test/libc/calls/vfork_test.c b/test/libc/calls/vfork_test.c index 1c5bc6155..11444ba68 100644 --- a/test/libc/calls/vfork_test.c +++ b/test/libc/calls/vfork_test.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/state.internal.h" #include "libc/runtime/runtime.h" #include "libc/sysv/consts/o.h" #include "libc/testlib/testlib.h" diff --git a/test/libc/calls/write_test.c b/test/libc/calls/write_test.c index 39e068529..dc443ad00 100644 --- a/test/libc/calls/write_test.c +++ b/test/libc/calls/write_test.c @@ -19,6 +19,7 @@ #include "libc/calls/calls.h" #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/sock/internal.h" #include "libc/sysv/consts/nr.h" #include "libc/sysv/consts/o.h" diff --git a/test/libc/mem/pledge_test.c b/test/libc/mem/pledge_test.c index 808141f41..10fb53463 100644 --- a/test/libc/mem/pledge_test.c +++ b/test/libc/mem/pledge_test.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/calls/internal.h" +#include "libc/calls/syscall_support-sysv.internal.h" #include "libc/dce.h" #include "libc/errno.h" #include "libc/mem/mem.h" diff --git a/third_party/python/Modules/posixmodule.c b/third_party/python/Modules/posixmodule.c index 2bb79f0cd..e352fd3cb 100644 --- a/third_party/python/Modules/posixmodule.c +++ b/third_party/python/Modules/posixmodule.c @@ -14,6 +14,7 @@ #include "libc/calls/struct/dirent.h" #include "libc/calls/struct/stat.macros.h" #include "libc/calls/struct/winsize.h" +#include "libc/calls/syscall-sysv.internal.h" #include "libc/calls/termios.h" #include "libc/calls/weirdtypes.h" #include "libc/dce.h" @@ -29,6 +30,7 @@ #include "libc/runtime/dlfcn.h" #include "libc/runtime/gc.internal.h" #include "libc/runtime/sysconf.h" +#include "libc/sock/sendfile.internal.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/at.h"