From: millert <millert@openbsd.org>
Date: Wed, 16 Apr 1997 04:19:07 +0000 (+0000)
Subject: Use _PATH_DEFTAPE not DEFTAPE in mt(1)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1e2ae582f204e9a17f4b65e859938a747e876feb;p=openbsd

Use _PATH_DEFTAPE not DEFTAPE in mt(1)
Remove DEFTAPE from <sys/mtio.h> and guard against multiple inclusion.
---

diff --git a/bin/mt/mt.c b/bin/mt/mt.c
index 194265e7fc9..f1eaad9893a 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.c,v 1.16 1997/03/29 21:23:10 tholo Exp $	*/
+/*	$OpenBSD: mt.c,v 1.17 1997/04/16 04:19:07 millert Exp $	*/
 /*	$NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.16 1997/03/29 21:23:10 tholo Exp $";
+static char rcsid[] = "$OpenBSD: mt.c,v 1.17 1997/04/16 04:19:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -126,7 +126,7 @@ main(argc, argv)
 		tape = NULL;
 	} else {
 		if ((tape = getenv("TAPE")) == NULL)
-			tape = DEFTAPE;
+			tape = _PATH_DEFTAPE;
 	}
 
 	while ((ch = getopt(argc, argv, "f:t:")) != -1) {
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 36f295bfef0..5eae516624e 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: mtio.h,v 1.3 1996/04/17 17:05:49 dm Exp $	*/
-/*	$NetBSD: mtio.h,v 1.12 1995/03/29 22:10:07 briggs Exp $	*/
+/*	$OpenBSD: mtio.h,v 1.4 1997/04/16 04:19:09 millert Exp $	*/
+/*	$NetBSD: mtio.h,v 1.14 1997/04/15 06:50:19 lukem Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -36,6 +36,9 @@
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
  */
 
+#ifndef _SYS_MTIO_H_
+#define _SYS_MTIO_H_
+
 /*
  * Structures and definitions for mag tape io control commands
  */
@@ -118,10 +121,6 @@ struct mtget {
 #define MTIOCIEOT	_IO('m', 3)			/* ignore EOT error */
 #define MTIOCEEOT	_IO('m', 4)			/* enable EOT error */
 
-#ifndef _KERNEL
-#define	DEFTAPE	"/dev/nrst0"
-#endif
-
 #ifdef	_KERNEL
 /*
  * minor device number
@@ -134,4 +133,6 @@ struct mtget {
 #define	T_1600BPI	010		/* select 1600 bpi */
 #define	T_6250BPI	020		/* select 6250 bpi */
 #define	T_BADBPI	030		/* undefined selection */
-#endif
+#endif /* _KERNEL */
+
+#endif /* !_SYS_MTIO_H_ */