X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharconv.tcl;h=d57f2262d7bdab6764c8a7d96ce90194d0979fc4;hb=c6b8edd2312a4606cc014738266059a20e3b6e61;hp=3086d262fbe32a8d95522cb45215045ff45ba6c4;hpb=ffa73561a78abb70d06d51cdcbf8ef3f8536a0ab;p=yaz-moved-to-github.git

diff --git a/src/charconv.tcl b/src/charconv.tcl
old mode 100755
new mode 100644
index 3086d26..d57f226
--- a/src/charconv.tcl
+++ b/src/charconv.tcl
@@ -1,5 +1,4 @@
 #!/usr/bin/tclsh
-# $Id: charconv.tcl,v 1.21 2008-01-06 13:02:48 adam Exp $
 
 proc usage {} {
     puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... }
@@ -38,19 +37,22 @@ proc preamble_trie {ofilehandle ifiles ofile} {
         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)
         {
-            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;
@@ -415,7 +417,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 {
@@ -423,4 +425,6 @@ foreach ifile $ifiles {
 }
 close $ofilehandle
 
+file rename -force ${ofile}.tmp ${ofile}
+