X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-buffer.c;h=09c7429357e6c518e9630b418067037e4986a43f;hb=86919305a08aa88b3a60c3216752291ba7f0b496;hp=8779ef323878df30c544f8eb1251dacc2c0f2ab2;hpb=809ba453f7d85d54349a8fc23da00fc6d09a56a1;p=libucw.git diff --git a/lib/fb-buffer.c b/lib/fb-buffer.c index 8779ef32..09c74293 100644 --- a/lib/fb-buffer.c +++ b/lib/fb-buffer.c @@ -1,7 +1,7 @@ /* - * Sherlock Library -- Fast Buffered I/O on Static Buffers + * UCW Library -- Fast Buffered I/O on Static Buffers * - * (c) 2003 Martin Mares + * (c) 2003--2006 Martin Mares * * This software may be freely distributed and used according to the terms * of the GNU Lesser General Public License. @@ -10,14 +10,29 @@ #include "lib/lib.h" #include "lib/fastbuf.h" +#include + static int fbbuf_refill(struct fastbuf *f UNUSED) { return 0; } +static void +fbbuf_seek(struct fastbuf *f, sh_off_t pos, int whence) +{ + /* Somebody might want to seek to the end of buffer, try to be nice to him. */ + sh_off_t len = f->bufend - f->buffer; + if (whence == SEEK_END) + pos += len; + ASSERT(pos >= 0 && pos <= len); + f->bptr = f->buffer + pos; + f->bstop = f->bufend; + f->pos = len; +} + void -fbbuf_init_read(struct fastbuf *f, byte *buf, uns size) +fbbuf_init_read(struct fastbuf *f, byte *buf, uns size, uns can_overwrite) { f->buffer = f->bptr = buf; f->bstop = f->bufend = buf + size; @@ -25,10 +40,10 @@ fbbuf_init_read(struct fastbuf *f, byte *buf, uns size) f->pos = size; f->refill = fbbuf_refill; f->spout = NULL; - f->seek = NULL; + f->seek = fbbuf_seek; f->close = NULL; f->config = NULL; - f->can_overwrite_buffer = 1; + f->can_overwrite_buffer = can_overwrite; } static void