empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ef_open): Don't assume blksize() is the same for all files.

Browse source 
(ef_open): Ensure the cache has at least one slot.
This commit is contained in:
Markus Armbruster 2005-10-22 19:12:27 +00:00
parent 898aaf3d3d
commit 2802ce1863
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/common/file.c
View file

@ -57,7 +57,6 @@ int
ef_open(int type, int mode, int how) ef_open(int type, int mode, int how)
{ {
struct empfile *ep; struct empfile *ep;
static int block;
int size; int size;
#if defined(_WIN32) #if defined(_WIN32)
@ -70,8 +69,6 @@ ef_open(int type, int mode, int how)
logerror("%s: open failed", ep->file); logerror("%s: open failed", ep->file);
return 0; return 0;
} }
if (block == 0)
block = blksize(ep->fd);
ep->baseid = 0; ep->baseid = 0;
ep->cids = 0; ep->cids = 0;
ep->mode = mode; ep->mode = mode;
@ -80,7 +77,7 @@ ef_open(int type, int mode, int how)
if (ep->flags & EFF_MEM) if (ep->flags & EFF_MEM)
ep->csize = ep->fids; ep->csize = ep->fids;
else else
ep->csize = block / ep->size; ep->csize = max(1, blksize(ep->fd) / ep->size);
size = ep->csize * ep->size; size = ep->csize * ep->size;
ep->cache = malloc(size); ep->cache = malloc(size);
if ((ep->cache == NULL) && (size != 0)) { if ((ep->cache == NULL) && (size != 0)) {