From: Martin Mares <mj@ucw.cz>
Date: Mon, 15 Jan 2001 11:30:45 +0000 (+0000)
Subject: Fixed a couple of bugs.
X-Git-Tag: holmes-import~1585
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=af3a2f867872027da51fe7451bb37592b14cee15;p=libucw.git

Fixed a couple of bugs.
---

diff --git a/lib/fb-mem.c b/lib/fb-mem.c
index e382abce..db0f4132 100644
--- a/lib/fb-mem.c
+++ b/lib/fb-mem.c
@@ -34,7 +34,7 @@ fbmem_refill(struct fastbuf *f)
       if (!b)
 	return 0;
     }
-  else if (f->bstop < b->data + b->size)
+  else if (f->buffer == b->data && f->bstop < b->data + b->size)
     {
       f->bstop = b->data + b->size;
       return 1;
@@ -147,12 +147,14 @@ fbmem_clone_read(struct fastbuf *b)
   struct fastbuf *f = xmalloc(sizeof(struct fastbuf));
   struct memstream *s = b->lldata;
 
+  bflush(b);
   s->uc++;
 
   f->bptr = f->bstop = f->buffer = f->bufend = NULL;
   f->pos = f->fdpos = 0;
   f->name = "<fbmem-read>";
   f->lldata = s;
+  f->llpos = NULL;
   f->refill = fbmem_refill;
   f->spout = NULL;
   f->seek = fbmem_seek;