* 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
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);
* 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.
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);
}
}