From: Neil Brown <neilb@suse.de>
Date: Mon, 7 May 2012 21:59:26 +0000 (+1000)
Subject: Better error message if split_patch fails for --extract
X-Git-Tag: v0.9~40
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=b85f0baddb0c62a0d0ae73be29a5dcd91ea445c9;p=wiggle.git

Better error message if split_patch fails for --extract

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/wiggle.c b/wiggle.c
index ae132f4..d922c83 100644
--- a/wiggle.c
+++ b/wiggle.c
@@ -141,9 +141,14 @@ static int extract(int argc, char *argv[], int ispatch, int which)
 			argv[optind], strerror(errno));
 		return 2;
 	}
-	if (ispatch)
-		split_patch(f, &flist[0], &flist[1]);
-	else {
+	if (ispatch) {
+		if (split_patch(f, &flist[0], &flist[1]) == 0) {
+			fprintf(stderr,
+				"%s: No chunk found in patch: %s\n", Cmd,
+				argv[optind]);
+			return 0;
+		}
+	} else {
 		if (!split_merge(f, &flist[0], &flist[1], &flist[2])) {
 			fprintf(stderr,
 				"%s: merge file %s looks bad.\n", Cmd,