linenoise: patch was merged on upstream

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Francois Perrad 2013-02-19 22:29:00 +00:00 committed by Peter Korsgaard
parent 4bf3c452a5
commit 4992307bd1
2 changed files with 1 additions and 21 deletions

View File

@ -1,20 +0,0 @@
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;
}

View File

@ -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