[Astlinux-commits] SF.net SVN: astlinux:[5278] branches/1.0/package/ex-vi

[<abe...@us...>]

Revision: 5278
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5278&view=rev
Author:   abelbeck
Date:     2011-12-02 16:17:00 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
ex-vi, fix obscure cases where the terminal window size was not properly retrieved
Note: env variables LINES and COLUMNS are used first, then ioctl TIOCGWINSZ and 0 baud has no effect anymore

Modified Paths:
--------------
    branches/1.0/package/ex-vi/ex-vi.mk

Added Paths:
-----------
    branches/1.0/package/ex-vi/ex-vi-include-ioctl.patch
    branches/1.0/package/ex-vi/ex-vi-zero-baud-fix.patch

Added: branches/1.0/package/ex-vi/ex-vi-include-ioctl.patch
===================================================================
--- branches/1.0/package/ex-vi/ex-vi-include-ioctl.patch	                        (rev 0)
+++ branches/1.0/package/ex-vi/ex-vi-include-ioctl.patch	2011-12-02 16:17:00 UTC (rev 5278)
@@ -0,0 +1,11 @@
+--- ex-vi-050325/ex.h.orig	2011-12-01 23:37:02.000000000 -0600
++++ ex-vi-050325/ex.h	2011-12-01 23:37:22.000000000 -0600
+@@ -144,7 +144,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <limits.h>
+-#ifndef	TIOCGWINSZ
++#ifdef	TIOCGWINSZ
+ #include <sys/ioctl.h>
+ #endif
+ 

Added: branches/1.0/package/ex-vi/ex-vi-zero-baud-fix.patch
===================================================================
--- branches/1.0/package/ex-vi/ex-vi-zero-baud-fix.patch	                        (rev 0)
+++ branches/1.0/package/ex-vi/ex-vi-zero-baud-fix.patch	2011-12-02 16:17:00 UTC (rev 5278)
@@ -0,0 +1,14 @@
+--- ex-vi-050325/ex_tty.c.orig	2011-12-02 00:15:11.000000000 -0600
++++ ex-vi-050325/ex_tty.c	2011-12-02 00:26:16.000000000 -0600
+@@ -100,7 +100,10 @@
+ 		ospeed = B0;
+ 		return;
+ 	}
+-	pospeed = cfgetospeed(&tty);
++	if ((pospeed = cfgetospeed(&tty)) == B0) {
++		/* Make 0 baud more reasonable */
++		pospeed = B38400;
++	}
+ 	if (ospeed != pospeed)
+ 		value(SLOWOPEN) = pospeed < B1200;
+ 	ospeed = pospeed;

Modified: branches/1.0/package/ex-vi/ex-vi.mk
===================================================================
--- branches/1.0/package/ex-vi/ex-vi.mk	2011-11-29 00:43:52 UTC (rev 5277)
+++ branches/1.0/package/ex-vi/ex-vi.mk	2011-12-02 16:17:00 UTC (rev 5278)
@@ -18,7 +18,7 @@
         $(MAKE) CC="$(TARGET_CC)" \
 		TERMLIB="ncurses" \
 		CHARSET="-DISO8859_1" \
-		FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DBIT8" \
+		FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DBIT8 -DTIOCGWINSZ" \
 		-C $(@D)
 endef
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.