rpms/powwow/devel powwow-long-prompt.patch, NONE, 1.1 powwow.spec, 1.3, 1.4
Kalev Lember
kalev at fedoraproject.org
Fri Aug 7 08:58:02 UTC 2009
Author: kalev
Update of /cvs/pkgs/rpms/powwow/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20710/devel
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/devel/powwow.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- powwow.spec 26 Jul 2009 19:20:16 -0000 1.3
+++ powwow.spec 7 Aug 2009 08:58:02 -0000 1.4
@@ -1,12 +1,15 @@
Name: powwow
Version: 1.2.15
-Release: 2%{?dist}
+Release: 3%{?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-3
+- Apply patch to match prompts longer than terminal width (#509288).
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list