Added s-fixint module (internal sorter for small fixed-size records).

[libucw.git] / lib / ff-string.c

diff --git a/lib/ff-string.c b/lib/ff-string.c
index 0f4c0b112dcf236689c4187e7d3c7edb9fdcb3d3..c8fa0fb35b48cc06a4bc44c6ee4280af5587f2ff 100644 (file)
--- a/lib/ff-string.c
+++ b/lib/ff-string.c
@@ -11,6 +11,7 @@
 #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)
@@ -79,15 +80,16 @@ exit:
 }
 
 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);
@@ -111,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;