diff options
author | peter <peter@FreeBSD.org> | 1997-03-11 12:09:50 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-03-11 12:09:50 +0000 |
commit | 7f724bc019c31a8c4431544257687485e1f4e097 (patch) | |
tree | c659cdd45beb794cde9ff44ac6c90d00a51602f2 /sbin/dump/tape.c | |
parent | 9d6aaa6325cf8be94ba275a08c832d48859ccf64 (diff) | |
download | FreeBSD-src-7f724bc019c31a8c4431544257687485e1f4e097.zip FreeBSD-src-7f724bc019c31a8c4431544257687485e1f4e097.tar.gz |
Merge Lite2 changes (rather bigish, the dump/restore folks should check)
Diffstat (limited to 'sbin/dump/tape.c')
-rw-r--r-- | sbin/dump/tape.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 26aed13..9378d9f 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; +static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95"; #endif /* not lint */ #include <sys/param.h> @@ -45,8 +45,8 @@ static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #include <ufs/fs.h> #include <ufs/inode.h> #else -#include <ufs/ffs/fs.h> #include <ufs/ufs/dinode.h> +#include <ufs/ffs/fs.h> #endif #include <protocols/dumprestore.h> @@ -584,10 +584,10 @@ restore_check_point: * the remaining names for subsequent volumes. */ tapeno++; /* current tape sequence */ - if (nexttape || index(tape, ',')) { + if (nexttape || strchr(tape, ',')) { if (nexttape && *nexttape) tape = nexttape; - if ((p = index(tape, ',')) != NULL) { + if ((p = strchr(tape, ',')) != NULL) { *p = '\0'; nexttape = p + 1; } else |