5045cff4a0
Although POSIX says the type is 'int', all BSD variants (including Mac OS X) have been using 'unsigned long' type for very long time and its use predates the standard long enough. For certain commands (e.g., TIOCSWINSZ, FIONBIO), the Python value may get sign-extended on 64-bit platforms (by implicit type promotion) and it causes annoying warnings from kernel such as this: WARNING pid 24509 (python2.6): ioctl sign-extension ioctl ffffffff8004667e Approved by: python (maintainer timeout)
27 lines
1.4 KiB
Python
27 lines
1.4 KiB
Python
--- Lib/test/test_ioctl.py.orig 2008-08-03 20:45:34.000000000 -0400
|
|
+++ Lib/test/test_ioctl.py 2010-06-24 13:26:52.000000000 -0400
|
|
@@ -44,21 +44,12 @@ class IoctlTests(unittest.TestCase):
|
|
raise TestSkipped('pty module required')
|
|
mfd, sfd = pty.openpty()
|
|
try:
|
|
- if termios.TIOCSWINSZ < 0:
|
|
- set_winsz_opcode_maybe_neg = termios.TIOCSWINSZ
|
|
- set_winsz_opcode_pos = termios.TIOCSWINSZ & 0xffffffffL
|
|
- else:
|
|
- set_winsz_opcode_pos = termios.TIOCSWINSZ
|
|
- set_winsz_opcode_maybe_neg, = struct.unpack("i",
|
|
- struct.pack("I", termios.TIOCSWINSZ))
|
|
-
|
|
+ set_winsz_opcode = termios.TIOCSWINSZ
|
|
# We're just testing that these calls do not raise exceptions.
|
|
saved_winsz = fcntl.ioctl(mfd, termios.TIOCGWINSZ, "\0"*8)
|
|
our_winsz = struct.pack("HHHH",80,25,0,0)
|
|
- # test both with a positive and potentially negative ioctl code
|
|
- new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz)
|
|
- new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz)
|
|
- fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, saved_winsz)
|
|
+ new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz)
|
|
+ fcntl.ioctl(mfd, set_winsz_opcode, saved_winsz)
|
|
finally:
|
|
os.close(mfd)
|
|
os.close(sfd)
|