diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2007-07-20 01:24:49 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2007-07-20 01:24:49 +0000 |
| commit | 7061a01ba7eace50e99e255da134e089bc0834c1 (patch) | |
| tree | 0f342851871581dedeacf3d57d93ee16900bc2ea /usr.bin | |
| parent | 53dcfbd18b5b400a25f209a9014d54fe9cd541b3 (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tar/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/tar/read.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 15b386ab901f..153cd0ec9af2 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= bsdtar -VERSION= 2.2.3 +VERSION= 2.2.5 SRCS= bsdtar.c getdate.y matching.c read.c tree.c util.c write.c WARNS?= 5 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c index dead37a22c8d..b0c5d2c8edea 100644 --- a/usr.bin/tar/read.c +++ b/usr.bin/tar/read.c @@ -129,15 +129,15 @@ read_archive(struct bsdtar *bsdtar, char mode) break; if (r < ARCHIVE_OK) bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a)); + if (r <= ARCHIVE_WARN) + bsdtar->return_value = 1; if (r == ARCHIVE_RETRY) { /* Retryable error: try again */ bsdtar_warnc(bsdtar, 0, "Retrying..."); continue; } - if (r != ARCHIVE_OK) { - bsdtar->return_value = 1; + if (r == ARCHIVE_FATAL) break; - } /* * Exclude entries that are too old. |