summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremie Courreges-Anglas <jca@cvs.openbsd.org>2024-04-15 17:33:11 +0000
committerJeremie Courreges-Anglas <jca@cvs.openbsd.org>2024-04-15 17:33:11 +0000
commit00fb9614509b6e21beaa13fb81bd38a4cba52080 (patch)
tree496757b1530f0b5a23c16cbf982daede71de03be
parent995014946283c994308055dd99a7b824607fa15b (diff)
Switch pax(1) to write archives using the 'pax' format by default
ramdisk versions will keep using ustar for writing. ok millert@
-rw-r--r--bin/pax/options.c8
-rw-r--r--bin/pax/pax.16
2 files changed, 9 insertions, 5 deletions
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 454c8409a97..0fac851bca0 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.107 2023/12/09 23:00:11 jca Exp $ */
+/* $OpenBSD: options.c,v 1.108 2024/04/15 17:33:10 jca Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -238,7 +238,11 @@ FSUB fsub[] = {
#define F_CPIO 3 /* format when called as cpio */
#define F_OTAR 4 /* format when called as tar -o */
#define F_TAR 5 /* format when called as tar */
-#define DEFLT 5 /* default write format from list above */
+#ifdef SMALL
+# define DEFLT 5 /* format when called as pax: ustar */
+#else
+# define DEFLT 10 /* format when called as pax: pax */
+#endif
/*
* ford is the archive search order used by get_arc() to determine what kind
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index ce3670216ad..19a23fe4390 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pax.1,v 1.77 2023/12/09 23:00:11 jca Exp $
+.\" $OpenBSD: pax.1,v 1.78 2024/04/15 17:33:10 jca Exp $
.\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
@@ -34,7 +34,7 @@
.\"
.\" @(#)pax.1 8.4 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: December 9 2023 $
+.Dd $Mdocdate: April 15 2024 $
.Dt PAX 1
.Os
.Sh NAME
@@ -810,7 +810,7 @@ field as described in
for more information about device IDs.
.It Fl x Ar format
Specify the output archive format, with the default format being
-.Cm ustar .
+.Cm pax .
.Nm
currently supports the following formats:
.Bl -tag -width "sv4cpio"