diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-09-16 21:20:36 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-09-16 21:20:36 +0000 |
| commit | e6687407df724f864722874c9184063ea5ad307c (patch) | |
| tree | ab2b138327c331015553677255216f21536da256 /bin | |
| parent | 53f105f9e1a6342e7af41c7ce263a3abf006fdc1 (diff) | |
Do not error out on archives without the
customary block of zeroes at the end.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/pax/ar_subs.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 8727fdb751f..c3887ea6d73 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_subs.c,v 1.12 1997/09/01 18:29:44 deraadt Exp $ */ +/* $OpenBSD: ar_subs.c,v 1.13 1997/09/16 21:20:35 niklas Exp $ */ /* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.12 1997/09/01 18:29:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.13 1997/09/16 21:20:35 niklas Exp $"; #endif #endif /* not lint */ @@ -1022,6 +1022,7 @@ next_head(arcn) register int hsz; register int in_resync = 0; /* set when we are in resync mode */ int cnt = 0; /* counter for trailer function */ + int first = 1; /* on 1st read, EOF isn't premature. */ /* * set up initial conditions, we want a whole frmt->hsz block as we @@ -1040,6 +1041,17 @@ next_head(arcn) break; /* + * If we read 0 bytes (EOF) from an archive when we + * expect to find a header, we have stepped upon + * an archive without the customary block of zeroes + * end marker. It's just stupid to error out on + * them, so exit gracefully. + */ + if (first && ret == 0) + return(-1); + first = 0; + + /* * some kind of archive read problem, try to resync the * storage device, better give the user the bad news. */ |