Skip to contentSkip to conversation

linenoise: patch was merged on upstream

PATCH New Francois Perrad 2 participants 2 messages Feb 20, 2013 – Feb 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linenoise: patch was merged on upstream

---
 package/linenoise/linenoise-get-columns.patch |   20 --------------------
 package/linenoise/linenoise.mk                |    2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 package/linenoise/linenoise-get-columns.patch
package/linenoise/linenoise-get-columns.patch deleted +0 -20
deleted file mode 100644
index 4fb9e40..0000000
@@ -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 <[email protected]>
-
-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;
- }
- 
package/linenoise/linenoise.mk +1 -1
index 343a107..fb73960 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 linenoise: patch was merged on upstream

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Francois" == Francois Perrad <[email protected]> writes:

Francois> Signed-off-by: Francois Perrad <[email protected]>

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard