churn: simplify code to get terminal width
authorChristian Ebert <blacktrash@gmx.net>
Wed, 12 Sep 2007 12:54:36 +0200
changeset 5419 041bd297f01e
parent 5418 9b469bdb1ce1
child 5420 6d1bd20ae14d
churn: simplify code to get terminal width
contrib/churn.py
--- a/contrib/churn.py	Mon Oct 08 22:20:23 2007 +0200
+++ b/contrib/churn.py	Wed Sep 12 12:54:36 2007 +0200
@@ -22,20 +22,16 @@
         except ValueError:
             pass
     try:
-        import termios, fcntl, struct
-        buf = 'abcd'
+        import termios, array, fcntl
         for dev in (sys.stdout, sys.stdin):
             try:
-                if buf != 'abcd':
-                    break
                 fd = dev.fileno()
                 if not os.isatty(fd):
                     continue
-                buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, buf)
+                arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8)
+                return array.array('h', arri)[1]
             except ValueError:
                 pass
-        if buf != 'abcd':
-           return struct.unpack('hh', buf)[1]
     except ImportError:
         pass
     return 80