Changeset 7422 for code/trunk

Timestamp:

Sep 12, 2010, 7:55:04 AM (14 years ago)

Author:

adrfried

Message:

Improve getTerminalSize

Width and height never get 0 anymore, this fixes a bug with a division
by zero in a special terminal reporting zero width.

File:

• code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) (3 diffs)

code/trunk/src/libraries/core/command/IOConsolePOSIX.cc

@@ -319 +319 @@
     void IOConsole::getTerminalSize()
     {
+        this->terminalWidth_  = 0;
+        this->terminalHeight_ = 0;
+
 #ifdef TIOCGSIZE
         struct ttysize win;
@@ -325 +328 @@
             this->terminalWidth_  = win.ts_cols;
             this->terminalHeight_ = win.ts_lines;
-            return;
         }
 #elif defined TIOCGWINSZ
@@ -333 +335 @@
             this->terminalWidth_  = win.ws_col;
             this->terminalHeight_ = win.ws_row;
-            return;
-        }
-#else
-        const char* s = getenv("COLUMNS");
-        this->terminalWidth_  = s ? strtol(s, NULL, 10) : 80;
-        s = getenv("LINES");
-        this->terminalHeight_ = s ? strtol(s, NULL, 10) : 24;
-        return;
+        }
 #endif
-        this->terminalWidth_  = 80;
-        this->terminalHeight_ = 24;
+
+        const char* s;
+        if (!this->terminalWidth_ && (s = getenv("COLUMNS")))
+            this->terminalWidth_  = strtol(s, NULL, 10);
+        if (!this->terminalWidth_)
+            this->terminalWidth_ = 80;
+        if (!this->terminalHeight_ && (s = getenv("LINES")))
+            this->terminalHeight_ = strtol(s, NULL, 10);
+        if (!this->terminalHeight_)
+            this->terminalHeight_ = 24;
     }