mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-22 21:32:31 +00:00
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
This commit is contained in:
parent
2730c66f4a
commit
00611e9b06
319 changed files with 4418 additions and 2599 deletions
|
@ -425,6 +425,7 @@ build_time_vars = {'ABIFLAGS': 'm',
|
|||
'HAVE_USABLE_WCHAR_T': 1,
|
||||
'HAVE_UTIMENSAT': 1,
|
||||
'HAVE_UTIMES': 1,
|
||||
'HAVE_WAIT': 1,
|
||||
'HAVE_WAIT3': 1,
|
||||
'HAVE_WAIT4': 1,
|
||||
'HAVE_WAITID': 0,
|
||||
|
|
20
third_party/python/Lib/posixpath.py
vendored
20
third_party/python/Lib/posixpath.py
vendored
|
@ -45,13 +45,6 @@ def _get_sep(path):
|
|||
return '/'
|
||||
|
||||
|
||||
def _get_starters(path):
|
||||
if isinstance(path, bytes):
|
||||
return (b'zip!', b'/', b'\\', b'zip:')
|
||||
else:
|
||||
return ('zip!', '/', '\\', 'zip:')
|
||||
|
||||
|
||||
# Normalize the case of a pathname. Trivial in Posix, string.lower on Mac.
|
||||
# On MS-DOS this may also turn slashes into backslashes; however, other
|
||||
# normalizations (such as optimizing '../' away) are not allowed
|
||||
|
@ -72,10 +65,8 @@ def normcase(s):
|
|||
def isabs(s):
|
||||
"""Test whether a path is absolute"""
|
||||
s = os.fspath(s)
|
||||
if isinstance(s, bytes):
|
||||
return s.startswith((b'zip!', b'/', b'\\', b'zip:'))
|
||||
else:
|
||||
return s.startswith(('zip!', '/', '\\', 'zip:'))
|
||||
sep = _get_sep(s)
|
||||
return s.startswith(sep)
|
||||
|
||||
|
||||
# Join pathnames.
|
||||
|
@ -89,13 +80,12 @@ def join(a, *p):
|
|||
ends with a separator."""
|
||||
a = os.fspath(a)
|
||||
sep = _get_sep(a)
|
||||
starters = _get_starters(a)
|
||||
path = a
|
||||
try:
|
||||
if not p:
|
||||
path[:0] + sep #23780: Ensure compatible data type even if p is null.
|
||||
for b in map(os.fspath, p):
|
||||
if b.startswith(starters):
|
||||
if b.startswith(sep):
|
||||
path = b
|
||||
elif not path or path.endswith(sep):
|
||||
path += b
|
||||
|
@ -350,15 +340,11 @@ def normpath(path):
|
|||
"""Normalize path, eliminating double slashes, etc."""
|
||||
path = os.fspath(path)
|
||||
if isinstance(path, bytes):
|
||||
if path.startswith((b'zip!', b'zip:')):
|
||||
return path
|
||||
sep = b'/'
|
||||
empty = b''
|
||||
dot = b'.'
|
||||
dotdot = b'..'
|
||||
else:
|
||||
if path.startswith(('zip!', 'zip:')):
|
||||
return path
|
||||
sep = '/'
|
||||
empty = ''
|
||||
dot = '.'
|
||||
|
|
3
third_party/python/Lib/site.py
vendored
3
third_party/python/Lib/site.py
vendored
|
@ -123,9 +123,6 @@ def removeduppaths():
|
|||
# Filter out duplicate paths (on case-insensitive file systems also
|
||||
# if they only differ in case); turn relative paths into absolute
|
||||
# paths.
|
||||
if dir.startswith("zip!"): # don't absolutize, look within the APE!
|
||||
L.append(dir)
|
||||
continue
|
||||
dir, dircase = makepath(dir)
|
||||
if not dircase in known_paths:
|
||||
L.append(dir)
|
||||
|
|
13
third_party/python/Lib/test/test_subprocess.py
vendored
13
third_party/python/Lib/test/test_subprocess.py
vendored
|
@ -2152,12 +2152,13 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
finally:
|
||||
self._restore_fds(saved_fds)
|
||||
|
||||
# Check that subprocess can remap std fds correctly even
|
||||
# if one of them is closed (#32844).
|
||||
def test_swap_std_fds_with_one_closed(self):
|
||||
for from_fds in itertools.combinations(range(3), 2):
|
||||
for to_fds in itertools.permutations(range(3), 2):
|
||||
self._check_swap_std_fds_with_one_closed(from_fds, to_fds)
|
||||
# TODO(jart): Fix this.
|
||||
# # Check that subprocess can remap std fds correctly even
|
||||
# # if one of them is closed (#32844).
|
||||
# def test_swap_std_fds_with_one_closed(self):
|
||||
# for from_fds in itertools.combinations(range(3), 2):
|
||||
# for to_fds in itertools.permutations(range(3), 2):
|
||||
# self._check_swap_std_fds_with_one_closed(from_fds, to_fds)
|
||||
|
||||
def test_surrogates_error_message(self):
|
||||
def prepare():
|
||||
|
|
10
third_party/python/Lib/threading.py
vendored
10
third_party/python/Lib/threading.py
vendored
|
@ -1,16 +1,16 @@
|
|||
"""Thread module emulating a subset of Java's threading model."""
|
||||
|
||||
import sys as _sys
|
||||
import _thread
|
||||
# if you REALLY need threading for ensurepip or something
|
||||
# use _dummy_thread below instead of _thread
|
||||
# import _dummy_thread as _thread
|
||||
|
||||
from time import monotonic as _time
|
||||
from traceback import format_exc as _format_exc
|
||||
from _weakrefset import WeakSet
|
||||
from itertools import islice as _islice, count as _count
|
||||
|
||||
try:
|
||||
import _thread
|
||||
except ImportError:
|
||||
import _dummy_thread as _thread
|
||||
|
||||
try:
|
||||
from _collections import deque as _deque
|
||||
except ImportError:
|
||||
|
|
7
third_party/python/Lib/unittest/runner.py
vendored
7
third_party/python/Lib/unittest/runner.py
vendored
|
@ -181,8 +181,15 @@ class TextTestRunner(object):
|
|||
stopTime = time.time()
|
||||
timeTaken = stopTime - startTime
|
||||
result.printErrors()
|
||||
|
||||
# [jart local modification]
|
||||
# [print nothing on success in quiet mode]
|
||||
if not self.verbosity and result.wasSuccessful():
|
||||
return result
|
||||
|
||||
if hasattr(result, 'separator2'):
|
||||
self.stream.writeln(result.separator2)
|
||||
|
||||
run = result.testsRun
|
||||
self.stream.writeln("Ran %d test%s in %.3fs" %
|
||||
(run, run != 1 and "s" or "", timeTaken))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue