frontend/scanner: Pass the right size to strncat.

[sysdb.git] / src / frontend / scanner.l

diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index 9d8e73d7d73cf01e8e80f552e8e90742cd345991..6781122c3c2b830547b66a0fe82a7e57b3f15cb4 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
@@ -51,19 +51,38 @@ static struct {
        const char *name;
        int id;
 } reserved_words[] = {
-       { "AND",        AND },
-       { "END",        END },
-       { "FETCH",      FETCH },
-       { "FILTER",     FILTER },
-       { "IS",         IS },
-       { "LIST",       LIST },
-       { "LOOKUP",     LOOKUP },
-       { "MATCHING",   MATCHING },
-       { "NOT",        NOT },
-       { "NULL",       NULL_T },
-       { "OR",         OR },
-       { "START",      START },
-       { "TIMESERIES", TIMESERIES },
+       { "ALL",         ALL },
+       { "AND",         AND },
+       { "ANY",         ANY },
+       { "END",         END },
+       { "FETCH",       FETCH },
+       { "FILTER",      FILTER },
+       { "IN",          IN },
+       { "IS",          IS },
+       { "LIST",        LIST },
+       { "LOOKUP",      LOOKUP },
+       { "MATCHING",    MATCHING },
+       { "NOT",         NOT },
+       { "NULL",        NULL_T },
+       { "OR",          OR },
+       { "START",       START },
+       { "TIMESERIES",  TIMESERIES },
+
+       /* object types */
+       { "host",        HOST_T },
+       { "hosts",       HOSTS_T },
+       { "service",     SERVICE_T },
+       { "services",    SERVICES_T },
+       { "metric",      METRIC_T },
+       { "metrics",     METRICS_T },
+       { "attribute",   ATTRIBUTE_T },
+       { "attributes",  ATTRIBUTES_T },
+       /* queryable fields */
+       { "name",        NAME_T },
+       { "last_update", LAST_UPDATE_T },
+       { "age",         AGE_T },
+       { "interval",    INTERVAL_T },
+       { "backend",     BACKEND_T },
 };
 
 void
@@ -191,6 +210,7 @@ time                ([0-9]{1,2}:[0-9]{1,2}(:[0-9]{1,2}(\.[0-9]{1,9})?)?)
                struct tm tm;
                char time[9], ns[10];
                char *tmp;
+               int t;
 
                memset(&tm, 0, sizeof(tm));
                memset(time, '\0', sizeof(time));
@@ -217,7 +237,7 @@ time                ([0-9]{1,2}:[0-9]{1,2}(:[0-9]{1,2}(\.[0-9]{1,9})?)?)
                assert(tmp);
                tmp = strchr(tmp + 1, ':');
                if (! tmp)
-                       strncat(time, ":00", sizeof(time));
+                       strncat(time, ":00", sizeof(time) - strlen(time) - 1);
 
                if (! strptime(time, "%H:%M:%S", &tm)) {
                        char errmsg[1024];
@@ -227,7 +247,8 @@ time                ([0-9]{1,2}:[0-9]{1,2}(:[0-9]{1,2}(\.[0-9]{1,9})?)?)
                        return SCANNER_ERROR;
                }
 
-               yylval->datetime = SECS_TO_SDB_TIME(mktime(&tm));
+               t = tm.tm_sec + 60 * tm.tm_min + 3600 * tm.tm_hour;
+               yylval->datetime = SECS_TO_SDB_TIME(t);
                yylval->datetime += (sdb_time_t)strtoll(ns, NULL, 10);
                return TIME;
        }
@@ -256,7 +277,7 @@ sdb_fe_scanner_init(const char *str, int len, sdb_fe_yyextra_t *yyext)
 
        if (sdb_fe_yylex_init(&scanner)) {
                char errbuf[1024];
-               sdb_log(SDB_LOG_ERR, "frontend: yylex_init failed: %s",
+               sdb_strbuf_sprintf(yyext->errbuf, "yylex_init_failed: %s",
                        sdb_strerror(errno, errbuf, sizeof(errbuf)));
                return NULL;
        }