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

Further loader golf

Browse source 
Shaves off a few bytes, paying for the cost of `RealPath` and then some
on x86_64 and offsetting some of the cost to aarch64.
This commit is contained in:
Jōshin 2023-12-15 21:42:44 +00:00
parent 2914b66ec1
commit 7cf845a9db
No known key found for this signature in database
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ape/loader.c
View file

@ -948,6 +948,12 @@ __attribute__((__noreturn__)) static void ShowUsage(int os, int fd, int rc) {
Exit(rc, os); Exit(rc, os);
} }
__attribute__((__noreturn__)) static void ShowError(int os, const char *ape,
const char *s) {
Print(os, 2, ape, ": ", s, " (pass -h for help)\n", 0l);
Exit(1, os);
}
EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp, EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
char dl) { char dl) {
int rc, n; int rc, n;
@ -1017,20 +1023,6 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
os = LINUX; os = LINUX;
} }
/* parse flags */
while (argc > 1) {
if (argv[1][0] != '-') break; /* normal argument */
if (!argv[1][1]) break; /* hyphen argument */
if (!StrCmp(argv[1], "-h") || !StrCmp(argv[1], "--help")) {
ShowUsage(os, 1, 0);
} else {
Print(os, 2, ape, ": invalid flag (pass -h for help)\n", 0l);
Exit(1, os);
}
*++sp = --argc;
++argv;
}
/* we can load via shell, shebang, or binfmt_misc */ /* we can load via shell, shebang, or binfmt_misc */
if ((literally = argc >= 3 && !StrCmp(argv[1], "-"))) { if ((literally = argc >= 3 && !StrCmp(argv[1], "-"))) {
/* if the first argument is a hyphen then we give the user the /* if the first argument is a hyphen then we give the user the
@ -1041,9 +1033,16 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
argc = sp[3] = sp[0] - 3; argc = sp[3] = sp[0] - 3;
argv = (char **)((sp += 3) + 1); argv = (char **)((sp += 3) + 1);
} else if (argc < 2) { } else if (argc < 2) {
Print(os, 2, ape, ": missing command name (pass -h for help)\n", 0l); ShowError(os, ape, "missing command name");
Exit(1, os);
} else { } else {
if (argv[1][0] == '-') {
if ((argv[1][1] == 'h' && !argv[1][2]) ||
!StrCmp(argv[1] + 1, "-help")) {
ShowUsage(os, 1, 0);
} else {
ShowError(os, ape, "invalid flag");
}
}
prog = (char *)sp[2]; prog = (char *)sp[2];
argc = sp[1] = sp[0] - 1; argc = sp[1] = sp[0] - 1;
argv = (char **)((sp += 1) + 1); argv = (char **)((sp += 1) + 1);