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

Update assimilate to work with modern APE format

Browse source
This commit is contained in:
Justine Tunney 2023-01-04 06:34:48 -08:00
parent 6dcdf91458
commit 651826b660
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tool/build/assimilate.c
View file

@ -17,11 +17,11 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/intrin/bits.h"
#include "libc/calls/calls.h"
#include "libc/calls/struct/stat.h"
#include "libc/dce.h"
#include "libc/fmt/conv.h"
#include "libc/intrin/bits.h"
#include "libc/intrin/kprintf.h"
#include "libc/log/check.h"
#include "libc/runtime/runtime.h"
@ -153,11 +153,16 @@ void GetMachoPayload(const char *image, size_t imagesize, int *out_offset,
const char *script;
regmatch_t rm[1 + 3] = {0};
int rc, skip, count, bs, offset, size;
if (!(script = memmem(image, imagesize, "'\n#'\"\n", 6))) {
if ((script = memmem(image, imagesize, "'\n#'\"\n", 6))) {
script += 6;
} else if ((script = memmem(image, imagesize, "#'\"\n", 4))) {
script += 4;
} else {
kprintf("%s: ape shell script not found\n", prog);
exit(5);
}
script += 6;
DCHECK_EQ(REG_OK, regcomp(&rx,
"bs=([ [:digit:]]+) "
"skip=\"?([ [:digit:]]+)\"? "