make "18:00 yesterday" work Pavel Mores <pvl@uh.cz>

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@70 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/parsetime.c b/src/parsetime.c
index cea967caaed7653e19ffd0a522d04dcc3ac64a1e..a081d58507ed975e0f739be5c89bc5c10871ec2e 100644 (file)
--- a/src/parsetime.c
+++ b/src/parsetime.c
@@ -697,6 +697,7 @@ day(struct time_value *ptv)
             */
            wday = (sc_tokid-SUN);
            ptv->tm.tm_mday += (wday - ptv->tm.tm_wday);
+            token();
            break;
            /*
            mday = ptv->tm.tm_mday;
@@ -835,7 +836,8 @@ parsetime(char *tspec, struct time_value *ptv)
     /* Only absolute time specifications below */
     case NUMBER:
            try(tod(ptv))
-           if (sc_tokid != NUMBER) break; 
+            try(day(ptv))
+            break;
     /* fix month parsing */
     case JAN: case FEB: case MAR: case APR: case MAY: case JUN:
     case JUL: case AUG: case SEP: case OCT: case NOV: case DEC: