} RECDB_OUT;
#ifdef HAVE_MMAP
-static int mmap_error=0;
+static int mmap_error;
#endif
#define EOL '\n'
enum fail_codes {
UNTERMINATED_STRING,
+ UNTERMINATED_COMMENT,
EXPECTED_OPEN_QUOTE,
EXPECTED_OPEN_BRACE,
EXPECTED_OPEN_PAREN,
do {
do {
c = dbgetc(recdb);
- } while (c != '*' && c != EOF);
+ if (c == EOF) ABORT(recdb, UNTERMINATED_COMMENT, c);
+ } while (c != '*');
if ((c = dbgetc(recdb)) == '/') in_comment = 0;
+ if (c == EOF) ABORT(recdb, UNTERMINATED_COMMENT, c);
} while (in_comment);
} else if (d == '/') {
/* C++ style comment, with slash slash comment newline */
const char *reason;
switch (code >> 8) {
case UNTERMINATED_STRING: reason = "Unterminated string"; break;
+ case UNTERMINATED_COMMENT: reason = "Unterminated comment"; break;
case EXPECTED_OPEN_QUOTE: reason = "Expected '\"'"; break;
case EXPECTED_OPEN_BRACE: reason = "Expected '{'"; break;
case EXPECTED_OPEN_PAREN: reason = "Expected '('"; break;
void
explain_failure(RECDB *recdb, int code)
{
- log_module(MAIN_LOG, LOG_ERROR, "%s (got '%c') at %s line %d column %d.",
- failure_reason(code), code & 255,
- recdb->source, recdb->ctx.line, recdb->ctx.col);
+ static char msg[1024];
+ snprintf(msg, sizeof(msg), "%s (got '%c') at %s line %d column %d.",
+ failure_reason(code), code & 255,
+ recdb->source, recdb->ctx.line, recdb->ctx.col);
+ if (MAIN_LOG == NULL) {
+ fputs(msg, stderr);
+ fputc('\n', stderr);
+ fflush(stderr);
+ } else
+ log_module(MAIN_LOG, LOG_ERROR, "%s", msg);
}
const char *
if (fstat(fileno(recdb.f), &statinfo)) {
log_module(MAIN_LOG, LOG_ERROR, "Unable to fstat database file '%s': %s", filename, strerror(errno));
+ fclose(recdb.f);
return NULL;
}
recdb.length = (size_t)statinfo.st_size;
+ if (recdb.length == 0) {
+ fclose(recdb.f);
+ return alloc_database();
+ }
#ifdef HAVE_MMAP
/* Try mmap */