X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-buffer.c;h=09c7429357e6c518e9630b418067037e4986a43f;hb=1e346d26a03735f09bba33ddbaba4cc9b268d381;hp=2e2d44541ff9cd87333baa85dd224e66fe3bcf72;hpb=f185581ca3237ec1c37bc4ad92aab4c3ce8e7236;p=libucw.git

diff --git a/lib/fb-buffer.c b/lib/fb-buffer.c
index 2e2d4454..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 <mj@ucw.cz>
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
  *
  *	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 <stdlib.h>
+
 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,9 +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 = can_overwrite;
 }
 
 static void
@@ -36,18 +52,6 @@ fbbuf_spout(struct fastbuf *f UNUSED)
   die("fbbuf: buffer overflow on write");
 }
 
-static int
-fbbuf_config(struct fastbuf *f UNUSED, uns item, int value UNUSED)
-{
-  switch (item)
-    {
-    case BCONFIG_CAN_OVERWRITE:
-      return 1;
-    default:
-      return -1;
-    }
-}
-
 void
 fbbuf_init_write(struct fastbuf *f, byte *buf, uns size)
 {
@@ -59,5 +63,6 @@ fbbuf_init_write(struct fastbuf *f, byte *buf, uns size)
   f->spout = fbbuf_spout;
   f->seek = NULL;
   f->close = NULL;
-  f->config = fbbuf_config;
+  f->config = NULL;
+  f->can_overwrite_buffer = 0;
 }