[src/netbsd-1-5]: src/sbin/dump Pull up revision 1.25 (requested by tron):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/125ebae24b24
branches:  netbsd-1-5
changeset: 491757:125ebae24b24
user:      he <he%NetBSD.org@localhost>
date:      Tue May 15 21:56:12 2001 +0000

description:
Pull up revision 1.25 (requested by tron):
  Fix bug in new ``e'' option: only eject tape if it is full, not
  if the dump was finished.

diffstat:

 sbin/dump/tape.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 04539f6149d5 -r 125ebae24b24 sbin/dump/tape.c
--- a/sbin/dump/tape.c  Tue May 15 21:55:58 2001 +0000
+++ b/sbin/dump/tape.c  Tue May 15 21:56:12 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tape.c,v 1.21.6.2 2001/05/09 19:16:07 he Exp $ */
+/*     $NetBSD: tape.c,v 1.21.6.3 2001/05/15 21:56:12 he Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c     8.4 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.21.6.2 2001/05/09 19:16:07 he Exp $");
+__RCSID("$NetBSD: tape.c,v 1.21.6.3 2001/05/15 21:56:12 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -377,7 +377,7 @@
 }
 
 void
-trewind()
+trewind(int eject)
 {
        int f;
        int got;
@@ -426,7 +426,7 @@
        (void) close(tapefd);
        while ((f = open(tape, 0)) < 0)
                sleep (10);
-       if (eflag) {
+       if (eflag && eject) {
                struct mtop offl;
 
                msg("Ejecting %s\n", tape);
@@ -440,7 +440,7 @@
 void
 close_rewind()
 {
-       trewind();
+       trewind(1);
        (void)do_stats();
        if (nexttape)
                return;