summaryrefslogtreecommitdiffstats
path: root/usr.bin/touch
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-06-29 15:52:49 +0000
committerbde <bde@FreeBSD.org>1998-06-29 15:52:49 +0000
commitd1ade19b076d3f0330c8a6d04def69d6945a4942 (patch)
tree1071835d440992727eb8635d14cbc1bf475af6f1 /usr.bin/touch
parent18a2201c574aa719ca9333b0820baf1b8a0fa7c0 (diff)
downloadFreeBSD-src-d1ade19b076d3f0330c8a6d04def69d6945a4942.zip
FreeBSD-src-d1ade19b076d3f0330c8a6d04def69d6945a4942.tar.gz
Don't assume that time_t is long.
Diffstat (limited to 'usr.bin/touch')
-rw-r--r--usr.bin/touch/touch.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 32a7319..712d72e 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -184,11 +184,13 @@ stime_arg1(arg, tvp)
char *arg;
struct timeval *tvp;
{
+ time_t now;
struct tm *t;
int yearset;
char *p;
/* Start with the current time. */
- if ((t = localtime(&tvp[0].tv_sec)) == NULL)
+ now = tvp[0].tv_sec;
+ if ((t = localtime(&now)) == NULL)
err(1, "localtime");
/* [[CC]YY]MMDDhhmm[.SS] */
if ((p = strchr(arg, '.')) == NULL)
@@ -246,9 +248,11 @@ stime_arg2(arg, year, tvp)
int year;
struct timeval *tvp;
{
+ time_t now;
struct tm *t;
/* Start with the current time. */
- if ((t = localtime(&tvp[0].tv_sec)) == NULL)
+ now = tvp[0].tv_sec;
+ if ((t = localtime(&now)) == NULL)
err(1, "localtime");
t->tm_mon = ATOI2(arg); /* MMDDhhmm[yy] */
OpenPOWER on IntegriCloud