diff --git a/src/frontend/scanner.l b/src/frontend/scanner.l
index c8d0dcbca25de94fe27196f7b1d65ff034370522..6781122c3c2b830547b66a0fe82a7e57b3f15cb4 100644 (file)
--- a/src/frontend/scanner.l
+++ b/src/frontend/scanner.l
struct tm tm;
char time[9], ns[10];
char *tmp;
+ int t;
memset(&tm, 0, sizeof(tm));
memset(time, '\0', sizeof(time));
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];
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;
}
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;
}