Mapping of whole files: Converted to size_t.

diff --git a/ucw/io-mmap.c b/ucw/io-mmap.c
index 24010b517cc45755b893506bd2fb7c6652bbbd7d..1a3f1438102f2371da3ec2ecfde5ef9626159c78 100644 (file)
--- a/ucw/io-mmap.c
+++ b/ucw/io-mmap.c
@@ -17,16 +17,18 @@
 #include <sys/mman.h>
 
 void *
-mmap_file(const char *name, unsigned *len, int writeable)
+mmap_file(const char *name, size_t *len, int writeable)
 {
-  int fd = open(name, writeable ? O_RDWR : O_RDONLY);
-  struct stat st;
+  int fd = ucw_open(name, writeable ? O_RDWR : O_RDONLY);
+  ucw_stat_t st;
   void *x;
 
   if (fd < 0)
     die("open(%s): %m", name);
-  if (fstat(fd, &st) < 0)
+  if (ucw_fstat(fd, &st) < 0)
     die("fstat(%s): %m", name);
+  if ((uintmax_t)st.st_size > SIZE_MAX)
+    die("mmap(%s): File too large", name);
   if (len)
     *len = st.st_size;
   if (st.st_size)
@@ -42,7 +44,7 @@ mmap_file(const char *name, unsigned *len, int writeable)
 }
 
 void
-munmap_file(void *start, unsigned len)
+munmap_file(void *start, size_t len)
 {
   munmap(start, len);
 }

diff --git a/ucw/io.h b/ucw/io.h
index 36b3524361f1812c33586524afea794efc87a64a..ac8c7ec67df834670e0f32293d564b3cbe5a3b26 100644 (file)
--- a/ucw/io.h
+++ b/ucw/io.h
@@ -65,8 +65,8 @@ ucw_off_t ucw_file_size(const char *name);
 
 /* io-mmap.c */
 
-void *mmap_file(const char *name, unsigned *len, int writeable);
-void munmap_file(void *start, unsigned len);
+void *mmap_file(const char *name, size_t *len, int writeable);
+void munmap_file(void *start, size_t len);
 
 /* io-careful.c */