Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From 8068659388127e8e63f2d2297ba2348c72b20705 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Mon, 12 Oct 2015 03:19:51 -0400 |
| 4 | Subject: [PATCH] bzip2: fix bunzip2 -qt returns 0 for corrupt archives |
| 5 | |
| 6 | "bzip2 -t FILE" returns 2 if FILE exists, but is not a valid bzip2 file. |
| 7 | "bzip2 -qt FILE" returns 0 when this happens, although it does print out |
| 8 | an error message as is does so. |
| 9 | |
| 10 | This has been fix by Debian, just port changes from Debian patch file |
| 11 | "20-legacy.patch". |
| 12 | |
| 13 | Debian defect: |
| 14 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=279025 |
| 15 | |
| 16 | Fix item from changelog: |
| 17 | http://archive.debian.net/changelogs/pool/main/b/bzip2/bzip2_1.0.2-7/changelog |
| 18 | |
| 19 | * Fixed "bunzip2 -qt returns 0 for corrupt archives" (Closes: #279025). |
| 20 | |
| 21 | Upstream-Status: Pending |
| 22 | |
| 23 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 24 | --- |
| 25 | bzip2.c | 14 ++++++++------ |
| 26 | 1 file changed, 8 insertions(+), 6 deletions(-) |
| 27 | |
| 28 | diff --git a/bzip2.c b/bzip2.c |
| 29 | index 6de9d1d..f2ce668 100644 |
| 30 | --- a/bzip2.c |
| 31 | +++ b/bzip2.c |
| 32 | @@ -2003,12 +2003,14 @@ IntNative main ( IntNative argc, Char *argv[] ) |
| 33 | testf ( aa->name ); |
| 34 | } |
| 35 | } |
| 36 | - if (testFailsExist && noisy) { |
| 37 | - fprintf ( stderr, |
| 38 | - "\n" |
| 39 | - "You can use the `bzip2recover' program to attempt to recover\n" |
| 40 | - "data from undamaged sections of corrupted files.\n\n" |
| 41 | - ); |
| 42 | + if (testFailsExist) { |
| 43 | + if (noisy) { |
| 44 | + fprintf ( stderr, |
| 45 | + "\n" |
| 46 | + "You can use the `bzip2recover' program to attempt to recover\n" |
| 47 | + "data from undamaged sections of corrupted files.\n\n" |
| 48 | + ); |
| 49 | + } |
| 50 | setExit(2); |
| 51 | exit(exitValue); |
| 52 | } |
| 53 | -- |
| 54 | 1.9.1 |
| 55 | |