mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-28 15:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Share file offset across execve() on Windows

Browse source 
This is a breaking change. It defines the new environment variable named
_COSMO_FDS_V2 which is used for inheriting non-stdio file descriptors on
execve() or posix_spawn(). No effort has been spent thus far integrating
with the older variable. If a new binary launches the older ones or vice
versa they'll only be able to pass stdin / stdout / stderr to each other
therefore it's important that you upgrade all your cosmo binaries if you
depend on this functionality. You'll be glad you did because inheritance
of file descriptors is more aligned with the POSIX standard than before.
This commit is contained in:
Justine Tunney 2024-08-03 17:48:00 -07:00
parent 761c6ad615
commit 3f26dfbb31
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
29 changed files with 572 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libc/calls/close-nt.c
View file

@ -65,7 +65,7 @@ textwindows int sys_close_nt(int fd, int fildes) {
default:
break;
}
if (f->shared && !f->isdup)
munmap(f->shared, sizeof(struct Cursor));
if (f->cursor)
__cursor_unref(f->cursor);
return CloseHandle(f->handle) ? 0 : __winerr();
}

4
libc/calls/dup-nt.c
View file

@ -24,6 +24,7 @@
#include "libc/calls/struct/sigset.internal.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/errno.h"
#include "libc/intrin/fds.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/weaken.h"
#include "libc/nt/files.h"
@ -82,8 +83,7 @@ static textwindows int sys_dup_nt_impl(int oldfd, int newfd, int flags,
g_fds.p[newfd] = g_fds.p[oldfd];
g_fds.p[newfd].handle = handle;
g_fds.p[newfd].isdup = true;
g_fds.p[oldfd].isdup = true; // TODO(jart): is it possible to avoid leak?
__cursor_ref(g_fds.p[newfd].cursor);
if (flags & _O_CLOEXEC) {
g_fds.p[newfd].flags |= _O_CLOEXEC;
} else {

4
libc/calls/fcntl-nt.c
View file

@ -151,7 +151,7 @@ static textwindows int sys_fcntl_nt_lock(struct Fd *f, int fd, int cmd,
case SEEK_SET:
break;
case SEEK_CUR:
off = f->shared->pointer + off;
off = f->cursor->shared->pointer + off;
break;
case SEEK_END: {
int64_t size;
@ -352,7 +352,7 @@ textwindows int sys_fcntl_nt(int fd, int cmd, uintptr_t arg) {
rc = 0;
} else if (cmd == F_SETLK || cmd == F_SETLKW || cmd == F_GETLK) {
struct Fd *f = g_fds.p + fd;
if (f->shared) {
if (f->cursor) {
pthread_mutex_lock(&g_locks.mu);
rc = sys_fcntl_nt_lock(f, fd, cmd, arg);
pthread_mutex_unlock(&g_locks.mu);

3
libc/calls/isapemagic.c
View file

@ -25,6 +25,5 @@
bool IsApeLoadable(char buf[8]) {
return READ32LE(buf) == READ32LE("\177ELF") ||
READ64LE(buf) == READ64LE("MZqFpD='") ||
READ64LE(buf) == READ64LE("jartsr='") ||
READ64LE(buf) == READ64LE("APEDBG='");
READ64LE(buf) == READ64LE("jartsr='");
}

11
libc/calls/lseek-nt.c
View file

@ -19,6 +19,7 @@
#include "libc/calls/calls.h"
#include "libc/calls/internal.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/intrin/fds.h"
#include "libc/nt/enum/filetype.h"
#include "libc/nt/files.h"
#include "libc/nt/struct/byhandlefileinformation.h"
@ -31,7 +32,7 @@ static textwindows int64_t GetPosition(struct Fd *f, int whence) {
case SEEK_SET:
return 0;
case SEEK_CUR:
return f->shared->pointer;
return f->cursor->shared->pointer;
case SEEK_END: {
struct NtByHandleFileInformation wst;
if (!GetFileInformationByHandle(f->handle, &wst)) {
@ -69,12 +70,12 @@ textwindows int64_t sys_lseek_nt(int fd, int64_t offset, int whence) {
int filetype = GetFileType(f->handle);
if (filetype != kNtFileTypePipe && //
filetype != kNtFileTypeChar && //
f->shared) {
f->cursor->shared) {
int64_t res;
__fd_lock(f);
__cursor_lock(f->cursor);
if ((res = Seek(f, offset, whence)) != -1)
f->shared->pointer = res;
__fd_unlock(f);
f->cursor->shared->pointer = res;
__cursor_unlock(f->cursor);
return res;
} else {
return espipe();

5
libc/calls/open-nt.c
View file

@ -24,6 +24,7 @@
#include "libc/calls/syscall-nt.internal.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/errno.h"
#include "libc/intrin/fds.h"
#include "libc/macros.internal.h"
#include "libc/nt/console.h"
#include "libc/nt/createfile.h"
@ -138,7 +139,7 @@ static textwindows int sys_open_nt_file(int dirfd, const char *file,
int64_t handle;
if ((handle = sys_open_nt_impl(dirfd, file, flags, mode,
kNtFileFlagOverlapped)) != -1) {
g_fds.p[fd].shared = __cursor_new();
g_fds.p[fd].cursor = __cursor_new();
g_fds.p[fd].handle = handle;
g_fds.p[fd].kind = kFdFile;
g_fds.p[fd].flags = flags;
@ -178,8 +179,8 @@ static textwindows int sys_open_nt_dup(int fd, int flags, int mode, int oldfd) {
kNtDuplicateSameAccess)) {
g_fds.p[fd] = g_fds.p[oldfd];
g_fds.p[fd].handle = handle;
g_fds.p[fd].isdup = true;
g_fds.p[fd].mode = mode;
__cursor_ref(g_fds.p[fd].cursor);
if (!sys_fcntl_nt_setfl(fd, flags)) {
return fd;
} else {

28
libc/calls/readwrite-nt.c
View file

@ -61,29 +61,29 @@ sys_readwrite_nt(int fd, void *data, size_t size, ssize_t offset,
return espipe();
// determine if we need to lock a file descriptor across processes
bool locked = isdisk && !pwriting && f->shared;
bool locked = isdisk && !pwriting && f->cursor;
if (locked)
__fd_lock(f);
__cursor_lock(f->cursor);
RestartOperation:
// when a file is opened in overlapped mode win32 requires that we
// take over full responsibility for managing our own file pointer
// which is fine, because the one win32 has was never very good in
// the sense that it behaves so differently from linux, that using
// win32 i/o required more compatibilty toil than doing it by hand
if (!pwriting) {
if (seekable && f->shared) {
offset = f->shared->pointer;
if (seekable && f->cursor) {
offset = f->cursor->shared->pointer;
} else {
offset = 0;
}
}
RestartOperation:
bool eagained = false;
// check for signals and cancelation
if (_check_cancel() == -1) {
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
return -1; // ECANCELED
}
if (_weaken(__sig_get) && (sig = _weaken(__sig_get)(waitmask))) {
@ -122,10 +122,10 @@ RestartOperation:
// if i/o succeeded then return its result
if (ok) {
if (!pwriting && seekable && f->shared)
f->shared->pointer = offset + exchanged;
if (!pwriting && seekable && f->cursor)
f->cursor->shared->pointer = offset + exchanged;
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
return exchanged;
}
@ -134,31 +134,31 @@ RestartOperation:
// raise EAGAIN if it's due to O_NONBLOCK mmode
if (eagained) {
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
return eagain();
}
// otherwise it must be due to a kill() via __sig_cancel()
if (_weaken(__sig_relay) && (sig = _weaken(__sig_get)(waitmask))) {
HandleInterrupt:
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
int handler_was_called = _weaken(__sig_relay)(sig, SI_KERNEL, waitmask);
if (_check_cancel() == -1)
return -1; // possible if we SIGTHR'd
if (locked)
__fd_lock(f);
__cursor_lock(f->cursor);
// read() is @restartable unless non-SA_RESTART hands were called
if (!(handler_was_called & SIG_HANDLED_NO_RESTART))
goto RestartOperation;
}
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
return eintr();
}
// read() and write() have generally different error-handling paths
if (locked)
__fd_unlock(f);
__cursor_unlock(f->cursor);
return -2;
}

2
libc/calls/write-nt.c
View file

@ -18,7 +18,6 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/internal.h"
#include "libc/calls/sig.internal.h"
#include "libc/intrin/fds.h"
#include "libc/calls/struct/iovec.h"
#include "libc/calls/struct/sigset.h"
#include "libc/calls/struct/sigset.internal.h"
@ -26,6 +25,7 @@
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/errno.h"
#include "libc/intrin/atomic.h"
#include "libc/intrin/fds.h"
#include "libc/intrin/nomultics.h"
#include "libc/intrin/weaken.h"
#include "libc/nt/console.h"

6
libc/integral/c.inc
View file

@ -6,12 +6,6 @@
#define COSMOPOLITAN_CXX_USING_
#endif
#ifndef __cplusplus
#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
#pragma GCC diagnostic warning "-Wint-conversion"
#endif
#if !defined(__GNUC__) && __cplusplus + 0 >= 201103L
#define typeof(x) decltype(x)
#elif !defined(__GNUC__) && __STDC_VERSION__ + 0 < 201112

1
libc/intrin/BUILD.mk
View file

@ -62,6 +62,7 @@ o/$(MODE)/libc/intrin/kprintf.o: private \
-Wframe-larger-than=128 \
-Walloca-larger-than=128
o/$(MODE)/libc/intrin/cursor.o \
o/$(MODE)/libc/intrin/mmap.o \
o/$(MODE)/libc/intrin/tree.o: private \
CFLAGS += \

64
libc/intrin/cursor.c Normal file
View file

@ -0,0 +1,64 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi │
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2024 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/assert.h"
#include "libc/intrin/atomic.h"
#include "libc/intrin/fds.h"
#include "libc/runtime/runtime.h"
struct Cursor *__cursor_new(void) {
struct Cursor *c;
if ((c = _mapanon(sizeof(struct Cursor)))) {
if ((c->shared = _mapshared(sizeof(struct CursorShared)))) {
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
pthread_mutex_init(&c->shared->lock, &attr);
pthread_mutexattr_destroy(&attr);
} else {
munmap(c, sizeof(struct Cursor));
c = 0;
}
}
return c;
}
void __cursor_ref(struct Cursor *c) {
if (!c)
return;
unassert(atomic_fetch_add_explicit(&c->refs, 1, memory_order_relaxed) >= 0);
}
int __cursor_unref(struct Cursor *c) {
if (!c)
return 0;
if (atomic_fetch_sub_explicit(&c->refs, 1, memory_order_release))
return 0;
atomic_thread_fence(memory_order_acquire);
int rc = munmap(c->shared, sizeof(struct CursorShared));
rc |= munmap(c, sizeof(struct Cursor));
return rc;
}
void __cursor_lock(struct Cursor *c) {
pthread_mutex_lock(&c->shared->lock);
}
void __cursor_unlock(struct Cursor *c) {
pthread_mutex_unlock(&c->shared->lock);
}

51
libc/intrin/fds.c
View file

@ -23,7 +23,7 @@
#include "libc/dce.h"
#include "libc/intrin/atomic.h"
#include "libc/intrin/extend.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/maps.h"
#include "libc/intrin/nomultics.h"
#include "libc/intrin/pushpop.h"
#include "libc/intrin/weaken.h"
@ -32,7 +32,9 @@
#include "libc/nt/enum/accessmask.h"
#include "libc/nt/enum/creationdisposition.h"
#include "libc/nt/enum/fileflagandattributes.h"
#include "libc/nt/enum/filemapflags.h"
#include "libc/nt/enum/filesharemode.h"
#include "libc/nt/memory.h"
#include "libc/nt/runtime.h"
#include "libc/runtime/internal.h"
#include "libc/runtime/memtrack.internal.h"
@ -55,7 +57,11 @@ static struct Fd g_fds_static[OPEN_MAX];
static bool TokAtoi(const char **str, long *res) {
int c, d;
unsigned long x = 0;
d = **str == '-' ? -1 : 1;
d = 1;
if (**str == '-') {
(*str)++;
d = -1;
}
while ((c = *(*str)++)) {
if (('0' <= c && c <= '9')) {
x *= 10;
@ -122,10 +128,11 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
// inherit file descriptors from cosmo parent process
if (IsWindows()) {
const char *fdspec;
if ((fdspec = getenv("_COSMO_FDS"))) {
if ((fdspec = getenv("_COSMO_FDS_V2"))) {
unsetenv("_COSMO_FDS");
unsetenv("_COSMO_FDS_V2");
for (;;) {
long fd, kind, flags, mode, handle, pointer, type, family, protocol;
long fd, kind, flags, mode, handle, shand, type, family, protocol;
if (!TokAtoi(&fdspec, &fd))
break;
if (!TokAtoi(&fdspec, &handle))
@ -136,7 +143,7 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
break;
if (!TokAtoi(&fdspec, &mode))
break;
if (!TokAtoi(&fdspec, &pointer))
if (!TokAtoi(&fdspec, &shand))
break;
if (!TokAtoi(&fdspec, &type))
break;
@ -149,9 +156,8 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
struct Fd *f = fds->p + fd;
if (f->handle && f->handle != -1 && f->handle != handle) {
CloseHandle(f->handle);
if (fd < 3) {
if (fd < 3)
SetStdHandle(kNtStdio[fd], handle);
}
}
f->handle = handle;
f->kind = kind;
@ -162,24 +168,31 @@ textstartup void __init_fds(int argc, char **argv, char **envp) {
f->protocol = protocol;
atomic_store_explicit(&fds->f, fd + 1, memory_order_relaxed);
//
// - v1 abi: This field was originally the file pointer.
//
// - v2 abi: This field is the negated shared memory address.
//
if (f->kind == kFdFile) {
if (pointer < 0) {
f->shared = (struct Cursor *)(uintptr_t)-pointer;
} else if ((f->shared = __cursor_new())) {
f->shared->pointer = pointer;
if (shand) {
struct Map *map;
struct CursorShared *shared;
if ((shared = MapViewOfFileEx(shand, kNtFileMapWrite, 0, 0,
sizeof(struct CursorShared), 0))) {
if ((f->cursor = _mapanon(sizeof(struct Cursor)))) {
f->cursor->shared = shared;
if ((map = __maps_alloc())) {
map->addr = (char *)shared;
map->size = sizeof(struct CursorShared);
map->off = 0;
map->prot = PROT_READ | PROT_WRITE;
map->flags = MAP_SHARED | MAP_ANONYMOUS;
map->hand = shand;
__maps_insert(map);
}
}
}
}
}
}
for (int i = 0; i < 3; ++i) {
struct Fd *f = fds->p + i;
if (f->kind == kFdFile && !f->shared)
f->shared = __cursor_new();
if (f->kind == kFdFile && !f->cursor)
f->cursor = __cursor_new();
}
}
}

17
libc/intrin/fds.h
View file

@ -1,6 +1,5 @@
#ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_
#define COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_
#include "libc/atomic.h"
#include "libc/thread/thread.h"
COSMOPOLITAN_C_START_
@ -15,14 +14,18 @@ COSMOPOLITAN_C_START_
#define kFdDevNull 9
#define kFdDevRandom 10
struct Cursor {
struct CursorShared {
pthread_mutex_t lock;
long pointer;
};
struct Cursor {
struct CursorShared *shared;
_Atomic(int) refs;
};
struct Fd {
char kind;
bool isdup;
bool isbound;
unsigned flags;
unsigned mode;
@ -33,7 +36,7 @@ struct Fd {
unsigned rcvtimeo; /* millis; 0 means wait forever */
unsigned sndtimeo; /* millis; 0 means wait forever */
void *connect_op;
struct Cursor *shared;
struct Cursor *cursor;
};
struct Fds {
@ -42,9 +45,11 @@ struct Fds {
struct Fd *p, *e;
};
void __fd_lock(struct Fd *);
void __fd_unlock(struct Fd *);
struct Cursor *__cursor_new(void);
void __cursor_ref(struct Cursor *);
int __cursor_unref(struct Cursor *);
void __cursor_lock(struct Cursor *);
void __cursor_unlock(struct Cursor *);
COSMOPOLITAN_C_END_
#endif /* COSMOPOLITAN_LIBC_CALLS_STRUCT_FD_INTERNAL_H_ */

22
libc/intrin/fds_lock.c
View file

@ -17,8 +17,6 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/state.internal.h"
#include "libc/intrin/fds.h"
#include "libc/runtime/runtime.h"
#include "libc/thread/thread.h"
void __fds_lock(void) {
@ -28,23 +26,3 @@ void __fds_lock(void) {
void __fds_unlock(void) {
pthread_mutex_unlock(&__fds_lock_obj);
}
void __fd_lock(struct Fd *f) {
pthread_mutex_lock(&f->shared->lock);
}
void __fd_unlock(struct Fd *f) {
pthread_mutex_unlock(&f->shared->lock);
}
struct Cursor *__cursor_new(void) {
struct Cursor *c;
if ((c = _mapshared(sizeof(struct Cursor)))) {
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
pthread_mutex_init(&c->lock, &attr);
pthread_mutexattr_destroy(&attr);
}
return c;
}

0
libc/runtime/mapanon.c → libc/intrin/mapanon.c
View file

1
libc/intrin/maps.h
View file

@ -52,6 +52,7 @@ void *__maps_randaddr(void);
void *__maps_pickaddr(size_t);
void __maps_add(struct Map *);
void __maps_free(struct Map *);
void __maps_insert(struct Map *);
struct Map *__maps_alloc(void);
struct Map *__maps_floor(const char *);
void __maps_stack(char *, int, int, size_t, int, intptr_t);

8
libc/intrin/mmap.c
View file

@ -138,7 +138,7 @@ StartOver:
__maps.count -= 1;
__maps_check();
} else if (IsWindows()) {
// you can't carve up memory maps on windows ;_;
STRACE("you can't carve up memory maps on windows ;_;");
rc = einval();
} else if (addr <= map_addr) {
// shave off lefthand side of mapping
@ -246,7 +246,7 @@ static void __maps_free_all(struct Map *list) {
}
}
static void __maps_insert(struct Map *map) {
void __maps_insert(struct Map *map) {
map->flags &= MAP_TYPE | MAP_ANONYMOUS | MAP_NOFORK;
// coalesce adjacent mappings
@ -351,12 +351,12 @@ static int __munmap(char *addr, size_t size) {
}
// untrack mappings
int rc;
struct Map *deleted = 0;
__muntrack(addr, pgup_size, pagesz, &deleted);
rc = __muntrack(addr, pgup_size, pagesz, &deleted);
__maps_unlock();
// delete mappings
int rc = 0;
for (struct Map *map = deleted; map; map = map->freed) {
if (!IsWindows()) {
if (sys_munmap(map->addr, map->size))

2
libc/intrin/strace.h
View file

@ -5,7 +5,7 @@
#define SYSDEBUG 0
#endif
#define _NTTRACE 0 /* not configurable w/ flag yet */
#define _NTTRACE 1 /* not configurable w/ flag yet */
#define _POLLTRACE 0 /* not configurable w/ flag yet */
#define _DATATRACE 1 /* not configurable w/ flag yet */
#define _LOCKTRACE 0 /* not configurable w/ flag yet */

37
libc/proc/describefds.c
View file

@ -18,8 +18,10 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/errno.h"
#include "libc/fmt/itoa.h"
#include "libc/intrin/fds.h"
#include "libc/intrin/maps.h"
#include "libc/intrin/strace.h"
#include "libc/mem/mem.h"
#include "libc/nt/files.h"
@ -27,7 +29,7 @@
#include "libc/nt/struct/startupinfo.h"
#include "libc/sysv/consts/o.h"
#define FDS_VAR "_COSMO_FDS="
#define FDS_VAR "_COSMO_FDS_V2="
#define MAX_ENTRY_BYTES 256
@ -99,6 +101,8 @@ textwindows char *__describe_fds(const struct Fd *fds, size_t fdslen,
if (__is_cloexec(f))
continue;
++handlecount;
if (f->cursor)
++handlecount;
}
if (!(handles = calloc(handlecount, sizeof(*handles)))) {
OnFailure:
@ -116,17 +120,31 @@ textwindows char *__describe_fds(const struct Fd *fds, size_t fdslen,
// make inheritable version of handle exist in creator process
if (!DuplicateHandle(GetCurrentProcess(), f->handle, hCreatorProcess,
&handle, 0, true, kNtDuplicateSameAccess)) {
STRACE("__describe_fds() DuplicateHandle() failed w/ %d", GetLastError());
__winerr();
goto OnFailure;
}
for (uint32_t i = 0; i < 3; ++i) {
if (lpStartupInfo->stdiofds[i] == f->handle) {
for (uint32_t i = 0; i < 3; ++i)
if (lpStartupInfo->stdiofds[i] == f->handle)
lpStartupInfo->stdiofds[i] = handle;
}
}
handles[hi++] = handle;
// get shared memory handle for the file offset pointer
intptr_t shand = 0;
if (f->cursor) {
struct Map *map;
if (!(map = __maps_floor((const char *)f->cursor->shared)) ||
map->addr != (const char *)f->cursor->shared) {
errno = EFAULT;
goto OnFailure;
}
if (!DuplicateHandle(GetCurrentProcess(), map->hand, hCreatorProcess,
&shand, 0, true, kNtDuplicateSameAccess)) {
__winerr();
goto OnFailure;
}
handles[hi++] = shand;
}
// ensure output string has enough space for new entry
if (sb.i + MAX_ENTRY_BYTES > sb.n) {
char *p2;
@ -151,12 +169,7 @@ textwindows char *__describe_fds(const struct Fd *fds, size_t fdslen,
*p++ = '_';
p = FormatInt64(p, f->mode);
*p++ = '_';
//
// - v1 abi: This field was originally the file pointer.
//
// - v2 abi: This field is the negated shared memory address.
//
p = FormatInt64(p, -(uintptr_t)f->shared);
p = FormatInt64(p, shand);
*p++ = '_';
p = FormatInt64(p, f->type);
*p++ = '_';

2
libc/proc/describefds.internal.h
View file

@ -4,6 +4,8 @@
#include "libc/nt/struct/startupinfo.h"
COSMOPOLITAN_C_START_
#define CURSOR_ADDRESS_FLAG 0x4000000000000000
bool __is_cloexec(const struct Fd *) libcesque;
void __undescribe_fds(int64_t, int64_t *, uint32_t) libcesque;
char *__describe_fds(const struct Fd *, size_t, struct NtStartupInfo *, int64_t,

5
libc/runtime/straceinit.greg.c
View file

@ -28,9 +28,8 @@
*/
textstartup int __strace_init(int argc, char **argv, char **envp, long *auxv) {
/* asan isn't initialized yet at runlevel 300 */
if ((__intercept_flag(&argc, argv, "--strace") ||
__atoul(nulltoempty(__getenv(envp, "STRACE").s))) &&
!issetugid()) {
if (__intercept_flag(&argc, argv, "--strace") ||
__atoul(nulltoempty(__getenv(envp, "STRACE").s))) {
strace_enabled(+1);
}
return (__argc = argc);

1
libc/runtime/winmain.greg.c
View file

@ -21,6 +21,7 @@
#include "libc/calls/sig.internal.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/intrin/dll.h"
#include "libc/intrin/kprintf.h"
#include "libc/intrin/maps.h"
#include "libc/intrin/nomultics.h"
#include "libc/intrin/weaken.h"

15
libc/runtime/zipos-get.c
View file

@ -21,6 +21,7 @@
#include "libc/calls/metalfile.internal.h"
#include "libc/calls/struct/stat.h"
#include "libc/cosmo.h"
#include "libc/dce.h"
#include "libc/fmt/conv.h"
#include "libc/intrin/cmpxchg.h"
#include "libc/intrin/promises.h"
@ -62,15 +63,11 @@ static void __zipos_dismiss(uint8_t *map, const uint8_t *cdir, long pg) {
}
// unmap the executable portion beneath the local files
mo = ROUNDDOWN(lo, __gransize);
if (mo)
munmap(map, mo);
// this is supposed to reduce our rss usage but does it really?
lo = ROUNDDOWN(lo, pg);
hi = MIN(ROUNDUP(hi, pg), ROUNDDOWN(c, pg));
if (hi > lo)
posix_madvise(map + lo, hi - lo, POSIX_MADV_DONTNEED);
if (!IsWindows()) {
mo = ROUNDDOWN(lo, __gransize);
if (mo)
munmap(map, mo);
}
}
static int __zipos_compare_names(const void *a, const void *b, void *c) {

12
libc/sock/sendfile.c
View file

@ -65,7 +65,7 @@ static dontinline textwindows ssize_t sys_sendfile_nt(
bool locked = false;
int64_t ih, oh, eof, offset;
struct NtByHandleFileInformation wst;
if (!__isfdkind(infd, kFdFile) || !g_fds.p[infd].shared)
if (!__isfdkind(infd, kFdFile) || !g_fds.p[infd].cursor)
return ebadf();
if (!__isfdkind(outfd, kFdSocket))
return ebadf();
@ -75,8 +75,8 @@ static dontinline textwindows ssize_t sys_sendfile_nt(
offset = *opt_in_out_inoffset;
} else {
locked = true;
__fd_lock(&g_fds.p[infd]);
offset = g_fds.p[infd].shared->pointer;
__cursor_lock(g_fds.p[infd].cursor);
offset = g_fds.p[infd].cursor->shared->pointer;
}
if (GetFileInformationByHandle(ih, &wst)) {
// TransmitFile() returns EINVAL if `uptobytes` goes past EOF.
@ -86,7 +86,7 @@ static dontinline textwindows ssize_t sys_sendfile_nt(
}
} else {
if (locked)
__fd_unlock(&g_fds.p[infd]);
__cursor_unlock(g_fds.p[infd].cursor);
return ebadf();
}
struct NtOverlapped ov = {.hEvent = WSACreateEvent(), .Pointer = offset};
@ -99,7 +99,7 @@ static dontinline textwindows ssize_t sys_sendfile_nt(
if (opt_in_out_inoffset) {
*opt_in_out_inoffset = offset + rc;
} else {
g_fds.p[infd].shared->pointer = offset + rc;
g_fds.p[infd].cursor->shared->pointer = offset + rc;
}
} else {
rc = __winsockerr();
@ -108,7 +108,7 @@ static dontinline textwindows ssize_t sys_sendfile_nt(
rc = __winsockerr();
}
if (locked)
__fd_unlock(&g_fds.p[infd]);
__cursor_unlock(g_fds.p[infd].cursor);
WSACloseEvent(ov.hEvent);
return rc;
}