Commit 4992307b authored by Francois Perrad's avatar Francois Perrad Committed by Peter Korsgaard
Browse files

linenoise: patch was merged on upstream

parent 4bf3c452
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
returns the default value (80) when a real value is not available
(0 is not an acceptable value for COLUMNS, the width of the screen).

see pull request on upstream : http://github.com/antirez/linenoise/pull/31

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Index: b/linenoise.c
===================================================================
--- a/linenoise.c
+++ b/linenoise.c
@@ -182,7 +182,7 @@
 static int getColumns(void) {
     struct winsize ws;
 
-    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
+    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
     return ws.ws_col;
 }
 
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
# linenoise
#
#############################################################
LINENOISE_VERSION = g8c9b481
LINENOISE_VERSION = g27a3b4d
LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
LINENOISE_LICENSE = BSD-2c
LINENOISE_INSTALL_STAGING = YES