Merge branch 'BigIntegerParse'

[mono.git] / mono / utils / mono-filemap.c

diff --git a/mono/utils/mono-filemap.c b/mono/utils/mono-filemap.c
index 5d73097ac56382d17482a066258e1221a0c0dc2b..36c7fd6df93abbdec09fb325c2957bad9dbe1e61 100644 (file)
--- a/mono/utils/mono-filemap.c
+++ b/mono/utils/mono-filemap.c
@@ -25,7 +25,18 @@
 MonoFileMap *
 mono_file_map_open (const char* name)
 {
+#ifdef WIN32
+       gunichar2 *wname = g_utf8_to_utf16 (name, -1, 0, 0, 0);
+       MonoFileMap *result;
+
+       if (wname == NULL)
+               return NULL;
+       result = (MonoFileMap *) _wfopen ((wchar_t *) wname, L"rb");
+       g_free (wname);
+       return result;
+#else
        return (MonoFileMap *)fopen (name, "rb");
+#endif
 }
 
 guint64 
@@ -49,7 +60,7 @@ mono_file_map_close (MonoFileMap *fmap)
        return fclose ((FILE*)fmap);
 }
 
-#if !defined(HAVE_MMAP) && !defined (HOST_WIN32)
+#if !defined (HOST_WIN32)
 
 static mono_file_map_alloc_fn alloc_fn = (mono_file_map_alloc_fn) malloc;
 static mono_file_map_release_fn release_fn = (mono_file_map_release_fn) free;
@@ -62,7 +73,7 @@ mono_file_map_set_allocator (mono_file_map_alloc_fn alloc, mono_file_map_release
 }
 
 void *
-mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_handle)
+mono_file_map_fileio (size_t length, int flags, int fd, guint64 offset, void **ret_handle)
 {
        guint64 cur_offset;
        size_t bytes_read;
@@ -71,19 +82,34 @@ mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_hand
                return NULL;
        cur_offset = lseek (fd, 0, SEEK_CUR);
        if (lseek (fd, offset, SEEK_SET) != offset) {
-               free (ptr);
+               (*release_fn) (ptr);
                return NULL;
        }
        bytes_read = read (fd, ptr, length);
+       if (bytes_read != length)
+               return NULL;
        lseek (fd, cur_offset, SEEK_SET);
        *ret_handle = NULL;
        return ptr;
 }
 
 int
-mono_file_unmap (void *addr, void *handle)
+mono_file_unmap_fileio (void *addr, void *handle)
 {
        (*release_fn) (addr);
        return 0;
 }
+#if !defined(HAVE_MMAP)
+void *
+mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_handle)
+{
+       return mono_file_map_fileio (length, flags, fd, offset, ret_handle);
+}
+
+int
+mono_file_unmap (void *addr, void *handle)
+{
+       return mono_file_unmap_fileio(addr, handle);
+}
+#endif
 #endif