Resources: res_new() requires an active pool

[libucw.git] / ucw / fb-mem.c

diff --git a/ucw/fb-mem.c b/ucw/fb-mem.c
index cddb169a8c690f2c2f29de1cb137b4c12f2514d7..92e3b4972a4e358093762b5c83c077d51ebcd2ee 100644 (file)
--- a/ucw/fb-mem.c
+++ b/ucw/fb-mem.c
@@ -112,10 +112,10 @@ fbmem_seek(struct fastbuf *f, ucw_off_t pos, int whence)
     {
       if (pos <= b->pos + (ucw_off_t)b->size) /* <=, because we need to be able to seek just after file end */
        {
     {
       if (pos <= b->pos + (ucw_off_t)b->size) /* <=, because we need to be able to seek just after file end */
        {

-         f->buffer = b->data;
+         f->buffer = f->bstop = b->data;

          f->bptr = b->data + (pos - b->pos);
          f->bptr = b->data + (pos - b->pos);

-         f->bufend = f->bstop = b->data + b->size;
-         f->pos = b->pos + b->size;
+         f->bufend = b->data + b->size;
+         f->pos = b->pos;

          FB_MEM(f)->block = b;
          return 1;
        }
          FB_MEM(f)->block = b;
          return 1;
        }


@@ -123,12 +123,12 @@ fbmem_seek(struct fastbuf *f, ucw_off_t pos, int whence)
   if (!m->first && !pos)
     {
       /* Seeking to offset 0 in an empty file needs an exception */
   if (!m->first && !pos)
     {
       /* Seeking to offset 0 in an empty file needs an exception */

-      f->buffer = f->bptr = f->bufend = NULL;
+      f->buffer = f->bptr = f->bstop = f->bufend = NULL;

       f->pos = 0;
       FB_MEM(f)->block = NULL;
       return 1;
     }
       f->pos = 0;
       FB_MEM(f)->block = NULL;
       return 1;
     }

-  die("fbmem_seek to invalid offset");
+  bthrow(f, "seek", "fbmem_seek to an invalid offset");

 }
 
 static void
 }
 
 static void


@@ -213,6 +213,7 @@ int main(void)
   printf("<!%d>", (int)btell(r));
   while ((t = bgetc(r)) >= 0)
     putchar(t);
   printf("<!%d>", (int)btell(r));
   while ((t = bgetc(r)) >= 0)
     putchar(t);

+  putchar('\n');

   fflush(stdout);
   bclose(r);
   return 0;
   fflush(stdout);
   bclose(r);
   return 0;