return CPIO_BAD_HEADER instead of exiting. (Scott M. Stone)

CVS patchset: 2438
CVS date: 1998/10/09 00:52:32

diff --git a/CHANGES b/CHANGES
index c9ae8d8..4b27ff7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@
        - add new fully recursive macro.c
 
 2.5.4 -> 2.5.5:
+       - return CPIO_BAD_HEADER instead of exiting. (Scott M. Stone)
        - untranslate "(none)" for auto relocating script wrappers.
        - non-linux arch/os identification (Eugene Kanter).
        - portable mode_t/pid_t typedefs.

diff --git a/lib/cpio.c b/lib/cpio.c
index 2013009..a33772c 100644 (file)
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -523,7 +523,7 @@ int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings,
        if ((rc = getNextHeader(cfd, &ch))) {
            fprintf(stderr, _("error %d reading header: %s\n"),
                rc, strerror(errno));
-           exit(1);
+           return CPIO_BAD_HEADER;
        }
 
        if (!strcmp(ch.path, TRAILER)) {