mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-04-22 06:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make revision to previous change

Browse source
This commit is contained in:
Justine Tunney 2024-09-19 03:29:39 -07:00
parent 0d74673213
commit d50f4c02f6
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ void __sig_generate(int, int);
void __sig_init(void); void __sig_init(void);
char16_t *__sig_process_path(char16_t *, uint32_t); char16_t *__sig_process_path(char16_t *, uint32_t);
atomic_ulong *__sig_map_process(int); atomic_ulong *__sig_map_process(int, int);
COSMOPOLITAN_C_END_ COSMOPOLITAN_C_END_
#endif /* COSMOPOLITAN_LIBC_CALLS_SIGNALS_INTERNAL_H_ */ #endif /* COSMOPOLITAN_LIBC_CALLS_SIGNALS_INTERNAL_H_ */

9
libc/intrin/sig.c
View file

@ -99,12 +99,13 @@ textwindows char16_t *__sig_process_path(char16_t *path, uint32_t pid) {
return path; return path;
} }
textwindows static atomic_ulong *__sig_map_process_impl(int pid) { textwindows static atomic_ulong *__sig_map_process_impl(int pid,
int disposition) {
char16_t path[128]; char16_t path[128];
intptr_t hand = CreateFile(__sig_process_path(path, pid), intptr_t hand = CreateFile(__sig_process_path(path, pid),
kNtGenericRead | kNtGenericWrite, kNtGenericRead | kNtGenericWrite,
kNtFileShareRead | kNtFileShareWrite, 0, kNtFileShareRead | kNtFileShareWrite, 0,
kNtOpenAlways, kNtFileAttributeNormal, 0); disposition, kNtFileAttributeNormal, 0);
if (hand == -1) if (hand == -1)
return 0; return 0;
SetFilePointer(hand, 8, 0, kNtFileBegin); SetFilePointer(hand, 8, 0, kNtFileBegin);
@ -120,9 +121,9 @@ textwindows static atomic_ulong *__sig_map_process_impl(int pid) {
return sigs; return sigs;
} }
textwindows atomic_ulong *__sig_map_process(int pid) { textwindows atomic_ulong *__sig_map_process(int pid, int disposition) {
int e = errno; int e = errno;
atomic_ulong *res = __sig_map_process_impl(pid); atomic_ulong *res = __sig_map_process_impl(pid, disposition);
errno = e; errno = e;
return res; return res;
} }

3
libc/proc/kill-nt.c
View file

@ -27,6 +27,7 @@
#include "libc/intrin/kprintf.h" #include "libc/intrin/kprintf.h"
#include "libc/intrin/strace.h" #include "libc/intrin/strace.h"
#include "libc/nt/console.h" #include "libc/nt/console.h"
#include "libc/nt/enum/creationdisposition.h"
#include "libc/nt/enum/ctrlevent.h" #include "libc/nt/enum/ctrlevent.h"
#include "libc/nt/enum/processaccess.h" #include "libc/nt/enum/processaccess.h"
#include "libc/nt/errors.h" #include "libc/nt/errors.h"
@ -75,7 +76,7 @@ textwindows int sys_kill_nt(int pid, int sig) {
// attempt to signal via /var/sig shared memory file // attempt to signal via /var/sig shared memory file
if (pid > 0 && sig != 9) { if (pid > 0 && sig != 9) {
atomic_ulong *sigproc; atomic_ulong *sigproc;
if ((sigproc = __sig_map_process(pid))) { if ((sigproc = __sig_map_process(pid, kNtOpenExisting))) {
if (sig > 0) if (sig > 0)
atomic_fetch_or_explicit(sigproc, 1ull << (sig - 1), atomic_fetch_or_explicit(sigproc, 1ull << (sig - 1),
memory_order_release); memory_order_release);

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

@ -31,6 +31,7 @@
#include "libc/nt/accounting.h" #include "libc/nt/accounting.h"
#include "libc/nt/console.h" #include "libc/nt/console.h"
#include "libc/nt/enum/consolemodeflags.h" #include "libc/nt/enum/consolemodeflags.h"
#include "libc/nt/enum/creationdisposition.h"
#include "libc/nt/enum/filemapflags.h" #include "libc/nt/enum/filemapflags.h"
#include "libc/nt/enum/pageflags.h" #include "libc/nt/enum/pageflags.h"
#include "libc/nt/files.h" #include "libc/nt/files.h"
@ -317,7 +318,7 @@ abi int64_t WinMain(int64_t hInstance, int64_t hPrevInstance,
__gransize = si.dwAllocationGranularity; __gransize = si.dwAllocationGranularity;
__umask = 077; __umask = 077;
__pid = __imp_GetCurrentProcessId(); __pid = __imp_GetCurrentProcessId();
if (!(__sig.process = __sig_map_process(__pid))) if (!(__sig.process = __sig_map_process(__pid, kNtOpenAlways)))
__sig.process = &fake_process_signals; __sig.process = &fake_process_signals;
atomic_store_explicit(__sig.process, 0, memory_order_release); atomic_store_explicit(__sig.process, 0, memory_order_release);
cmdline = __imp_GetCommandLineW(); cmdline = __imp_GetCommandLineW();