mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-02-07 15:03:34 +00:00
Commit bc6c183
introduced a bunch of discrepancies between what files
look like in the repo and what clang-format says they should look like.
However, there were already a few discrepancies prior to that. Most of
these discrepancies seemed to be unintentional, but a few of them were
load-bearing (e.g., a #include that violated header ordering needing
something to have been #defined by a 'later' #include.)
I opted to take what I hope is a relatively smooth-brained approach: I
reverted the .clang-format change, ran clang-format on the whole repo,
reapplied the .clang-format change, reran clang-format again, and then
reverted the commit that contained the first run. Thus the full effect
of this PR should only be to apply the changed formatting rules to the
repo, and from skimming the results, this seems to be the case.
My work can be checked by applying the short, manual commits, and then
rerunning the command listed in the autogenerated commits (those whose
messages I have prefixed auto:) and seeing if your results agree.
It might be that the other diffs should be fixed at some point but I'm
leaving that aside for now.
fd '\.c(c|pp)?$' --print0| xargs -0 clang-format -i
245 lines
8 KiB
C
245 lines
8 KiB
C
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
|
│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi │
|
|
╞══════════════════════════════════════════════════════════════════════════════╡
|
|
│ Copyright 2023 Justine Alexandra Roberts Tunney │
|
|
│ │
|
|
│ Permission to use, copy, modify, and/or distribute this software for │
|
|
│ any purpose with or without fee is hereby granted, provided that the │
|
|
│ above copyright notice and this permission notice appear in all copies. │
|
|
│ │
|
|
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
|
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
|
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
|
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
|
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
|
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
|
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
|
│ PERFORMANCE OF THIS SOFTWARE. │
|
|
╚─────────────────────────────────────────────────────────────────────────────*/
|
|
#include "libc/calls/calls.h"
|
|
#include "libc/dce.h"
|
|
#include "libc/elf/elf.h"
|
|
#include "libc/elf/struct/ehdr.h"
|
|
#include "libc/elf/struct/shdr.h"
|
|
#include "libc/errno.h"
|
|
#include "libc/fmt/magnumstrs.internal.h"
|
|
#include "libc/limits.h"
|
|
#include "libc/runtime/runtime.h"
|
|
#include "libc/serialize.h"
|
|
#include "libc/stdio/stdio.h"
|
|
#include "libc/stdio/sysparam.h"
|
|
#include "libc/str/str.h"
|
|
#include "libc/sysv/consts/map.h"
|
|
#include "libc/sysv/consts/o.h"
|
|
#include "libc/sysv/consts/prot.h"
|
|
#include "libc/zip.internal.h"
|
|
#include "third_party/getopt/getopt.internal.h"
|
|
|
|
static int infd;
|
|
static int outfd;
|
|
static ssize_t insize;
|
|
static ssize_t outsize;
|
|
static const char *prog;
|
|
static const char *inpath;
|
|
static const char *outpath;
|
|
static unsigned char *inmap;
|
|
|
|
static wontreturn void Die(const char *path, const char *reason) {
|
|
tinyprint(2, path, ": ", reason, "\n", NULL);
|
|
exit(1);
|
|
}
|
|
|
|
static wontreturn void SysDie(const char *path, const char *func) {
|
|
const char *errstr;
|
|
if (!(errstr = _strerdoc(errno)))
|
|
errstr = "EUNKNOWN";
|
|
tinyprint(2, path, ": ", func, " failed with ", errstr, "\n", NULL);
|
|
exit(1);
|
|
}
|
|
|
|
static wontreturn void PrintUsage(int fd, int exitcode) {
|
|
tinyprint(fd, "\
|
|
NAME\n\
|
|
\n\
|
|
Cosmopolitan Zip Copier\n\
|
|
\n\
|
|
SYNOPSIS\n\
|
|
\n\
|
|
",
|
|
prog, " [FLAGS] SRC DST\n\
|
|
\n\
|
|
DESCRIPTION\n\
|
|
\n\
|
|
This tool copies the zip artifacts, if they exist, to the\n\
|
|
end of the destination file. If no zip files exist within\n\
|
|
the input file, then this tool performs no operation. The\n\
|
|
output file will be created if it doesn't exist, which is\n\
|
|
useful for creating new zip archives possibly to clean up\n\
|
|
holes between input records. If the destination file does\n\
|
|
exist, e.g. an executable, then any existing content will\n\
|
|
be preserved, including an existing zip archive. That may\n\
|
|
however lead to bloat that's not easy to access.\n\
|
|
\n\
|
|
FLAGS\n\
|
|
\n\
|
|
-h show this help\n\
|
|
\n\
|
|
EXAMPLE\n\
|
|
\n\
|
|
objcopy -SO binary foo.dbg foo\n\
|
|
zipcopy foo.dbg foo\n\
|
|
\n\
|
|
\n\
|
|
",
|
|
NULL);
|
|
exit(exitcode);
|
|
}
|
|
|
|
static void GetOpts(int argc, char *argv[]) {
|
|
int opt;
|
|
while ((opt = getopt(argc, argv, "h")) != -1) {
|
|
switch (opt) {
|
|
case 'h':
|
|
PrintUsage(1, 0);
|
|
default:
|
|
PrintUsage(2, 1);
|
|
}
|
|
}
|
|
if (optind + 2 != argc) {
|
|
PrintUsage(2, 1);
|
|
}
|
|
inpath = argv[optind + 0];
|
|
outpath = argv[optind + 1];
|
|
}
|
|
|
|
static void CopyZip(void) {
|
|
char *secstrs;
|
|
int rela, recs;
|
|
Elf64_Ehdr *ehdr;
|
|
unsigned long ldest, cdest, ltotal, ctotal, length;
|
|
unsigned char *ineof, *stop, *eocd, *cdir, *lfile, *cfile;
|
|
|
|
// find zip eocd header
|
|
//
|
|
// if input is an elf file with sections, then the zip artifacts need
|
|
// to have been linked into a .zip section and then later copied into
|
|
// the file end by fixupobj.
|
|
//
|
|
if (IsElf64Binary((ehdr = (Elf64_Ehdr *)inmap), insize) && ehdr->e_shnum &&
|
|
(secstrs = GetElfSectionNameStringTable(ehdr, insize)) &&
|
|
!FindElfSectionByName(ehdr, insize, secstrs, ".zip")) {
|
|
return; // zip artifacts were never linked into this elf binary
|
|
}
|
|
ineof = inmap + insize;
|
|
eocd = ineof - kZipCdirHdrMinSize;
|
|
stop = MAX(eocd - 65536, inmap);
|
|
for (;; --eocd) {
|
|
if (eocd < stop)
|
|
return;
|
|
if (READ32LE(eocd) == kZipCdirHdrMagic) {
|
|
if (IsZipEocd32(inmap, insize, eocd - inmap) != kZipOk) {
|
|
Die(inpath, "found bad eocd record");
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
// validate input
|
|
recs = ltotal = ctotal = 0;
|
|
cdir = inmap + ZIP_CDIR_OFFSET(eocd);
|
|
stop = cdir + ZIP_CDIR_SIZE(eocd);
|
|
for (cfile = cdir; cfile < stop; cfile += ZIP_CFILE_HDRSIZE(cfile)) {
|
|
if (++recs >= 65536) {
|
|
Die(inpath, "too many zip files");
|
|
}
|
|
if (cfile < inmap || //
|
|
cfile + kZipCfileHdrMinSize > ineof || //
|
|
cfile + ZIP_CFILE_HDRSIZE(cfile) > ineof) {
|
|
Die(inpath, "zip directory overflow");
|
|
}
|
|
if (READ32LE(cfile) != kZipCfileHdrMagic) {
|
|
Die(inpath, "zip directory corrupted");
|
|
}
|
|
if ((rela = ZIP_CFILE_OFFSET(cfile)) < 0) {
|
|
Die(inpath, "zip directory offset negative or zip64");
|
|
}
|
|
lfile = inmap + rela;
|
|
if (lfile < inmap || //
|
|
lfile + kZipLfileHdrMinSize > ineof || //
|
|
lfile + ZIP_LFILE_SIZE(lfile) > ineof) {
|
|
Die(inpath, "zip local file overflow");
|
|
}
|
|
if (READ32LE(lfile) != kZipLfileHdrMagic) {
|
|
Die(inpath, "zip local file corrupted");
|
|
}
|
|
ctotal += ZIP_CFILE_HDRSIZE(cfile);
|
|
ltotal += ZIP_LFILE_SIZE(lfile);
|
|
}
|
|
if (outsize + ltotal + ctotal + ZIP_CDIR_HDRSIZE(eocd) > INT_MAX) {
|
|
Die(outpath, "the time has come to upgrade to zip64");
|
|
}
|
|
|
|
// write output
|
|
if ((outfd = open(outpath, O_WRONLY | O_CREAT, 0644)) == -1) {
|
|
SysDie(outpath, "open");
|
|
}
|
|
if ((outsize = lseek(outfd, 0, SEEK_END)) == -1) {
|
|
SysDie(outpath, "lseek");
|
|
}
|
|
ldest = outsize;
|
|
cdest = outsize + ltotal;
|
|
for (cfile = cdir; cfile < stop; cfile += ZIP_CFILE_HDRSIZE(cfile)) {
|
|
lfile = inmap + ZIP_CFILE_OFFSET(cfile);
|
|
WRITE32LE(cfile + kZipCfileOffsetOffset, ldest);
|
|
// write local file
|
|
length = ZIP_LFILE_SIZE(lfile);
|
|
if (pwrite(outfd, lfile, length, ldest) != length) {
|
|
SysDie(outpath, "lfile pwrite");
|
|
}
|
|
ldest += length;
|
|
// write directory entry
|
|
length = ZIP_CFILE_HDRSIZE(cfile);
|
|
if (pwrite(outfd, cfile, length, cdest) != length) {
|
|
SysDie(outpath, "lfile pwrite");
|
|
}
|
|
cdest += length;
|
|
}
|
|
WRITE32LE(eocd + kZipCdirOffsetOffset, outsize + ltotal);
|
|
length = ZIP_CDIR_HDRSIZE(eocd);
|
|
if (pwrite(outfd, eocd, length, cdest) != length) {
|
|
SysDie(outpath, "eocd pwrite");
|
|
}
|
|
if (close(outfd)) {
|
|
SysDie(outpath, "close");
|
|
}
|
|
}
|
|
|
|
int main(int argc, char *argv[]) {
|
|
#ifdef MODE_DBG
|
|
ShowCrashReports();
|
|
#endif
|
|
prog = argv[0];
|
|
if (!prog)
|
|
prog = "apelink";
|
|
GetOpts(argc, argv);
|
|
if ((infd = open(inpath, O_RDONLY)) == -1) {
|
|
SysDie(inpath, "open");
|
|
}
|
|
if ((insize = lseek(infd, 0, SEEK_END)) == -1) {
|
|
SysDie(inpath, "lseek");
|
|
}
|
|
if (!insize) {
|
|
Die(inpath, "file is empty");
|
|
}
|
|
if ((inmap = mmap(0, insize, PROT_READ | PROT_WRITE, MAP_PRIVATE, infd, 0)) ==
|
|
MAP_FAILED) {
|
|
SysDie(inpath, "mmap");
|
|
}
|
|
CopyZip();
|
|
if (munmap(inmap, insize)) {
|
|
SysDie(inpath, "munmap");
|
|
}
|
|
if (close(infd)) {
|
|
SysDie(inpath, "close");
|
|
}
|
|
}
|