X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkey_block.c;h=4ec9a0bf3cf1cfe7436d58cc7953f1658d5c13fb;hb=eeb136c56069a5365e5550fec2e40ac592b48981;hp=9ca9e7de7383ef1e96bf790e9ef9a39355d9295c;hpb=3e96aa60be900d8b3b8e9825409f811b16f72823;p=idzebra-moved-to-github.git

diff --git a/index/key_block.c b/index/key_block.c
index 9ca9e7d..4ec9a0b 100644
--- a/index/key_block.c
+++ b/index/key_block.c
@@ -1,4 +1,4 @@
-/* $Id: key_block.c,v 1.9 2007-02-06 09:33:31 adam Exp $
+/* $Id: key_block.c,v 1.12 2008-01-09 23:00:13 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -99,15 +99,21 @@ static void encode_key_init(struct encode_info *i)
     i->decode_handle = iscz1_start();
 }
 
-static void encode_key_write (char *k, struct encode_info *i, FILE *outf)
+static void encode_key_write(const char *k, struct encode_info *i, FILE *outf)
 {
     struct it_key key;
     char *bp = i->buf, *bp0;
     const char *src = (char *) &key;
+    size_t klen = strlen(k);
+    
+    if (fwrite (k, klen+1, 1, outf) != 1)
+    {
+        yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite");
+        zebra_exit("encode_key_write");
+    }
+
+    k = k + klen+1;
 
-    /* copy term to output buf */
-    while ((*bp++ = *k++))
-        ;
     /* and copy & align key so we can mangle */
     memcpy (&key, k+1, sizeof(struct it_key));  /* *k is insert/delete */
 
@@ -302,16 +308,21 @@ void key_block_write(zebra_key_block_t p, zint sysno, struct it_key *key_in,
 
 
 void key_block_flush_int(zebra_key_block_t p,
-                         char **key_buf, size_t ptr_top,  size_t ptr_i)
+                         char **key_buf, size_t ptr_top, size_t ptr_i)
 {
     FILE *outf;
     char out_fname[200];
     char *prevcp, *cp;
     struct encode_info encode_info;
 
+    if (ptr_i == 0)
+        return ;
+        
     (p->key_file_no)++;
     yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
 
+    assert(ptr_i > 0);
+
 #if USE_SHELLSORT
     shellsort(key_buf + ptr_top - ptr_i, ptr_i,
               sizeof(char*), key_qsort_compare);