mirror of
https://github.com/Interlisp/maiko.git
synced 2026-01-20 09:45:13 +00:00
Fix timezone detection (refs Interlisp/medley#65)
Use tzset() and the timezone variable to more robustly detect the timezone.
This will also allow a user to set the TZ environment variable to override system timezone settings.
modified: src/timer.c
This commit is contained in:
parent
b9fa900512
commit
2dd366bcb9
17
src/timer.c
17
src/timer.c
@ -40,6 +40,7 @@ unsigned long tick_count = 0; /* approx 18 ticks per sec */
|
||||
#define USETIMEFN
|
||||
|
||||
#else
|
||||
#include <time.h>
|
||||
#include <sys/time.h>
|
||||
#endif /* DOS */
|
||||
#include <sys/types.h>
|
||||
@ -61,10 +62,6 @@ unsigned long tick_count = 0; /* approx 18 ticks per sec */
|
||||
#endif /* DOS */
|
||||
#endif /* ISC */
|
||||
|
||||
#ifdef SYSVONLY
|
||||
extern long timezone; /* seconds difference GMT to local */
|
||||
#endif
|
||||
|
||||
#ifdef OS5
|
||||
#include <sys/times.h>
|
||||
#include <stropts.h>
|
||||
@ -270,7 +267,6 @@ static int gettime(int casep)
|
||||
{
|
||||
#ifndef USETIMEFN
|
||||
struct timeval timev;
|
||||
struct timezone tz;
|
||||
#elif DOS
|
||||
struct dostime_t dtm; /* for hundredths of secs */
|
||||
#endif /* USETIMEFN */
|
||||
@ -319,16 +315,11 @@ static int gettime(int casep)
|
||||
return (305); /* this is wrong, only works in PST */
|
||||
|
||||
case 8:
|
||||
#ifdef OS5
|
||||
/* other methods of determining timezone offset are unreliable and/or deprecated */
|
||||
/* timezone is declared in <time.h>; the time mechanisms must be initialized */
|
||||
tzset();
|
||||
return (timezone / 3600); /* timezone, extern, is #secs diff GMT to local. */
|
||||
|
||||
#elif USETIMEFN
|
||||
return (timezone / 3600); /* timezone, extern, is #secs diff GMT to local. */
|
||||
#else
|
||||
gettimeofday(&timev, &tz);
|
||||
return (tz.tz_minuteswest / 60); /* only integral timezones work */
|
||||
#endif
|
||||
|
||||
default: return (0);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user