/* recdb.c - recursive/record database implementation
* Copyright 2000-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
} RECDB_OUT;
#ifdef HAVE_MMAP
-static int mmap_error=0;
+static int mmap_error;
#endif
#define EOL '\n'
void*
database_get_data(dict_t db, const char *path, enum recdb_type type)
{
+ assert(path != NULL);
+ if(!path)
+ log_module(MAIN_LOG, LOG_WARNING, "Null path in database_get_data()");
+ /* log_module(MAIN_LOG, LOG_DEBUG, "Reading config option '%s'", path); */
struct record_data *rd = database_get_path(db, path);
return (rd && rd->type == type) ? rd->d.whatever : NULL;
}
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) {
+ return alloc_database();
+ }
#ifdef HAVE_MMAP
/* Try mmap */
if (!mmap_error && (recdb.s = mmap(NULL, recdb.length, PROT_READ|PROT_WRITE, MAP_PRIVATE, fileno(recdb.f), 0)) != MAP_FAILED) {
recdb.type = RECDB_MMAP;
+ madvise(recdb.s, recdb.length, MADV_SEQUENTIAL);
} else {
/* Fall back to stdio */
if (!mmap_error) {