diff options
| author | svn2git <svn2git@FreeBSD.org> | 1994-07-01 08:00:00 +0000 |
|---|---|---|
| committer | svn2git <svn2git@FreeBSD.org> | 1994-07-01 08:00:00 +0000 |
| commit | 5e0e9b99dc3fc0ecd49d929db0d57c784b66f481 (patch) | |
| tree | e779b5a6edddbb949b7990751b12d6f25304ba86 /sbin/dump | |
| parent | a16f65c7d117419bd266c28a1901ef129a337569 (diff) | |
Diffstat (limited to 'sbin/dump')
| -rw-r--r-- | sbin/dump/dump.8 | 2 | ||||
| -rw-r--r-- | sbin/dump/dumpoptr.c | 3 | ||||
| -rw-r--r-- | sbin/dump/dumptape.c | 17 | ||||
| -rw-r--r-- | sbin/dump/rdump.8 | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8 index ff5a914a191b..1cefb8f39747 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -31,7 +31,7 @@ .\" .\" @(#)dump.8 6.8 (Berkeley) 6/17/91 .\" -.\" $Header: /home/cvs/386BSD/src/sbin/dump/dump.8,v 1.2.2.1 1994/05/01 16:06:51 jkh Exp $ +.\" $Header: /home/cvs/386BSD/src/sbin/dump/dump.8,v 1.2 1993/07/22 16:49:13 jkh Exp $ .\" .Dd June 17, 1991 .Dt DUMP 8 diff --git a/sbin/dump/dumpoptr.c b/sbin/dump/dumpoptr.c index deff36a7fd19..5db2bc134473 100644 --- a/sbin/dump/dumpoptr.c +++ b/sbin/dump/dumpoptr.c @@ -33,7 +33,7 @@ #ifndef lint static char sccsid[] = "@(#)dumpoptr.c 5.8 (Berkeley) 3/7/91"; -static char rcsid[] = "$Header: /home/cvs/386BSD/src/sbin/dump/dumpoptr.c,v 1.2 1993/07/22 16:49:17 jkh Exp $"; +static char rcsid[] = "$Header: /home/cvs/386BSD/src/sbin/dump/dumpoptr.c,v 1.3 1994/03/07 16:37:08 ats Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -505,6 +505,7 @@ lastdump(arg) time(&tnow); getfstab(); /* /etc/fstab input */ initdumptimes(); /* /etc/dumpdates input */ + if(ddatev == NULL) exit(1); /* /etc/dumpdates doesn't exist */ qsort(ddatev, nddates, sizeof(struct dumpdates *), datesort); if (arg == 'w') diff --git a/sbin/dump/dumptape.c b/sbin/dump/dumptape.c index 52992ecf8117..b1f7fddc82c6 100644 --- a/sbin/dump/dumptape.c +++ b/sbin/dump/dumptape.c @@ -33,7 +33,7 @@ #ifndef lint static char sccsid[] = "@(#)dumptape.c 5.18 (Berkeley) 4/24/91"; -static char rcsid[] = "$Header: /home/cvs/386BSD/src/sbin/dump/dumptape.c,v 1.2 1993/07/22 16:49:19 jkh Exp $"; +static char rcsid[] = "$Header: /home/cvs/386BSD/src/sbin/dump/dumptape.c,v 1.3 1994/03/08 16:20:06 ats Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -66,7 +66,7 @@ char *nexttape; extern char *host; int rmtopen(), rmtwrite(); void rmtclose(); -#endif RDUMP +#endif /* RDUMP */ int atomic(); void doslave(), enslave(), flushtape(), killall(); @@ -231,7 +231,7 @@ trewind() rmtclose(); return; } -#endif RDUMP +#endif /* RDUMP */ close(tapefd); while ((f = open(tape, 0)) < 0) sleep (10); @@ -363,10 +363,10 @@ startnewtape() #ifdef RDUMP while ((tapefd = (host ? rmtopen(tape, 2) : pipeout ? 1 : open(tape, O_WRONLY|O_CREAT, 0666))) < 0) -#else RDUMP +#else /* RDUMP */ while ((tapefd = pipeout ? 1 : open(tape, O_WRONLY|O_CREAT, 0666)) < 0) -#endif RDUMP +#endif /* RDUMP */ { msg("Cannot open output \"%s\".\n", tape); if (!query("Do you want to retry the open?")) @@ -404,6 +404,9 @@ dumpabort() killall(); msg("The ENTIRE dump is aborted.\n"); } +#ifdef RDUMP + rmtclose(); +#endif Exit(X_ABORT); } @@ -538,10 +541,10 @@ doslave(cmd, prev, next) #ifdef RDUMP if ((nwrite = (host ? rmtwrite(tblock[0], writesize) : write(tapefd, tblock[0], writesize))) != writesize) { -#else RDUMP +#else /* RDUMP */ if ((nwrite = write(tapefd, tblock[0], writesize)) != writesize) { -#endif RDUMP +#endif /* RDUMP */ if (nwrite == -1) perror("write"); else diff --git a/sbin/dump/rdump.8 b/sbin/dump/rdump.8 index acbfeab5367b..41b65836cdf0 100644 --- a/sbin/dump/rdump.8 +++ b/sbin/dump/rdump.8 @@ -31,7 +31,7 @@ .\" .\" @(#)rdump.8 6.3 (Berkeley) 3/16/91 .\" -.\" $Header: /home/cvs/386BSD/src/sbin/dump/rdump.8,v 1.3.2.1 1994/05/01 16:06:53 jkh Exp $ +.\" $Header: /home/cvs/386BSD/src/sbin/dump/rdump.8,v 1.3 1993/09/13 21:25:13 rgrimes Exp $ .\" .Dd March 16, 1991 .Dt RDUMP 8 |