rpms/powwow/F-10 powwow-long-prompt.patch, NONE, 1.1 powwow.spec, 1.2, 1.3

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/powwow/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710/F-10

Modified Files:
	powwow.spec 
Added Files:
	powwow-long-prompt.patch 
Log Message:
Apply patch to match prompts longer than terminal width (#509288).


powwow-long-prompt.patch:
 main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE powwow-long-prompt.patch ---
commit 8d6fc5e4f31623d3ff7a00d54f5a7d4acc03ae93
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Aug 6 21:35:48 2009 +0300

    Match prompts longer than terminal width
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=509288

diff --git a/main.c b/main.c
index 9e680a2..0c3ec7e 100644
--- a/main.c
+++ b/main.c
@@ -694,8 +694,8 @@ static int grab_prompt __P3 (char *,linestart, int,len, int,islast)
      * match #prompts. They usually have no #print, so we print manually
      * if islast is not set and a #prompt matches.
      */
-    if ((is_iac_prompt || islast || printstrlen(linestart) < cols) &&
-	((search_prompt(linestart, 1) && surely_isprompt) || is_iac_prompt)) {
+    if ((is_iac_prompt || islast)
+        && search_prompt(linestart, 1) && surely_isprompt) {
 
 	char *reprint;
 	/*
@@ -783,7 +783,7 @@ static void process_singleline __P2 (char **,pbuf, int *,psize)
      * if a #prompt matches and sets #isprompt, then it is REALLY a prompt
      *     so never match #actions on it.
      */
-    if (lineend == end && tcp_fd == tcp_main_fd && printstrlen(linestart) < cols) {
+    if (lineend == end && tcp_fd == tcp_main_fd) {
 	/*
 	 * The last line in the chunk we received has no trailing \n
 	 * Assume it is a prompt.


Index: powwow.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powwow/F-10/powwow.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- powwow.spec	1 May 2009 22:52:08 -0000	1.2
+++ powwow.spec	7 Aug 2009 08:58:01 -0000	1.3
@@ -1,12 +1,15 @@
 Name:           powwow
 Version:        1.2.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A console MUD client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://hoopajoo.net/projects/powwow.html
 Source:         http://hoopajoo.net/static/projects/%{name}-%{version}.tar.gz
+# Match prompts longer than terminal width
+# https://bugzilla.redhat.com/show_bug.cgi?id=509288
+Patch0:         powwow-long-prompt.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  ncurses-devel
@@ -31,6 +34,8 @@ for developing applications which use po
 %prep
 %setup -q
 
+%patch0 -p1 -b .long-prompt
+
 # Convert to utf-8
 for file in README powwow.doc; do
     mv $file timestamp
@@ -74,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 07 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-2
+- Apply patch to match prompts longer than terminal width (#509288).
+
 * Sat May 02 2009 Kalev Lember <kalev at smartlink.ee> - 1.2.15-1
 - Update to powwow 1.2.15.