Mercurial > hg > portage

changeset 177:11adf80154c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix argv[0] handling - upstream bug?
author holger
date Tue, 24 Nov 2009 10:58:16 +0100
parents 850bb6467b62
children 24790a7e3ea2 6f48ae6f62bf
files app-arch/pigz/Manifest app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch
diffstat 2 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/app-arch/pigz/Manifest	Tue Nov 24 07:52:37 2009 +0100
+++ b/app-arch/pigz/Manifest	Tue Nov 24 10:58:16 2009 +0100
@@ -1,5 +1,5 @@
 AUX pigz-2.1.5-decode-symlinks-to-stdout.patch 512 RMD160 115ae0cdc4187b8cbc2282c3b36aca5f0b8ea5b1 SHA1 158f21fa736d9034b608d5b6fd452919f7d73e51 SHA256 067acf2075e80ef083dd730a557bff87efb39a80b49be760c84bfa4cd73047ce
-AUX pigz-2.1.5-gunzip-compat.patch 450 RMD160 a32629933f3cd69b0e177c49cb5621875e1a7760 SHA1 8e31e6c903519a09b6d3f96146ca06ba6952aaf5 SHA256 50e265c76713187c4b22392d5db6ae580758ccbcd7b7cd99de1bf4b9ed24cbed
+AUX pigz-2.1.5-gunzip-compat.patch 630 RMD160 eb1ac6a99fe17fb6c9d7029912109630e5ec984b SHA1 98c4132001d2ab808e70a728c87c9afe2d549f42 SHA256 4a2b6acde824b15453a0647c7830f7444247606aece3979b6b85b90eeb7adef1
 AUX pigz-2.1.5-respect-flags.patch 404 RMD160 e444679d43a33f44c684d99ec782f825bef66bab SHA1 8557dea8496682fa9525278b314178f5c100c9b2 SHA256 8806680b9d1f4099f7f2caa803957b104f2df24bed49b0a41f696060b43b69c4
 DIST pigz-2.1.5.tar.gz 93788 RMD160 b02f012e9f87f9f69309574ef7000bf6242b2114 SHA1 9e169aa2f1b08be057760c03c480e64651fa3299 SHA256 ae1f16f1f84c963df512a24f5b676a776ffd95f059291547672917b2f818e53b
 EBUILD pigz-2.1.5.ebuild 989 RMD160 4305c3bde1dad21490bd29e3513b73e4879e9701 SHA1 4110d612ee09351ba97ba0eefb90f3bde4efa71b SHA256 a79b2b9f18b73138f86de65b368987c7141355b5b1de2dbca6c6e6031a961751
--- a/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch	Tue Nov 24 07:52:37 2009 +0100
+++ b/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch	Tue Nov 24 10:58:16 2009 +0100
@@ -1,12 +1,22 @@
 --- ../pigz-2.1.5/pigz.c	2009-07-20 04:42:00.000000000 +0200
-+++ pigz.c	2009-11-14 19:53:59.000000000 +0100
-@@ -3077,7 +3077,8 @@
++++ pigz.c	2009-11-24 10:50:13.000000000 +0100
+@@ -3075,9 +3075,17 @@
+     if (argc < 2 && isatty(1))
+         help();
  
-     /* decompress if named "unpigz" */
+-    /* decompress if named "unpigz" */
++    /* find program name */
      p = strrchr(argv[0], '/');
 -    if (strcmp(p == NULL ? argv[0] : p + 1, "unpigz") == 0)
-+    if (p == NULL) p = argv[0];
-+    if ((strcmp(p + 1, "unpigz") == 0) || (strcmp(p + 1, "gunzip") == 0))
++    if (p == NULL) {
++        p = argv[0];
++    }
++    else {
++        ++p;
++    }    
++
++    /* decompress if named "unpigz" or "gunzip" */
++    if ((strcmp(p, "unpigz") == 0) || (strcmp(p, "gunzip") == 0))
          decode = 1, headis = 0;
  
      /* process command-line arguments */