[src/netbsd-1-4]: src/bin/pax Pull up revision 1.17 (requested by mycroft):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/19d0b166051c
branches:  netbsd-1-4
changeset: 470137:19d0b166051c
user:      he <he%NetBSD.org@localhost>
date:      Fri Jan 21 00:18:52 2000 +0000

description:
Pull up revision 1.17 (requested by mycroft):
  Fix bugs handling files larger than 2GB.

diffstat:

 bin/pax/tar.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 46cd5f093f30 -r 19d0b166051c bin/pax/tar.c
--- a/bin/pax/tar.c     Fri Jan 21 00:17:37 2000 +0000
+++ b/bin/pax/tar.c     Fri Jan 21 00:18:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tar.c,v 1.14.2.1 1999/08/20 04:46:10 cgd Exp $ */
+/*     $NetBSD: tar.c,v 1.14.2.2 2000/01/21 00:18:52 he Exp $  */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tar.c      8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: tar.c,v 1.14.2.1 1999/08/20 04:46:10 cgd Exp $");
+__RCSID("$NetBSD: tar.c,v 1.14.2.2 2000/01/21 00:18:52 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -472,7 +472,11 @@
            0xfff);
        arcn->sb.st_uid = (uid_t)asc_ul(hd->uid, sizeof(hd->uid), OCT);
        arcn->sb.st_gid = (gid_t)asc_ul(hd->gid, sizeof(hd->gid), OCT);
-       arcn->sb.st_size = (size_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#      ifdef NET2_STAT
+       arcn->sb.st_size = (off_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#      else
+       arcn->sb.st_size = (off_t)asc_uqd(hd->size, sizeof(hd->size), OCT);
+#      endif
        arcn->sb.st_mtime = (time_t)asc_ul(hd->mtime, sizeof(hd->mtime), OCT);
        arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;
 
@@ -858,7 +862,11 @@
         */
        arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode, sizeof(hd->mode), OCT) &
            0xfff);
-       arcn->sb.st_size = (size_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#      ifdef NET2_STAT
+       arcn->sb.st_size = (off_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#      else
+       arcn->sb.st_size = (off_t)asc_uqd(hd->size, sizeof(hd->size), OCT);
+#      endif
        arcn->sb.st_mtime = (time_t)asc_ul(hd->mtime, sizeof(hd->mtime), OCT);
        arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;