Made `datetime' more user friendly. Now it should be a quoted string

of type "dd-mm-yyyy".

diff --git a/TODO b/TODO
index 4b033b089328a6a178ce5955b629316313ccf5be..0193d94efb30179835fcdbf74c788ddee3cd80a2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,10 +18,7 @@ Core
 
 - netlink: import Linux route attributes to our rta's, so that they can be filtered?
 
-- config: executable config files
 - config: when parsing prefix, check zero bits
-- config: useless rules when protocols disabled
-- config: better datetime format
 
 - krt: rescan interfaces when route addition fails?
 
@@ -56,6 +53,7 @@ Globals
 
 Various ideas
 ~~~~~~~~~~~~~
+- config: executable config files
 - client: access control
 - IPv6 router advertisements
 - real multipath (doesn't seem to be simple at all :()

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 49d3b124923e2ddfc1a5ed9bffa209dc5f5a7d5b..ba60fb2742cc6dfadaabfabf55d47e71d40714db 100644 (file)
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -1,7 +1,7 @@
 /*
  *     BIRD -- Configuration Parser Top
  *
- *     (c) 1998--1999 Martin Mares <mj@ucw.cz>
+ *     (c) 1998--2000 Martin Mares <mj@ucw.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -37,6 +37,7 @@ CF_DECLS
   struct password_item *p;
   struct rt_show_data *ra;
   void *g;
+  bird_clock_t time;
 }
 
 %token END CLI_MARKER INVALID_TOKEN
@@ -46,7 +47,8 @@ CF_DECLS
 %token <s> SYM
 %token <t> TEXT
 
-%type <i> expr bool pxlen datetime
+%type <i> expr bool pxlen
+%type <time> datetime
 
 %nonassoc '=' '<' '>' '~' '.'
 %left '+' '-'
@@ -115,8 +117,12 @@ pxlen:
    }
  ;
 
-datetime:      /* Return seconds from epoch, FIXME we want be more user friendly  */
-   NUM { $$ = $1; }
+datetime:      /* Return seconds from epoch, FIXME we want be more user friendly */
+   TEXT {
+     $$ = tm_parse_date($1);
+     if (!$$)
+       cf_error("Invalid date");
+   }
  ;
 
 CF_CODE