X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcharconv.tcl;h=8f8cc9e94b49621254f234a772a7c95836c0261a;hp=4412c2a3438122af373ddce172b6f652ef8107d4;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431

diff --git a/src/charconv.tcl b/src/charconv.tcl
index 4412c2a..8f8cc9e 100644
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -16,6 +16,11 @@ proc preamble_trie {ofilehandle ifiles ofile} {
     puts $f "    Generated automatically by charconv.tcl"
     puts $f "*/"
     puts $f "\#include <string.h>"
+
+    puts $f "\#if HAVE_CONFIG_H"
+    puts $f "\#include <config.h>"
+    puts $f "\#endif"
+
     puts $f "
         struct yaz_iconv_trie_flat {
             char from\[6\];
@@ -35,21 +40,24 @@ proc preamble_trie {ofilehandle ifiles ofile} {
     "
     puts $f {
         static unsigned long lookup(struct yaz_iconv_trie **ptrs, int ptr, unsigned char *inp,
-                                    size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, int boffset)
+                                    size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, unsigned int boffset)
         {
-            struct yaz_iconv_trie *t = (ptr > 0) ? ptrs[ptr-1] : 0;
-            if (!t || inbytesleft < 1)
+            struct yaz_iconv_trie *t = ptrs[ptr-1];
+            if (inbytesleft < 1)
                 return 0;
             if (t->dir)
             {
                 size_t ch = (inp[0] & mask) + boffset;
-                unsigned long code =
-                lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
-                if (code)
+                unsigned long code;
+                if (t->dir[ch].ptr)
                 {
-                    (*no_read)++;
-                    return code;
-                }
+                    code = lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining, mask, boffset);
+		    if (code)
+		    {
+			(*no_read)++;
+			return code;
+		    }
+		}
                 if (t->dir[ch].to)
                 {
                     code = t->dir[ch].to;
@@ -208,7 +216,7 @@ proc dump_trie {ofilehandle} {
 		set v [lindex $m 3]
                 puts $f "\}, /* $v */"
             }
-            puts $f "  \{\"\", 0\}"
+            puts $f "  \{\"\", 0, 0\}"
             puts $f "\};"
             puts $f "struct yaz_iconv_trie $trie(prefix)page${this} = \{"
             puts $f "  $trie(prefix)page${this}_flat, 0"
@@ -261,7 +269,7 @@ proc dump_trie {ofilehandle} {
     puts $f ""
 
     puts $f "unsigned long yaz_$trie(prefix)_conv
-            (unsigned char *inp, size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, int boffset)
+            (unsigned char *inp, size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, unsigned int boffset)
         {
             unsigned long code;
             
@@ -414,7 +422,7 @@ if {![info exists ifiles]} {
     usage
 }
 
-set ofilehandle [open $ofile w]
+set ofilehandle [open ${ofile}.tmp w]
 preamble_trie $ofilehandle $ifiles $ofile
 
 foreach ifile $ifiles {
@@ -422,4 +430,6 @@ foreach ifile $ifiles {
 }
 close $ofilehandle
 
+file rename -force ${ofile}.tmp ${ofile}
+