X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffastbuf.c;h=0929f101a9c8a959bda89abe1c892711fe643051;hb=75eea53f8050dc1482de088b3cbd081b2511c5a4;hp=1b039c6ca7e32fb69a1f1a8467f35bf4ec7f0550;hpb=c982330d65a5ff8930682b250612ea135db2d4f6;p=libucw.git

diff --git a/lib/fastbuf.c b/lib/fastbuf.c
index 1b039c6c..0929f101 100644
--- a/lib/fastbuf.c
+++ b/lib/fastbuf.c
@@ -2,12 +2,14 @@
  *	Sherlock Library -- Fast Buffered I/O
  *
  *	(c) 1997--2000 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 void bclose(struct fastbuf *f)
@@ -15,29 +17,24 @@ void bclose(struct fastbuf *f)
   if (f)
     {
       bflush(f);
-      f->close(f);
-      xfree(f);
+      if (f->close)
+	f->close(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;
-	  f->pos = f->fdpos;
-	}
-      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)
 {
-  if (pos >= f->pos && (pos <= f->pos + (f->bptr - f->buffer) || pos <= f->pos + (f->bstop - f->buffer)))
-    f->bptr = f->buffer + (pos - f->pos);
+  /* We can optimize seeks only when reading */
+  if (pos >= f->pos - (f->bstop - f->buffer) && pos <= f->pos)
+    f->bptr = f->bstop + (pos - f->pos);
   else
     {
       bflush(f);
@@ -247,11 +244,11 @@ bgets(struct fastbuf *f, byte *b, uns l)
   int k;
 
   k = bgetc(f);
-  if (k == EOF)
+  if (k < 0)
     return NULL;
   while (b < e)
     {
-      if (k == '\n' || k == EOF)
+      if (k == '\n' || k < 0)
 	{
 	  *b = 0;
 	  return b;
@@ -262,6 +259,29 @@ bgets(struct fastbuf *f, byte *b, uns l)
   die("%s: Line too long", f->name);
 }
 
+int
+bgets_nodie(struct fastbuf *f, byte *b, uns l)
+{
+  byte *start = b;
+  byte *e = b + l - 1;
+  int k;
+
+  k = bgetc(f);
+  if (k < 0)
+    return 0;
+  while (b < e)
+    {
+      if (k == '\n' || k < 0)
+	{
+	  *b++ = 0;
+	  return b - start;
+	}
+      *b++ = k;
+      k = bgetc(f);
+    }
+  return -1;
+}
+
 byte *
 bgets0(struct fastbuf *f, byte *b, uns l)
 {
@@ -269,11 +289,11 @@ bgets0(struct fastbuf *f, byte *b, uns l)
   int k;
 
   k = bgetc(f);
-  if (k == EOF)
+  if (k < 0)
     return NULL;
   while (b < e)
     {
-      if (!k || k == EOF)
+      if (k <= 0)
 	{
 	  *b = 0;
 	  return b;
@@ -284,30 +304,34 @@ bgets0(struct fastbuf *f, byte *b, uns l)
   die("%s: Line too long", f->name);
 }
 
-int
-bdirect_read(struct fastbuf *f, byte **buf)
+void
+bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l)
 {
-  int len;
+  while (l)
+    {
+      byte *fptr, *tptr;
+      uns favail, tavail, n;
 
-  if (f->bptr == f->bstop && !f->refill(f))
-    return EOF;
-  *buf = f->bptr;
-  len = f->bstop - f->bptr;
-  f->bptr += len;
-  return len;
+      favail = bdirect_read_prepare(f, &fptr);
+      if (!favail)
+	{
+	  if (l == ~0U)
+	    return;
+	  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);
+      if (l != ~0U)
+	l -= 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;
-}
-
-void
-bdirect_write_commit(struct fastbuf *f, byte *pos)
+bconfig(struct fastbuf *f, uns item, int value)
 {
-  f->bptr = pos;
+  return f->config ? f->config(f, item, value) : -1;
 }