diff options
| author | bde <bde@FreeBSD.org> | 1998-06-29 17:06:00 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-06-29 17:06:00 +0000 |
| commit | 122886a1e045b6711c6a11c9d90d10faee896958 (patch) | |
| tree | ace78682a8f56db8f3a9f80b67be82ddd614b54c /usr.bin | |
| parent | 0b0c5d1c4e51492acceb52c065db2dfd454a6494 (diff) | |
| download | FreeBSD-src-122886a1e045b6711c6a11c9d90d10faee896958.zip FreeBSD-src-122886a1e045b6711c6a11c9d90d10faee896958.tar.gz | |
Don't assume that time_t is long.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/lock/lock.c | 6 | ||||
| -rw-r--r-- | usr.bin/pr/pr.c | 10 | ||||
| -rw-r--r-- | usr.bin/tip/tip/log.c | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 1bbec1d..786c31a 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: lock.c,v 1.4 1997/07/21 12:09:34 charnier Exp $"; #endif /* not lint */ /* @@ -88,6 +88,7 @@ main(argc, argv) { struct passwd *pw; struct timeval timval; + time_t timval_sec; struct itimerval ntimer, otimer; struct tm *timp; int ch, sectimeout, usemine; @@ -130,7 +131,8 @@ main(argc, argv) if (gettimeofday(&timval, (struct timezone *)NULL)) err(1, "gettimeofday"); nexttime = timval.tv_sec + (sectimeout * 60); - timp = localtime(&timval.tv_sec); + timval_sec = timval.tv_sec; + timp = localtime(&timval_sec); ap = asctime(timp); tzn = timp->tm_zone; diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c index ed729d8..c4fac42 100644 --- a/usr.bin/pr/pr.c +++ b/usr.bin/pr/pr.c @@ -1255,6 +1255,7 @@ nxtfile(argc, argv, fname, buf, dt) { FILE *inf = NULL; struct timeval tv; + time_t tv_sec; struct timezone tz; struct tm *timeptr = NULL; struct stat statbuf; @@ -1282,7 +1283,8 @@ nxtfile(argc, argv, fname, buf, dt) eoptind = argc - 1; return(NULL); } - timeptr = localtime(&(tv.tv_sec)); + tv_sec = tv.tv_sec; + timeptr = localtime(&tv_sec); } for (; eoptind < argc; ++eoptind) { if (strcmp(argv[eoptind], "-") == 0) { @@ -1305,7 +1307,8 @@ nxtfile(argc, argv, fname, buf, dt) strerror(errno)); return(NULL); } - timeptr = localtime(&(tv.tv_sec)); + tv_sec = tv.tv_sec; + timeptr = localtime(&tv_sec); } else { /* * normal file processing @@ -1336,7 +1339,8 @@ nxtfile(argc, argv, fname, buf, dt) strerror(errno)); return(NULL); } - timeptr = localtime(&(tv.tv_sec)); + tv_sec = tv.tv_sec; + timeptr = localtime(&tv_sec); } else { if (fstat(fileno(inf), &statbuf) < 0) { ++errcnt; diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c index 2a57c844..acf5d87 100644 --- a/usr.bin/tip/tip/log.c +++ b/usr.bin/tip/tip/log.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: log.c,v 1.2 1997/08/18 07:16:03 charnier Exp $"; #endif /* not lint */ #include "tipconf.h" @@ -56,7 +56,7 @@ logent(group, num, acu, message) { char *user, *timestamp; struct passwd *pwd; - long t; + time_t t; if (flog == NULL) return; |
