From edf09fc5529eae3e8214a432058b4c07b2b8d2f9 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 15 Jul 1997 16:28:41 +0000
Subject: [PATCH] Bug fix: storeData didn't work with files with multiple
 records. Bug fix: fixed memory management with records; not
 really well  thought through.

---
 index/extract.c  |   17 ++++++++++++-----
 index/recindex.c |   11 ++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/index/extract.c b/index/extract.c
index df17b2d..0320801 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.70  1997-07-01 13:00:42  adam
+ * Revision 1.71  1997-07-15 16:28:41  adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ *  thought through.
+ *
+ * Revision 1.70  1997/07/01 13:00:42  adam
  * Bug fix in routine searchRecordKey: uninitialized variables.
  *
  * Revision 1.69  1997/04/29 09:26:03  adam
@@ -1143,16 +1148,18 @@ static int recordExtract (SYSNO *sysno, const char *fname,
     xfree (rec->info[recInfo_storeData]);
     if (rGroup->flagStoreData == 1)
     {
-        rec->size[recInfo_storeData] = fi->file_max;
-        rec->info[recInfo_storeData] = xmalloc (fi->file_max);
+        int size = fi->file_moffset - recordOffset; 
+        if (!size)
+            size = fi->file_max - recordOffset;
+        rec->size[recInfo_storeData] = size;
+        rec->info[recInfo_storeData] = xmalloc (size);
         if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
         {
             logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s", fname,
                   (long) recordOffset);
             exit (1);
         }
-        if (read (fi->fd, rec->info[recInfo_storeData], fi->file_max)
-            < fi->file_max)
+        if (read (fi->fd, rec->info[recInfo_storeData], size) < size)
         {
             logf (LOG_ERRNO|LOG_FATAL, "read %d bytes of %s",
                   fi->file_max, fname);
diff --git a/index/recindex.c b/index/recindex.c
index 979d067..a6dfbe9 100644
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $
- * Revision 1.17  1997-02-12 20:39:46  adam
+ * Revision 1.18  1997-07-15 16:28:42  adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ *  thought through.
+ *
+ * Revision 1.17  1997/02/12 20:39:46  adam
  * Implemented options -f <n> that limits the log to the first <n>
  * records.
  * Changed some log messages also.
@@ -98,11 +103,11 @@ static void rec_write_head (Records p)
 
 static void rec_tmp_expand (Records p, int size, int dst_type)
 {
-    if (p->tmp_size < size + 256 ||
+    if (p->tmp_size < size + 2048 ||
         p->tmp_size < p->head.block_size[dst_type]*2)
     {
         xfree (p->tmp_buf);
-        p->tmp_size = size + p->head.block_size[dst_type]*2 + 256;
+        p->tmp_size = size + p->head.block_size[dst_type]*2 + 2048;
         p->tmp_buf = xmalloc (p->tmp_size);
     }
 }
-- 
1.7.10.4