diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-25 09:30:23 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-25 09:30:23 +0000 |
| commit | 096dd5e8320a1d7f1bbe87225e89148d5520e00e (patch) | |
| tree | 017f4d4a66b24b8eb558ca9ed8864e513c2cd68e /bin/pax/ar_io.c | |
| parent | 92934f38d3942bab9c38827b2e42cd0768a5413e (diff) | |
Back out my previous kludge to make tar files with short trailers work in
favor of a simpler change--never try to do a media change when invoked
as tar. This fixes problems that crop up if gzip exits unhappily and
others.
Diffstat (limited to 'bin/pax/ar_io.c')
| -rw-r--r-- | bin/pax/ar_io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 0029cfd767d..97b91a61510 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_io.c,v 1.12 1997/03/02 20:42:56 tholo Exp $ */ +/* $OpenBSD: ar_io.c,v 1.13 1997/03/25 09:30:19 millert Exp $ */ /* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_io.c,v 1.12 1997/03/02 20:42:56 tholo Exp $"; +static char rcsid[] = "$OpenBSD: ar_io.c,v 1.13 1997/03/25 09:30:19 millert Exp $"; #endif #endif /* not lint */ @@ -1186,7 +1186,7 @@ ar_next() if (sigprocmask(SIG_SETMASK, &o_mask, (sigset_t *)NULL) < 0) syswarn(0, errno, "Unable to restore signal mask"); - if (done || !wr_trail) + if (done || !wr_trail || strcmp(NM_TAR, argv0) == 0) return(-1); tty_prnt("\nATTENTION! %s archive volume change required.\n", argv0); |