rpms/file/devel file-4.15-style.patch,NONE,1.1 file.spec,1.33,1.34

[fedora-cvs-commits at redhat.com]

Author: rvokal

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

Modified Files:
	file.spec 
Added Files:
	file-4.15-style.patch 
Log Message:
 - print xxx-style only once (#168617)

file-4.15-style.patch:
 readelf.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE file-4.15-style.patch ---
--- file-4.15/src/readelf.c.style	2005-07-14 04:22:25.000000000 +0200
+++ file-4.15/src/readelf.c	2005-09-19 11:28:14.000000000 +0200
@@ -42,6 +42,7 @@
 
 #ifdef	ELFCORE
 private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t);
+int print_style = 1;
 #endif
 private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t);
 private int doshn(struct magic_set *, int, int, int, off_t, int, size_t);
@@ -531,10 +532,12 @@
 	}
 
 #ifdef ELFCORE
-	if (os_style != -1)
-		if (file_printf(ms, ", %s-style", os_style_names[os_style]) == -1)
+	if (os_style != -1 && print_style) {
+		print_style = 0;
+		if (file_printf(ms, ", %s-style", os_style_names[os_style], print_style) == -1) 		
 			return size;
-
+	}
+			
 	if (os_style == OS_STYLE_NETBSD && nh_type == NT_NETBSD_CORE_PROCINFO) {
 		uint32_t signo;
 		/*


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- file.spec	19 Aug 2005 06:20:00 -0000	1.33
+++ file.spec	19 Sep 2005 09:34:25 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.15
-Release: 1
+Release: 2
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch3: file-4.14-magic.patch
 Patch5: file-4.13-fsdump.patch
 Patch6: file-4.13-quick.patch
+Patch7: file-4.15-style.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .magic
 %patch5 -p1 -b .fsdump
 %patch6 -p1 -b .quick
+%patch7 -p1 -b .style
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -77,6 +79,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Mon Sep 19 2005 Radek Vokal <rvokal at redhat.com> - 4.15-2
+- print xxx-style only once (#168617)
+
 * Thu Aug 09 2005 Radek Vokal <rvokal at redhat.com> - 4.15-1
 - upgrade to upstream