2010-05-31 Miguel de Icaza <miguel@novell.com>

	* console-unix.c (terminal_get_dimensions): Fix my previous
	botched commit and return the actual value obtained from the ioctl.

svn path=/trunk/mono/; revision=158227

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 73b8cdc3c27ae74a16f1bfdfd92f89650690700e..8026935b1f392097eba3af5c97fc8400021c204b 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Miguel de Icaza  <miguel@novell.com>
+
+       * console-unix.c (terminal_get_dimensions): Fix my previous
+       botched commit and return the actual value obtained from the ioctl.
+
 2010-05-29  Mark Probst  <mark.probst@gmail.com>
 
        * sgen-gc.c: Always use DESC_TYPE_RUN_LENGTH for objects without

diff --git a/mono/metadata/console-unix.c b/mono/metadata/console-unix.c
index 0a16ab8ca12a9494de716c4e570ff9c148b3483d..0808baabc2d15bfcc425cb593a5eff22e1397b87 100644 (file)
--- a/mono/metadata/console-unix.c
+++ b/mono/metadata/console-unix.c
@@ -182,8 +182,8 @@ terminal_get_dimensions (void)
        if (ioctl (STDIN_FILENO, TIOCGWINSZ, &ws) == 0){
                ret = (ws.ws_col << 16) | ws.ws_row;
                errno = save_errno;
-       }
-
+               return ret;
+       } 
        return -1;
 }
 #else