rpms/ncompress/devel ncompress-4.2.4-zerobyteforce.patch, 1.1, 1.2 ncompress.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28838

Modified Files:
	ncompress-4.2.4-zerobyteforce.patch ncompress.spec 
Log Message:
fix problems with compressing zero-sized files (#189215, #189216)


ncompress-4.2.4-zerobyteforce.patch:
 compress42.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: ncompress-4.2.4-zerobyteforce.patch
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress-4.2.4-zerobyteforce.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncompress-4.2.4-zerobyteforce.patch	22 Sep 2005 10:19:13 -0000	1.1
+++ ncompress-4.2.4-zerobyteforce.patch	21 Apr 2006 12:20:07 -0000	1.2
@@ -1,6 +1,6 @@
---- ncompress-4.2.4/compress42.c.zerobyteforce	2005-09-02 18:42:56.000000000 +0530
-+++ ncompress-4.2.4/compress42.c	2005-09-02 18:43:55.000000000 +0530
-@@ -1145,7 +1145,7 @@
+--- ncompress-4.2.4/compress42.c.zerobyteforce	2006-04-14 14:18:28.000000000 +0200
++++ ncompress-4.2.4/compress42.c	2006-04-14 14:20:15.000000000 +0200
+@@ -1145,10 +1145,12 @@
  			if (fdout != 1 && close(fdout))
  				write_error();
  
@@ -9,3 +9,16 @@
  			{
  				if (remove_ofname)
  				{
++					if(!quiet)
++						fprintf(stderr, "No compression -- %s unchanged\n", ifname);
+ 					if (unlink(ofname))	/* Remove input file */
+ 					{
+ 						fprintf(stderr, "\nunlink error (ignored) ");
+@@ -1157,6 +1159,7 @@
+ 					}
+ 		
+ 					remove_ofname = 0;
++					exit_code = 2;
+ 				}
+ 			}
+ 			else


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ncompress.spec	11 Feb 2006 04:42:46 -0000	1.18
+++ ncompress.spec	21 Apr 2006 12:20:07 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 43.2.1
+Release: 44
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -69,6 +69,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Fri Apr 21 2006 Peter Vrabec <pvrabec at redhat.com> 4.2.4-44
+- fix problems with compressing zero-sized files (#189215, #189216)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-43.2.1
 - bump again for double-long bug on ppc(64)