-#!/bin/sh
-# the next line restarts using tclsh \
-if [ -f /usr/local/bin/tclsh8.4 ]; then exec tclsh8.4 "$0" "$@"; else exec tclsh "$0" "$@"; fi
-#
-# $Id: charconv.tcl,v 1.20 2007-09-22 18:55:02 adam Exp $
+#!/usr/bin/tclsh
proc usage {} {
puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... }
"
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)
+ 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] & 0xff;
- unsigned long code =
- lookup(ptrs, t->dir[ch].ptr, inp+1, inbytesleft-1, no_read, combining);
- if (code)
+ size_t ch = (inp[0] & mask) + boffset;
+ 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;
size_t len = strlen(flat->from);
if (len <= inbytesleft)
{
- if (memcmp(flat->from, inp, len) == 0)
+ size_t i;
+ for (i = 0; i < len; i++)
+ {
+ if (((unsigned char *) flat->from)[i] != (inp[i] & mask) + boffset)
+ break;
+ }
+ if (i == len)
{
*no_read = len;
*combining = flat->combining;
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"
puts $f ""
puts $f "unsigned long yaz_$trie(prefix)_conv
- (unsigned char *inp, size_t inbytesleft, size_t *no_read, int *combining)
+ (unsigned char *inp, size_t inbytesleft, size_t *no_read, int *combining, unsigned mask, unsigned int boffset)
{
unsigned long code;
- code = lookup($trie(prefix)ptrs, 1, inp, inbytesleft, no_read, combining);
+ code = lookup($trie(prefix)ptrs, 1, inp, inbytesleft, no_read, combining, mask, boffset);
if (!code)
{
*no_read = 1;
usage
}
-set ofilehandle [open $ofile w]
+set ofilehandle [open ${ofile}.tmp w]
preamble_trie $ofilehandle $ifiles $ofile
foreach ifile $ifiles {
}
close $ofilehandle
+file rename -force ${ofile}.tmp ${ofile}
+