do not mess with dst status after running localtime, the system gets confused otherwh...

[rrdtool-all.git] / program / src / parsetime.c

diff --git a/program/src/parsetime.c b/program/src/parsetime.c
index f1958430224ef73487e8660001334315ca84d38a..74063b200a876aa4a44e797d55ca0ac09a5c8261 100644 (file)
--- a/program/src/parsetime.c
+++ b/program/src/parsetime.c
@@ -721,7 +721,7 @@ day(struct rrd_time_value *ptv)
                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);           
@@ -798,7 +798,8 @@ parsetime(const char *tspec, struct rrd_time_value *ptv)
     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) {
@@ -837,9 +838,23 @@ parsetime(const char *tspec, struct rrd_time_value *ptv)
 
     /* Only absolute time specifications below */
     case NUMBER:
-           try(tod(ptv))
-            try(day(ptv))
-            try(tod(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:
@@ -901,7 +916,6 @@ parsetime(const char *tspec, struct rrd_time_value *ptv)
       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 */