4 files changed, 25 insertions, 24 deletions
diff --git a/bin/pax/CVS/Entries b/bin/pax/CVS/Entries
index 0ba2835..1acc03a 100644
--- a/bin/pax/CVS/Entries
+++ b/bin/pax/CVS/Entries
@@ -1,24 +1,24 @@
-/Makefile/1.13/Thu Sep 13 12:33:43 2018//
-/ar_io.c/1.63/Fri Jun 28 13:34:59 2019//
 /ar_subs.c/1.49/Fri Jun 28 13:34:59 2019//
 /buf_subs.c/1.31/Fri Jun 28 13:34:59 2019//
-/cpio.1/1.36/Thu Jan 16 16:46:46 2020//
 /cpio.c/1.33/Sat Sep 16 07:42:34 2017//
-/cpio.h/1.4/Mon Jun  2 23:32:08 2003//
-/extern.h/1.60/Mon Mar 23 20:04:19 2020//
 /file_subs.c/1.55/Mon Mar 23 20:04:19 2020//
-/ftree.c/1.42/Fri Jun 28 13:34:59 2019//
 /gen_subs.c/1.32/Fri Aug 26 05:06:14 2016//
-/getoldopt.c/1.9/Tue Oct 27 23:59:22 2009//
 /options.c/1.103/Fri Nov 15 20:34:17 2019//
 /pat_rep.c/1.43/Sat Sep 16 07:42:34 2017//
-/pax.1/1.75/Thu Jan 16 16:46:46 2020//
 /pax.c/1.53/Fri Jun 28 13:34:59 2019//
-/pax.h/1.29/Tue Sep 12 17:11:11 2017//
 /sel_subs.c/1.28/Mon Jun 24 03:33:09 2019//
 /tables.c/1.54/Fri Jun 28 05:35:34 2019//
-/tar.1/1.62/Thu Jan 16 16:46:46 2020//
-/tar.c/1.68/Mon Jun 24 03:33:09 2019//
-/tar.h/1.9/Wed Jan  8 06:43:34 2014//
-/tty_subs.c/1.17/Fri Aug 26 04:22:13 2016//
+/Makefile/1.13/Mon Oct 19 10:44:53 2020//
+/ar_io.c/1.63/Mon Oct 19 10:44:53 2020//
+/cpio.1/1.36/Mon Oct 19 10:44:53 2020//
+/cpio.h/1.4/Mon Oct 19 10:44:53 2020//
+/extern.h/1.60/Mon Oct 19 10:44:53 2020//
+/ftree.c/1.42/Mon Oct 19 10:44:53 2020//
+/getoldopt.c/1.9/Mon Oct 19 10:44:53 2020//
+/pax.1/1.75/Mon Oct 19 10:44:53 2020//
+/pax.h/1.29/Mon Oct 19 10:44:53 2020//
+/tar.1/1.63/Wed Jul 14 08:10:46 2021//
+/tar.c/1.69/Result of merge//
+/tar.h/1.9/Mon Oct 19 10:44:53 2020//
+/tty_subs.c/1.17/Mon Oct 19 10:44:53 2020//
 D
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index deddca0..23f9b04 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -715,7 +715,7 @@ mod_name(ARCHD *arcn)
 		if ((res = rep_name(arcn->name, sizeof(arcn->name), &(arcn->nlen), 1)) != 0)
 			return(res);
 
-		if (PAX_IS_LINK(arcn->type)) {
+		if (PAX_IS_HARDLINK(arcn->type)) {
 			if ((res = rep_name(arcn->ln_name,
 			    sizeof(arcn->ln_name), &(arcn->ln_nlen), 0)) != 0)
 				return(res);
@@ -728,7 +728,7 @@ mod_name(ARCHD *arcn)
 		 */
 		if ((res = tty_rename(arcn)) != 0)
 			return(res);
-		if (PAX_IS_LINK(arcn->type))
+		if (PAX_IS_HARDLINK(arcn->type))
 			sub_name(arcn->ln_name, &(arcn->ln_nlen),
 			    sizeof(arcn->ln_name));
 	}
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index bbdef11..c4346a5 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tar.1,v 1.62 2020/01/16 16:46:46 schwarze Exp $
+.\"	$OpenBSD: tar.1,v 1.63 2020/10/05 05:52:19 jmc Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -23,7 +23,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.
 .\"
-.Dd $Mdocdate: January 16 2020 $
+.Dd $Mdocdate: October 5 2020 $
 .Dt TAR 1
 .Os
 .Sh NAME
@@ -142,12 +142,13 @@ from the directory.
 .It Fl e
 Stop after the first error.
 .It Fl f Ar archive
-Filename where the archive is stored.
-Defaults to
+Read from or write to
+.Ar archive .
+A hyphen
+.Pq -
+can be used to represent standard input or output.
+The default is
 .Pa /dev/rst0 .
-If set to hyphen
-.Pq Sq -
-standard output is used.
 See also the
 .Ev TAPE
 environment variable.
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index c62705b..898fddd 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tar.c,v 1.68 2019/06/24 03:33:09 deraadt Exp $	*/
+/*	$OpenBSD: tar.c,v 1.69 2021/06/14 00:36:13 deraadt Exp $	*/
 /*	$NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $	*/
 
 /*-
@@ -735,7 +735,7 @@ reset:
 	/* Process Extended headers. */
 	if (hd->typeflag == XHDRTYPE || hd->typeflag == GHDRTYPE) {
 		if (rd_xheader(arcn, hd->typeflag == GHDRTYPE,
-		    (off_t)asc_ul(hd->size, sizeof(hd->size), OCT)) < 0)
+		    (off_t)asc_ull(hd->size, sizeof(hd->size), OCT)) < 0)
 			return (-1);
 
 		/* Update and check the ustar header. */