[gentoo-commits] gentoo-x86 commit in app-arch/pbzip2/files: pbzip2-1.0.5-fix-stdout-optparse.patch pbzip2-1.0.2-uclibc.patch pbzip2-1.0.3-uclibc.patch

[Dror Levin (spatz)]

spatz       10/02/09 20:03:13

  Added:                pbzip2-1.0.5-fix-stdout-optparse.patch
  Removed:              pbzip2-1.0.2-uclibc.patch pbzip2-1.0.3-uclibc.patch
  Log:
  Add patch to fix command line handling, bug 302757. Clean old patches.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch?rev=1.1&content-type=text/plain

Index: pbzip2-1.0.5-fix-stdout-optparse.patch
===================================================================
--- pbzip2-1.0.5-orig/pbzip2.cpp	2009-01-08 23:08:17.000000000 +0200
+++ pbzip2-1.0.5/pbzip2.cpp	2010-01-29 20:09:22.031524677 +0200
@@ -2254,7 +2254,7 @@
 			FileList[FileListCount] = stdinFile;
 			FileListCount++;
 		}
-		else if (OutputStdOut == 1)
+		else if ((decompress == 0) || (OutputStdOut == 1))
 		{
 			#ifndef WIN32
 			if (isatty(fileno(stdout)))
@@ -2269,6 +2269,7 @@
 			// expecting data from stdin
 			FileList[FileListCount] = stdinFile;
 			FileListCount++;
+			OutputStdOut = keep = 1;
 		}
 		else if ((decompress == 1) && (argc == 2))
 		{