X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fff-string.c;h=913c33535599d46531f86f880530728be2044bfd;hb=5635c7575119dffacda891b3f59bf3d2b839e455;hp=bb43ab859ff055db5a0a956e9a5df15f4cb159cf;hpb=d0b022ddc2a4cf5955a65e7c3ee6e83876ebc80a;p=libucw.git

diff --git a/lib/ff-string.c b/lib/ff-string.c
index bb43ab85..913c3353 100644
--- a/lib/ff-string.c
+++ b/lib/ff-string.c
@@ -11,9 +11,10 @@
 #include "lib/lib.h"
 #include "lib/fastbuf.h"
 #include "lib/mempool.h"
+#include "lib/bbuf.h"
 
-byte *					/* Non-standard */
-bgets(struct fastbuf *f, byte *b, uns l)
+char *					/* Non-standard */
+bgets(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src;
@@ -46,7 +47,7 @@ exit:
 }
 
 int
-bgets_nodie(struct fastbuf *f, byte *b, uns l)
+bgets_nodie(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src, *start = b;
@@ -75,30 +76,32 @@ bgets_nodie(struct fastbuf *f, byte *b, uns l)
   while (src_len);
 exit:
   *b++ = 0;
-  return b - start;
+  return b - (char *)start;
 }
 
 uns
-bgets_bb(struct fastbuf *f, bb_t *bb)
+bgets_bb(struct fastbuf *f, struct bb_t *bb, uns limit)
 {
+  ASSERT(limit);
   byte *src;
   uns src_len = bdirect_read_prepare(f, &src);
   if (!src_len)
     return 0;
   bb_grow(bb, 1);
   byte *buf = bb->ptr;
-  uns len = 0, buf_len = bb->len;
+  uns len = 0, buf_len = MIN(bb->len, limit);
   do
     {
       uns cnt = MIN(src_len, buf_len);
       for (uns i = cnt; i--;)
         {
-	  if (*src == '\n')
+	  byte v = *src++;
+	  if (v == '\n')
 	    {
               bdirect_read_commit(f, src);
 	      goto exit;
 	    }
-	  *buf++ = *src++;
+	  *buf++ = v;
 	}
       len += cnt;
       if (cnt == src_len)
@@ -110,9 +113,11 @@ bgets_bb(struct fastbuf *f, bb_t *bb)
 	src_len -= cnt;
       if (cnt == buf_len)
         {
+	  if (unlikely(len == limit))
+            die("%s: Line too long", f->name);
 	  bb_do_grow(bb, len + 1);
 	  buf = bb->ptr + len;
-	  buf_len = bb->len - len;
+	  buf_len = MIN(bb->len, limit) - len;
 	}
       else
 	buf_len -= cnt;
@@ -123,32 +128,33 @@ exit:
   return buf - bb->ptr;
 }
 
-byte *
-bgets_mp(struct mempool *mp, struct fastbuf *f)
+char *
+bgets_mp(struct fastbuf *f, struct mempool *mp)
 {
   byte *src;
   uns src_len = bdirect_read_prepare(f, &src);
   if (!src_len)
     return NULL;
-#define BLOCK_SIZE 4096
+#define BLOCK_SIZE (4096 - sizeof(void *))
   struct block {
     struct block *prev;
     byte data[BLOCK_SIZE];
   } *blocks = NULL;
-  uns sum = 0, buf_len = BLOCK_SIZE;
-  struct block *new_block = alloca(sizeof(struct block));
+  uns sum = 0, buf_len = BLOCK_SIZE, cnt;
+  struct block first_block, *new_block = &first_block;
   byte *buf = new_block->data;
   do
     {
-      uns cnt = MIN(src_len, buf_len);
+      cnt = MIN(src_len, buf_len);
       for (uns i = cnt; i--;)
         {
-	  if (*src == '\n')
+	  byte v = *src++;
+	  if (v == '\n')
 	    {
               bdirect_read_commit(f, src);
 	      goto exit;
 	    }
-	  *buf++ = *src++;
+	  *buf++ = v;
 	}
       if (cnt == src_len)
         {
@@ -162,13 +168,14 @@ bgets_mp(struct mempool *mp, struct fastbuf *f)
           new_block->prev = blocks;
           blocks = new_block;
           sum += buf_len = BLOCK_SIZE;
+	  new_block = alloca(sizeof(struct block));
 	  buf = new_block->data;
 	}
       else
 	buf_len -= cnt;
     }
   while (src_len);
-exit: ; 
+exit: ;
   uns len = buf - new_block->data;
   byte *result = mp_alloc(mp, sum + len + 1) + sum;
   result[len] = 0;
@@ -183,27 +190,71 @@ exit: ;
 #undef BLOCK_SIZE
 }
 
-int
-bgets_stk_step(struct fastbuf *f, byte *old_buf, byte *buf, uns len)
+void
+bgets_stk_init(struct bgets_stk_struct *s)
 {
-  if (old_buf)
+  s->src_len = bdirect_read_prepare(s->f, &s->src);
+  if (!s->src_len)
     {
-      len = len >> 1;
-      memcpy(buf, old_buf, len);
-      buf += len;
+      s->cur_buf = NULL;
+      s->cur_len = 0;
     }
-  while (len--)
+  else
     {
-      int k = bgetc(f);
-      if (k == '\n' || k < 0)
-	return *buf = 0;
-      *buf++ = k;
+      s->old_buf = NULL;
+      s->cur_len = 256;
+    }
+}
+
+void
+bgets_stk_step(struct bgets_stk_struct *s)
+{
+  byte *buf = s->cur_buf;
+  uns buf_len = s->cur_len;
+  if (s->old_buf)
+    {
+      memcpy( s->cur_buf, s->old_buf, s->old_len);
+      buf += s->old_len;
+      buf_len -= s->old_len;
+    }
+  do
+    {
+      uns cnt = MIN(s->src_len, buf_len);
+      for (uns i = cnt; i--;)
+        {
+	  byte v = *s->src++;
+	  if (v == '\n')
+	    {
+              bdirect_read_commit(s->f, s->src);
+	      goto exit;
+	    }
+	  *buf++ = v;
+	}
+      if (cnt == s->src_len)
+        {
+	  bdirect_read_commit(s->f, s->src);
+	  s->src_len = bdirect_read_prepare(s->f, &s->src);
+	}
+      else
+	s->src_len -= cnt;
+      if (cnt == buf_len)
+        {
+	  s->old_len = s->cur_len;
+	  s->old_buf = s->cur_buf;
+	  s->cur_len *= 2;
+	  return;
+	}
+      else
+	buf_len -= cnt;
     }
-  return 1;
+  while (s->src_len);
+exit:
+  *buf = 0;
+  s->cur_len = 0;
 }
 
-byte *
-bgets0(struct fastbuf *f, byte *b, uns l)
+char *
+bgets0(struct fastbuf *f, char *b, uns l)
 {
   ASSERT(l);
   byte *src;