index eedd3e488b80f6112fe597ca19659c0e65365164..74063b200a876aa4a44e797d55ca0ac09a5c8261 100644 (file)
--- a/program/src/parsetime.c
+++ b/program/src/parsetime.c
break;
}
- if (mon > 19700101 && mon < 24000101){ /*works between 1900 and 2400 */
+ if (mon > 19700101 && mon < 24000101){ /*works between 1970 and 2400 */
char cmon[3],cmday[3],cyear[5];
strncpy(cyear,sc_token,4);cyear[4]='\0';
year = atol(cyear);
ptv->type = ABSOLUTE_TIME;
ptv->offset = 0;
ptv->tm = *localtime(&now);
- ptv->tm.tm_isdst = -1; /* mk time can figure this out for us ... */
+ ptv->tm.tm_isdst = -1; /* by default lets mk time guess dst status ... */
+
token();
switch (sc_tokid) {
/* Only absolute time specifications below */
case NUMBER:
- try(tod(ptv))
- try(day(ptv))
+ {
+ long hour_sv = ptv->tm.tm_hour;
+ long year_sv = ptv->tm.tm_year;
+ ptv->tm.tm_hour = 30;
+ ptv->tm.tm_year = 30000;
+ try(tod(ptv))
+ try(day(ptv))
+ if ( ptv->tm.tm_hour == 30 && ptv->tm.tm_year != 30000 ){
+ try(tod(ptv))
+ }
+ if ( ptv->tm.tm_hour == 30 ){
+ ptv->tm.tm_hour = hour_sv;
+ }
+ if ( ptv->tm.tm_year == 30000 ){
+ ptv->tm.tm_year = year_sv;
+ }
+ };
break;
/* fix month parsing */
case JAN: case FEB: case MAR: case APR: case MAY: case JUN:
panic(e("unparsable trailing text: '...%s%s'", sc_token, sct));
}
- ptv->tm.tm_isdst = -1; /* for mktime to guess DST status */
if( ptv->type == ABSOLUTE_TIME )
if( mktime( &ptv->tm ) == -1 ) { /* normalize & check */
/* can happen for "nonexistent" times, e.g. around 3am */