Readding line of makefile lost in merge

[libucw.git] / lib / fb-buffer.c

diff --git a/lib/fb-buffer.c b/lib/fb-buffer.c
index 03c8e32108ca7bc0abff0999ce7875cd2be7d58d..d8094eb027e2c880c69da1f0fda4550362deaeeb 100644 (file)
--- 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,31 @@
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 static int
 fbbuf_refill(struct fastbuf *f UNUSED)
 {
   return 0;
 }
 
+static int
+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;
+  return 1;
+}
+
 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 +42,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
@@ -48,4 +66,5 @@ fbbuf_init_write(struct fastbuf *f, byte *buf, uns size)
   f->seek = NULL;
   f->close = NULL;
   f->config = NULL;
+  f->can_overwrite_buffer = 0;
 }