X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Ftst-trie.c;h=990b151e20ae08d5e1496546a84ed7ecaa99d43a;hb=86bf8f7a016cfd8475ffc363a4cac0a29a4aacfd;hp=cc8c8f35aa8db2af4562bb71849a2cf5172f36b7;hpb=4694ac125f0dd752126de3f3f4e81b406cdd98e6;p=apps%2Fpfixtools.git

diff --git a/common/tst-trie.c b/common/tst-trie.c
index cc8c8f3..990b151 100644
--- a/common/tst-trie.c
+++ b/common/tst-trie.c
@@ -33,49 +33,27 @@
  * Copyright © 2008 Florent Bruneau
  */
 
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
 #include "common.h"
 #include "str.h"
 #include "trie.h"
+#include "file.h"
 
 static trie_t *create_trie_from_file(const char *file)
 {
     trie_t *db;
-    const char *map, *p, *end;
-    struct stat st;
-    int fd;
+    file_map_t map;
+    const char *p, *end;
     char line[BUFSIZ];
 
-    fd = open(file, O_RDONLY, 0000);
-    if (fd < 0) {
-        UNIXERR("open");
-        return NULL;
-    }
-
-    if (fstat(fd, &st) < 0) {
-        UNIXERR("fstat");
-        close(fd);
+    if (!file_map_open(&map, file, false)) {
         return NULL;
     }
-
-    p = map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (map == MAP_FAILED) {
-        UNIXERR("mmap");
-        close(fd);
-        return NULL;
-    }
-    close(fd);
-
-    end = map + st.st_size;
-    while (end > map && end[-1] != '\n') {
+    p   = map.map;
+    end = map.end;
+    while (end > p && end[-1] != '\n') {
         --end;
     }
-    if (end != map + st.st_size) {
+    if (end != map.end) {
         syslog(LOG_WARNING, "file %s miss a final \\n, ignoring last line",
                file);
     }
@@ -102,7 +80,7 @@ static trie_t *create_trie_from_file(const char *file)
         trie_insert(db, line);
         p = eol + 1;
     }
-    munmap((void*)map, st.st_size);
+    file_map_close(&map);
     trie_compile(db, false);
     return db;
 }
@@ -151,7 +129,6 @@ int main(int argc, char *argv[])
      */
     if (argc > 1) {
         trie = create_trie_from_file(argv[1]);
-        trie_lock(trie);
         trie_inspect(trie, false);
         trie_delete(&trie);
     }