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

Fix ctrl-c in redbean on Windows

Browse source
This commit is contained in:
Justine Tunney 2023-10-13 07:43:47 -07:00
parent d458642790
commit 4bcb107cb0
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
12 changed files with 326 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libc/log/backtrace2.c
View file

@ -107,7 +107,7 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
}
addr = frame->addr;
#ifdef __x86_64__
if (addr == (uintptr_t)_weaken(__gc)) {
if (gi && addr == (uintptr_t)_weaken(__gc)) {
do {
--gi;
} while ((addr = garbage->p[gi].ret) == (uintptr_t)_weaken(__gc));
@ -116,7 +116,7 @@ static int PrintBacktraceUsingAddr2line(int fd, const struct StackFrame *bp) {
argv[i++] = buf + j;
buf[j++] = '0';
buf[j++] = 'x';
j += uint64toarray_radix16(addr - 1, buf + j) + 1;
j += uint64toarray_radix16(addr, buf + j) + 1;
}
argv[i++] = NULL;
if (sys_pipe2(pipefds, O_CLOEXEC) == -1) {

15
libc/log/backtrace3.c
View file

@ -73,20 +73,7 @@ dontinstrument dontasan int PrintBacktraceUsingSymbols(
}
#endif
if (addr) {
if (
#ifdef __x86_64__
/*
* we subtract one to handle the case of noreturn functions
* with a call instruction at the end, since %rip in such
* cases will point to the start of the next function.
* generally %rip always points to the byte after the
* instruction. one exception is in case like __restore_rt
* where the kernel creates a stack frame that points to the
* beginning of the function.
*/
(symbol = __get_symbol(st, addr - 1)) != -1 ||
#endif
(symbol = __get_symbol(st, addr)) != -1) {
if ((symbol = __get_symbol(st, addr)) != -1) {
addend = addr - st->addr_base;
addend -= st->symbols[symbol].x;
} else {

2
libc/log/vflogf.c
View file

@ -135,7 +135,7 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f,
(dprintf)(STDERR_FILENO,
"exiting due to aforementioned error (host %s pid %d tid %d)\n",
buf32, getpid(), gettid());
__die();
_Exit(22);
}
ALLOW_SIGNALS;