mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmap_read/mmap_shared on zero length files no longer fail but return a

Browse Source 
zero length buffer
This commit is contained in:
leitner 2015-03-02 21:25:57 +00:00
parent ed93e203a1
commit a255cebc57
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -24,6 +24,8 @@
add io_fd_flags so the caller can tell io_fd whether the socket is blocking add io_fd_flags so the caller can tell io_fd whether the socket is blocking
(saves one fcntl syscall) (saves one fcntl syscall)
more constness for stralloc and buffer more constness for stralloc and buffer
mmap_read/mmap_shared on zero length files no longer fail but return a
zero length buffer
0.29: 0.29:
save 8 bytes in taia.h for 64-bit systems save 8 bytes in taia.h for 64-bit systems

9
mmap/mmap_read.c
View File

@ -30,9 +30,12 @@ extern const char* mmap_read(const char* filename,size_t * filesize) {
register off_t o=lseek(fd,0,SEEK_END); register off_t o=lseek(fd,0,SEEK_END);
if (sizeof(off_t)!=sizeof(size_t) && o > (off_t)(size_t)-1) { close(fd); return 0; } if (sizeof(off_t)!=sizeof(size_t) && o > (off_t)(size_t)-1) { close(fd); return 0; }
*filesize=(size_t)o; *filesize=(size_t)o;
map=mmap(0,*filesize,PROT_READ,MAP_SHARED,fd,0); if (o>0) {
if (map==(char*)-1) map=mmap(0,*filesize,PROT_READ,MAP_SHARED,fd,0);
map=0; if (map==(char*)-1)
map=0;
} else
map="";
close(fd); close(fd);
return map; return map;
} }

9
mmap/mmap_shared.c
View File

@ -30,9 +30,12 @@ extern char* mmap_shared(const char* filename,size_t * filesize) {
register off_t o=lseek(fd,0,SEEK_END); register off_t o=lseek(fd,0,SEEK_END);
if (sizeof(off_t)!=sizeof(size_t) && o > (off_t)(size_t)-1) { close(fd); return 0; } if (sizeof(off_t)!=sizeof(size_t) && o > (off_t)(size_t)-1) { close(fd); return 0; }
*filesize=(size_t)o; *filesize=(size_t)o;
map=mmap(0,*filesize,PROT_READ|PROT_WRITE,MAP_SHARED,fd,0); if (o) {
if (map==(char*)-1) map=mmap(0,*filesize,PROT_READ|PROT_WRITE,MAP_SHARED,fd,0);
map=0; if (map==(char*)-1)
map=0;
} else
map="";
close(fd); close(fd);
return map; return map;
} }

2
mmap/mmap_unmap.c
View File

@ -13,6 +13,6 @@ int mmap_unmap(const char* mapped,size_t maplen) {
(void)maplen; (void)maplen;
return UnmapViewOfFile(mapped)?0:-1; return UnmapViewOfFile(mapped)?0:-1;
#else #else
return munmap((char*)mapped,maplen); return maplen ? munmap((char*)mapped,maplen) : 0;
#endif #endif
} }