From: Jim Meyering Date: Tue, 19 Apr 1994 13:02:55 +0000 (+0000) Subject: GNU shell utilities X-Git-Tag: SHELLUTILS-1_9_4f~1 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4bca89cf667765867ae29fe129e27655931dab18;p=gnulib.git GNU shell utilities --- diff --git a/lib/getdate.y b/lib/getdate.y index 63b9e7cfa8..6d93a57d6f 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -6,11 +6,11 @@ ** and Jim Berets in August, 1990; ** send any email to Rich. ** -** This grammar has nine shift/reduce conflicts. +** This grammar has 10 shift/reduce conflicts. ** ** This code is in the public domain and has no copyright. */ -/* SUPPRESS 287 on yaccpar_sccsid *//* Unusd static variable */ +/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ /* SUPPRESS 288 on yyerrlab *//* Label unused */ #ifdef HAVE_CONFIG_H @@ -31,26 +31,6 @@ #undef static #endif -/* The following block of alloca-related preprocessor directives is here - solely to allow compilation by non GNU-C compilers of the C parser - produced from this file by old versions of bison. Newer versions of - bison include a block similar to this one in bison.simple. */ - -#ifdef __GNUC__ -#undef alloca -#define alloca __builtin_alloca -#else -#ifdef HAVE_ALLOCA_H -#include -#else -#ifdef _AIX /* for Bison */ - #pragma alloca -#else -void *alloca (); -#endif -#endif -#endif - #include #include @@ -883,51 +863,38 @@ yylex() } } - -#define TM_YEAR_ORIGIN 1900 - -/* Yield A - B, measured in seconds. */ -static long -difftm (a, b) - struct tm *a, *b; -{ - int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); - int by = b->tm_year + (TM_YEAR_ORIGIN - 1); - int days = ( - /* difference in day of year */ - a->tm_yday - b->tm_yday - /* + intervening leap days */ - + ((ay >> 2) - (by >> 2)) - - (ay/100 - by/100) - + ((ay/100 >> 2) - (by/100 >> 2)) - /* + difference in years * 365 */ - + (long)(ay-by) * 365 - ); - return (60*(60*(24*days + (a->tm_hour - b->tm_hour)) - + (a->tm_min - b->tm_min)) - + (a->tm_sec - b->tm_sec)); -} - time_t get_date(p, now) char *p; struct timeb *now; { - struct tm *tm, gmt; + struct tm *tm; struct timeb ftz; time_t Start; time_t tod; yyInput = p; - if (now == NULL) { + if (now == NULL) + { + int tz; + struct tm *tmp; + time_t epoch = 0; + now = &ftz; (void)time(&ftz.time); - if (! (tm = gmtime (&ftz.time))) - return -1; - gmt = *tm; /* Make a copy, in case localtime modifies *tm. */ - ftz.timezone = difftm (&gmt, localtime (&ftz.time)) / 60; - } + /* Compute local timezone. Do *not* take daylight savings + into account here. */ + tmp = localtime (&epoch); + tz = tmp->tm_hour * 60 + tmp->tm_min; /* Minutes east of UTC. */ + if (tz > 0) + { + tz = 24 * 60 - tz; /* Minutes west of UTC. */ + if (tmp->tm_year == 70) + tz -= 24 * 60; /* Account for date line. */ + } + ftz.timezone = tz; + } tm = localtime(&now->time); yyYear = tm->tm_year; @@ -980,6 +947,7 @@ get_date(p, now) #if defined(TEST) /* ARGSUSED */ +int main(ac, av) int ac; char *av[];