diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-03 04:08:30 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-03 04:08:30 +0000 |
| commit | f47e41a433152c4c6b002c5390705ea4cd63800d (patch) | |
| tree | 6f0d746eb6484c90b664ce832e6af0589a7ba88f /bin/pax/cpio.c | |
| parent | edf0eef297ba31074044e1ec0411618d54ff55da (diff) | |
cpio and ustar formats store times in octal fields that are 11 characters
wide, so they support up to 33bits. Take advantage of the extra bits by
no longer forcing them into 32bit ints before the time_t conversion. This
gets us another 204 years of range once time_t changes type
ok deraadt@ tedu@
Diffstat (limited to 'bin/pax/cpio.c')
| -rw-r--r-- | bin/pax/cpio.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index c9b07b14d6c..33358ec1a52 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.c,v 1.21 2013/05/25 13:33:47 lum Exp $ */ +/* $OpenBSD: cpio.c,v 1.22 2013/07/03 04:08:29 guenther Exp $ */ /* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */ /*- @@ -37,6 +37,7 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/stat.h> +#include <limits.h> #include <string.h> #include <stdio.h> #include <unistd.h> @@ -274,6 +275,7 @@ int cpio_rd(ARCHD *arcn, char *buf) { int nsz; + u_quad_t val; HD_CPIO *hd; /* @@ -296,8 +298,11 @@ cpio_rd(ARCHD *arcn, char *buf) arcn->sb.st_nlink = (nlink_t)asc_ul(hd->c_nlink, sizeof(hd->c_nlink), OCT); arcn->sb.st_rdev = (dev_t)asc_ul(hd->c_rdev, sizeof(hd->c_rdev), OCT); - arcn->sb.st_mtime = (time_t)asc_ul(hd->c_mtime, sizeof(hd->c_mtime), - OCT); + val = asc_uqd(hd->c_mtime, sizeof(hd->c_mtime), OCT); + if ((time_t)val < 0 || (time_t)val != val) + arcn->sb.st_mtime = INT_MAX; /* XXX 2038 */ + else + arcn->sb.st_mtime = val; arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime; # ifdef LONG_OFF_T arcn->sb.st_size = (off_t)asc_ul(hd->c_filesize,sizeof(hd->c_filesize), @@ -448,7 +453,7 @@ cpio_wr(ARCHD *arcn) OCT) || ul_asc((u_long)arcn->sb.st_rdev, hd->c_rdev, sizeof(hd->c_rdev), OCT) || - ul_asc((u_long)arcn->sb.st_mtime,hd->c_mtime,sizeof(hd->c_mtime), + uqd_asc((u_quad_t)arcn->sb.st_mtime,hd->c_mtime,sizeof(hd->c_mtime), OCT) || ul_asc((u_long)nsz, hd->c_namesize, sizeof(hd->c_namesize), OCT)) goto out; |