mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-06-27 14:58:30 +00:00
Remove dollars from system call support symbols
This commit is contained in:
parent
a8d7195777
commit
a37960a3af
743 changed files with 1380 additions and 2016 deletions
|
@ -466,7 +466,7 @@ static int AppendIovsGuest(struct Machine *m, struct Iovs *iv, int64_t iovaddr,
|
|||
}
|
||||
|
||||
static struct sigaction *CoerceSigactionToCosmo(
|
||||
struct sigaction *dst, const struct sigaction$linux *src) {
|
||||
struct sigaction *dst, const struct sigaction_linux *src) {
|
||||
if (!src) return NULL;
|
||||
memset(dst, 0, sizeof(*dst));
|
||||
ASSIGN(dst->sa_handler, src->sa_handler);
|
||||
|
@ -476,8 +476,8 @@ static struct sigaction *CoerceSigactionToCosmo(
|
|||
return dst;
|
||||
}
|
||||
|
||||
static struct sigaction$linux *CoerceSigactionToLinux(
|
||||
struct sigaction$linux *dst, const struct sigaction *src) {
|
||||
static struct sigaction_linux *CoerceSigactionToLinux(
|
||||
struct sigaction_linux *dst, const struct sigaction *src) {
|
||||
if (!dst) return NULL;
|
||||
memset(dst, 0, sizeof(*dst));
|
||||
ASSIGN(dst->sa_handler, src->sa_handler);
|
||||
|
@ -1145,14 +1145,14 @@ static int OpSigaction(struct Machine *m, int sig, int64_t act, int64_t old) {
|
|||
int rc;
|
||||
struct OpSigactionMemory {
|
||||
struct sigaction act, old;
|
||||
uint8_t b[sizeof(struct sigaction$linux)];
|
||||
uint8_t b[sizeof(struct sigaction_linux)];
|
||||
void *p[2];
|
||||
} * mem;
|
||||
if (!(mem = malloc(sizeof(*mem)))) return enomem();
|
||||
if ((rc = sigaction(
|
||||
XlatSignal(sig),
|
||||
CoerceSigactionToCosmo(
|
||||
&mem->act, LoadBuf(m, act, sizeof(struct sigaction$linux))),
|
||||
&mem->act, LoadBuf(m, act, sizeof(struct sigaction_linux))),
|
||||
&mem->old)) != -1) {
|
||||
CoerceSigactionToLinux(BeginStoreNp(m, old, sizeof(mem->b), mem->p, mem->b),
|
||||
&mem->old);
|
||||
|
|
|
@ -87,7 +87,7 @@ noasan void PrintStartupInfo(void) {
|
|||
╚──────────────────────────────────────────────────────────────────────────────╝\n\
|
||||
\n");
|
||||
#define X(D, F) \
|
||||
printf("%s.%-22s= " D "\n", "g_ntstartupinfo", #F, g_ntstartupinfo.F);
|
||||
printf("%s.%-22s= " D "\n", "__nt_startupinfo", #F, __nt_startupinfo.F);
|
||||
X("%u", cb);
|
||||
X("%p", lpReserved);
|
||||
X("%hs", lpDesktop);
|
||||
|
@ -99,8 +99,8 @@ noasan void PrintStartupInfo(void) {
|
|||
X("%u", dwXCountChars);
|
||||
X("%u", dwYCountChars);
|
||||
X("%u", dwFillAttribute);
|
||||
printf("%s.%-22s: %s\n", "g_ntstartupinfo", "dwFlags",
|
||||
RecreateFlags(kNtStartfFlagNames, g_ntstartupinfo.dwFlags));
|
||||
printf("%s.%-22s: %s\n", "__nt_startupinfo", "dwFlags",
|
||||
RecreateFlags(kNtStartfFlagNames, __nt_startupinfo.dwFlags));
|
||||
X("%hu", wShowWindow);
|
||||
X("%hu", cbReserved2);
|
||||
X("%s", lpReserved2);
|
||||
|
@ -117,7 +117,7 @@ void PrintSystemInfo(void) {
|
|||
╚──────────────────────────────────────────────────────────────────────────────╝\n\
|
||||
\n");
|
||||
#define X(D, F) \
|
||||
printf("%s.%-28s= " D "\n", "g_ntsysteminfo", #F, g_ntsysteminfo.F);
|
||||
printf("%s.%-28s= " D "\n", "__nt_systeminfo", #F, __nt_systeminfo.F);
|
||||
X("%08x", dwOemId);
|
||||
X("%04hx", wProcessorArchitecture);
|
||||
X("%d", dwPageSize);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue