X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-mem.c;h=daa807338301000882aa338cc5dc8ef1864619da;hb=7f1288b27f2008215fcd08ee61612c1b52bfb727;hp=0f3158c379dbc9e7ae666c35d90e0d91c6bdfb32;hpb=cf83e06e4158617e981fef5bf3878315b23bf7f9;p=libucw.git diff --git a/lib/fb-mem.c b/lib/fb-mem.c index 0f3158c3..daa80733 100644 --- a/lib/fb-mem.c +++ b/lib/fb-mem.c @@ -110,7 +110,7 @@ fbmem_seek(struct fastbuf *f, sh_off_t pos, int whence) /* Yes, this is linear. But considering the average number of buckets, it doesn't matter. */ for (b=m->first; b; b=b->next) { - if (pos <= b->pos + b->size) /* <=, because we need to be able to seek just after file end */ + if (pos <= b->pos + (sh_off_t)b->size) /* <=, because we need to be able to seek just after file end */ { f->buffer = b->data; f->bptr = b->data + (pos - b->pos); @@ -120,6 +120,14 @@ fbmem_seek(struct fastbuf *f, sh_off_t pos, int whence) return; } } + if (!m->first && !pos) + { + /* Seeking to offset 0 in an empty file needs an exception */ + f->buffer = f->bptr = f->bufend = NULL; + f->pos = 0; + FB_MEM(f)->block = NULL; + return; + } die("fbmem_seek to invalid offset"); }