-
-
Notifications
You must be signed in to change notification settings - Fork 645
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve ZIP filesystem and change its prefix
The ZIP filesystem has a breaking change. You now need to use /zip/ to open() / opendir() / etc. assets within the ZIP structure of your APE binary, instead of the previous convention of using zip: or zip! URIs. This is needed because Python likes to use absolute paths, and having ZIP paths encoded like URIs simply broke too many things. Many more system calls have been updated to be able to operate on ZIP files and file descriptors. In particular fcntl() and ioctl() since Python would do things like ask if a ZIP file is a terminal and get confused when the old implementation mistakenly said yes, because the fastest way to guarantee native file descriptors is to dup(2). This change also improves the async signal safety of zipos and ensures it doesn't maintain any open file descriptors beyond that which the user has opened. This change makes a lot of progress towards adding magic numbers that are specific to platforms other than Linux. The philosophy here is that, if you use an operating system like FreeBSD, then you should be able to take advantage of FreeBSD exclusive features, even if we don't polyfill them on other platforms. For example, you can now open() a file with the O_VERIFY flag. If your program runs on other platforms, then Cosmo will automatically set O_VERIFY to zero. This lets you safely use it without the need for #ifdef or ifstatements which detract from readability. One of the blindspots of the ASAN memory hardening we use to offer Rust like assurances has always been that memory passed to the kernel via system calls (e.g. writev) can't be checked automatically since the kernel wasn't built with MODE=asan. This change makes more progress ensuring that each system call will verify the soundness of memory before it's passed to the kernel. The code for doing these checks is fast, particularly for buffers, where it can verify 64 bytes a cycle. - Correct O_LOOP definition on NT - Introduce program_executable_name - Add ASAN guards to more system calls - Improve termios compatibility with BSDs - Fix bug in Windows auxiliary value encoding - Add BSD and XNU specific errnos and open flags - Add check to ensure build doesn't talk to internet
- Loading branch information
Showing
319 changed files
with
4,404 additions
and
2,585 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #if 0 | ||
| /*─────────────────────────────────────────────────────────────────╗ | ||
| │ To the extent possible under law, Justine Tunney has waived │ | ||
| │ all copyright and related or neighboring rights to this file, │ | ||
| │ as it is written in the following disclaimers: │ | ||
| │ • http://unlicense.org/ │ | ||
| │ • http://creativecommons.org/publicdomain/zero/1.0/ │ | ||
| ╚─────────────────────────────────────────────────────────────────*/ | ||
| #endif | ||
| #include "libc/calls/calls.h" | ||
| #include "libc/calls/struct/timespec.h" | ||
| #include "libc/fmt/itoa.h" | ||
| #include "libc/log/log.h" | ||
| #include "libc/math.h" | ||
| #include "libc/str/str.h" | ||
| #include "libc/sysv/consts/ex.h" | ||
| #include "libc/time/time.h" | ||
| #include "libc/x/x.h" | ||
|
|
||
| /** | ||
| * @fileoverview command for showing how long a command takes | ||
| * | ||
| * This offers the following improvements over the existing `time` | ||
| * command that's incorporated into most shells: | ||
| * | ||
| * - This will show microseconds if seconds < 1 | ||
| * - This will launch APE binaries on systems with broken libc execv() | ||
| */ | ||
|
|
||
| #define WRITE(FD, STR) write(FD, STR, strlen(STR)) | ||
|
|
||
| void OnChild(void *arg) { | ||
| char **argv = arg; | ||
| execv(argv[0], argv); | ||
| _exit(127); | ||
| } | ||
|
|
||
| long double GetTimeval(struct timeval t) { | ||
| return t.tv_sec + t.tv_usec * 1e-6l; | ||
| } | ||
|
|
||
| void PrintMetric(const char *name, long double d) { | ||
| char buf[256], *p = buf; | ||
| long mins, secs, mils, mics; | ||
| mins = d / 60; | ||
| secs = fmodl(d, 60); | ||
| mils = fmodl(d * 1000, 1000); | ||
| mics = fmodl(d * 1000000, 1000); | ||
| p = stpcpy(p, name), *p++ = '\t'; | ||
| p += int64toarray_radix10(mins, p), *p++ = 'm'; | ||
| p += int64toarray_radix10(secs, p), *p++ = '.'; | ||
| *p++ = '0' + mils / 100; | ||
| *p++ = '0' + mils / 10 % 10; | ||
| *p++ = '0' + mils % 10; | ||
| if (!secs) { | ||
| *p++ = '0' + mics / 100; | ||
| *p++ = '0' + mics / 10 % 10; | ||
| *p++ = '0' + mics % 10; | ||
| } | ||
| *p++ = 's'; | ||
| *p++ = '\n'; | ||
| write(2, buf, p - buf); | ||
| } | ||
|
|
||
| int main(int argc, char *argv[]) { | ||
| int ws; | ||
| char *exepath; | ||
| struct rusage r; | ||
| long double real; | ||
| char exebuf[PATH_MAX]; | ||
| if (argc >= 2) { | ||
| if ((exepath = commandv(argv[1], exebuf))) { | ||
| real = nowl(); | ||
| argv[1] = exepath; | ||
| if ((ws = xvspawn(OnChild, argv + 1, &r)) != -1) { | ||
| PrintMetric("real", nowl() - real); | ||
| PrintMetric("user", GetTimeval(r.ru_utime)); | ||
| PrintMetric("sys", GetTimeval(r.ru_stime)); | ||
| if (WIFEXITED(ws)) { | ||
| return WEXITSTATUS(ws); | ||
| } else { | ||
| return 128 + WTERMSIG(ws); | ||
| } | ||
| } else { | ||
| perror("xvspawn"); | ||
| return 127; | ||
| } | ||
| } else { | ||
| perror(argv[1]); | ||
| return 127; | ||
| } | ||
| } else { | ||
| WRITE(2, "Usage: "); | ||
| WRITE(2, argv[0]); | ||
| WRITE(2, " PROG [ARGS...]\n"); | ||
| return EX_USAGE; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.