Avoid trying to mmap() or read a zero-byte database file.

[srvx.git] / src / recdb.c

diff --git a/src/recdb.c b/src/recdb.c
index 67c3e7054b195b1ef98ddb0a1fd5854fcee4bd2a..cba98139082c0d1e03a6fb7c431d52d471f8642b 100644 (file)
--- a/src/recdb.c
+++ b/src/recdb.c
@@ -93,7 +93,7 @@ typedef struct recdb_outfile {
 } RECDB_OUT;
 
 #ifdef HAVE_MMAP
-static int mmap_error=0;
+static int mmap_error;
 #endif
 
 #define EOL '\n'
@@ -616,11 +616,15 @@ parse_database(const char *filename)
         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) {