X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Ffb-file.c;h=5394730b93fe3d4cadd559dee251b183baeea03c;hb=ae2b00416589dfe798fc40f0575f62a0c664798f;hp=fff443786b7623f3881e18b631f567a6c355ded0;hpb=a45646a634b71708f5bc4277868c60e80daaa84c;p=libucw.git

diff --git a/ucw/fb-file.c b/ucw/fb-file.c
index fff44378..5394730b 100644
--- a/ucw/fb-file.c
+++ b/ucw/fb-file.c
@@ -8,9 +8,9 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/lfs.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +25,7 @@ struct fb_file {
   ucw_off_t wpos;			/* Real file position */
   uns wlen;				/* Window size */
 };
-#define FB_FILE(f) ((struct fb_file *)(f)->is_fastbuf)
+#define FB_FILE(f) ((struct fb_file *)(f))
 #define FB_BUFFER(f) (byte *)(FB_FILE(f) + 1)
 
 static int
@@ -56,7 +56,7 @@ long_seek:
 	      int l = read(F->fd, f->buffer, MIN(skip, blen));
 	      if (unlikely(l <= 0))
 		if (l < 0)
-		  die("Error reading %s: %m", f->name);
+		  bthrow(f, "read", "Error reading %s: %m", f->name);
 		else
 		  {
 		    F->wpos -= skip;
@@ -91,7 +91,7 @@ long_seek:
 	  goto long_seek;
 	}
       /* Seek into previous window (do nothing... for example brewind) */
-      else if ((uns)diff <= F->wlen) 
+      else if ((uns)diff <= F->wlen)
         {
 	  f->bstop = f->buffer + F->wlen;
 	  f->bptr = f->bstop - diff;
@@ -114,14 +114,14 @@ seek:
       /* Do lseek() */
       F->wpos = f->pos + (f->buffer - f->bptr);
       if (ucw_seek(F->fd, F->wpos, SEEK_SET) < 0)
-	die("Error seeking %s: %m", f->name);
+	bthrow(f, "read", "Error seeking %s: %m", f->name);
     }
   /* Read (part of) buffer */
   do
     {
       int l = read(F->fd, read_ptr, read_len);
       if (unlikely(l < 0))
-	die("Error reading %s: %m", f->name);
+	bthrow(f, "read", "Error reading %s: %m", f->name);
       if (!l)
 	if (unlikely(read_ptr < f->bptr))
 	  goto eof;
@@ -149,7 +149,7 @@ bfd_spout(struct fastbuf *f)
 {
   /* Do delayed lseek() if needed */
   if (FB_FILE(f)->wpos != f->pos && ucw_seek(FB_FILE(f)->fd, f->pos, SEEK_SET) < 0)
-    die("Error seeking %s: %m", f->name);
+    bthrow(f, "write", "Error seeking %s: %m", f->name);
 
   int l = f->bptr - f->buffer;
   byte *c = f->buffer;
@@ -161,33 +161,27 @@ bfd_spout(struct fastbuf *f)
     {
       int z = write(FB_FILE(f)->fd, c, l);
       if (z <= 0)
-	die("Error writing %s: %m", f->name);
+	bthrow(f, "write", "Error writing %s: %m", f->name);
       l -= z;
       c += z;
     }
-  f->bptr = f->buffer = FB_BUFFER(f);
+  f->bptr = f->bstop = f->buffer = FB_BUFFER(f);
 }
 
 static int
 bfd_seek(struct fastbuf *f, ucw_off_t pos, int whence)
 {
+  ASSERT(f->bptr == f->bstop);
   /* Delay the seek for the next refill() or spout() call (if whence != SEEK_END). */
-  ucw_off_t l;
   switch (whence)
     {
       case SEEK_SET:
 	f->pos = pos;
 	return 1;
-      case SEEK_CUR:
-	l = f->pos + pos;
-	if ((pos > 0) ^ (l > f->pos))
-	  return 0;
-	f->pos = l;
-	return 1;
-      case SEEK_END:
-	l = ucw_seek(FB_FILE(f)->fd, pos, SEEK_END);
+      case SEEK_END: ;
+	ucw_off_t l = ucw_seek(FB_FILE(f)->fd, pos, SEEK_END);
 	if (l < 0)
-	  return 0;
+	  bthrow(f, "seek", "Error seeking %s: %m", f->name);
 	FB_FILE(f)->wpos = f->pos = l;
 	FB_FILE(f)->wlen = 0;
 	return 1;
@@ -244,7 +238,6 @@ bfdopen_internal(int fd, const char *name, uns buflen)
   f->close = bfd_close;
   f->config = bfd_config;
   f->can_overwrite_buffer = 2;
-  fb_tie(f);
   return f;
 }