rpms/htop/EL-4 htop-0.8.1-nonprint.patch, NONE, 1.1 htop.spec, 1.16, 1.17

[Adam Miller]

Author: maxamillion

Update of /cvs/extras/rpms/htop/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17815

Modified Files:
	htop.spec 
Added Files:
	htop-0.8.1-nonprint.patch 
Log Message:
rafal fixed a bug, i applied the patch to the EL branches



htop-0.8.1-nonprint.patch:

--- NEW FILE htop-0.8.1-nonprint.patch ---
--- RichString.c.orig	2008-03-09 03:23:49.000000000 +0100
+++ RichString.c	2008-11-18 12:30:21.000000000 +0100
@@ -89,7 +89,7 @@
 inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) {
    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
    for (int i = this->len, j = 0; i < last; i++, j++)
-      this->chstr[i] = data_c[j] | attrs;
+      this->chstr[i] = ((data_c[j] > 31) ? data_c[j] : '?' ) | attrs;
    this->chstr[last] = 0;
    this->len = last;
 }


Index: htop.spec
===================================================================
RCS file: /cvs/extras/rpms/htop/EL-4/htop.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- htop.spec	14 Oct 2008 22:14:44 -0000	1.16
+++ htop.spec	18 Nov 2008 15:39:16 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           htop
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interactive process viewer
 Summary(pl):    Interaktywna przeglądarka procesów
 
@@ -8,6 +8,7 @@
 License:        GPL+
 URL:            http://htop.sourceforge.net/
 Source0:        http://download.sourceforge.net/htop/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8.1-nonprint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 
 sed -i s#"INSTALL_DATA = @INSTALL_DATA@"#"INSTALL_DATA = @INSTALL_DATA@ -p"# Makefile.in
 sed -i -e '2,3d' -e '9d' htop.desktop
 
@@ -61,6 +63,10 @@
 
 
 %changelog
+* Tue Nov 18 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.8.1-2
+- non-printable character filter patch (#504144)
+- Rafal fixed the bug, I just updated the EL packages.
+
 * Tue Oct  4 2008 Adam Miller <maxamillion [AT] gmail.com> - 0.8.1-1
 - Backport of Rafal Posta's upstream fedora package