mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2024-05-18 11:32:41 +00:00
Code Issues Projects Releases Wiki Activity

Improve system call wrappers

Browse source 
This change improves copy_file_range(), sendfile(), splice(), openpty(),
closefrom(), close_range(), fadvise() and posix_fadvise() in addition to
writing tests that confirm things like errno and seeking behavior across
platforms. We now less aggressively polyfill behavior with some of these
functions when the platform support isn't available. Please see:

https://justine.lol/cosmopolitan/functions.html
This commit is contained in:
Justine Tunney 2022-09-19 15:01:48 -07:00
parent 224c12f54d
commit c7a8cd21e9
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
89 changed files with 1151 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -94,7 +94,7 @@ o/$(MODE): \
libc/disclaimer.inc \
rx:build/bootstrap \
rx:o/third_party/gcc \
/proc/self/status \
/proc/stat \
rw:/dev/null \
w:o/stack.log \
/etc/hosts \

1
examples/script.c
View file

@ -40,7 +40,6 @@
#include "libc/errno.h"
#include "libc/fmt/conv.h"
#include "libc/intrin/bswap.h"
#include "libc/intrin/kprintf.h"
#include "libc/log/bsd.h"
#include "libc/macros.internal.h"
#include "libc/mem/mem.h"

93
libc/calls/_ptsname.c Normal file
View file

@ -0,0 +1,93 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/syscall-sysv.internal.h"
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/fmt/itoa.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/termios.h"
#include "libc/sysv/errfuns.h"
extern const unsigned FIODGNAME;
extern const unsigned TIOCPTSNAME;
extern const unsigned TIOCPTYGNAME;
struct fiodgname_arg {
int len;
void *buf;
};
struct ptmget {
int cfd;
int sfd;
char cn[1024];
char sn[1024];
};
int _ptsname(int fd, char *buf, size_t size) {
int pty;
size_t n;
struct ptmget t;
if (_isptmaster(fd)) {
return -1;
}
t.sn[0] = '/';
t.sn[1] = 'd';
t.sn[2] = 'e';
t.sn[3] = 'v';
t.sn[4] = '/';
t.sn[5] = 0;
if (IsLinux()) {
if (sys_ioctl(fd, TIOCGPTN, &pty)) return -1;
t.sn[5] = 'p';
t.sn[6] = 't';
t.sn[7] = 's';
t.sn[8] = '/';
FormatInt32(t.sn + 9, pty);
} else if (IsXnu()) {
if (sys_ioctl(fd, TIOCPTYGNAME, t.sn)) {
return -1;
}
} else if (IsFreebsd()) {
struct fiodgname_arg fgn = {sizeof(t.sn) - 5, t.sn + 5};
if (sys_ioctl(fd, FIODGNAME, &fgn) == -1) {
if (errno == EINVAL) {
errno = ERANGE;
}
return -1;
}
} else if (IsNetbsd()) {
if (sys_ioctl(fd, TIOCPTSNAME, &t)) {
return -1;
}
} else {
return enosys();
}
if ((n = strlen(t.sn)) < size) {
memcpy(buf, t.sn, n + 1);
return 0;
} else {
return erange();
}
}

1
libc/calls/calls.mk
View file

@ -97,6 +97,7 @@ o/$(MODE)/libc/calls/ntcontext2linux.o: private \
# we always want -O3 because:
# it makes the code size smaller too
o/$(MODE)/libc/calls/termios2host.o \
o/$(MODE)/libc/calls/sigenter-freebsd.o \
o/$(MODE)/libc/calls/sigenter-netbsd.o \
o/$(MODE)/libc/calls/sigenter-openbsd.o \

36
libc/calls/close_range.c
View file

@ -17,10 +17,10 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/errno.h"
#include "libc/limits.h"
#include "libc/dce.h"
#include "libc/intrin/strace.internal.h"
#include "libc/sysv/errfuns.h"
/**
* Closes inclusive range of file descriptors, e.g.
@ -32,33 +32,27 @@
* }
* }
*
* This is supported on Linux 5.9+, FreeBSD, and OpenBSD. On FreeBSD,
* `flags` must be zero. On OpenBSD, we call closefrom(int) so `last`
* should be `-1` in order to get OpenBSD support, otherwise `ENOSYS`
* will be returned. We also polyfill closefrom on FreeBSD since it's
* available on older kernels.
* The following flags are available:
*
* On Linux, the following flags are supported:
* - `CLOSE_RANGE_UNSHARE` (Linux-only)
* - `CLOSE_RANGE_CLOEXEC` (Linux-only)
*
* - CLOSE_RANGE_UNSHARE
* - CLOSE_RANGE_CLOEXEC
* This is only supported on Linux 5.9+ and FreeBSD 13+. Consider using
* closefrom() which will work on OpenBSD too.
*
* @return 0 on success, or -1 w/ errno
* @error ENOSYS if not Linux 5.9+ / FreeBSD / OpenBSD
* @error EBADF on OpenBSD if `first` is greater than highest fd
* @error EINVAL if flags are bad or first is greater than last
* @error EMFILE if a weird race condition happens on Linux
* @error EINTR possibly on OpenBSD
* @error ENOSYS if not Linux 5.9+ or FreeBSD 13+
* @error ENOMEM on Linux maybe
* @see closefrom()
*/
int close_range(unsigned int first, unsigned int last, unsigned int flags) {
int rc, err;
err = errno;
if ((rc = sys_close_range(first, last, flags)) == -1) {
if (errno == ENOSYS && first <= INT_MAX && last == UINT_MAX && !flags) {
errno = err;
rc = sys_closefrom(first);
}
int rc;
if (IsLinux() || IsFreebsd()) {
rc = sys_close_range(first, last, flags);
} else {
rc = enosys();
}
STRACE("close_range(%d, %d, %#x) → %d% m", first, last, flags, rc);
return rc;

26
libc/calls/closefrom.c
View file

@ -17,9 +17,10 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/strace.internal.h"
#include "libc/limits.h"
#include "libc/sysv/errfuns.h"
@ -34,26 +35,27 @@
* }
*
* @return 0 on success, or -1 w/ errno
* @error ENOSYS if not Linux 5.9+ / FreeBSD / OpenBSD
* @error EBADF if `first` is negative
* @error EBADF on OpenBSD if `first` is greater than highest fd
* @error EINVAL if flags are bad or first is greater than last
* @error EMFILE if a weird race condition happens on Linux
* @error ENOSYS if not Linux 5.9+, FreeBSD 8+, or OpenBSD
* @error EINTR possibly on OpenBSD
* @error ENOMEM on Linux maybe
* @note supported on Linux 5.9+, FreeBSD 8+, and OpenBSD
*/
int closefrom(int first) {
int rc, err;
if (first >= 0) {
err = errno;
if ((rc = sys_close_range(first, -1, 0)) == -1) {
if (errno == ENOSYS) {
errno = err;
rc = sys_closefrom(first);
}
}
} else {
if (IsNetbsd() || IsWindows() || IsMetal()) {
rc = enosys();
} else if (first < 0) {
// consistent with openbsd
// freebsd allows this but it's dangerous
// necessary on linux due to type signature
rc = ebadf();
} else if (IsLinux()) {
rc = sys_close_range(first, 0xffffffffu, 0);
} else {
rc = sys_closefrom(first);
}
STRACE("closefrom(%d) → %d% m", first, rc);
return rc;

115
libc/calls/copy_file_range.c Normal file
View file

@ -0,0 +1,115 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/calls.h"
#include "libc/calls/struct/sigset.h"
#include "libc/calls/struct/sigset.internal.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/asan.internal.h"
#include "libc/intrin/describeflags.internal.h"
#include "libc/intrin/strace.internal.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/errfuns.h"
#include "libc/thread/thread.h"
static struct CopyFileRange {
pthread_once_t once;
bool ok;
} g_copy_file_range;
static bool HasCopyFileRange(void) {
bool ok;
int e, rc;
e = errno;
if (IsLinux()) {
// We modernize our detection by a few years for simplicity.
// This system call is chosen since it's listed by pledge().
// https://www.cygwin.com/bugzilla/show_bug.cgi?id=26338
ok = sys_close_range(-1, -2, 0) == -1 && errno == EINVAL;
} else if (IsFreebsd()) {
ok = sys_copy_file_range(-1, 0, -1, 0, 0, 0) == -1 && errno == EBADF;
} else {
ok = false;
}
errno = e;
return ok;
}
static void copy_file_range_init(void) {
g_copy_file_range.ok = HasCopyFileRange();
}
/**
* Transfers data between files.
*
* If this system call is available (Linux c. 2018 or FreeBSD c. 2021)
* and the file system supports it (e.g. ext4) and the source and dest
* files are on the same file system, then this system call shall make
* copies go about 2x faster.
*
* This implementation requires Linux 5.9+ even though the system call
* was introduced in Linux 4.5. That's to ensure ENOSYS works reliably
* due to a faulty backport, that happened in RHEL7. FreeBSD detection
* on the other hand will work fine.
*
* @param infd is source file, which should be on same file system
* @param opt_in_out_inoffset may be specified for pread() behavior
* @param outfd should be a writable file, but not `O_APPEND`
* @param opt_in_out_outoffset may be specified for pwrite() behavior
* @param uptobytes is maximum number of bytes to transfer
* @param flags is reserved for future use and must be zero
* @return number of bytes transferred, or -1 w/ errno
* @raise EXDEV if source and destination are on different filesystems
* @raise EBADF if `infd` or `outfd` aren't open files or append-only
* @raise EPERM if `fdout` refers to an immutable file on Linux
* @raise EINVAL if ranges overlap or `flags` is non-zero
* @raise EFBIG if `setrlimit(RLIMIT_FSIZE)` is exceeded
* @raise EFAULT if one of the pointers memory is bad
* @raise ERANGE if overflow happens computing ranges
* @raise ENOSPC if file system has run out of space
* @raise ETXTBSY if source or dest is a swap file
* @raise EINTR if a signal was delivered instead
* @raise EISDIR if source or dest is a directory
* @raise ENOSYS if not Linux 5.9+ or FreeBSD 13+
* @raise EIO if a low-level i/o error happens
* @see sendfile() for seekable → socket
* @see splice() for fd ↔ pipe
*/
ssize_t copy_file_range(int infd, int64_t *opt_in_out_inoffset, int outfd,
int64_t *opt_in_out_outoffset, size_t uptobytes,
uint32_t flags) {
ssize_t rc;
pthread_once(&g_copy_file_range.once, copy_file_range_init);
if (!g_copy_file_range.ok) {
rc = enosys();
} else if (IsAsan() && ((opt_in_out_inoffset &&
!__asan_is_valid(opt_in_out_inoffset, 8)) ||
(opt_in_out_outoffset &&
!__asan_is_valid(opt_in_out_outoffset, 8)))) {
rc = efault();
} else {
rc = sys_copy_file_range(infd, opt_in_out_inoffset, outfd,
opt_in_out_outoffset, uptobytes, flags);
}
STRACE("copy_file_range(%d, %s, %d, %s, %'zu, %#x) → %'ld% m", infd,
DescribeInOutInt64(rc, opt_in_out_inoffset), outfd,
DescribeInOutInt64(rc, opt_in_out_outoffset), uptobytes, flags);
return rc;
}

6
libc/calls/fadvise-nt.c
View file

@ -21,6 +21,7 @@
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/nt/createfile.h"
#include "libc/nt/enum/fileflagandattributes.h"
#include "libc/nt/enum/filetype.h"
#include "libc/nt/files.h"
#include "libc/nt/runtime.h"
#include "libc/sysv/consts/madv.h"
@ -33,6 +34,7 @@ textwindows int sys_fadvise_nt(int fd, uint64_t offset, uint64_t len,
int rc, flags, mode;
uint32_t perm, share, attr;
if ((int64_t)len < 0) return einval();
if (!__isfdkind(fd, kFdFile)) return ebadf();
h1 = g_fds.p[fd].handle;
mode = g_fds.p[fd].mode;
@ -57,6 +59,10 @@ textwindows int sys_fadvise_nt(int fd, uint64_t offset, uint64_t len,
return -1;
}
if (GetFileType(h1) == kNtFileTypePipe) {
return espipe();
}
// MSDN says only these are allowed, otherwise it returns EINVAL.
attr &= kNtFileFlagBackupSemantics | kNtFileFlagDeleteOnClose |
kNtFileFlagNoBuffering | kNtFileFlagOpenNoRecall |

37
libc/calls/fadvise.c
View file

@ -16,11 +16,17 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.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/intrin/strace.internal.h"
#include "libc/str/str.h"
#include "libc/sysv/errfuns.h"
int sys_fadvise_netbsd(int, int, int64_t, int64_t, int) asm("sys_fadvise");
/**
* Drops hints to O/S about intended I/O behavior.
@ -28,16 +34,33 @@
* It makes a huge difference. For example, when copying a large file,
* it can stop the system from persisting GBs of useless memory content.
*
* @param len 0 means ‘til end of file
* @param len 0 means until end of file
* @param advice can be MADV_SEQUENTIAL, MADV_RANDOM, etc.
* @return -1 on error
* @return 0 on success, or -1 w/ errno
* @raise EBADF if `fd` isn't a valid file descriptor
* @raise ESPIPE if `fd` refers to a pipe
* @raise EINVAL if `advice` was invalid
* @raise ENOSYS on XNU and OpenBSD
*/
int fadvise(int fd, uint64_t offset, uint64_t len, int advice) {
int rc;
if (!IsWindows()) {
rc = sys_fadvise(fd, offset, len, advice); /* linux & freebsd */
} else {
int rc, e = errno;
if (IsLinux()) {
rc = sys_fadvise(fd, offset, len, advice);
} else if (IsFreebsd() || IsNetbsd()) {
if (IsFreebsd()) {
rc = sys_fadvise(fd, offset, len, advice);
} else {
rc = sys_fadvise_netbsd(fd, offset, offset, len, advice);
}
_npassert(rc >= 0);
if (rc) {
errno = rc;
rc = -1;
}
} else if (IsWindows()) {
rc = sys_fadvise_nt(fd, offset, len, advice);
} else {
rc = enosys();
}
STRACE("fadvise(%d, %'lu, %'lu, %d) → %d% m", fd, offset, len, advice, rc);
return rc;

4
libc/calls/getgroups.c
View file

@ -33,7 +33,9 @@
*/
int getgroups(int size, uint32_t list[]) {
int rc;
if (IsAsan() && size && !__asan_is_valid(list, size * sizeof(list[0]))) {
size_t n;
if (IsAsan() && (__builtin_mul_overflow(size, sizeof(list[0]), &n) ||
!__asan_is_valid(list, n))) {
rc = efault();
} else if (IsLinux() || IsNetbsd() || IsOpenbsd() || IsFreebsd() || IsXnu()) {
rc = sys_getgroups(size, list);

4
libc/calls/grantpt.c
View file

@ -17,10 +17,12 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/calls/termios.h"
#include "libc/dce.h"
#include "libc/intrin/strace.internal.h"
#include "libc/sysv/consts/termios.h"
extern const unsigned TIOCPTYGRANT;
/**
* Grants access to subordinate pseudoteletypewriter.

19
libc/calls/ioctl_tcsets.c
View file

@ -29,7 +29,7 @@
#include "libc/sysv/consts/termios.h"
#include "libc/sysv/errfuns.h"
void __on_ioctl_tcsets(void);
void __on_ioctl_tcsets(int);
int ioctl_tcsets_nt(int, uint64_t, const struct termios *);
static int ioctl_tcsets_metal(int fd, uint64_t request,
@ -37,19 +37,6 @@ static int ioctl_tcsets_metal(int fd, uint64_t request,
return 0;
}
static inline void *__termios2host(union metatermios *mt,
const struct termios *lt) {
if (!IsXnu() && !IsFreebsd() && !IsOpenbsd() && !IsNetbsd()) {
return (/*unconst*/ void *)lt;
} else if (IsXnu()) {
COPY_TERMIOS(&mt->xnu, lt);
return &mt->xnu;
} else {
COPY_TERMIOS(&mt->bsd, lt);
return &mt->bsd;
}
}
static int ioctl_tcsets_sysv(int fd, uint64_t request,
const struct termios *tio) {
union metatermios mt;
@ -72,9 +59,9 @@ int ioctl_tcsets(int fd, uint64_t request, ...) {
va_start(va, request);
tio = va_arg(va, const struct termios *);
va_end(va);
if (_weaken(__on_ioctl_tcsets)) {
if (0 <= fd && fd <= 2 && _weaken(__on_ioctl_tcsets)) {
if (!once) {
_weaken(__on_ioctl_tcsets)();
_weaken(__on_ioctl_tcsets)(fd);
once = true;
}
}

40
libc/calls/openpty.c
View file

@ -16,18 +16,25 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/calls/ioctl.h"
#include "libc/calls/struct/metatermios.internal.h"
#include "libc/calls/struct/termios.h"
#include "libc/calls/struct/winsize.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/calls/termios.h"
#include "libc/calls/termios.internal.h"
#include "libc/dce.h"
#include "libc/intrin/asan.internal.h"
#include "libc/intrin/kprintf.h"
#include "libc/log/rop.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/pty.h"
#include "libc/sysv/consts/termios.h"
#include "libc/sysv/errfuns.h"
struct IoctlPtmGet {
int m;
@ -49,28 +56,37 @@ struct IoctlPtmGet {
int openpty(int *mfd, int *sfd, char *name, const struct termios *tio,
const struct winsize *wsz) {
int m, s, p;
const char *t;
struct IoctlPtmGet ptm;
union metatermios mt;
struct IoctlPtmGet t;
if (IsWindows() || IsMetal()) {
return enosys();
}
if (IsAsan() && (!__asan_is_valid(mfd, sizeof(int)) ||
!__asan_is_valid(sfd, sizeof(int)) ||
(name && !__asan_is_valid(name, 16)) ||
(tio && !__asan_is_valid(tio, sizeof(*tio))) ||
(wsz && !__asan_is_valid(wsz, sizeof(*wsz))))) {
return efault();
}
RETURN_ON_ERROR((m = posix_openpt(O_RDWR | O_NOCTTY)));
if (!IsOpenbsd()) {
RETURN_ON_ERROR(grantpt(m));
RETURN_ON_ERROR(unlockpt(m));
if (!(t = ptsname(m))) goto OnError;
RETURN_ON_ERROR((s = open(t, O_RDWR)));
RETURN_ON_ERROR(_ptsname(m, t.sname, sizeof(t.sname)));
RETURN_ON_ERROR((s = sys_open(t.sname, O_RDWR, 0)));
} else {
RETURN_ON_ERROR(ioctl(m, PTMGET, &ptm));
RETURN_ON_ERROR(sys_ioctl(m, PTMGET, &t));
close(m);
m = ptm.m;
s = ptm.s;
t = ptm.sname;
m = t.m;
s = t.s;
}
*mfd = m;
*sfd = s;
if (name) strcpy(name, t);
if (tio) ioctl(s, TCSETSF, tio);
if (wsz) ioctl(s, TIOCSWINSZ, wsz);
if (name) strcpy(name, t.sname);
if (tio) _npassert(!sys_ioctl(s, TCSETSF, __termios2host(&mt, tio)));
if (wsz) _npassert(!sys_ioctl(s, TIOCGWINSZ, wsz));
return 0;
OnError:
if (m != -1) close(m);
if (m != -1) sys_close(m);
return -1;
}

6
libc/calls/poll.c
View file

@ -17,13 +17,13 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/asan.internal.h"
#include "libc/intrin/describeflags.internal.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/likely.h"
#include "libc/intrin/strace.internal.h"
#include "libc/macros.internal.h"
#include "libc/sock/internal.h"
#include "libc/sock/sock.h"
@ -68,10 +68,12 @@
* @norestart
*/
int poll(struct pollfd *fds, size_t nfds, int timeout_ms) {
size_t n;
int i, rc;
uint64_t millis;
if (IsAsan() && !__asan_is_valid(fds, nfds * sizeof(struct pollfd))) {
if (IsAsan() && (__builtin_mul_overflow(nfds, sizeof(struct pollfd), &n) ||
!__asan_is_valid(fds, n))) {
rc = efault();
} else if (!IsWindows()) {
if (!IsMetal()) {

48
libc/calls/posix_fadvise.c
View file

@ -16,8 +16,52 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.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/intrin/strace.internal.h"
#include "libc/str/str.h"
#include "libc/sysv/errfuns.h"
int(posix_fadvise)(int fd, uint64_t offset, uint64_t len, int advice) {
return fadvise(fd, offset, len, advice);
int sys_fadvise_netbsd(int, int, int64_t, int64_t, int) asm("sys_fadvise");
/**
* Drops hints to O/S about intended I/O behavior.
*
* It makes a huge difference. For example, when copying a large file,
* it can stop the system from persisting GBs of useless memory content.
*
* @param len 0 means until end of file
* @param advice can be POSIX_FADV_SEQUENTIAL, POSIX_FADV_RANDOM, etc.
* @return 0 on success, or errno on error
* @raise EBADF if `fd` isn't a valid file descriptor
* @raise EINVAL if `advice` is invalid or `len` is huge
* @raise ESPIPE if `fd` refers to a pipe
* @raise ENOSYS on XNU and OpenBSD
*/
errno_t posix_fadvise(int fd, uint64_t offset, uint64_t len, int advice) {
int rc, e = errno;
if (IsLinux()) {
rc = sys_fadvise(fd, offset, len, advice);
} else if (IsFreebsd()) {
rc = sys_fadvise(fd, offset, len, advice);
_unassert(rc >= 0);
} else if (IsNetbsd()) {
rc = sys_fadvise_netbsd(fd, offset, offset, len, advice);
_unassert(rc >= 0);
} else if (IsWindows()) {
rc = sys_fadvise_nt(fd, offset, len, advice);
} else {
rc = enosys();
}
if (rc == -1) {
rc = errno;
errno = e;
}
STRACE("posix_fadvise(%d, %'lu, %'lu, %d) → %s", fd, offset, len, advice,
!rc ? "0" : _strerrno(rc));
return rc;
}

5
libc/calls/posix_openpt.c
View file

@ -20,6 +20,7 @@
#include "libc/calls/termios.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/describeflags.internal.h"
#include "libc/intrin/strace.internal.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/errfuns.h"
@ -35,7 +36,7 @@ int posix_openpt(int flags) {
int rc;
if ((flags & O_ACCMODE) != O_RDWR) {
rc = einval();
} else if (IsLinux() || IsXnu()) {
} else if (IsLinux() || IsXnu() || IsNetbsd()) {
rc = sys_open("/dev/ptmx", flags, 0);
} else if (IsOpenbsd()) {
rc = sys_open("/dev/ptm", flags, 0);
@ -45,6 +46,6 @@ int posix_openpt(int flags) {
} else {
rc = enosys();
}
STRACE("posix_openpt(%#o) → %d% m", flags, rc);
STRACE("posix_openpt(%s) → %d% m", DescribeOpenFlags(flags), rc);
return rc;
}

6
libc/calls/ppoll.c
View file

@ -17,13 +17,13 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.h"
#include "libc/calls/struct/sigset.internal.h"
#include "libc/calls/struct/timespec.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/asan.internal.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/strace.internal.h"
#include "libc/macros.internal.h"
#include "libc/sock/struct/pollfd.h"
#include "libc/sock/struct/pollfd.internal.h"
@ -57,12 +57,14 @@
*/
int ppoll(struct pollfd *fds, size_t nfds, const struct timespec *timeout,
const sigset_t *sigmask) {
size_t n;
int e, i, rc;
uint64_t millis;
sigset_t oldmask;
struct timespec ts, *tsp;
if (IsAsan() && (!__asan_is_valid(fds, nfds * sizeof(struct pollfd)) ||
if (IsAsan() && (__builtin_mul_overflow(nfds, sizeof(struct pollfd), &n) ||
!__asan_is_valid(fds, n) ||
(timeout && !__asan_is_valid(timeout, sizeof(timeout))) ||
(sigmask && !__asan_is_valid(sigmask, sizeof(sigmask))))) {
rc = efault();

9
libc/calls/ptsname.c
View file

@ -16,11 +16,12 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/calls/termios.h"
#include "libc/errno.h"
#include "libc/intrin/strace.internal.h"
static char g_ptsname[256];
static char g_ptsname[16];
/**
* Gets name subordinate pseudoteletypewriter.
@ -29,13 +30,11 @@ static char g_ptsname[256];
*/
char *ptsname(int fd) {
char *res;
errno_t e;
if (!(e = ptsname_r(fd, g_ptsname, sizeof(g_ptsname)))) {
if (!_ptsname(fd, g_ptsname, sizeof(g_ptsname))) {
res = g_ptsname;
} else {
errno = e;
res = 0;
}
STRACE("ptsname(%d) → %s% m", fd, res);
STRACE("ptsname(%d) → %#s% m", fd, res);
return res;
}

52
libc/calls/ptsname_r.c
View file

@ -16,57 +16,9 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/calls/termios.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/fmt/itoa.h"
#include "libc/paths.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/termios.h"
#include "libc/sysv/errfuns.h"
struct fiodgname_arg {
int len;
void *buf;
};
static int PtsName(int fd, char *buf, size_t size) {
if (size < 9 + 12) return erange();
if (_isptmaster(fd)) return -1;
if (IsLinux()) {
int pty;
if (sys_ioctl(fd, TIOCGPTN, &pty)) return -1;
buf[0] = '/', buf[1] = 'd', buf[2] = 'e', buf[3] = 'v';
buf[4] = '/', buf[5] = 'p', buf[6] = 't', buf[7] = 's';
buf[8] = '/', FormatInt32(buf + 9, pty);
return 0;
}
if (IsFreebsd()) {
struct fiodgname_arg fgn = {size - 5, buf + 5};
buf[0] = '/', buf[1] = 'd';
buf[2] = 'e', buf[3] = 'v';
buf[4] = '/', buf[5] = 0;
if (sys_ioctl(fd, FIODGNAME, &fgn) == -1) {
if (errno == EINVAL) errno = ERANGE;
return -1;
}
return 0;
}
if (IsXnu()) {
char b2[128];
if (sys_ioctl(fd, TIOCPTYGNAME, b2)) return -1;
if (strlen(b2) + 1 > size) return erange();
strcpy(buf, b2);
return 0;
}
return enosys();
}
/**
* Gets name subordinate pseudoteletypewriter.
@ -75,7 +27,7 @@ static int PtsName(int fd, char *buf, size_t size) {
*/
errno_t ptsname_r(int fd, char *buf, size_t size) {
int rc, e = errno;
if (!PtsName(fd, buf, size)) {
if (!_ptsname(fd, buf, size)) {
rc = 0;
} else {
rc = errno;

2
libc/calls/rmdir.c
View file

@ -22,7 +22,7 @@
/**
* Deletes empty directory.
*
* @return 0 on success or -1 w/ errno on error
* @return 0 on success, or -1 w/ errno
*/
int rmdir(const char *path) {
return unlinkat(AT_FDCWD, path, AT_REMOVEDIR);

4
libc/calls/setgroups.c
View file

@ -39,7 +39,9 @@
*/
int setgroups(size_t size, const uint32_t list[]) {
int rc;
if (IsAsan() && size && !__asan_is_valid(list, size * sizeof(list[0]))) {
size_t n;
if (IsAsan() && (__builtin_mul_overflow(size, sizeof(list[0]), &n) ||
!__asan_is_valid(list, n))) {
rc = efault();
} else if (IsLinux() || IsNetbsd() || IsOpenbsd() || IsFreebsd() || IsXnu()) {
rc = sys_setgroups(size, list);

98
libc/calls/splice.c
View file

@ -17,58 +17,80 @@
│ 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/fmt/itoa.h"
#include "libc/intrin/asan.internal.h"
#include "libc/intrin/describeflags.internal.h"
#include "libc/intrin/strace.internal.h"
#include "libc/mem/alloca.h"
#include "libc/str/str.h"
#include "libc/sysv/errfuns.h"
#include "libc/thread/thread.h"
static ssize_t splicer(int infd, int64_t *inoffset, int outfd,
int64_t *outoffset, size_t uptobytes, uint32_t flags,
int64_t impl(int infd, int64_t *inoffset, int outfd,
int64_t *outoffset, size_t uptobytes,
uint32_t flags)) {
int olderr;
ssize_t transferred;
if (!uptobytes || flags == -1) return einval();
if (IsModeDbg() && uptobytes > 1) uptobytes >>= 1;
olderr = errno;
if (__isfdkind(infd, kFdZip) || __isfdkind(outfd, kFdZip) ||
(transferred =
impl(infd, inoffset, outfd, outoffset, uptobytes, flags)) == -1 &&
errno == ENOSYS) {
errno = olderr;
transferred = copyfd(infd, inoffset, outfd, outoffset, uptobytes, flags);
static struct Splice {
pthread_once_t once;
bool ok;
} g_splice;
static bool HasSplice(void) {
bool ok;
int e, rc;
e = errno;
if (IsLinux()) {
// Our testing indicates splice() doesn't work as documneted on
// RHEL5 and RHEL7 so let's require a modern kernel to be safe.
// We choose close_range() for this since it's listed by pledge
ok = sys_close_range(-1, -2, 0) == -1 && errno == EINVAL;
} else {
ok = false;
}
return transferred;
errno = e;
return ok;
}
static void splice_init(void) {
g_splice.ok = HasSplice();
}
/**
* Transfers data to/from pipe.
*
* @param flags can have SPLICE_F_{MOVE,NONBLOCK,MORE,GIFT}
* @param opt_in_out_inoffset may be specified if `infd` isn't a pipe and is
* used as both an input and output parameter for pread() behavior
* @param opt_in_out_outoffset may be specified if `outfd` isn't a pipe and is
* used as both an input and output parameter for pwrite() behavior
* @return number of bytes transferred, 0 on input end, or -1 w/ errno
* @raise EBADF if `infd` or `outfd` aren't open files or append-only
* @raise ESPIPE if an offset arg was specified for a pipe fd
* @raise EINVAL if offset was given for non-seekable device
* @raise EINVAL if file system doesn't support splice()
* @raise EFAULT if one of the pointers memory is bad
* @raise EINVAL if `flags` is invalid
* @raise ENOSYS if not Linux 5.9+
* @see copy_file_range() for file ↔ file
* @see sendfile() for seekable → socket
*/
ssize_t splice(int infd, int64_t *inopt_out_inoffset, int outfd,
int64_t *inopt_out_outoffset, size_t uptobytes, uint32_t flags) {
return splicer(infd, inopt_out_inoffset, outfd, inopt_out_outoffset,
uptobytes, flags, sys_splice);
}
/**
* Transfers data between files.
*
* @param outfd should be a writable file, but not O_APPEND
* @param flags is reserved for future use
* @return number of bytes actually copied, or -1 w/ errno
* @see sendfile() for seekable → socket
* @see splice() for fd ↔ pipe
*/
ssize_t copy_file_range(int infd, int64_t *inopt_out_inoffset, int outfd,
int64_t *inopt_out_outoffset, size_t uptobytes,
uint32_t flags) {
return splicer(infd, inopt_out_inoffset, outfd, inopt_out_outoffset,
uptobytes, flags, sys_copy_file_range);
ssize_t splice(int infd, int64_t *opt_in_out_inoffset, int outfd,
int64_t *opt_in_out_outoffset, size_t uptobytes,
uint32_t flags) {
ssize_t rc;
pthread_once(&g_splice.once, splice_init);
if (!g_splice.ok) {
rc = enosys();
} else if (IsAsan() && ((opt_in_out_inoffset &&
!__asan_is_valid(opt_in_out_inoffset, 8)) ||
(opt_in_out_outoffset &&
!__asan_is_valid(opt_in_out_outoffset, 8)))) {
rc = efault();
} else {
rc = sys_splice(infd, opt_in_out_inoffset, outfd, opt_in_out_outoffset,
uptobytes, flags);
}
STRACE("splice(%d, %s, %d, %s, %'zu, %#x) → %'ld% m", infd,
DescribeInOutInt64(rc, opt_in_out_inoffset), outfd,
DescribeInOutInt64(rc, opt_in_out_outoffset), uptobytes, flags);
return rc;
}

11
libc/calls/syscall-sysv.internal.h
View file

@ -53,9 +53,9 @@ 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_getresgid(u32 *, u32 *, u32 *) hidden;
i32 sys_getresuid(u32 *, u32 *, u32 *) hidden;
i32 sys_getsid(i32) hidden;
i32 sys_gettid(void) hidden;
i32 sys_ioctl(i32, u64, ...) hidden;
i32 sys_issetugid(void) hidden;
@ -112,11 +112,10 @@ i64 sys_pread(i32, void *, u64, i64, i64) 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_readlinkat(i32, const char *, char *, u64) 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;
int _isptmaster(int);
u32 sys_getegid(void) hidden;
u32 sys_geteuid(void) hidden;
u32 sys_getgid(void) hidden;
@ -124,7 +123,7 @@ 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;
void sys_exit(i32) hidden;
#undef i32
#undef i64

6
libc/calls/syscall_support-sysv.internal.h
View file

@ -20,8 +20,10 @@ void *__vdsosym(const char *, 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);
void cosmo2flock(uintptr_t) hidden;
void flock2cosmo(uintptr_t) hidden;
int _ptsname(int, char *, size_t) hidden;
int _isptmaster(int) hidden;
COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

2
libc/calls/tcgetattr.c
View file

@ -51,7 +51,7 @@
*
* @param fd open file descriptor that isatty()
* @param tio is where result is stored
* @return -1 w/ errno on error
* @return 0 on success, or -1 w/ errno
* @asyncsignalsafe
*/
int(tcgetattr)(int fd, struct termios *tio) {

2
libc/calls/termios.internal.h
View file

@ -27,4 +27,6 @@
(TO)->c_ospeed = c_ospeed; \
} while (0)
void *__termios2host(union metatermios *, const struct termios *);
#endif /* COSMOPOLITAN_LIBC_CALLS_TERMIOS_INTERNAL_H_ */

32
libc/calls/termios2host.c Normal file
View file

@ -0,0 +1,32 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/termios.internal.h"
#include "libc/dce.h"
void *__termios2host(union metatermios *mt, const struct termios *lt) {
if (!IsXnu() && !IsFreebsd() && !IsOpenbsd() && !IsNetbsd()) {
return (/*unconst*/ void *)lt;
} else if (IsXnu()) {
COPY_TERMIOS(&mt->xnu, lt);
return &mt->xnu;
} else {
COPY_TERMIOS(&mt->bsd, lt);
return &mt->bsd;
}
}

6
libc/calls/tgkill.c
View file

@ -17,12 +17,14 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/intrin/strace.internal.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/intrin/strace.internal.h"
/**
* Kills thread group.
* Kills thread, the Linux way.
*
* @param tgid is thread group id, which on Linux means process id
* @param tid is thread id
* @raises ENOSYS on non-Linux
* @see tkill()
*/

8
libc/calls/unlockpt.c
View file

@ -18,12 +18,15 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/calls/syscall_support-sysv.internal.h"
#include "libc/calls/termios.h"
#include "libc/dce.h"
#include "libc/intrin/strace.internal.h"
#include "libc/sysv/consts/pty.h"
#include "libc/sysv/errfuns.h"
extern const uint32_t TIOCPTYUNLK;
/**
* Unlocks pseudoteletypewriter pair.
*
@ -32,13 +35,12 @@
* @raise EINVAL if fd is valid but not associated with pty
*/
int unlockpt(int fd) {
int rc;
if (IsFreebsd() || IsOpenbsd()) {
int rc, unlock = 0;
if (IsFreebsd() || IsOpenbsd() || IsNetbsd()) {
rc = _isptmaster(fd);
} else if (IsXnu()) {
rc = sys_ioctl(fd, TIOCPTYUNLK);
} else if (IsLinux()) {
int unlock = 0;
rc = sys_ioctl(fd, TIOCSPTLCK, &unlock);
} else {
rc = enosys();

2
libc/intrin/describeflags.internal.h
View file

@ -20,6 +20,7 @@ const char *DescribeFrame(char[32], int);
const char *DescribeFutexOp(char[64], int);
const char *DescribeFutexResult(char[12], int);
const char *DescribeHow(char[12], int);
const char *DescribeInOutInt64(char[23], ssize_t, int64_t *);
const char *DescribeMapFlags(char[64], int);
const char *DescribeMapping(char[8], int, int);
const char *DescribeNtConsoleInFlags(char[256], uint32_t);
@ -64,6 +65,7 @@ const char *DescribeWhence(char[12], int);
#define DescribeFutexOp(x) DescribeFutexOp(alloca(64), x)
#define DescribeFutexResult(x) DescribeFutexResult(alloca(12), x)
#define DescribeHow(x) DescribeHow(alloca(12), x)
#define DescribeInOutInt64(rc, x) DescribeInOutInt64(alloca(23), rc, x)
#define DescribeMapFlags(x) DescribeMapFlags(alloca(64), x)
#define DescribeMapping(x, y) DescribeMapping(alloca(8), x, y)
#define DescribeNtConsoleInFlags(x) DescribeNtConsoleInFlags(alloca(256), x)

61
libc/calls/copyfd.c → libc/intrin/describeinoutint64.c
View file

@ -1,7 +1,7 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2020 Justine Alexandra Roberts Tunney │
│ 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 │
@ -16,51 +16,22 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/errno.h"
#include "libc/macros.internal.h"
#include "libc/fmt/itoa.h"
#include "libc/intrin/describeflags.internal.h"
/**
* Copies data between file descriptors the slow way.
*
* @return -1 on error/interrupt, 0 on eof, or [1..size] on success
* @see copy_file_range() for file ↔ file
* @see sendfile() for seekable → socket
* @see splice() for fd ↔ pipe
*/
ssize_t copyfd(int infd, int64_t *inoutopt_inoffset, int outfd,
int64_t *inoutopt_outoffset, size_t size, uint32_t flags) {
ssize_t rc;
char buf[2048];
size_t i, j, n;
for (i = 0; i < size; i += j) {
n = MIN(size - i, sizeof(buf));
if (inoutopt_inoffset) {
rc = pread(infd, buf, n, *inoutopt_inoffset);
} else {
rc = read(infd, buf, n);
}
if (!rc) return i;
if (rc == -1) {
if (i) return i;
return -1;
}
n = rc;
for (j = 0; j < n; j += rc) {
TryAgain:
if (inoutopt_outoffset) {
rc = pwrite(outfd, buf + j, n - j, *inoutopt_outoffset);
} else {
rc = write(outfd, buf + j, n - j);
}
if (rc == -1) {
if (errno == EINTR) goto TryAgain;
if (errno == EWOULDBLOCK) goto TryAgain; /* suboptimal */
return -1;
}
if (inoutopt_inoffset) *inoutopt_inoffset += rc;
if (inoutopt_outoffset) *inoutopt_outoffset += rc;
}
const char *(DescribeInOutInt64)(char buf[23], ssize_t rc, int64_t *x) {
if (!x) return "NULL";
char *p = buf;
if (rc != -1) *p++ = '[';
if (rc == -1 && errno == EFAULT) {
*p++ = '!';
*p++ = '!';
*p++ = '!';
} else {
p = FormatInt64(p, *x);
}
return i;
if (rc != -1) *p++ = ']';
*p = 0;
return buf;
}

2
libc/intrin/pthread_mutex_trylock.c
View file

@ -34,7 +34,7 @@
* @raise EBUSY if lock is already held
* @raise ENOTRECOVERABLE if `mutex` is corrupted
*/
int pthread_mutex_trylock(pthread_mutex_t *mutex) {
errno_t pthread_mutex_trylock(pthread_mutex_t *mutex) {
int c, d, t;
if (__tls_enabled && //

2
libc/intrin/pthread_once.c
View file

@ -44,7 +44,7 @@
*
* @return 0 on success, or errno on error
*/
int pthread_once(pthread_once_t *once, void init(void)) {
errno_t pthread_once(pthread_once_t *once, void init(void)) {
uint32_t old;
if (_weaken(nsync_run_once)) {
_weaken(nsync_run_once)((nsync_once *)once, init);

4
libc/intrin/restoretty.c
View file

@ -40,10 +40,10 @@ static bool __isrestorable;
static union metatermios __oldtermios;
// called weakly by libc/calls/ioctl_tcsets.c to avoid pledge("tty")
void __on_ioctl_tcsets(void) {
void __on_ioctl_tcsets(int fd) {
int e;
e = errno;
if (sys_ioctl(0, TCGETS, &__oldtermios) != -1) {
if (sys_ioctl(fd, TCGETS, &__oldtermios) != -1) {
__isrestorable = true;
}
errno = e;

11
libc/mem/copyfd.c
View file

@ -25,17 +25,6 @@
/**
* Copies data between fds the old fashioned way.
*
* Even though Cosmopolitan polyfills copy_file_range() to fallback to
* doing this, it's useful to call this function in cases where you know
* it'd be more helpful to get the larger buffer size with read/write.
*
* Reads are allowed to be interrupted. Writes are uninterruptible. If
* we get an interrupt when partial data was written, we return the
* partial amount. Therefore the file descriptors are guaranteed to
* remain in a consistent state, provided EINTR is the only error.
*
* If n is 0 then 0 is returned and no i/o operations are performed.
*
* @return bytes successfully exchanged
*/
ssize_t _copyfd(int infd, int outfd, size_t n) {

0
libc/calls/copyfd.internal.h → libc/mem/copyfd.internal.h
View file

140
libc/sock/sendfile.c
View file

@ -16,18 +16,24 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/calls/internal.h"
#include "libc/calls/sig.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"
#include "libc/intrin/describeflags.internal.h"
#include "libc/intrin/safemacros.internal.h"
#include "libc/intrin/strace.internal.h"
#include "libc/macros.internal.h"
#include "libc/nt/enum/filetype.h"
#include "libc/nt/enum/wait.h"
#include "libc/nt/errors.h"
#include "libc/nt/files.h"
#include "libc/nt/struct/byhandlefileinformation.h"
#include "libc/nt/winsock.h"
#include "libc/sock/internal.h"
#include "libc/sock/sendfile.internal.h"
@ -65,54 +71,76 @@ static textwindows int SendfileBlock(int64_t handle,
return got;
}
static textwindows ssize_t sendfile_linux2nt(int outfd, int infd,
int64_t *inout_opt_inoffset,
size_t uptobytes) {
static dontinline textwindows ssize_t sys_sendfile_nt(
int outfd, int infd, int64_t *opt_in_out_inoffset, uint32_t uptobytes) {
ssize_t rc;
int64_t offset;
struct NtOverlapped overlapped;
if (!__isfdkind(outfd, kFdSocket)) return ebadf();
int64_t ih, oh, pos, eof, offset;
struct NtByHandleFileInformation wst;
if (!__isfdkind(infd, kFdFile)) return ebadf();
if (inout_opt_inoffset) {
offset = *inout_opt_inoffset;
} else if (!SetFilePointerEx(g_fds.p[infd].handle, 0, &offset, SEEK_CUR)) {
if (!__isfdkind(outfd, kFdSocket)) return ebadf();
ih = g_fds.p[infd].handle;
oh = g_fds.p[outfd].handle;
if (!SetFilePointerEx(ih, 0, &pos, SEEK_CUR)) {
return __winerr();
}
bzero(&overlapped, sizeof(overlapped));
overlapped.Pointer = (void *)(intptr_t)offset;
overlapped.hEvent = WSACreateEvent();
if (TransmitFile(g_fds.p[outfd].handle, g_fds.p[infd].handle, uptobytes, 0,
&overlapped, 0, 0)) {
if (opt_in_out_inoffset) {
offset = *opt_in_out_inoffset;
} else {
offset = pos;
}
if (GetFileInformationByHandle(ih, &wst)) {
// TransmitFile() returns EINVAL if `uptobytes` goes past EOF.
eof = (uint64_t)wst.nFileSizeHigh << 32 | wst.nFileSizeLow;
if (offset + uptobytes > eof) {
uptobytes = eof - offset;
}
} else {
return ebadf();
}
struct NtOverlapped ov = {
.Pointer = (void *)(intptr_t)offset,
.hEvent = WSACreateEvent(),
};
if (TransmitFile(oh, ih, uptobytes, 0, &ov, 0, 0)) {
rc = uptobytes;
} else {
rc = SendfileBlock(g_fds.p[outfd].handle, &overlapped);
rc = SendfileBlock(oh, &ov);
}
if (rc != -1 && inout_opt_inoffset) {
*inout_opt_inoffset = offset + rc;
if (rc != -1) {
if (opt_in_out_inoffset) {
*opt_in_out_inoffset = offset + rc;
_npassert(SetFilePointerEx(ih, pos, 0, SEEK_SET));
} else {
_npassert(SetFilePointerEx(ih, offset + rc, 0, SEEK_SET));
}
}
WSACloseEvent(overlapped.hEvent);
WSACloseEvent(ov.hEvent);
return rc;
}
static ssize_t sendfile_linux2bsd(int outfd, int infd,
int64_t *inout_opt_inoffset,
size_t uptobytes) {
int rc;
static ssize_t sys_sendfile_bsd(int outfd, int infd,
int64_t *opt_in_out_inoffset,
size_t uptobytes) {
ssize_t rc;
int64_t offset, sbytes;
if (inout_opt_inoffset) {
offset = *inout_opt_inoffset;
if (opt_in_out_inoffset) {
offset = *opt_in_out_inoffset;
} else if ((offset = lseek(infd, 0, SEEK_CUR)) == -1) {
return -1;
}
if (IsFreebsd()) {
rc = sys_sendfile_freebsd(infd, outfd, offset, uptobytes, 0, &sbytes, 0);
if (rc == -1 && errno == ENOBUFS) errno = ENOMEM;
} else {
sbytes = uptobytes;
rc = sys_sendfile_xnu(infd, outfd, offset, &sbytes, 0, 0);
}
if (rc == -1 && errno == ENOTSOCK) errno = EBADF;
if (rc != -1) {
if (inout_opt_inoffset) {
*inout_opt_inoffset += sbytes;
if (opt_in_out_inoffset) {
*opt_in_out_inoffset += sbytes;
} else {
_npassert(lseek(infd, offset + sbytes, SEEK_SET) == offset + sbytes);
}
return sbytes;
} else {
@ -125,35 +153,55 @@ static ssize_t sendfile_linux2bsd(int outfd, int infd,
*
* @param outfd needs to be a socket
* @param infd needs to be a file
* @param inout_opt_inoffset may be specified for pread()-like behavior
* @param uptobytes is usually the number of bytes remaining in file; it
* can't exceed INT_MAX-1; some platforms block until everything's
* sent, whereas others won't; zero isn't allowed
* @return number of bytes transmitted which may be fewer than requested
* @param opt_in_out_inoffset may be specified for pread()-like behavior
* in which case the file position won't be changed; otherwise, this
* shall read from the file pointer which is advanced accordingly
* @param uptobytes is the maximum number of bytes to send; some platforms
* block until everything's sent, whereas others won't; the behavior of
* zero is undefined; this value may overlap the end of file in which
* case what remains is sent; this is silently reduced to `0x7ffff000`
* @return number of bytes transmitted which may be fewer than requested in
* which case caller must be prepared to call sendfile() again
* @raise ESPIPE on Linux RHEL7+ if offset is used but `infd` isn't seekable,
* otherwise this could be EINVAL
* @raise EPIPE on most systems if socket has been shutdown for reading or
* the remote end closed the connection, otherwise this could be EINVAL
* @raise EBADF if `outfd` isn't a valid writeable stream sock descriptor
* @raise EAGAIN if `O_NONBLOCK` is in play and it would have blocked
* @raise EBADF if `infd` isn't a valid readable file descriptor
* @raise EFAULT if `opt_in_out_inoffset` is a bad pointer
* @raise EINVAL if `*opt_in_out_inoffset` is negative
* @raise EOVERFLOW is documented as possible on Linux
* @raise EIO if `infd` had a low-level i/o error
* @raise ENOMEM if we require more vespene gas
* @raise ENOTCONN if `outfd` isn't connected
* @raise ENOSYS on NetBSD and OpenBSD
* @see copy_file_range() for file ↔ file
* @see splice() for fd ↔ pipe
*/
ssize_t sendfile(int outfd, int infd, int64_t *inout_opt_inoffset,
ssize_t sendfile(int outfd, int infd, int64_t *opt_in_out_inoffset,
size_t uptobytes) {
int rc;
if (!uptobytes) {
rc = einval();
} else if (IsAsan() && inout_opt_inoffset &&
!__asan_is_valid(inout_opt_inoffset,
sizeof(*inout_opt_inoffset))) {
ssize_t rc;
// We must reduce this due to the uint32_t type conversion on Windows
// which has a maximum of 0x7ffffffe. It also makes sendfile(..., -1)
// less error prone, since Linux may EINVAL if greater than INT64_MAX
uptobytes = MIN(uptobytes, 0x7ffff000);
if (IsAsan() && opt_in_out_inoffset &&
!__asan_is_valid(opt_in_out_inoffset, 8)) {
rc = efault();
} else if (uptobytes > 0x7ffffffe /* Microsoft's off-by-one */) {
rc = eoverflow();
} else if (IsLinux()) {
rc = sys_sendfile(outfd, infd, inout_opt_inoffset, uptobytes);
rc = sys_sendfile(outfd, infd, opt_in_out_inoffset, uptobytes);
} else if (IsFreebsd() || IsXnu()) {
rc = sendfile_linux2bsd(outfd, infd, inout_opt_inoffset, uptobytes);
rc = sys_sendfile_bsd(outfd, infd, opt_in_out_inoffset, uptobytes);
} else if (IsWindows()) {
rc = sendfile_linux2nt(outfd, infd, inout_opt_inoffset, uptobytes);
rc = sys_sendfile_nt(outfd, infd, opt_in_out_inoffset, uptobytes);
} else {
rc = copyfd(infd, inout_opt_inoffset, outfd, NULL, uptobytes, 0);
rc = enosys();
}
STRACE("sendfile(%d, %d, %p, %'zu) → %ld% m", outfd, infd, inout_opt_inoffset,
uptobytes, rc);
STRACE("sendfile(%d, %d, %p, %'zu) → %ld% m", outfd, infd,
DescribeInOutInt64(rc, opt_in_out_inoffset), uptobytes, rc);
return rc;
}

2
libc/stdio/fputws.c
View file

@ -28,7 +28,7 @@
*
* @param s is a NUL-terminated string that's non-NULL
* @param f is an open stream
* @return strlen(s) or -1 w/ errno on error
* @return strlen(s), or -1 w/ errno
* @threadsafe
*/
int fputws(const wchar_t *s, FILE *f) {

2
libc/stdio/fputws_unlocked.c
View file

@ -28,7 +28,7 @@
*
* @param s is a NUL-terminated string that's non-NULL
* @param f is an open stream
* @return strlen(s) or -1 w/ errno on error
* @return strlen(s), or -1 w/ errno
*/
int fputws_unlocked(const wchar_t *s, FILE *f) {
int res = 0;

2
libc/sysv/calls/sys_fadvise.s
View file

@ -1,2 +1,2 @@
.include "o/libc/sysv/macros.internal.inc"
.scall sys_fadvise,0xffffff213ffff0dd,globl,hidden
.scall sys_fadvise,0x1a0fff213ffff0dd,globl,hidden

5
libc/sysv/consts.sh
View file

@ -1410,8 +1410,9 @@ syscon termios TIOCSTSTAMP 0 0 0 0x8008745a 0x8008745a 0 # boop
syscon termios ENDRUNDISC 0 0 0 0x9 0x9 0 # boop
syscon termios TIOCPTMASTER 0 0 0x2000741c 0 0 0 # boop
syscon termios TIOCPTYGRANT 0 0x20007454 0 0 0 0 # xnu grantpt()
syscon termios TIOCPTYUNLK 0 0x20007452 0 0 0 0 # xnu grantpt()
syscon termios TIOCPTYGNAME 0 0x40807453 0 0 0 0 # xnu grantpt()
syscon termios TIOCPTYUNLK 0 0x20007452 0 0 0 0 # xnu unlockpt()
syscon termios TIOCPTYGNAME 0 0x40807453 0 0 0 0 # xnu ptyname()
syscon termios TIOCPTSNAME 0 0 0 0 0x48087448 0 # netbsd ptyname()
syscon termios FIODGNAME 0 0 0x80106678 0 0 0 # freebsd ptsname_r()
syscon termios NETGRAPHDISC 0 0 0x6 0 0 0 # boop
syscon termios H4DISC 0 0 0x7 0 0 0 # boop

2
libc/sysv/consts/TIOCPTSNAME.s Normal file
View file

@ -0,0 +1,2 @@
.include "o/libc/sysv/consts/syscon.internal.inc"
.syscon termios,TIOCPTSNAME,0,0,0,0,0x48087448,0

10
libc/sysv/consts/fio.h
View file

@ -4,11 +4,11 @@
#if !(__ASSEMBLER__ + __LINKER__ + 0)
COSMOPOLITAN_C_START_
extern const uint64_t FIOASYNC;
extern const uint64_t FIOCLEX;
extern const uint64_t FIONBIO;
extern const uint64_t FIONCLEX;
extern const uint64_t FIONREAD;
extern const uint32_t FIOASYNC;
extern const uint32_t FIOCLEX;
extern const uint32_t FIONBIO;
extern const uint32_t FIONCLEX;
extern const uint32_t FIONREAD;
COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

34
libc/sysv/consts/posix.h
View file

@ -6,29 +6,25 @@ COSMOPOLITAN_C_START_
extern const int POSIX_FADV_DONTNEED;
extern const int POSIX_FADV_NOREUSE;
extern const int POSIX_FADV_NORMAL;
extern const int POSIX_FADV_RANDOM;
extern const int POSIX_FADV_SEQUENTIAL;
extern const int POSIX_FADV_WILLNEED;
extern const int POSIX_MADV_DONTNEED;
extern const int POSIX_MADV_NORMAL;
extern const int POSIX_MADV_RANDOM;
extern const int POSIX_MADV_SEQUENTIAL;
extern const int POSIX_MADV_WILLNEED;
extern const int POSIX_MADV_DONTNEED;
COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
#define POSIX_FADV_DONTNEED SYMBOLIC(POSIX_FADV_DONTNEED)
#define POSIX_FADV_NOREUSE SYMBOLIC(POSIX_FADV_NOREUSE)
#define POSIX_FADV_NORMAL SYMBOLIC(POSIX_FADV_NORMAL)
#define POSIX_FADV_RANDOM SYMBOLIC(POSIX_FADV_RANDOM)
#define POSIX_FADV_SEQUENTIAL SYMBOLIC(POSIX_FADV_SEQUENTIAL)
#define POSIX_FADV_WILLNEED SYMBOLIC(POSIX_FADV_WILLNEED)
#define POSIX_MADV_DONTNEED SYMBOLIC(POSIX_MADV_DONTNEED)
#define POSIX_MADV_NORMAL SYMBOLIC(POSIX_MADV_NORMAL)
#define POSIX_MADV_RANDOM SYMBOLIC(POSIX_MADV_RANDOM)
#define POSIX_MADV_SEQUENTIAL SYMBOLIC(POSIX_MADV_SEQUENTIAL)
#define POSIX_MADV_WILLNEED SYMBOLIC(POSIX_MADV_WILLNEED)
#define POSIX_FADV_NORMAL LITERALLY(0)
#define POSIX_FADV_RANDOM LITERALLY(1)
#define POSIX_FADV_SEQUENTIAL LITERALLY(2)
#define POSIX_FADV_WILLNEED LITERALLY(3)
#define POSIX_FADV_DONTNEED SYMBOLIC(POSIX_FADV_DONTNEED)
#define POSIX_FADV_NOREUSE SYMBOLIC(POSIX_FADV_NOREUSE)
#define POSIX_MADV_NORMAL LITERALLY(0)
#define POSIX_MADV_RANDOM LITERALLY(1)
#define POSIX_MADV_SEQUENTIAL LITERALLY(2)
#define POSIX_MADV_WILLNEED LITERALLY(3)
#define POSIX_MADV_DONTNEED SYMBOLIC(POSIX_MADV_DONTNEED)
#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_POSIX_H_ */

8
libc/sysv/consts/termios.h
View file

@ -178,10 +178,6 @@ extern const uint8_t VTIME;
extern const uint8_t VWERASE;
extern const uint32_t XCASE;
extern const uint32_t XTABS;
extern const uint32_t FIODGNAME;
extern const uint32_t TIOCPTYGRANT;
extern const uint32_t TIOCPTYUNLK;
extern const uint32_t TIOCPTYGNAME;
COSMOPOLITAN_C_END_
#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
@ -254,7 +250,6 @@ COSMOPOLITAN_C_END_
#define EXTA SYMBOLIC(EXTA)
#define EXTB SYMBOLIC(EXTB)
#define EXTPROC SYMBOLIC(EXTPROC)
#define FIODGNAME SYMBOLIC(FIODGNAME)
#define FLUSHO SYMBOLIC(FLUSHO)
#define H4DISC SYMBOLIC(H4DISC)
#define HUPCL SYMBOLIC(HUPCL)
@ -324,9 +319,6 @@ COSMOPOLITAN_C_END_
#define TIOCNXCL SYMBOLIC(TIOCNXCL)
#define TIOCOUTQ SYMBOLIC(TIOCOUTQ)
#define TIOCPTMASTER SYMBOLIC(TIOCPTMASTER)
#define TIOCPTYGNAME SYMBOLIC(TIOCPTYGNAME)
#define TIOCPTYGRANT SYMBOLIC(TIOCPTYGRANT)
#define TIOCPTYUNLK SYMBOLIC(TIOCPTYUNLK)
#define TIOCREMOTE SYMBOLIC(TIOCREMOTE)
#define TIOCSBRK SYMBOLIC(TIOCSBRK)
#define TIOCSCTTY SYMBOLIC(TIOCSCTTY)

4
libc/sysv/syscalls.sh
View file

@ -249,7 +249,7 @@ scall sys_getdents 0x18606311020c40d9 globl hidden # use opendir/readdir; four
scall sys_set_tid_address 0xfffffffffffff0da globl # no wrapper
scall sys_restart_syscall 0xfffffffffffff0db globl # no wrapper
scall sys_semtimedop 0xfffffffffffff0dc globl # no wrapper
scall sys_fadvise 0xffffff213ffff0dd globl hidden
scall sys_fadvise 0x1a0fff213ffff0dd globl hidden
scall sys_timer_create 0x0ebffffffffff0de globl # no wrapper
scall sys_timer_settime 0x1beffffffffff0df globl # no wrapper
scall sys_timer_gettime 0x1bfffffffffff0e0 globl # no wrapper
@ -383,7 +383,7 @@ scall sys_fsmount 0xfffffffffffff1b0 globl # no wrapper
scall sys_fspick 0xfffffffffffff1b1 globl # no wrapper
scall sys_pidfd_open 0xfffffffffffff1b2 globl # no wrapper
scall sys_clone3 0xfffffffffffff1b3 globl # no wrapper
scall sys_close_range 0xffffff23fffff1b4 globl hidden # linux 5.9
scall sys_close_range 0xffffff23fffff1b4 globl hidden # Linux 5.9
scall sys_openat2 0xfffffffffffff1b5 globl hidden # Linux 5.6
scall sys_pidfd_getfd 0xfffffffffffff1b6 globl # no wrapper
scall sys_faccessat2 0xfffffffffffff1b7 globl hidden

3
libc/thread/pthread_attr_getguardsize.c
View file

@ -24,7 +24,8 @@
* @param guardsize will be set to guard size in bytes
* @return 0 on success, or errno on error
*/
int pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize) {
errno_t pthread_attr_getguardsize(const pthread_attr_t *attr,
size_t *guardsize) {
*guardsize = attr->guardsize;
return 0;
}

6
libc/thread/pthread_attr_getstack.c
View file

@ -16,8 +16,8 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/thread/thread.h"
#include "libc/runtime/stack.h"
#include "libc/thread/thread.h"
/**
* Returns configuration for thread stack.
@ -30,8 +30,8 @@
* @return 0 on success, or errno on error
* @see pthread_attr_setstacksize()
*/
int pthread_attr_getstack(const pthread_attr_t *attr, void **stackaddr,
size_t *stacksize) {
errno_t pthread_attr_getstack(const pthread_attr_t *attr, void **stackaddr,
size_t *stacksize) {
*stackaddr = attr->stackaddr;
*stacksize = attr->stacksize;
return 0;

4
libc/thread/pthread_attr_getstacksize.c
View file

@ -16,8 +16,8 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/thread/thread.h"
#include "libc/runtime/stack.h"
#include "libc/thread/thread.h"
/**
* Returns size of thread stack.
@ -28,7 +28,7 @@
* @return 0 on success, or errno on error
* @see pthread_attr_setstacksize()
*/
int pthread_attr_getstacksize(const pthread_attr_t *a, size_t *x) {
errno_t pthread_attr_getstacksize(const pthread_attr_t *a, size_t *x) {
if (a->stacksize) {
*x = a->stacksize;
} else {

4
libc/thread/pthread_attr_init.c
View file

@ -16,15 +16,15 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/thread/thread.h"
#include "libc/runtime/stack.h"
#include "libc/thread/thread.h"
/**
* Initializes pthread attributes.
*
* @return 0 on success, or errno on error
*/
int pthread_attr_init(pthread_attr_t *attr) {
errno_t pthread_attr_init(pthread_attr_t *attr) {
*attr = (pthread_attr_t){
.stacksize = GetStackSize(),
.guardsize = PAGESIZE,

2
libc/thread/pthread_attr_setguardsize.c
View file

@ -24,7 +24,7 @@
* @param guardsize contains guard size in bytes
* @return 0 on success, or errno on error
*/
int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize) {
errno_t pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize) {
attr->guardsize = guardsize;
return 0;
}

2
libc/thread/pthread_attr_setinheritsched.c
View file

@ -40,7 +40,7 @@
* @return 0 on success, or errno on error
* @raise EINVAL on bad value
*/
int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched) {
errno_t pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched) {
switch (inheritsched) {
case PTHREAD_INHERIT_SCHED:
case PTHREAD_EXPLICIT_SCHED:

4
libc/thread/pthread_attr_setstack.c
View file

@ -62,8 +62,8 @@
* @raise EINVAL if parameters were unacceptable
* @see pthread_attr_setstacksize()
*/
int pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
size_t stacksize) {
errno_t pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
size_t stacksize) {
if (!stackaddr) {
attr->stackaddr = 0;
attr->stacksize = 0;

2
libc/thread/pthread_attr_setstacksize.c
View file

@ -26,7 +26,7 @@
* @return 0 on success, or errno on error
* @raise EINVAL if `stacksize` is less than `PTHREAD_STACK_MIN`
*/
int pthread_attr_setstacksize(pthread_attr_t *a, size_t stacksize) {
errno_t pthread_attr_setstacksize(pthread_attr_t *a, size_t stacksize) {
if (stacksize < PTHREAD_STACK_MIN) return EINVAL;
a->stacksize = stacksize;
return 0;

2
libc/thread/pthread_barrier_wait.c
View file

@ -30,7 +30,7 @@
* @return 0 on success, `PTHREAD_BARRIER_SERIAL_THREAD` to one lucky
* thread which was the last arrival, or an errno on error
*/
int pthread_barrier_wait(pthread_barrier_t *barrier) {
errno_t pthread_barrier_wait(pthread_barrier_t *barrier) {
if (nsync_counter_add(barrier->_nsync, -1)) {
nsync_counter_wait(barrier->_nsync, nsync_time_no_deadline);
return 0;

2
libc/thread/pthread_cond_broadcast.c
View file

@ -36,7 +36,7 @@
* @see pthread_cond_signal
* @see pthread_cond_wait
*/
int pthread_cond_broadcast(pthread_cond_t *cond) {
errno_t pthread_cond_broadcast(pthread_cond_t *cond) {
nsync_cv_broadcast((nsync_cv *)cond);
return 0;
}

2
libc/thread/pthread_cond_signal.c
View file

@ -36,7 +36,7 @@
* @see pthread_cond_broadcast
* @see pthread_cond_wait
*/
int pthread_cond_signal(pthread_cond_t *cond) {
errno_t pthread_cond_signal(pthread_cond_t *cond) {
nsync_cv_signal((nsync_cv *)cond);
return 0;
}

4
libc/thread/pthread_cond_timedwait.c
View file

@ -44,8 +44,8 @@
* @see pthread_cond_broadcast
* @see pthread_cond_signal
*/
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec *abstime) {
errno_t pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec *abstime) {
if (abstime && !(0 <= abstime->tv_nsec && abstime->tv_nsec < 1000000000)) {
return EINVAL;
}

2
libc/thread/pthread_cond_wait.c
View file

@ -37,6 +37,6 @@
* @see pthread_cond_broadcast
* @see pthread_cond_signal
*/
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
errno_t pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
return pthread_cond_timedwait(cond, mutex, 0);
}

4
libc/thread/pthread_create.c
View file

@ -184,8 +184,8 @@ static int FixupCustomStackOnOpenbsd(pthread_attr_t *attr) {
* isn't authorized to use it
* @threadsafe
*/
int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg) {
errno_t pthread_create(pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine)(void *), void *arg) {
int rc, e = errno;
struct PosixThread *pt;
__require_tls();

4
libc/thread/pthread_getaffinity_np.c
View file

@ -31,8 +31,8 @@
* @return 0 on success, or errno on error
* @raise ENOSYS if not Linux or Windows
*/
int pthread_getaffinity_np(pthread_t thread, size_t bitsetsize,
cpu_set_t *bitset) {
errno_t pthread_getaffinity_np(pthread_t thread, size_t bitsetsize,
cpu_set_t *bitset) {
int rc, e = errno;
struct PosixThread *pt = (struct PosixThread *)thread;
if (!sched_getaffinity(pt->tid, bitsetsize, bitset)) {

2
libc/thread/pthread_getname_np.c
View file

@ -44,7 +44,7 @@
* result will still be returned truncated if possible
* @raise ENOSYS on MacOS, Windows, FreeBSD, and OpenBSD
*/
int pthread_getname_np(pthread_t thread, char *name, size_t size) {
errno_t pthread_getname_np(pthread_t thread, char *name, size_t size) {
int e, fd, rc, tid, len;
if (!size) return 0;

2
libc/thread/pthread_rwlock_rdlock.c
View file

@ -24,7 +24,7 @@
*
* @return 0 on success, or errno on error
*/
int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock) {
errno_t pthread_rwlock_rdlock(pthread_rwlock_t *rwlock) {
nsync_mu_rlock((nsync_mu *)rwlock);
return 0;
}

2
libc/thread/pthread_rwlock_unlock.c
View file

@ -25,7 +25,7 @@
* @return 0 on success, or errno on error
* @raise EINVAL if lock is in a bad state
*/
int pthread_rwlock_unlock(pthread_rwlock_t *rwlock) {
errno_t pthread_rwlock_unlock(pthread_rwlock_t *rwlock) {
if (rwlock->_iswrite) {
rwlock->_iswrite = 0;
nsync_mu_unlock((nsync_mu *)rwlock);

2
libc/thread/pthread_rwlock_wrlock.c
View file

@ -24,7 +24,7 @@
*
* @return 0 on success, or errno on error
*/
int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock) {
errno_t pthread_rwlock_wrlock(pthread_rwlock_t *rwlock) {
nsync_mu_lock((nsync_mu *)rwlock);
rwlock->_iswrite = 1;
return 0;

4
libc/thread/pthread_setaffinity_np.c
View file

@ -27,8 +27,8 @@
* @return 0 on success, or errno on error
* @raise ENOSYS if not Linux or Windows
*/
int pthread_setaffinity_np(pthread_t thread, size_t bitsetsize,
const cpu_set_t *bitset) {
errno_t pthread_setaffinity_np(pthread_t thread, size_t bitsetsize,
const cpu_set_t *bitset) {
int rc, e = errno;
struct PosixThread *pt = (struct PosixThread *)thread;
if (!sched_setaffinity(pt->tid, bitsetsize, bitset)) {

2
libc/thread/pthread_setname_np.c
View file

@ -51,7 +51,7 @@
* @raise ENOSYS on MacOS, Windows, and OpenBSD
* @see pthread_getname_np()
*/
int pthread_setname_np(pthread_t thread, const char *name) {
errno_t pthread_setname_np(pthread_t thread, const char *name) {
char path[128], *p;
int e, fd, rc, tid, len;

2
libc/thread/pthread_spin_destroy.c
View file

@ -23,6 +23,6 @@
*
* @return 0 on success, or errno on error
*/
int(pthread_spin_destroy)(pthread_spinlock_t *spin) {
errno_t(pthread_spin_destroy)(pthread_spinlock_t *spin) {
return pthread_spin_destroy(spin);
}

2
libc/thread/pthread_spin_init.c
View file

@ -27,6 +27,6 @@
* @see pthread_spin_destroy
* @see pthread_spin_lock
*/
int(pthread_spin_init)(pthread_spinlock_t *spin, int pshared) {
errno_t(pthread_spin_init)(pthread_spinlock_t *spin, int pshared) {
return pthread_spin_init(spin, pshared);
}

2
libc/thread/pthread_spin_lock.c
View file

@ -50,6 +50,6 @@
* @see pthread_spin_unlock
* @see pthread_spin_init
*/
int(pthread_spin_lock)(pthread_spinlock_t *spin) {
errno_t(pthread_spin_lock)(pthread_spinlock_t *spin) {
return pthread_spin_lock(spin);
}

2
libc/thread/pthread_spin_trylock.c
View file

@ -27,6 +27,6 @@
* @return 0 on success, or errno on error
* @raise EBUSY if lock is already held
*/
int(pthread_spin_trylock)(pthread_spinlock_t *spin) {
errno_t(pthread_spin_trylock)(pthread_spinlock_t *spin) {
return pthread_spin_trylock(spin);
}

2
libc/thread/pthread_spin_unlock.c
View file

@ -24,6 +24,6 @@
* @return 0 on success, or errno on error
* @see pthread_spin_lock
*/
int(pthread_spin_unlock)(pthread_spinlock_t *spin) {
errno_t(pthread_spin_unlock)(pthread_spinlock_t *spin) {
return pthread_spin_unlock(spin);
}

34
test/libc/calls/closefrom_test.c
View file

@ -21,6 +21,7 @@
#include "libc/errno.h"
#include "libc/runtime/runtime.h"
#include "libc/sysv/consts/f.h"
#include "libc/testlib/subprocess.h"
#include "libc/testlib/testlib.h"
void SetUp(void) {
@ -34,6 +35,10 @@ void SetUp(void) {
}
}
TEST(closefrom, ebadf) {
ASSERT_SYS(EBADF, -1, closefrom(-2));
}
TEST(closefrom, test) {
ASSERT_SYS(0, 3, dup(2));
ASSERT_SYS(0, 4, dup(2));
@ -48,14 +53,23 @@ TEST(closefrom, test) {
}
TEST(close_range, test) {
ASSERT_SYS(0, 3, dup(2));
ASSERT_SYS(0, 4, dup(2));
ASSERT_SYS(0, 5, dup(2));
ASSERT_SYS(0, 6, dup(2));
EXPECT_SYS(0, 0, close_range(3, -1, 0));
ASSERT_SYS(0, 0, fcntl(2, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(3, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(4, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(5, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(6, F_GETFD));
if (IsLinux() || IsFreebsd()) {
ASSERT_SYS(0, 3, dup(2));
ASSERT_SYS(0, 4, dup(2));
ASSERT_SYS(0, 5, dup(2));
ASSERT_SYS(0, 6, dup(2));
EXPECT_SYS(0, 0, close_range(3, -1, 0));
ASSERT_SYS(0, 0, fcntl(2, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(3, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(4, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(5, F_GETFD));
ASSERT_SYS(EBADF, -1, fcntl(6, F_GETFD));
} else {
EXPECT_SYS(ENOSYS, -1, close_range(3, -1, 0));
}
}
TEST(close_range, ignoresNonexistantRanges) {
if (!IsLinux() && !IsFreebsd()) return;
EXPECT_SYS(0, 0, close_range(-2, -1, 0));
}

161
test/libc/calls/copy_file_range_test.c Normal file
View file

@ -0,0 +1,161 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/calls.h"
#include "libc/calls/struct/stat.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/mem/gc.h"
#include "libc/mem/mem.h"
#include "libc/runtime/runtime.h"
#include "libc/stdio/rand.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/posix.h"
#include "libc/testlib/testlib.h"
#include "libc/x/x.h"
#include "libc/x/xasprintf.h"
char testlib_enable_tmp_setup_teardown;
void Make(const char *path, int mode) {
int fd, n = lemur64() & 0xfffff;
char *data = _gc(malloc(n));
rngset(data, n, lemur64, -1);
ASSERT_NE(-1, (fd = creat(path, mode)));
ASSERT_SYS(0, n, write(fd, data, n));
ASSERT_SYS(0, 0, close(fd));
}
void Copy(const char *from, const char *to) {
ssize_t rc;
char buf[512];
struct stat st;
int fdin, fdout, e = errno;
ASSERT_NE(-1, (fdin = open(from, O_RDONLY)));
ASSERT_SYS(0, 0, fstat(fdin, &st));
ASSERT_NE(-1, (fdout = creat(to, st.st_mode | 0400)));
if (!(IsXnu() || IsOpenbsd())) {
ASSERT_SYS(0, 0, posix_fadvise(fdin, 0, st.st_size, POSIX_FADV_SEQUENTIAL));
}
ASSERT_SYS(0, 0, ftruncate(fdout, st.st_size));
while ((rc = copy_file_range(fdin, 0, fdout, 0, -1u, 0))) {
if (rc == -1) {
ASSERT_EQ(ENOSYS, errno);
errno = e;
while ((rc = read(fdin, buf, sizeof(buf)))) {
ASSERT_NE(-1, rc);
ASSERT_EQ(rc, write(fdout, buf, rc));
}
break;
}
}
ASSERT_SYS(0, 0, close(fdin));
ASSERT_SYS(0, 0, close(fdout));
}
TEST(copy_file_range, test) {
char *p, *q;
size_t n, m;
Make("foo", 0644);
Copy("foo", "bar");
p = _gc(xslurp("foo", &n));
q = _gc(xslurp("bar", &m));
ASSERT_EQ(n, m);
ASSERT_EQ(0, memcmp(p, q, n));
}
bool HasCopyFileRange(void) {
bool ok;
int rc, e;
e = errno;
rc = copy_file_range(-1, 0, -1, 0, 0, 0);
ok = rc == -1 && errno == EBADF;
errno = e;
return ok;
}
TEST(copy_file_range, badFd) {
if (!HasCopyFileRange()) return;
ASSERT_SYS(EBADF, -1, copy_file_range(-1, 0, -1, 0, -1u, 0));
}
TEST(copy_file_range, badFlags) {
if (!HasCopyFileRange()) return;
ASSERT_SYS(EINVAL, -1, copy_file_range(0, 0, 1, 0, -1u, -1));
}
TEST(copy_file_range, differentFileSystems) {
if (!IsLinux()) return;
if (!HasCopyFileRange()) return;
ASSERT_SYS(0, 3, open("/proc/stat", 0));
ASSERT_SYS(0, 4, creat("foo", 0644));
ASSERT_SYS(EXDEV, -1, copy_file_range(3, 0, 4, 0, -1u, 0));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}
TEST(copy_file_range, twoDifferentFiles) {
char buf[16] = {0};
int64_t i = 1, o = 0;
if (!HasCopyFileRange()) return;
ASSERT_SYS(0, 3, open("foo", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 4, open("bar", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 5, pwrite(3, "hello", 5, 0));
ASSERT_SYS(0, 4, copy_file_range(3, &i, 4, &o, 4, 0));
ASSERT_SYS(0, 0, copy_file_range(3, &i, 4, &o, 0, 0));
ASSERT_EQ(5, i);
ASSERT_EQ(4, o);
ASSERT_SYS(0, 4, read(4, buf, 16));
ASSERT_STREQ("ello", buf);
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}
TEST(copy_file_range, sameFile_doesntChangeFilePointer) {
char buf[16] = {0};
int64_t i = 1, o = 5;
if (!HasCopyFileRange()) return;
ASSERT_SYS(0, 3, open("foo", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 5, pwrite(3, "hello", 5, 0));
ASSERT_SYS(0, 4, copy_file_range(3, &i, 3, &o, 4, 0));
ASSERT_EQ(5, i);
ASSERT_EQ(9, o);
ASSERT_SYS(0, 9, read(3, buf, 16));
ASSERT_STREQ("helloello", buf);
ASSERT_SYS(0, 0, close(3));
}
TEST(copy_file_range, overlappingRange) {
int rc;
int64_t i = 1, o = 2;
if (!HasCopyFileRange()) return;
ASSERT_SYS(0, 3, open("foo", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 5, pwrite(3, "hello", 5, 0));
rc = copy_file_range(3, &i, 3, &o, 4, 0);
ASSERT_EQ(-1, rc);
if (IsLinux()) {
// [wut] rhel7 returns enosys here
ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
} else {
ASSERT_TRUE(errno == EINVAL);
}
errno = 0;
ASSERT_SYS(0, 0, close(3));
}

2
test/libc/calls/pledge_test.c
View file

@ -17,7 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/internal.h"
#include "libc/calls/ioctl.h"
#include "libc/calls/pledge.internal.h"

106
test/libc/calls/posix_fadvise_test.c Normal file
View file

@ -0,0 +1,106 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/calls.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/limits.h"
#include "libc/runtime/runtime.h"
#include "libc/sysv/consts/madv.h"
#include "libc/sysv/consts/posix.h"
#include "libc/testlib/testlib.h"
#include "libc/x/x.h"
char testlib_enable_tmp_setup_teardown;
void SetUp(void) {
if (IsOpenbsd() || IsXnu()) exit(0);
}
TEST(fadvise, ebadf) {
ASSERT_SYS(EBADF, -1, fadvise(-1, 0, 0, MADV_SEQUENTIAL));
}
TEST(posix_fadvise, ebadf) {
ASSERT_SYS(0, EBADF, posix_fadvise(-1, 0, 0, POSIX_FADV_SEQUENTIAL));
}
TEST(fadvise, test) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(0, 0, fadvise(3, 0, 0, MADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(3));
}
TEST(posix_fadvise, test) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(0, 0, posix_fadvise(3, 0, 0, POSIX_FADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(3));
}
TEST(fadvise, testBadAdvice) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(EINVAL, -1, fadvise(3, 0, 0, 127));
ASSERT_SYS(0, 0, close(3));
}
TEST(posix_fadvise, testBadAdvice) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(0, EINVAL, posix_fadvise(3, 0, 0, 127));
ASSERT_SYS(0, 0, close(3));
}
TEST(fadvise, testPastEof_isFine) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(0, 0, fadvise(3, 100, 100, MADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(3));
}
TEST(fadvise, testNegativeLen_isInvalid) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(EINVAL, -1, fadvise(3, 0, INT64_MIN, MADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(3));
}
TEST(posix_fadvise, testNegativeLen_isInvalid) {
ASSERT_SYS(0, 0, xbarf("foo", "hello", -1));
ASSERT_SYS(0, 3, open("foo", 0));
ASSERT_SYS(0, EINVAL, posix_fadvise(3, 0, INT64_MIN, POSIX_FADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(3));
}
TEST(fadvise, espipe) {
int fds[2];
ASSERT_SYS(0, 0, pipe(fds));
ASSERT_SYS(ESPIPE, -1, fadvise(3, 0, 0, MADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}
TEST(posix_fadvise, espipe) {
int fds[2];
ASSERT_SYS(0, 0, pipe(fds));
ASSERT_SYS(0, ESPIPE, posix_fadvise(3, 0, 0, POSIX_FADV_SEQUENTIAL));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}

81
test/libc/calls/splice_test.c Normal file
View file

@ -0,0 +1,81 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 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/calls/calls.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/runtime/runtime.h"
#include "libc/sysv/consts/o.h"
#include "libc/testlib/testlib.h"
char testlib_enable_tmp_setup_teardown;
void SetUp(void) {
int e = errno;
if (splice(-1, 0, -1, 0, 0, 0) == -1 && errno == ENOSYS) {
exit(0);
}
errno = e;
}
TEST(splice, einval) {
ASSERT_SYS(0, 0, splice(0, 0, 1, 0, 0, -1));
}
TEST(splice, espipe) {
int64_t x;
int fds[2];
ASSERT_SYS(0, 0, pipe(fds));
ASSERT_SYS(0, 0, splice(0, 0, 4, &x, 0, 0));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}
TEST(splice, noOffsets_usesFilePointer) {
// this test fails on rhel5 and rhel7
int fds[2];
char buf[16] = {0};
ASSERT_SYS(0, 0, pipe(fds));
ASSERT_SYS(0, 5, open("foo", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 5, pwrite(5, "hello", 5, 0));
ASSERT_SYS(0, 5, splice(5, 0, 4, 0, 5, 0));
ASSERT_SYS(0, 5, splice(3, 0, 5, 0, 5, 0));
ASSERT_SYS(0, 10, pread(5, buf, sizeof(buf), 0));
ASSERT_STREQ("hellohello", buf);
ASSERT_SYS(0, 0, close(5));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}
TEST(splice, offsets_doesntChangePointerAndIsReadOnly) {
int fds[2];
int64_t x = 0;
char buf[16] = {0};
ASSERT_SYS(0, 0, pipe(fds));
ASSERT_SYS(0, 5, open("foo", O_RDWR | O_CREAT | O_TRUNC, 0644));
ASSERT_SYS(0, 5, pwrite(5, "hello", 5, 0));
ASSERT_SYS(0, 5, splice(5, &x, 4, 0, 5, 0));
ASSERT_EQ(5, x);
ASSERT_SYS(0, 5, splice(3, 0, 5, &x, 5, 0));
ASSERT_EQ(10, x);
ASSERT_SYS(0, 10, read(5, buf, sizeof(buf)));
ASSERT_STREQ("hellohello", buf);
ASSERT_SYS(0, 0, close(5));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
}

2
test/libc/calls/unveil_test.c
View file

@ -17,6 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/landlock.h"
#include "libc/calls/struct/dirent.h"
#include "libc/calls/struct/stat.h"
@ -25,7 +26,6 @@
#include "libc/errno.h"
#include "libc/intrin/kprintf.h"
#include "libc/mem/gc.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/runtime/internal.h"
#include "libc/runtime/runtime.h"
#include "libc/sock/sock.h"

3
test/libc/intrin/asan_test.c
View file

@ -21,8 +21,8 @@
#include "libc/intrin/asan.internal.h"
#include "libc/log/libfatal.internal.h"
#include "libc/log/log.h"
#include "libc/mem/mem.h"
#include "libc/mem/gc.internal.h"
#include "libc/mem/mem.h"
#include "libc/runtime/runtime.h"
#include "libc/stdio/stdio.h"
#include "libc/str/str.h"
@ -33,6 +33,7 @@ TEST(asan, test) {
char *p;
if (!IsAsan()) return;
p = gc(malloc(3));
EXPECT_TRUE(__asan_is_valid(0, 0));
EXPECT_TRUE(__asan_is_valid(p, 3));
EXPECT_FALSE(__asan_is_valid(p, 4));
EXPECT_TRUE(__asan_is_valid(p + 1, 2));

2
test/libc/log/backtrace_test.c
View file

@ -18,6 +18,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/fmt/conv.h"
@ -26,7 +27,6 @@
#include "libc/log/libfatal.internal.h"
#include "libc/log/log.h"
#include "libc/mem/gc.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/mem.h"
#include "libc/runtime/internal.h"
#include "libc/runtime/runtime.h"

104
test/libc/sock/sendfile_test.c
View file

@ -17,8 +17,13 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/mem/mem.h"
#include "libc/calls/struct/sigaction.h"
#include "libc/dce.h"
#include "libc/errno.h"
#include "libc/intrin/kprintf.h"
#include "libc/limits.h"
#include "libc/mem/gc.internal.h"
#include "libc/mem/mem.h"
#include "libc/runtime/runtime.h"
#include "libc/sock/sock.h"
#include "libc/sock/struct/sockaddr.h"
@ -26,20 +31,31 @@
#include "libc/sysv/consts/af.h"
#include "libc/sysv/consts/ipproto.h"
#include "libc/sysv/consts/o.h"
#include "libc/sysv/consts/shut.h"
#include "libc/sysv/consts/sig.h"
#include "libc/sysv/consts/sock.h"
#include "libc/testlib/hyperion.h"
#include "libc/testlib/testlib.h"
#include "libc/x/x.h"
char testlib_enable_tmp_setup_teardown;
void SetUpOnce(void) {
if (IsNetbsd()) exit(0);
if (IsOpenbsd()) exit(0);
ASSERT_SYS(0, 0, pledge("stdio rpath wpath cpath proc inet", 0));
}
TEST(sendfile, test) {
int ws;
char *buf;
int64_t inoffset;
int64_t GetFileOffset(int fd) {
int64_t pos;
ASSERT_NE(-1, (pos = lseek(fd, 0, SEEK_CUR)));
return pos;
}
TEST(sendfile, testSeeking) {
char buf[1024];
int rc, ws, fds[2];
int64_t inoffset = 0;
uint32_t addrsize = sizeof(struct sockaddr_in);
struct sockaddr_in addr = {
.sin_family = AF_INET,
@ -53,24 +69,74 @@ TEST(sendfile, test) {
ASSERT_SYS(0, 0, getsockname(3, &addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, 1));
if (!fork()) {
inoffset = 0;
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 5, open("hyperion.txt", O_RDONLY));
ASSERT_SYS(0, 512, sendfile(4, 5, &inoffset, 512));
EXPECT_EQ(512, inoffset);
ASSERT_SYS(0, 0, close(5));
ASSERT_SYS(0, 0, close(4));
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 12, sendfile(4, 5, &inoffset, 12));
ASSERT_EQ(0, GetFileOffset(5));
ASSERT_SYS(0, 8, read(5, buf, 8));
ASSERT_EQ(0, memcmp(buf, "The fall", 8));
ASSERT_EQ(8, GetFileOffset(5));
ASSERT_SYS(EBADF, -1, sendfile(5, 5, &inoffset, -1));
ASSERT_EQ(-1, sendfile(5, 5, &inoffset, -1));
ASSERT_TRUE(errno == ESPIPE || errno == EBADF);
errno = 0;
ASSERT_SYS(0, 500, sendfile(4, 5, &inoffset, -1));
ASSERT_EQ(8, GetFileOffset(5));
ASSERT_EQ(512, inoffset);
inoffset = -1;
ASSERT_SYS(EINVAL, -1, sendfile(4, 5, &inoffset, -1));
_Exit(0);
}
buf = gc(malloc(512));
EXPECT_SYS(0, 0, close(3));
EXPECT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
EXPECT_SYS(0, 0, connect(3, &addr, sizeof(addr)));
EXPECT_SYS(0, 512, read(3, buf, 512));
EXPECT_EQ(0, memcmp(buf, kHyperion, 512));
EXPECT_SYS(0, 0, close(3));
EXPECT_NE(-1, wait(&ws));
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, connect(3, &addr, sizeof(addr)));
ASSERT_SYS(0, 12, read(3, buf, 12)); // needed due to windows
ASSERT_SYS(0, 500, read(3, buf + 12, 700));
ASSERT_EQ(0, memcmp(buf, kHyperion, 512));
ASSERT_SYS(0, 0, close(3));
ASSERT_NE(-1, wait(&ws));
ASSERT_TRUE(WIFEXITED(ws));
ASSERT_EQ(0, WEXITSTATUS(ws));
}
TEST(sendfile, testPositioning) {
int ws, fds[2];
char buf[1024];
uint32_t addrsize = sizeof(struct sockaddr_in);
struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_addr.s_addr = htonl(0x7f000001),
};
ASSERT_SYS(0, 3, creat("hyperion.txt", 0644));
ASSERT_SYS(0, 512, write(3, kHyperion, 512));
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, bind(3, &addr, sizeof(addr)));
ASSERT_SYS(0, 0, getsockname(3, &addr, &addrsize));
ASSERT_SYS(0, 0, listen(3, 1));
if (!fork()) {
signal(SIGPIPE, SIG_IGN);
ASSERT_SYS(0, 4, accept(3, &addr, &addrsize));
ASSERT_SYS(0, 5, open("hyperion.txt", O_RDONLY));
ASSERT_SYS(0, 6, sendfile(4, 5, 0, 6));
ASSERT_EQ(6, GetFileOffset(5));
ASSERT_SYS(0, 6, sendfile(4, 5, 0, 6));
ASSERT_SYS(0, 0, shutdown(4, SHUT_WR));
ASSERT_EQ(-1, sendfile(4, 5, 0, 6));
ASSERT_TRUE(errno == EINVAL || errno == EPIPE);
errno = 0;
ASSERT_EQ(12, GetFileOffset(5));
_Exit(0);
}
ASSERT_SYS(0, 0, close(3));
ASSERT_SYS(0, 3, socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
ASSERT_SYS(0, 0, connect(3, &addr, sizeof(addr)));
ASSERT_SYS(0, 6, read(3, buf, 6));
ASSERT_SYS(0, 6, read(3, buf + 6, 6));
ASSERT_SYS(0, 0, read(3, buf, 12));
ASSERT_EQ(0, memcmp(buf, kHyperion, 12));
ASSERT_SYS(0, 0, close(3));
ASSERT_NE(-1, wait(&ws));
ASSERT_TRUE(WIFEXITED(ws));
ASSERT_EQ(0, WEXITSTATUS(ws));
}

2
test/tool/plinko/plinko_test.c
View file

@ -17,7 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/struct/sigaction.h"
#include "libc/errno.h"
#include "libc/intrin/kprintf.h"

4
third_party/zlib/insert_string.internal.h vendored
View file

@ -51,7 +51,9 @@ COSMOPOLITAN_C_START_
#if defined(TARGET_CPU_WITH_CRC)
local INLINE Pos insert_string_simd(deflate_state* const s, const Pos str) {
// TODO(jart): Why does this fail alignment check?
noubsan local INLINE Pos insert_string_simd(deflate_state* const s,
const Pos str) {
Pos ret;
unsigned *ip, val, h = 0;

2
tool/build/ar.c
View file

@ -18,7 +18,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/struct/iovec.h"
#include "libc/calls/struct/stat.h"
#include "libc/elf/elf.h"

8
tool/build/compile.c
View file

@ -17,7 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/copyfile.h"
#include "libc/calls/ioctl.h"
#include "libc/calls/struct/itimerval.h"
@ -755,14 +755,14 @@ bool MovePreservingDestinationInode(const char *from, const char *to) {
rc = copy_file_range(fdin, 0, fdout, 0, remain, 0);
if (rc != -1) {
remain -= rc;
} else if (errno == EXDEV) {
} else if (errno == EXDEV || errno == ENOSYS) {
if (lseek(fdin, 0, SEEK_SET) == -1) {
kprintf("%s: failed to lseek after exdev\n", from);
kprintf("%s: failed to lseek\n", from);
res = false;
break;
}
if (lseek(fdout, 0, SEEK_SET) == -1) {
kprintf("%s: failed to lseek after exdev\n", to);
kprintf("%s: failed to lseek\n", to);
res = false;
break;
}

2
tool/build/cp.c
View file

@ -17,7 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/copyfile.h"
#include "libc/calls/struct/stat.h"
#include "libc/errno.h"

2
tool/build/ocat.c
View file

@ -17,7 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/errno.h"
#include "libc/fmt/itoa.h"
#include "libc/runtime/runtime.h"

2
tool/build/pledge.c
View file

@ -18,7 +18,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/calls.h"
#include "libc/calls/copyfd.internal.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/calls/landlock.h"
#include "libc/calls/pledge.h"
#include "libc/calls/pledge.internal.h"

5
tool/viz/printpeb.c
View file

@ -16,11 +16,12 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/intrin/safemacros.internal.h"
#include "libc/calls/calls.h"
#include "libc/calls/internal.h"
#include "libc/dce.h"
#include "libc/intrin/safemacros.internal.h"
#include "libc/log/log.h"
#include "libc/mem/copyfd.internal.h"
#include "libc/nt/dll.h"
#include "libc/nt/enum/filetype.h"
#include "libc/nt/enum/startf.h"
@ -56,7 +57,7 @@ int NextBestThing(void) {
int64_t fd = open("/proc/self/maps", O_RDONLY);
posix_fadvise(fd, 0, 0, MADV_SEQUENTIAL);
ssize_t wrote;
while ((wrote = copyfd(fd, NULL, 1, NULL, 1024 * 64, 0)) != -1) {
while ((wrote = _copyfd(fd, 1, -1)) != -1) {
if (wrote == 0) break;
}
close(fd);