Change rmt -> rst and use _PATH_DEFTAPE as default file if none is

specified.

diff --git a/bin/pax/options.c b/bin/pax/options.c
index 5c70104..9872ac0 100644 (file)
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: options.c,v 1.23 1997/04/12 17:25:25 tholo Exp $      */
+/*     $OpenBSD: options.c,v 1.24 1997/04/16 03:50:23 millert Exp $    */
 /*     $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $  */
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.23 1997/04/12 17:25:25 tholo Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.24 1997/04/16 03:50:23 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -57,6 +57,7 @@ static char rcsid[] = "$OpenBSD: options.c,v 1.23 1997/04/12 17:25:25 tholo Exp
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <paths.h>
 #include "pax.h"
 #include "options.h"
 #include "cpio.h"
@@ -855,7 +856,7 @@ tar_options(argc, argv)
        if (!fstdin && ((arcname == (char *)NULL) || (*arcname == '\0'))) {
                arcname = getenv("TAPE");
                if ((arcname == (char *)NULL) || (*arcname == '\0'))
-                       arcname = DEV_8;
+                       arcname = _PATH_DEFTAPE;
        }
 }
 

diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index 07bc2b3..2f8634b 100644 (file)
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"    $OpenBSD: tar.1,v 1.11 1997/04/09 17:48:25 millert Exp $
+.\"    $OpenBSD: tar.1,v 1.12 1997/04/16 03:50:24 millert Exp $
 .\"
 .Dd June 11, 1996
 .Dt TAR 1
@@ -94,7 +94,7 @@ standard and will not be portable to all systems.
 Stop after first error.
 .It Fl f Ar archive
 Filename where the archive is stored.  Defaults to
-.Pa /dev/rmt8
+.Pa /dev/rst0
 .It Fl h
 Follow symbolic links as if they were normal files
 or directories.
@@ -184,10 +184,10 @@ Compress archive using compress.
 The options
 .Op Fl 014578
 can be used to select one of the compiled-in backup devices,
-.Pa /dev/rmtN .
+.Pa /dev/rstN .
 .Sh FILES
-.Bl -tag -width "/dev/rmt8"
-.It Pa /dev/rmt8
+.Bl -tag -width "/dev/rst0"
+.It Pa /dev/rst0
 The default archive name
 .El
 .Sh SEE ALSO

diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index f4cbbd5..79a8ce4 100644 (file)
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tar.h,v 1.4 1997/02/10 06:48:15 millert Exp $ */
+/*     $OpenBSD: tar.h,v 1.5 1997/04/16 03:50:25 millert Exp $ */
 /*     $NetBSD: tar.h,v 1.3 1995/03/21 09:07:51 cgd Exp $      */
 
 /*-
@@ -114,12 +114,12 @@ typedef struct {
 /*
  * default device names
  */
-#define        DEV_0           "/dev/rmt0"
-#define        DEV_1           "/dev/rmt1"
-#define        DEV_4           "/dev/rmt4"
-#define        DEV_5           "/dev/rmt5"
-#define        DEV_7           "/dev/rmt7"
-#define        DEV_8           "/dev/rmt8"
+#define        DEV_0           "/dev/rst0"
+#define        DEV_1           "/dev/rst1"
+#define        DEV_4           "/dev/rst4"
+#define        DEV_5           "/dev/rst5"
+#define        DEV_7           "/dev/rst7"
+#define        DEV_8           "/dev/rst8"
 #endif /* _PAX_ */
 
 /*