rpms/file/devel file-5.00-non-english-word.patch, NONE, 1.1 file.spec, 1.88, 1.89

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10451

Modified Files:
	file.spec 
Added Files:
	file-5.00-non-english-word.patch 
Log Message:

fix #485141


file-5.00-non-english-word.patch:

--- NEW FILE file-5.00-non-english-word.patch ---
--- file-5.00/src/readcdf.c	3 Feb 2009 20:27:51 -0000	1.11
+++ file-5.00/src/readcdf.c	13 Feb 2009 18:45:33 -0000
@@ -75,9 +75,23 @@
 			if (len > 1) {
 				s = info[i].pi_str.s_buf;
 				if (NOTMIME(ms)) {
-					if (file_printf(ms, ", %s: %.*s", buf,
-					    len, s) == -1)
-						return -1;
+					char vbuf[1024];
+					size_t j;
+					for (j = 0; j < sizeof(vbuf) && len--;
+					    j++, s++) {
+						if (*s == '\0')
+							break;
+						if (isprint((unsigned char)*s))
+							vbuf[j] = *s;
+					}
+					if (j == sizeof(vbuf))
+						--j;
+					vbuf[j] = '\0';
+					if (vbuf[0]) {
+						if (file_printf(ms, ", %s: %s",
+						    buf, vbuf) == -1)
+							return -1;
+					}
 				} else if (info[i].pi_id == 
 					CDF_PROPERTY_NAME_OF_APPLICATION) {
 					if (strstr(s, "Word"))



Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- file.spec	9 Feb 2009 14:03:14 -0000	1.88
+++ file.spec	16 Feb 2009 15:21:15 -0000	1.89
@@ -5,13 +5,14 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.00
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 URL: http://www.darwinsys.com/file/
 Patch0: file-4.21-pybuild.patch
 Patch1: file-5.00-devdrv.patch
+Patch2: file-5.00-non-english-word.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,8 @@
 %patch0 -p1
 #fixes #463809
 %patch1 -p1
+#fixes #485141
+%patch2 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -133,6 +136,9 @@
 %endif
 
 %changelog
+* Mon Feb 16 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-2
+- fix #485141 -  rpm failed while checking a French Word file
+
 * Mon Feb 09 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-1
 - upgrade to 5.00
 - drop upstreamed patches, rebase remaining patch