X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffastbuf.c;h=b7be624b5645d5ac34e1e52ca83b1ce2a951be62;hb=cd5b7ea487ab7692635ba7eca98fcb55f6d996a7;hp=1b89a813998d7db2aea31dd0789a09a138d17a75;hpb=3d2689a215b9041b1a5fe5577569771a55a73823;p=libucw.git

diff --git a/lib/fastbuf.c b/lib/fastbuf.c
index 1b89a813..b7be624b 100644
--- a/lib/fastbuf.c
+++ b/lib/fastbuf.c
@@ -24,13 +24,10 @@ void bclose(struct fastbuf *f)
 
 void bflush(struct fastbuf *f)
 {
-  if (f->bptr != f->buffer)
-    {					/* Have something to flush */
-      if (f->bstop > f->buffer)		/* Read data? */
-	f->bptr = f->bstop = f->buffer;
-      else				/* Write data... */
-	f->spout(f);
-    }
+  if (f->bptr > f->bstop)
+    f->spout(f);
+  else if (f->bstop > f->buffer)
+    f->bptr = f->bstop = f->buffer;
 }
 
 inline void bsetpos(struct fastbuf *f, sh_off_t pos)
@@ -284,32 +281,29 @@ bgets0(struct fastbuf *f, byte *b, uns l)
   die("%s: Line too long", f->name);
 }
 
-int
-bdirect_read_prepare(struct fastbuf *f, byte **buf)
-{
-  if (f->bptr == f->bstop && !f->refill(f))
-    return EOF;
-  *buf = f->bptr;
-  return f->bstop - f->bptr;
-}
-
 void
-bdirect_read_commit(struct fastbuf *f, byte *pos)
+bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l)
 {
-  f->bptr = pos;
-}
+  while (l)
+    {
+      byte *fptr, *tptr;
+      uns favail, tavail, n;
 
-int
-bdirect_write_prepare(struct fastbuf *f, byte **buf)
-{
-  if (f->bptr == f->bufend)
-    f->spout(f);
-  *buf = f->bptr;
-  return f->bufend - f->bptr;
+      favail = bdirect_read_prepare(f, &fptr);
+      if (!favail)
+	die("bbcopy: source exhausted");
+      tavail = bdirect_write_prepare(t, &tptr);
+      n = MIN(l, favail);
+      n = MIN(n, tavail);
+      memcpy(tptr, fptr, n);
+      bdirect_read_commit(f, fptr + n);
+      bdirect_write_commit(t, tptr + n);
+      l -= n;
+    }
 }
 
-void
-bdirect_write_commit(struct fastbuf *f, byte *pos)
+int
+bconfig(struct fastbuf *f, uns item, int value)
 {
-  f->bptr = pos;
+  return f->config ? f->config(f, item, value) : -1;
 }