X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffb-limfd.c;h=50bc5215d568d6d5253c091abe96fa4bece21b5a;hb=90afcc18dbf7cb6c682e1efb994007f03e304422;hp=ac95d908915b42fb3ea2f0c4145886c8e4c77f16;hpb=f185581ca3237ec1c37bc4ad92aab4c3ce8e7236;p=libucw.git

diff --git a/lib/fb-limfd.c b/lib/fb-limfd.c
index ac95d908..50bc5215 100644
--- a/lib/fb-limfd.c
+++ b/lib/fb-limfd.c
@@ -1,7 +1,7 @@
 /*
- *	Sherlock Library -- Fast Buffered Input on Limited File Descriptors
+ *	UCW Library -- Fast Buffered Input on Limited File Descriptors
  *
- *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2004 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,7 +10,6 @@
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 
-#include <stdlib.h>
 #include <unistd.h>
 
 struct fb_limfd {
@@ -19,15 +18,16 @@ struct fb_limfd {
   int limit;
 };
 #define FB_LIMFD(f) ((struct fb_limfd *)(f)->is_fastbuf)
+#define FB_BUFFER(f) (byte *)(FB_LIMFD(f) + 1)
 
 static int
 bfl_refill(struct fastbuf *f)
 {
+  f->bptr = f->buffer = FB_BUFFER(f);
   int max = MIN(FB_LIMFD(f)->limit - f->pos, f->bufend - f->buffer);
   int l = read(FB_LIMFD(f)->fd, f->buffer, max);
   if (l < 0)
     die("Error reading %s: %m", f->name);
-  f->bptr = f->buffer;
   f->bstop = f->buffer + l;
   f->pos += l;
   return l;
@@ -39,18 +39,6 @@ bfl_close(struct fastbuf *f)
   xfree(f);
 }
 
-static int
-bfl_config(struct fastbuf *f UNUSED, uns item, int value UNUSED)
-{
-  switch (item)
-    {
-    case BCONFIG_CAN_OVERWRITE:
-      return 2;
-    default:
-      return -1;
-    }
-}
-
 struct fastbuf *
 bopen_limited_fd(int fd, uns buflen, uns limit)
 {
@@ -66,7 +54,7 @@ bopen_limited_fd(int fd, uns buflen, uns limit)
   F->limit = limit;
   f->refill = bfl_refill;
   f->close = bfl_close;
-  f->config = bfl_config;
+  f->can_overwrite_buffer = 2;
   return f;
 }