From e0c332844a6571fc859120edf2032940d8dad64b Mon Sep 17 00:00:00 2001 From: dholland Date: Thu, 31 Jan 2008 05:19:44 +0000 Subject: Fix y2038 bug: time_t != int. --- atc/extern.c | 7 ++++--- atc/extern.h | 5 +++-- atc/main.c | 11 ++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'atc') diff --git a/atc/extern.c b/atc/extern.c index 9c946d3d..b0179972 100644 --- a/atc/extern.c +++ b/atc/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.9 2005/08/10 17:53:28 rpaulo Exp $ */ +/* $NetBSD: extern.c,v 1.10 2008/01/31 05:19:44 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.9 2005/08/10 17:53:28 rpaulo Exp $"); +__RCSID("$NetBSD: extern.c,v 1.10 2008/01/31 05:19:44 dholland Exp $"); #endif #endif /* not lint */ @@ -54,7 +54,8 @@ __RCSID("$NetBSD: extern.c,v 1.9 2005/08/10 17:53:28 rpaulo Exp $"); char GAMES[] = "Game_List"; -int clck, safe_planes, start_time, test_mode; +int clck, safe_planes, test_mode; +time_t start_time; const char *filename; diff --git a/atc/extern.h b/atc/extern.h index 0e9cca5a..6ac2ed7a 100644 --- a/atc/extern.h +++ b/atc/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.13 2005/08/10 17:53:28 rpaulo Exp $ */ +/* $NetBSD: extern.h,v 1.14 2008/01/31 05:19:44 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,8 @@ extern char GAMES[]; extern const char *filename; -extern int clck, safe_planes, start_time, test_mode; +extern int clck, safe_planes, test_mode; +extern time_t start_time; #if 0 extern FILE *filein, *fileout; diff --git a/atc/main.c b/atc/main.c index b4dbde3d..58d7fc81 100644 --- a/atc/main.c +++ b/atc/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.17 2006/06/07 09:35:03 jnemeth Exp $ */ +/* $NetBSD: main.c,v 1.18 2008/01/31 05:19:44 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.17 2006/06/07 09:35:03 jnemeth Exp $"); +__RCSID("$NetBSD: main.c,v 1.18 2008/01/31 05:19:44 dholland Exp $"); #endif #endif /* not lint */ @@ -63,7 +63,7 @@ extern FILE *yyin; int main(int argc, char *argv[]) { - int seed; + unsigned long seed; int f_usage = 0, f_list = 0, f_showscore = 0; int f_printpath = 0; const char *file = NULL; @@ -77,7 +77,8 @@ main(int argc, char *argv[]) open_score_file(); (void)setgid(getgid()); - start_time = seed = time(NULL); + start_time = time(NULL); + seed = start_time; while ((ch = getopt(argc, argv, ":u?lstpg:f:r:")) != -1) { switch (ch) { @@ -107,7 +108,7 @@ main(int argc, char *argv[]) } if (optind < argc) f_usage++; - srandom((unsigned long)seed); + srandom(seed); if (f_usage) (void)fprintf(stderr, -- cgit v1.2.3-56-ge451