From 035dd2ee5a281b71a7c248704d8a4096b84b49cf Mon Sep 17 00:00:00 2001 From: millert Date: Wed, 16 Apr 1997 03:43:53 +0000 Subject: [PATCH] now includes _PATH_DEFTAPE. Change rmt0 -> rst0 in man page. From NetBSD (lukem). --- usr.bin/tcopy/pathnames.h | 39 --------------------------------------- usr.bin/tcopy/tcopy.1 | 6 +++--- usr.bin/tcopy/tcopy.c | 9 ++++----- 3 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 usr.bin/tcopy/pathnames.h diff --git a/usr.bin/tcopy/pathnames.h b/usr.bin/tcopy/pathnames.h deleted file mode 100644 index e7784a04074..00000000000 --- a/usr.bin/tcopy/pathnames.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:40:28 deraadt Exp $ */ -/* $NetBSD: pathnames.h,v 1.3 1994/12/09 02:14:36 jtc Exp $ */ - -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 - */ - -#define _PATH_DEFTAPE "/dev/rmt0" diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1 index 55a4b47fdda..6f8c997dd5a 100644 --- a/usr.bin/tcopy/tcopy.1 +++ b/usr.bin/tcopy/tcopy.1 @@ -1,5 +1,5 @@ -.\" $OpenBSD: tcopy.1,v 1.2 1996/06/26 05:40:29 deraadt Exp $ -.\" $NetBSD: tcopy.1,v 1.3 1994/12/09 02:14:38 jtc Exp $ +.\" $OpenBSD: tcopy.1,v 1.3 1997/04/16 03:43:54 millert Exp $ +.\" $NetBSD: tcopy.1,v 1.4 1997/04/15 07:23:07 lukem Exp $ .\" .\" Copyright (c) 1985, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -52,7 +52,7 @@ is designed to copy magnetic tapes. The only assumption made about the tape is that there are two tape marks at the end. .Nm Tcopy with only a source tape -.Pf ( Ar rmt0 +.Pf ( Ar /dev/rst0 by default) specified will print information about the sizes of records and tape files. If a destination is specified a copy will be made of the source tape. The blocking on the diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index 631da628f23..bd0575cd036 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -1,5 +1,5 @@ -/* $OpenBSD: tcopy.c,v 1.3 1997/01/15 23:43:19 millert Exp $ */ -/* $NetBSD: tcopy.c,v 1.4 1995/08/31 22:17:24 jtc Exp $ */ +/* $OpenBSD: tcopy.c,v 1.4 1997/04/16 03:43:56 millert Exp $ */ +/* $NetBSD: tcopy.c,v 1.5 1997/04/15 07:23:08 lukem Exp $ */ /* * Copyright (c) 1985, 1987, 1993, 1995 @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95"; #endif -static char rcsid[] = "$OpenBSD: tcopy.c,v 1.3 1997/01/15 23:43:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: tcopy.c,v 1.4 1997/04/16 03:43:56 millert Exp $"; #endif /* not lint */ #include @@ -55,14 +55,13 @@ static char rcsid[] = "$OpenBSD: tcopy.c,v 1.3 1997/01/15 23:43:19 millert Exp $ #include #include #include +#include #include #include #include #include #include -#include "pathnames.h" - #define MAXREC (64 * 1024) #define NOCOUNT (-2) -- 2.20.1