a8e1710951
Python 2.4 is now in bugfix-only mode, no new features are being added. At least 50 bugs have been squashed since Python 2.4.2, including a number of bugs and potential bugs found by Coverity.
31 lines
1.5 KiB
Text
31 lines
1.5 KiB
Text
$NetBSD: patch-ad,v 1.2 2006/04/12 20:21:48 drochner Exp $
|
|
|
|
--- Lib/posixfile.py.orig Wed Aug 18 17:13:40 2004
|
|
+++ Lib/posixfile.py
|
|
@@ -183,10 +183,11 @@ class _posixfile_:
|
|
# additions for AIX by Vladimir.Marangozov@imag.fr
|
|
import sys, os
|
|
if sys.platform in ('netbsd1',
|
|
+ 'netbsd2', 'netbsd3',
|
|
'openbsd2',
|
|
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
|
|
'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
|
|
- flock = struct.pack('lxxxxlxxxxlhh', \
|
|
+ flock = struct.pack('qqihh', \
|
|
l_start, l_len, os.getpid(), l_type, l_whence)
|
|
elif sys.platform in ['aix3', 'aix4']:
|
|
flock = struct.pack('hhlllii', \
|
|
@@ -199,11 +200,12 @@ class _posixfile_:
|
|
|
|
if '?' in how:
|
|
if sys.platform in ('netbsd1',
|
|
+ 'netbsd2', 'netbsd3',
|
|
'openbsd2',
|
|
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
|
|
'bsdos2', 'bsdos3', 'bsdos4'):
|
|
l_start, l_len, l_pid, l_type, l_whence = \
|
|
- struct.unpack('lxxxxlxxxxlhh', flock)
|
|
+ struct.unpack('qqihh', flock)
|
|
elif sys.platform in ['aix3', 'aix4']:
|
|
l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \
|
|
struct.unpack('hhlllii', flock)
|