Просмотр исходного кода

s/PARSE_MMAP/HAVE_MMAP/, so that we now use mmap to read status and
available(and like files).

Adam Heath лет назад: 25
Родитель
Сommit
f23385c3cb
2 измененных файлов с 11 добавлено и 5 удалено
  1. 5 0
      ChangeLog
  2. 6 5
      lib/parse.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Sun Apr 22 19:02:12 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * lib/parse.c: s/PARSE_MMAP/HAVE_MMAP/, so that we now use mmap
+    to read status and available(and like files).
+
 Sun Apr 22 18:32:02 CDT 2001 Adam Heath <doogie@debian.org>
 
   * lib/parse.c: Fix another segfault when parsing single-paragraph

+ 6 - 5
lib/parse.c

@@ -29,15 +29,16 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#ifdef PARSE_MMAP
-#include <sys/mman.h>
-#endif
 
 #include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"
 
+#ifdef HAVE_MMAP
+#include <sys/mman.h>
+#endif
+
 const struct fieldinfo fieldinfos[]= {
   /* NB: capitalisation of these strings is important. */
   { "Package",          f_name,            w_name                                     },
@@ -108,7 +109,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
   if (fstat(fd, &stat) == -1)
     ohshite(_("can't stat package info file `%.255s'"),filename);
 
-#ifdef PARSE_MMAP
+#ifdef HAVE_MMAP
   if ((dataptr= (char *)mmap(NULL, stat.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED)
     ohshite(_("can't mmap package info file `%.255s'"),filename);
 #else
@@ -316,7 +317,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
     if (c == '\n') lno++;
   }
   pop_cleanup(0);
-#ifdef PARSE_MMAP
+#ifdef HAVE_MMAP
   munmap(data, stat.st_size);
 #else
   free(data);