rpms/file/devel file-4.16-dont_use_isprint.patch, NONE, 1.1 file.spec, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8145

Modified Files:
	file.spec 
Added Files:
	file-4.16-dont_use_isprint.patch 
Log Message:
 - printf utf8 filenames and don't use isprint() (#174348)

file-4.16-dont_use_isprint.patch:
 funcs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE file-4.16-dont_use_isprint.patch ---
--- file-4.16/src/funcs.c.old	2005-10-17 21:03:34.000000000 +0200
+++ file-4.16/src/funcs.c	2005-11-29 15:33:00.000000000 +0100
@@ -163,7 +163,7 @@
 
 	if (ms->flags & MAGIC_RAW)
 		return ms->o.buf;
-
+/*
 	nsize = ms->o.len * 4 + 1;
 	if (ms->o.psize < nsize) {
 		if ((nbuf = realloc(ms->o.pbuf, nsize)) == NULL) {
@@ -184,8 +184,8 @@
 			*np++ = (((uint32_t)*op >> 0) & 7) + '0';
 		}
 	}
-	*np = '\0';
-	return ms->o.pbuf;
+	*np = '\0';*/
+	return ms->o.buf;
 }
 
 /*


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- file.spec	8 Nov 2005 08:13:33 -0000	1.39
+++ file.spec	29 Nov 2005 14:40:06 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.16
-Release: 3
+Release: 4
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch6: file-4.13-quick.patch
 Patch8: file-4.15-berkeley.patch
 Patch9: file-4.16-readelf.patch
+Patch10: file-4.16-dont_use_isprint.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -35,6 +36,7 @@
 %patch6 -p1 -b .quick
 %patch8 -p1 -b .berkeley
 %patch9 -p1 -b .corefile
+%patch10 -p1 -b .isprint
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -80,6 +82,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Tue Nov 29 2005 Radek Vokal <rvokal at redhat.com> - 4.16-4
+- printf utf8 filenames and don't use isprint() (#174348)
+
 * Tue Nov 08 2005 Radek Vokal <rvokal at redhat.com> - 4.16-3
 - remove .la files (#172633)