annotate files/patch-rpython_rlib_rposix.py @ 106:ffca34182746

Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now. BUGS: Python 3.7 is not supported any more. The configuration option for PY37 needs to be removed.
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 04 Jan 2023 15:50:00 +0100
parents
children cf8f8a3eea6b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
106
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 --- rpython/rlib/rposix.py.orig 2022-12-29 08:05:46 UTC
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 +++ rpython/rlib/rposix.py
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 @@ -3014,6 +3014,30 @@ if sys.platform.startswith('linux'):
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 res = c_sendfile(out_fd, in_fd, lltype.nullptr(_OFF_PTR_T.TO), count)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
5 return handle_posix_error('sendfile', res)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 +elif sys.platform.startswith('freebsd'):
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8 + # FreeBSD
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9 + #
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 + # Please note that the implementation below is partial;
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11 + # the VOIDP is an iovec for sending headers and trailers which
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
12 + # CPython uses for the headers and trailers argument, and it also
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
13 + # has a flags argument. None of these are currently supported.
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
14 + sendfile_eci = ExternalCompilationInfo(includes=["sys/socket.h"])
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
15 + _OFF_PTR_T = rffi.CArrayPtr(OFF_T)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
16 + # NB: the VOIDP is an struct sf_hdtr for sending headers and trailers
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
17 + c_sendfile = rffi.llexternal('sendfile',
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
18 + [rffi.INT, rffi.INT, OFF_T, rffi.SIZE_T, rffi.VOIDP, _OFF_PTR_T, rffi.INT],
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
19 + rffi.INT, save_err=rffi.RFFI_SAVE_ERRNO,
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
20 + compilation_info=sendfile_eci)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
21 +
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
22 + def sendfile(out_fd, in_fd, offset, count):
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
23 + with lltype.scoped_alloc(_OFF_PTR_T.TO, 1) as sbytes:
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
24 + sbytes[0] = 0 # rffi.cast(OFF_T, count)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
25 + res = c_sendfile(in_fd, out_fd, offset, count, lltype.nullptr(rffi.VOIDP.TO), sbytes, 0)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
26 + if res != 0:
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
27 + return handle_posix_error('sendfile', res)
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
28 + res = sbytes[0]
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
29 + return res
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
30 +
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
31 elif not _WIN32:
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
32 # Neither on Windows nor on Linux, so probably a BSD derivative of
ffca34182746 Allow to build PyPy3 v7.3.11: PLIST changes and patches for os.sendmail() which is enabled now.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
33 # some sort. Please note that the implementation below is partial;