]> git.neil.brown.name Git - wiggle.git/commitdiff
Better error message if split_patch fails for --extract
authorNeil Brown <neilb@suse.de>
Mon, 7 May 2012 21:59:26 +0000 (07:59 +1000)
committerNeil Brown <neilb@suse.de>
Mon, 7 May 2012 21:59:26 +0000 (07:59 +1000)
Signed-off-by: NeilBrown <neilb@suse.de>
wiggle.c

index ae132f435d541f56258ad4e8c5df5f2199aaff68..d922c839f4a3113dce344cd547608394fd6406a6 100644 (file)
--- 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,