diff --git a/libucw/.gitignore b/libucw/.gitignore
new file mode 100644
index 0000000..d9e1f1e
--- /dev/null
+++ b/libucw/.gitignore
@@ -0,0 +1,9 @@
+/run
+/obj
+/charset/unidata
+TAGS
+*~
+_*
+*.swp
+.make.log
+/debian-tmp
diff --git a/libucw/Makefile b/libucw/Makefile
new file mode 100644
index 0000000..4fb2bbf
--- /dev/null
+++ b/libucw/Makefile
@@ -0,0 +1,79 @@
+# Makefile for the UCW libraries
+# (c) 2007--2010 Martin Mares <mj@ucw.cz>
+
+# The default target
+all: runtree libs api programs extras configs
+
+# Include configuration
+s=.
+-include obj/config.mk
+obj/config.mk:
+	@echo "You need to run configure first." && false
+
+BUILDSYS=$(s)/build
+
+# We will use the libucw build system
+include $(BUILDSYS)/Maketop
+
+CONFIG_SRC_DIR=etc
+TESTING_DEPS=$(LIBUCW)
+
+# Install the build system
+include $(BUILDSYS)/Makefile
+
+# Set up names of common libraries (to avoid forward references in rules)
+ifdef CONFIG_CHARSET
+LIBCHARSET=$(o)/charset/libucw-charset.pc
+endif
+
+# The UCW library
+include $(s)/ucw/Makefile
+
+# Install config files
+ifdef CONFIG_SHERLOCK_LIB
+FREE_CONFIGS=sherlock local
+CONFIGS+=$(FREE_CONFIGS)
+
+INSTALL_TARGETS+=install-configs
+install-configs:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+endif
+
+# Include submakefiles of requested libraries
+ifdef CONFIG_CHARSET
+include $(s)/charset/Makefile
+endif
+
+ifdef CONFIG_IMAGES
+LIBIMAGES=$(o)/images/libucw-images.pc
+include $(s)/images/Makefile
+endif
+
+ifdef CONFIG_XML
+LIBXML=$(o)/ucw-xml/libucw-xml.pc
+include $(s)/ucw-xml/Makefile
+endif
+
+ifdef CONFIG_JSON
+LIBJSON=$(o)/ucw-json/libucw-json.pc
+include $(s)/ucw-json/Makefile
+endif
+
+# Build documentation by default?
+ifdef CONFIG_DOC
+all: docs
+endif
+
+libs: $(LIBUCW) $(LIBXML) $(LIBJSON) $(LIBIMAGES) $(LIBCHARSET)
+
+# And finally the default rules of the build system
+include $(BUILDSYS)/Makebottom
+
+ifndef CONFIG_LOCAL
+install: all $(INSTALL_TARGETS)
+else
+install:
+	@echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install
diff --git a/libucw/README b/libucw/README
new file mode 100644
index 0000000..ea61db3
--- /dev/null
+++ b/libucw/README
@@ -0,0 +1,25 @@
+################################################################################
+
+	The UCW Libraries @VERSION@
+
+	(c) 1997--2015 Martin Mares <mj@ucw.cz>
+	(c) 2006--2015 Pavel Charvat <pchar@ucw.cz>
+	(c) 2000--2009 Robert Spalek <robert@ucw.cz>
+
+	and other contributors listed in ucw/doc/index.txt
+
+################################################################################
+
+This package contains the LibUCW library and several other libraries,
+which have split off the Sherlock Holmes search engine project.
+
+See:
+
+   o  ucw/doc/install.txt for build requirements and instructions.
+   o  ucw/doc/relnotes.txt for release notes.
+   o  ucw/doc/index.txt for master index of documentation.
+
+For more information, take a look at http://www.ucw.cz/libucw/.
+
+If you have any suggestions or bug reports, please write to our
+mailing list libucw-devel@ucw.cz, or directly to mj@ucw.cz.
diff --git a/libucw/README.md b/libucw/README.md
new file mode 100644
index 0000000..4c06446
--- /dev/null
+++ b/libucw/README.md
@@ -0,0 +1 @@
+Source: https://www.ucw.cz/libucw/
diff --git a/libucw/build/Makebottom b/libucw/build/Makebottom
new file mode 100644
index 0000000..bb8c67d
--- /dev/null
+++ b/libucw/build/Makebottom
@@ -0,0 +1,236 @@
+# Bottom part of Makefile for the UCW Libraries
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
+
+# The run tree
+
+DOCDIR=doc
+
+runtree: run/.tree-stamp $(addsuffix /.dir-stamp,$(addprefix $(o)/,$(DIRS)) $(addprefix run/$(DOCDIR)/,$(DOC_MODULES)))
+
+run/.tree-stamp: $(o)/config.mk
+	$(M)Creating runtree
+	$(Q)mkdir -p run $(addprefix run/, $(CONFIG_DIR) $(EXTRA_RUNDIRS) $(INSTALL_RUNDIRS))
+	$(Q)touch run/.tree-stamp
+
+# Miscellaneous targets
+
+programs: $(PROGS)
+datafiles: $(DATAFILES)
+tests: $(TESTS)
+configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
+docs: runtree $(DOCS) $(DOC_INDICES) $(MANPAGES)
+
+tags:
+	etags `find . -name "*.[ch]"`
+
+# Black magic with dependencies. It would be more correct to make "depend.new"
+# a prerequisite for "depend", but "depend.new" often has the same timestamp
+# as "depend" which would confuse make a lot and either force remaking anyway
+# or (as in current versions of GNU make) erroneously skipping the remaking.
+
+-include $(o)/depend
+
+$(o)/depend: force
+	$(Q)if [ -s $(o)/depend.new ] ; then $(BUILDSYS)/mergedeps $(o)/depend $(o)/depend.new ; >$(o)/depend.new ; fi
+
+force:
+
+# Rules for directories
+
+%.dir-stamp:
+	$(Q)mkdir -p $(@D) && touch $@
+
+# Rules for configuration files
+
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_SRC_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)CF $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+
+$(o)/%.cf: $(s)/%.cf $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)CF $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)cp $@ run/$(CONFIG_DIR)/$(basename $(@F))
+
+# Rules for libraries
+
+%.a:
+	$(M)AR $@
+	$(Q)rm -f $@
+	$(Q)ar rcs $@ $^
+ifdef CONFIG_INSTALL_API
+	$(Q)$(call symlink-alias,$@,run/lib,$(*F)$(LIBNAME_INFIX).a)
+endif
+
+%.so:
+	$(M)LD $@
+	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
+	$(Q)ln -fs $(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX) run/$(SO_RUNDIR)/$(*F)$(SONAME_INFIX).so
+
+# On Darwin, gcc expects shared libraries in *.dylib instead of *.so.
+# Surprisingly, when a program is run, it suffices to have *.so files.
+# We don't want to mess up the whole build system with configurable
+# suffices and we also don't want to incur an overhead on Linux, so we
+# just create symbolic links on Darwin, if requested.
+%.dylib: %.so
+	cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
+
+$(o)/%.pc: $(s)/%.pc $(o)/%$(LV).$(LS)
+	$(M)PC $<
+	$(Q)DEPS="$(shell $(BUILDSYS)/lib-deps $^)" LIBDIR=$(@D) $(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)mkdir -p $(o)/pkgconfig
+	$(Q)$(call symlink,$@,$(o)/pkgconfig)
+
+# Rules for public API
+
+ifdef CONFIG_INSTALL_API
+
+ifdef CONFIG_LOCAL
+# Need an absolute path
+API_ROOT:=$(shell pwd)/run
+API_LIBDIR=$(API_ROOT)/lib
+API_INCDIR=$(API_ROOT)/include
+else
+API_LIBDIR=$(INSTALL_LIB_DIR)
+API_INCDIR=$(INSTALL_INCLUDE_DIR)
+endif
+INSTALL_RUNDIRS+=include lib/pkgconfig
+api: $(API_INCLUDES) $(addprefix run/lib/pkgconfig/,$(addsuffix .pc,$(API_LIBS)))
+
+$(o)/%/.include-stamp:
+	$(Q)$(BUILDSYS)/install-includes $(<D) run/include/$(IDST) $(?F)
+	$(Q)touch $@
+
+run/lib/pkgconfig/%.pc:		# RHS supplied in the sub-makefile
+	$(M)PC-API $@
+	$(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_LIBDIR)@;s@^incdir=.*@incdir=$(API_INCDIR)@"
+
+else
+api:
+endif
+
+# Rules for compiling C
+
+$(o)/%.o: $(s)/%.c $(o)/autoconf.h
+	$(M)CC $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
+
+$(o)/%.o: %.c $(o)/autoconf.h
+	$(M)CC $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
+
+%.o: %.c $(o)/autoconf.h
+	$(M)CC $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -c -o $@ $<
+
+$(o)/%.oo: $(s)/%.c $(o)/autoconf.h
+	$(M)CC-SO $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
+
+$(o)/%.oo: %.c $(o)/autoconf.h
+	$(M)CC-SO $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
+
+%.oo: %.c $(o)/autoconf.h
+	$(M)CC-SO $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) $(CSHARED) -c -o $@ $<
+
+$(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h
+	$(M)CC-TEST $<
+	$(Q)DEPENDENCIES_OUTPUT="$(o)/depend.new $@" $(CC) $(CFLAGS) -DTEST -c -o $@ $<
+
+# Rules for testing
+
+$(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
+	$(M)LD-TEST $@
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+
+$(o)/%.test: $(s)/%.t $(BUILDSYS)/tester
+	$(M)TEST $@
+	$(Q)$(BUILDSYS)/tester --rundir=run $(TESTERFLAGS) $< && touch $@
+
+# Rules for binaries
+
+BINDIR=bin
+
+$(o)/%: $(o)/%.o
+	$(M)LD $@
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(call symlink,$@,run/$(BINDIR))
+
+$(o)/%: $(s)/%.sh $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)PP $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)chmod +x $@
+	$(Q)$(call symlink,$@,run/$(BINDIR))
+
+$(o)/%: %.sh $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)PP $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)chmod +x $@
+	$(Q)$(call symlink,$@,run/$(BINDIR))
+
+$(o)/%: $(s)/%.pl $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)PP $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)chmod +x $@
+	$(Q)$(call symlink,$@,run/$(BINDIR))
+
+$(o)/%: %.pl $(o)/config.mk $(BUILDSYS)/genconf
+	$(M)PP $<
+	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
+	$(Q)chmod +x $@
+	$(Q)$(call symlink,$@,run/$(BINDIR))
+
+PERL_MODULE_DIR=UCW
+
+$(o)/%.pm: $(s)/%.pm
+	$(M)"PM $< -> run/lib/perl5/$(PERL_MODULE_DIR)/$(@F)"
+	$(Q)cp $^ $@
+	$(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
+
+$(o)/%.pm: %.pm
+	$(M)"PM $< -> run/lib/perl/$(PERL_MODULE_DIR)/$(@F)"
+	$(Q)cp $^ $@
+	$(Q)$(call symlink,$@,run/lib/perl5/$(PERL_MODULE_DIR))
+
+# Rules for data files
+
+DATADIR=lib
+
+$(DATAFILES): $(o)/%: $(s)/%
+	$(M)DATA $<
+	$(Q)cp $^ $@
+	$(Q)$(call symlink,$@,run/$(DATADIR))
+
+# Rules for documentation
+
+$(o)/%.html: $(o)/%.txt $(BUILDSYS)/asciidoc.conf $(BUILDSYS)/asciidoc-xhtml.conf run/$(DOCDIR)/$(DOC_MODULE)/.dir-stamp
+	$(M)"DOC-HTML $<"
+	$(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f $(HOST_PREFIX)/etc/asciidoc/asciidoc.conf -f $(HOST_PREFIX)/etc/asciidoc/xhtml11.conf $<
+	$(Q)$(call symlink,$@,run/$(DOCDIR)/$(DOC_MODULE))
+
+$(MANPAGES): $(o)/%: $(s)/%.txt
+	$(M)"DOC-MAN $<"
+	$(Q)a2x -d manpage -f manpage -D $(dir $@) $<
+	$(Q)mkdir -p run/$(DOCDIR)/man/man$(subst .,,$(suffix $@))
+	$(Q)$(call symlink,$@,run/$(DOCDIR)/man/man$(subst .,,$(suffix $@)))
+
+# In reality, we do not depend on the .txt files, but on the corresponding .deflist's.
+# However, the Makefile language cannot express that doc-extract generates both .txt
+# and .deflist, so we always use the .txt's in dependencies.
+$(patsubst %.html,%.txt,$(DOC_INDICES)): $(o)/%.txt: $(patsubst %.html,%.txt,$(DOCS)) $(BUILDSYS)/doc-defs
+	$(M)"DOC-DEFS $@"
+	$(Q)echo $@: $(DOC_HEAD) $(DOC_LIST) >> $(o)/depend.new
+	$(Q)$(BUILDSYS)/doc-defs $(DOC_HEAD) $@ $(DOC_LIST)
+
+$(patsubst %.html,%.txt,$(DOCS)): $(o)/%.txt: $(s)/%.txt $(BUILDSYS)/doc-extract
+	$(M)"DOC-EXT $<"
+	$(Q)$(BUILDSYS)/doc-extract $< $@ $(o)/depend.new $(s) $(patsubst %.txt,%.deflist,$@)
+
+# Don't delete intermediate targets. There shouldn't be any, but due to bugs
+# in GNU Make rules with targets in not-yet-existing directories are ignored
+# when searching for implicit rules and thence targets considered intermediate.
+.SECONDARY:
+
+.PHONY: all clean distclean runtree programs api datafiles force tags configs dust install docs tests
diff --git a/libucw/build/Makefile b/libucw/build/Makefile
new file mode 100644
index 0000000..8c70961
--- /dev/null
+++ b/libucw/build/Makefile
@@ -0,0 +1,19 @@
+# Makefile for LibUCW Build Tools
+
+DIRS+=build
+
+$(o)/build/genhash: $(o)/build/genhash.o
+
+# This is a hack which compensates make's desires for propagating per-rule settings
+# of variables: if some module specifies its own LIBS and it depends on genhash,
+# genhash is sometimes built with the module's LIBS (if it isn't already built).
+# A proper solution would be using a different rule for linking build/*, but
+# as it currently concerns only genhash, it's easier to battle this way.
+$(o)/build/genhash: LIBS=
+
+INSTALL_TARGETS+=install-build
+install-build:
+	install -d -m 755 $(DESTDIR)$(INSTALL_SHARE_DIR)/ucw/build
+	install -m 755 $(addprefix $(BUILDSYS)/,install-includes doc-defs doc-extract genconf mergedeps tester lib-deps lib-flags) $(DESTDIR)$(INSTALL_SHARE_DIR)/ucw/build
+	install -m 644 $(addprefix $(BUILDSYS)/,asciidoc.conf asciidoc-xhtml.conf Makebottom Maketop) $(DESTDIR)$(INSTALL_SHARE_DIR)/ucw/build
+.PHONY: install-build
diff --git a/libucw/build/Maketop b/libucw/build/Maketop
new file mode 100644
index 0000000..ac3e5ce
--- /dev/null
+++ b/libucw/build/Maketop
@@ -0,0 +1,101 @@
+# Top part of Makefile for the UCW Libraries
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
+
+# Set to 1 if you want verbose output
+V=0
+
+# Set to 'y' (or 'n') if you want to auto-confirm (auto-reject) all questions in build/installer
+CONFIRM=
+
+# Disable all built-in rules and variables. Speeds up make and simplifies debugging.
+MAKEFLAGS+=-rR
+
+CFLAGS=$(CLANG) $(COPT) $(CDEBUG) $(CWARNS) $(CEXTRA) -I. -I$(o) -I$(s)
+LDFLAGS=$(LOPT) $(LEXTRA)
+
+DIRS=
+PROGS=
+CONFIGS=
+CONFIG_SRC_DIR=$(CONFIG_DIR)
+TESTS=
+EXTRA_RUNDIRS=tmp log
+INSTALL_RUNDIRS=bin lib
+API_INCLUDES=
+API_LIBS=
+
+DOCS=
+DOC_INDICES=
+MANPAGES=
+
+# Various files whose type does not fit into PROGS
+DATAFILES=
+
+ifdef CONFIG_DARWIN
+DYNAMIC_LIBRARIES=dylib
+SOEXT=bundle
+HOST_PREFIX=/sw
+else
+DYNAMIC_LIBRARIES=so
+SOEXT=so
+HOST_PREFIX=
+endif
+
+ifdef CONFIG_SHARED
+LS=$(DYNAMIC_LIBRARIES)
+OS=oo
+PKG_CONFIG_OPTS=
+else
+LS=a
+OS=o
+PKG_CONFIG_OPTS=--static
+endif
+LV=$(UCW_ABI_SUFFIX)
+
+SO_RUNDIR=lib
+
+# Whenever "make -s" (silent) is run, turn on verbose mode (paradoxical, but gives the right result)
+ifneq ($(findstring s,$(MAKEFLAGS)),)
+V=1
+endif
+
+# Define M (message) and Q (quiet command prefix) macros and also MAKESILENT passed to sub-makes
+ifeq ($(V),1)
+M=@\#
+Q=
+MAKESILENT=
+else
+M=@echo #
+Q=@
+MAKESILENT=-s
+endif
+
+# Clean needs to be a double-colon rule since we want sub-makefiles to be able
+# to define their own cleanup actions.
+dust::
+	rm -f `find . -path "*~" -or -name "\#*\#"`
+	rm -f allocs.tmp cscope.out TAGS
+
+clean:: dust
+	rm -rf `find obj/ucw -mindepth 1 -maxdepth 1 -not -name autoconf.h`
+	rm -rf `find obj -mindepth 1 -maxdepth 1 -not \( -name config.mk -o -name autoconf.h -o -name ucw \)`
+	rm -rf tests run/{bin,lib,include,.tree-stamp,doc}
+
+distclean:: clean
+	rm -rf obj run debian-tmp
+
+testclean::
+	rm -f `find obj -name "*.test"`
+
+docclean::
+	rm -f $(DOCS) $(patsubst %.html,%.txt,$(DOCS))
+
+# Extra default rules (appended to by submakefiles)
+extras::
+
+# Relative symlinks and other pathname manipulation macros
+empty:=
+space:=$(empty) $(empty)
+backref=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(1))))
+tack-on=$(if $(patsubst /%,,$(2)),$(1)/$(2),$(2))
+symlink=ln -sf $(call tack-on,$(call backref,$(2)),$(1)) $(2)/
+symlink-alias=ln -sf $(call tack-on,$(call backref,$(2)),$(1)) $(2)/$(3)
diff --git a/libucw/build/asciidoc-xhtml.conf b/libucw/build/asciidoc-xhtml.conf
new file mode 100644
index 0000000..22dda23
--- /dev/null
+++ b/libucw/build/asciidoc-xhtml.conf
@@ -0,0 +1,27 @@
+[replacements]
+NULL=<tt>NULL</tt>
+
+[func_ref-inlinemacro]
+<a href='#fun_{name}'>{caption={all}}</a>
+
+[func_ref_file-inlinemacro]
+<a href='{filename}.html#fun_{name}'>{caption={all}}</a>
+
+[xref_file-inlinemacro]
+<a href='{filename}.html#{target}'>{caption=[{target}]}</a>
+
+[xref_file_only-inlinemacro]
+<a href='{filename}.html'>{caption=<tt>[{filename}]</tt>}</a>
+
+[func_auto_ref-inlinemacro]
+<a href='#fun_{name}'>{all}</a>
+
+[func_param-inlinemacro]
+<i><tt>{name}</tt></i>
+
+[func_format-inlinemacro]
+<tt>{all}</tt>
+
+[footer-text]
+Version {revnumber}{basebackend-xhtml11?<br />}{basebackend-xhtml11=<br>}
+Last updated {docdate} {doctime}
diff --git a/libucw/build/asciidoc.conf b/libucw/build/asciidoc.conf
new file mode 100644
index 0000000..18c92d4
--- /dev/null
+++ b/libucw/build/asciidoc.conf
@@ -0,0 +1,16 @@
+[macros]
+(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?P<all>(?P<name>[^&;:()<> ]+)(\([^&:;]*\);?))(,(?P<caption>[^&]+))?&gt;&gt;=func_ref_file
+(?su)[\\]?&lt;&lt;(?P<all>(?P<name>[^&;:()<> ]+)(\([^&:;]*\);?))(,(?P<caption>[^&]+))?&gt;&gt;=func_ref
+(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(,(?P<caption>[^&]+))?&gt;&gt;=xref_file_only
+(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?P<target>[^,();&]+)(,(?P<caption>[^&]+))?&gt;&gt;=xref_file
+(?su)[\\]?@(?P<all>(?P<name>\w+)\([^();:]*\))=func_ref
+(?su)[\\]?(?P<all>\w+\([^();:]*\))=func_format
+(?su)[\\]?@(?P<word>\w+)@=no_func_param
+(?su)[\\]?@(?P<name>\w+)=func_param
+(?su)[\\]?@!!KEEP!!(?P<word>\w+)!!KEEP!!@=no_func_param_return
+
+[no_func_param-inlinemacro]
+@!!KEEP!!{word}!!KEEP!!@
+
+[no_func_param_return-inlinemacro]
+@{word}@
diff --git a/libucw/build/doc-defs b/libucw/build/doc-defs
new file mode 100755
index 0000000..8e39825
--- /dev/null
+++ b/libucw/build/doc-defs
@@ -0,0 +1,64 @@
+#!/usr/bin/perl
+# Script for formatting documentation from definition lists
+# (they get out of extract-doc.pl as a side-product).
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+use strict;
+use warnings;
+
+my $head = shift;
+my $out = shift;
+
+open OUT, ">$out" or die "Could not write output $out ($!)\n";
+open HEAD, $head or die "Could not open head $head ($!)\n";
+print OUT foreach( <HEAD> );
+close HEAD;
+
+my $dir = $out;
+$dir =~ s/\/[^\/]+$//;
+
+my @dump;
+
+while( defined( my $line = <> ) ) {
+	chomp $line;
+	push @dump, [ split /,/, $line, 5 ];
+}
+
+my @types = (
+	[ 'enum', 'Enumerations' ],
+	[ 'struct', 'Structures' ],
+	[ 'type', 'Types' ],
+	[ 'fun', 'Functions' ],
+	[ 'var', 'Variables' ],
+	[ 'def', 'Preprocessor definitions' ]
+);
+
+my( $index, %groups, %heads ) = ( 0 );
+
+foreach( @types ) {
+	my( $name, $value ) = @{$_};
+	$groups{$name} = ++ $index;
+	$heads{$name} = $value;
+}
+
+my $lasttype = '';
+
+foreach( sort { ( $groups{$a->[2]} <=> $groups{$b->[2]} ) or ( $a->[3] cmp $b->[3] ); } @dump ) {
+	my( $file, $anchor, $type, $name, $text ) = @{$_};
+	if( $lasttype ne $type ) {
+		$lasttype = $type;
+		print OUT "\n== $heads{$type} [[$type]]\n\n";
+	}
+	my $dircp = $dir;
+	while( shift @{[ $dircp =~ /([^\/]+)/, "//" ]} eq shift @{[ $file =~ /([^\/]+)/, "///" ]} ) {
+		$dircp =~ s/[^\/]+\/?//;
+		$file =~ s/[^\/]+\/?//;
+	}
+	$dircp =~ s/[^\/]+/../g;
+	$file = $dircp."/".$file;
+	$file =~ s/^\///;
+	$file =~ s/\.[^.]+$//;
+	$text =~ s/(\.\.\.|\*|'|#|_)/\\$1/g;
+	print OUT "<<$file:$anchor,`$name`>>:: `$text`\n";
+}
+
+close OUT;
diff --git a/libucw/build/doc-extract b/libucw/build/doc-extract
new file mode 100755
index 0000000..67fdd64
--- /dev/null
+++ b/libucw/build/doc-extract
@@ -0,0 +1,221 @@
+#!/usr/bin/perl
+# Script for extracting documentation out of header files
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+use strict;
+use warnings;
+
+my( $inname, $outname, $depname, $basedir, $defdump ) = @ARGV;
+if( defined $inname ) {
+	open IN, $inname or die "Could not read $inname ($!)\n";
+} else {
+	open IN, "<&STDIN" or die "Could not read stdin ($!)\n";
+}
+if( defined $outname ) {
+	open OUT, ">$outname" or die "Could not write $outname ($!)\n";
+} else {
+	open OUT, ">&STDOUT" or die "Could not write to stdout ($!)\n";
+}
+my $hasdump;
+if( defined $defdump ) {
+	open DUMP, ">$defdump" or die "Could not write definition dump $defdump ($!)\n";
+	$hasdump = 1;
+}
+
+# Function to guess type of statement
+sub detect( $ ) {
+	( $_ ) = @_;
+	# typedef struct|enum { something } name;
+	return( $1, 1, $2, "typedef $1 { ... } $2;" ) if /^\s*typedef\s+(struct|enum)\s*{.*}\s*(\w+)\s*;\s*$/s;
+	# struct|enum name { something };
+	return( $1, 1, $2, $_ ) if /^\s*(struct|enum)\s+(\w+)\s*;\s*$/s;
+	my $l = length;
+	s/\n.*//s;
+	# struct|enum name {
+	#   something
+	# };
+	return( $1, 0, $2, $_ ) if /(struct|enum)\s+(\w+)\s+{/;
+	return( 'def', 0, $1, $_ ) if /#define\s+(\w+)/;
+	if( $l > length ) {
+		warn( "Unknown multiline statement $_\n" );
+		return( '', 0, $_, $_ );
+	}
+	# typedef type (*function_type)(params);
+	return( 'type', 1, $2, $_ ) if /^\s*typedef[^()]+?(\(\s*?\*\s*?)?(\w+)(\s*\))?\s*\(.*\)/;
+	# type (*function_var)(params);
+	return( 'var', 1, $1, $_ ) if /^.*?\(\*(\w+)\)\(.*\)/;
+	# type function(name);
+	return( 'fun', 1, $2, $1 ) if /^(.*?(\w+)\([^{]*\)[^{]*)/;
+	# typedef something name;
+	return( 'type', 1, $1, $_ ) if /^\s*typedef.*?(\w+);/;
+	# type name;
+	return( 'var', 1, $1, $_ ) if /\s\**(\w+);/;
+	warn( "Unknown statement $_\n" );
+	return( '', 0, $_, $_ );
+}
+
+my @deps;
+my $id = 0;
+
+sub formatNote( $$ ) {
+	my( $head, $comment ) = @_;
+	$head =~ s/(\S)[ ]+/$1 /g;
+	print OUT "\n";
+	print OUT "''''\n";
+	chomp $head;
+	my( $type, $semicolon, $name, $oneline ) = detect( $head );
+	# Just few transformations of the result
+	$oneline =~ s/\s+$//;
+	$oneline =~ s/;?$/;/ if( $semicolon );
+	$head =~ s/;?\s*$/;/ if( $semicolon );
+	$head =~ s/(\s|,|\()(\.\.\.)/$1\\$2/g; # Do not convert tripple dot into ellipsis
+	print OUT "[[${type}_$name]]\n";
+	$head = $oneline if $type eq 'fun';#Remove { from inline functions
+	# Remove the generic hack markup
+	$head =~ s/_OPEN_PAREN_/(/g;
+	$head =~ s/_CLOSE_PAREN_/)/g;
+	print OUT "..................\n";
+	print OUT "$head\n";
+	print OUT "..................\n\n";
+	if( $hasdump ) {
+		$oneline =~ s/_OPEN_PAREN_/(/g;
+		$oneline =~ s/_CLOSE_PAREN_/)/g;
+		my $symname = $type.'_'.$name;
+		$name =~ s/_OPEN_PAREN_/(/g;
+		$name =~ s/_CLOSE_PAREN_/)/g;
+		print DUMP "$outname,$symname,$type,$name,$oneline\n";
+		$id ++;
+	}
+	$comment =~ s/_OPEN_PAREN_/(/g;
+	$comment =~ s/_CLOSE_PAREN_/)/g;
+	$comment =~ s/_GENERIC_LINK_\|([^|]+)\|([^|]+)\|/${1}_OPEN_PAREN_${2}_CLOSE_PAREN_/g;
+	print OUT "$comment\n\n";
+}
+
+sub process( $$ ) {
+	my( $file, $prefixes ) = @_;
+	open FILE, $file or die "Could nod read $file ($!)\n";
+	my $line;
+	my $active;
+	my $verbatim;
+	my $buff;
+	my $head;
+	my $struct;
+	my $def;
+	my $sdepth;
+	while( defined( $line = <FILE> ) ) {
+		chomp $line;
+		# Generic macro hack - replaces the parenthesis so it is valid identifier
+		$line =~ s/$_\(([^()]+)\)/${_}_OPEN_PAREN_${1}_CLOSE_PAREN_/g foreach @{$prefixes};
+		if( $def ) {
+			$head .= "\n".$line;
+			$line =~ s/(\/\*.*?\*\/|\/\/.*)//g;
+			if( $line !~ /\\\s*$/ ) {
+				formatNote( $head, $buff );
+				$def = 0;
+				$buff = $head = undef;
+			}
+		} elsif( $struct ) {
+			$head .= "\n".$line;
+			my $cp = $line;
+			$sdepth += ($cp =~ tr/{//);
+			$sdepth -= ($cp =~ tr/}//);
+			if( !$sdepth ) {
+				formatNote( $head, $buff );
+				$struct = 0;
+				$buff = undef;
+				$head = undef;
+			}
+		} elsif( $verbatim ) {
+			if( $line =~ /\*\// ) {
+				$verbatim = 0;
+				print OUT "\n";
+			} else {
+				$line =~ s/^\s*\* ?//;
+				print OUT "$line\n";
+			}
+		} elsif( $active ) {
+			if( $line =~ /\*\// ) {
+				$active = 0;
+			} else {
+				$line =~ s/^\s*\* ?//;
+				$buff .= "$line\n";
+			}
+		} else {
+			if( ( $line =~ /\S/ ) && ( defined $buff ) ) {
+				if( $line =~ /^\s*#define.*\\(\s*(\/\/.*|\/\*.*?\*\/|))*/ ) {
+					$head = $line;
+					$def = 1;
+				} elsif( $line =~ /\(/ || $line !~ /{/ || $line =~ /^\s*#define/ ) {
+					$_ = $line;
+					s/^\s*\s?//;
+					s/\/\/.*//;
+					s/\/\*.*?\*\///gs;
+					formatNote( $_, $buff );
+					$head = undef;
+					$buff = undef;
+				} else {
+					$head = $line;
+					$struct = $sdepth = 1;
+				}
+			} elsif( ( $buff ) = ( $line =~ /\/\*\*\*(.*)\*\*\*\// ) ) {
+				$buff =~ s/^\s?//;
+				print OUT "$buff\n\n";
+				$buff = undef;
+			} elsif( ( $buff ) = ( $line =~ /^\s*\/\*\*(.*)\*\*\// ) ) {
+				$buff =~ s/^\s*//;
+				$buff .= "\n";
+			} elsif( ( $head, $buff ) = ( $line =~ /^(.*)\/\*\*(.*)\*\*\// ) ) {
+				$buff =~ s/^\s*//;
+				$buff =~ s/\s*$//;
+				if( $head =~ /\(/ || $head !~ /{/ || $head =~/}/ ) {
+					$head =~ s/^\s*//;
+					$head =~ s/\/\*.*?\*\///gs;
+					formatNote( $head, $buff );
+					$head = undef;
+					$buff = undef;
+				} else {
+					$struct = $sdepth = 1;
+				}
+			} elsif( $line =~ /\/\*\*\*/ ) {
+				$verbatim = 1;
+			} elsif( $line =~ /\/\*\*/ ) {
+				$active = 1;
+			}
+		}
+	}
+	close FILE;
+}
+
+my $line;
+while( defined( $line = <IN> ) ) {
+	chomp $line;
+	my $prefixes;
+	if( my( $fname, $prefixes ) = ( $line =~ /^!!\s*(\S+)(.*)/ ) ) {
+		$fname = "$basedir/$fname" if( ( $fname !~ /^\// ) && defined $basedir );
+		process( $fname, [ ( map( {
+			my( $result ) = /^\s*(.*\S)\s*$/;
+			$result;
+		} ( split /,/, $prefixes ) ) ) ] );
+		push @deps, $fname;
+	} else {
+		print OUT "$line\n";
+	}
+}
+
+if( defined $depname ) {
+	open DEP, ">>$depname" or die "Could not write dep file $depname ($!)\n";
+	print DEP "$outname:";
+	print DEP " $_" foreach( @deps );
+	print DEP "\n";
+	if( $hasdump ) {
+		print DEP "$defdump:";
+		print DEP " $_" foreach( @deps );
+		print DEP "\n";
+	}
+	close DEP;
+}
+
+close IN;
+close OUT;
+close DUMP;
diff --git a/libucw/build/genconf b/libucw/build/genconf
new file mode 100755
index 0000000..30e8896
--- /dev/null
+++ b/libucw/build/genconf
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+# Configuration file and script preprocessor
+# (c) 2004--2007 Martin Mares <mj@ucw.cz>
+
+use strict;
+use warnings;
+
+@ARGV == 3 or die "Usage: genconf <src> <dest> <config.mk>";
+
+open CF, $ARGV[2] or die "Unable to open $ARGV[2]";
+my %options = ();
+my %vars = ();
+sub opt {
+	my ($k,$v) = @_;
+	$vars{$k} = $v;
+	$options{$k} = 1 if ($k =~ /^CONFIG_/);
+}
+foreach my $k (keys %ENV) {
+	opt($k, $ENV{$k});
+}
+while (<CF>) {
+	chomp;
+	if (my ($k,$v) = /^(\w+)=(.*)/) {
+		$v =~ s/\s+$//;
+		opt($k, $v);
+	}
+}
+close CF;
+
+sub eval_expr {
+	$_ = shift @_;
+	s/\b(CONFIG_\w+)\b/defined($options{$1}) ? 1 : 0/ge;
+	return eval $_;
+}
+
+open IN, $ARGV[0] or die "Unable to open $ARGV[0]";
+open OUT, ">$ARGV[1]" or die "Unable to create $ARGV[1]";
+my @ifs = ();	# stack of conditions, 1=satisfied, -1=unsatisfied, 0=shadowed
+my $empty = 0;	# last line was empty
+while (<IN>) {
+	if (/^#ifdef\s+(\w+)/) {
+		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (defined $options{$1}) ? 1 : -1;
+	} elsif (/^#ifndef\s+(\w+)/) {
+		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (defined $options{$1}) ? -1 : 1;
+	} elsif (/^#if\s(.*)$/) {
+		push @ifs, (@ifs && $ifs[$#ifs] <= 0) ? 0 : (eval_expr $1) ? 1 : -1;
+	} elsif (/^#endif/) {
+		defined pop @ifs || die "Improper nesting of conditionals";
+	} elsif (/^#else/) {
+		my $x = pop @ifs;
+		defined $x || die "Improper nesting of conditionals";
+		push @ifs, $x >= 0 ? 0 : 1;
+	} elsif (/^#elsif\s(.*)$/) {
+		my $x = pop @ifs;
+		defined $x || die "Improper nesting of conditionals";
+		push @ifs, $x >= 0 ? 0 : (eval_expr $1) ? 1 : -1;
+	} else {
+		@ifs && $ifs[$#ifs] <= 0 && next;
+		if (/^$/) {
+			$empty && next;
+			$empty = 1;
+		} else { $empty = 0; }
+		if (/^#pipe\s+(.+)/) {
+			my $cmd = $1;
+			my $val = `$cmd`;
+			die "Piped command '$cmd' failed" if $?;
+			print OUT `$1`;
+		} else {
+			sub repl($);
+			sub repl($) {
+				my $v = shift @_;
+				exists $vars{$v} or die "Cannot substitute $v: variable not set";
+				my $x = $vars{$v};
+				while ($x =~ s/\$\((\w+)\)/repl($1)/ge) { }
+				return $x;
+			}
+			s/@(\w+)@/repl($1)/ge;
+			print OUT;
+		}
+	}
+}
+@ifs && die "Unterminated #ifdef";
+close IN;
+close OUT;
diff --git a/libucw/build/genhash.c b/libucw/build/genhash.c
new file mode 100644
index 0000000..6d5fe33
--- /dev/null
+++ b/libucw/build/genhash.c
@@ -0,0 +1,153 @@
+/*
+ *	Generator of Word Recognition Hash Tables
+ *	(a.k.a. simple gperf replacement)
+ *
+ *	(c) 1999 Martin Mares <mj@ucw.cz>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <alloca.h>
+
+struct word {
+  struct word *next;
+  char *w;
+  char *extra;
+};
+
+static unsigned int hash(char *c)
+{
+  unsigned int h = 0;
+  while (*c)
+    h = (h * 37) + *c++;
+  return h;
+}
+
+static int				/* Sequential search */
+fast_isprime(unsigned x)		/* We know x != 2 && x != 3 */
+{
+  unsigned test = 5;
+
+  for(;;)
+    {
+      if (!(x % test))
+	return 0;
+      if (x / test <= test)
+	return 1;
+      test += 2;			/* 6k+1 */
+      if (!(x % test))
+	return 0;
+      if (x / test <= test)
+	return 1;
+      test += 4;			/* 6k-1 */
+    }
+}
+
+static unsigned int
+nextprime(unsigned x)			/* Returns some prime greater than X */
+{
+  if (x <= 5)
+    return 5;
+  x += 5 - (x % 6);			/* x is 6k-1 */
+  for(;;)
+    {
+      if (fast_isprime(x))
+	return x;
+      x += 2;				/* 6k+1 */
+      if (fast_isprime(x))
+	return x;
+      x += 4;				/* 6k-1 */
+    }
+}
+
+int main(int argc, char **argv)
+{
+  FILE *fi, *fo;
+  struct word *words = NULL;
+  struct word *w, **ht;
+  char buf[1024], *c, namebuf[256];
+  int cnt = 0;
+  int skip, i, size;
+
+  if (argc != 4)
+    {
+      fprintf(stderr, "Usage: genhash <input> <output> <func_name>\n");
+      return 1;
+    }
+  fi = fopen(argv[1], "r");
+  if (!fi) { fprintf(stderr, "Cannot open input file: %m\n"); return 1; }
+  fo = fopen(argv[2], "w");
+  if (!fo) { fprintf(stderr, "Cannot open output file: %m\n"); return 1; }
+
+  buf[0] = 0;
+  fgets(buf, sizeof(buf)-1, fi);
+  if (strncmp(buf, "%{", 2)) { fprintf(stderr, "Syntax error at <%s>\n", buf); return 1; }
+  fputs(buf+2, fo);
+  while (fgets(buf, sizeof(buf)-1, fi) && strcmp(buf, "%}\n"))
+    fputs(buf, fo);
+  fgets(namebuf, sizeof(namebuf)-1, fi);
+  if (strncmp(namebuf, "struct ", 7) || !(c = strchr(namebuf+7, ' ')))
+    { fprintf(stderr, "Syntax error at <%s>\n", namebuf); return 1; }
+  *c = 0;
+  while (fgets(buf, sizeof(buf)-1, fi) && strcmp(buf, "%%\n"))
+    ;
+  while (fgets(buf, sizeof(buf)-1, fi))
+    {
+      c = strchr(buf, '\n');
+      if (c)
+	*c = 0;
+      c = strchr(buf, ',');
+      w = alloca(sizeof(struct word));
+      if (c)
+	*c++ = 0;
+      else
+	{ fprintf(stderr, "No comma?\n"); return 1; }
+      w->w = alloca(strlen(buf)+1);
+      strcpy(w->w, buf);
+      w->extra = alloca(strlen(c)+1);
+      strcpy(w->extra, c);
+      w->next = words;
+      words = w;
+      cnt++;
+    }
+  cnt = cnt*12/10;
+  size = 16;
+  while (size < cnt)
+    size += size;
+  skip = nextprime(size*3/4);
+
+  ht = alloca(size * sizeof(struct word *));
+  bzero(ht, size * sizeof(struct word *));
+  for(w=words; w; w=w->next)
+    {
+      int h = hash(w->w) & (size - 1);
+      while (ht[h])
+	h = (h + skip) & (size - 1);
+      ht[h] = w;
+    }
+
+  fprintf(fo, "static %s htable[] = {\n", namebuf);
+  for(i=0; i<size; i++)
+    if (ht[i])
+      fprintf(fo, "{ \"%s\", %s },\n", ht[i]->w, ht[i]->extra);
+    else
+      fprintf(fo, "{ NULL },\n");
+  fprintf(fo, "};\n\nconst %s *%s(const char *x, unsigned int len)\n\
+{\n\
+  const char *c = x;\n\
+  unsigned int h = 0;\n\
+  while (*c)\n\
+    h = (h * 37) + *c++;\n\
+  h = h & %d;\n\
+  while (htable[h].name)\n\
+    {\n\
+      if (!strcmp(htable[h].name, x))\n\
+        return &htable[h];\n\
+      h = (h + %d) & %d;\n\
+    }\n\
+  return NULL;\n\
+}\n", namebuf, argv[3], size-1, skip, size-1);
+
+  return 0;
+}
diff --git a/libucw/build/git/pre-commit b/libucw/build/git/pre-commit
new file mode 100755
index 0000000..8153c35
--- /dev/null
+++ b/libucw/build/git/pre-commit
@@ -0,0 +1,80 @@
+#!/usr/bin/perl
+
+my $found_bad = 0;
+my $filename;
+my $reported_filename = "";
+my $lineno;
+
+if (scalar @ARGV > 0) {
+	my $f;
+	foreach $f (@ARGV) {
+		check_file($f);
+	}
+} else {
+	exit(0) if (system("git-rev-parse --verify HEAD 2>/dev/null"));
+	open(PATCH, "git-diff-index -p -M --cached HEAD --|") ||
+		die("git-diff-index failed");
+	while (<PATCH>) {
+		check_file($1) if (m|^diff --git a/(.*\.[ch]) b/\1$|);
+	}
+	close(PATCH);
+	
+}
+exit($found_bad);
+
+sub bad_line {
+	my ($why, $line) = @_;
+	if (!$found_bad) {
+		print STDERR "*\n";
+		print STDERR "* You have some suspicious patch lines:\n";
+		print STDERR "*\n";
+		$found_bad = 1;
+	}
+	if ($reported_filename ne $filename) {
+		print STDERR "* In $filename\n";
+		$reported_filename = $filename;
+	}
+	print STDERR "* \t$why\n";
+	print STDERR "$lineno:$line\n" if ($line);
+}
+
+
+sub check_file {
+	($filename) = @_;
+        open(IN, "$filename") || die ("Cannot open $filename");
+	my $has_loc = 0;
+	my $has_glob = 0;
+	my $has_copy = 0;
+	my $empty = 0;
+
+	$lineno = 1;
+	while(<IN>) {
+		chomp;
+		if (/^\s*\#include\s+"/) {
+			bad_line("sherlock includes after global includes", $_) if (!$has_loc && $has_glob);
+			$has_loc++;
+		}
+		if (/\s$/) {
+			bad_line("trailing whitespace", $_);
+		}
+		if (/^\s* \t/) {
+			bad_line("indent SP followed by a TAB", $_);
+		}
+		if (/^\s*\#define\s+LOCAL_DEBUG/) {
+			bad_line("LOCAL_DEBUG left enabled", $_);
+		}
+		if (/^([<>])\1{6} |^={7}$/) {
+			bad_line("unresolved merge conflict", $_);
+		}
+
+		$has_glob++ if (/^\s*\#include\s+\</);
+		$has_copy++ if (/\([Cc]\)\s*\w/);
+		$empty = $_ =~ /^\s*$/;
+		$lineno++;
+	}
+	bad_line("empty lines at end of input") if ($empty);
+	bad_line("missing copyright") if (!$has_copy);
+	close(IN);
+}
+
+
diff --git a/libucw/build/install-includes b/libucw/build/install-includes
new file mode 100755
index 0000000..f403fd3
--- /dev/null
+++ b/libucw/build/install-includes
@@ -0,0 +1,16 @@
+#!/bin/sh
+# A simple installer of include files
+# (c) 2005--2007 Martin Mares <mj@ucw.cz>
+
+set -e
+SRC=$1
+DEST=$2
+shift 2
+while [ -n "$1" ] ; do
+	if [ ! -f "$DEST/$1" -o "$SRC/$1" -nt "$DEST/$1" ] ; then
+		echo "INC $SRC/$1 -> $DEST/$1"
+		mkdir -p $DEST/`dirname $1`
+		sed -e 's/^\(#include[	 ]*\)"\(.*\)"/\1<\2>/' <$SRC/$1 >$DEST/$1
+	fi
+	shift
+done
diff --git a/libucw/build/lib-deps b/libucw/build/lib-deps
new file mode 100755
index 0000000..1019bc2
--- /dev/null
+++ b/libucw/build/lib-deps
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# A tool which builds a list of dependent libraries from the list
+# of pkg-config files.
+#
+# (c) 2007 Martin Mares <mj@ucw.cz>, placed under GNU LGPL
+#
+
+set -e
+
+shift
+SEEN=
+while [ -n "$1" ] ; do
+	case "$1" in
+		*.pc)	if [ -n "$SEEN" ] ; then echo -n ", " ; fi
+			echo -n "`basename $1 .pc`"
+			SEEN=1
+			;;
+		*)	;;
+	esac
+	shift
+done
diff --git a/libucw/build/lib-flags b/libucw/build/lib-flags
new file mode 100755
index 0000000..29bb4e8
--- /dev/null
+++ b/libucw/build/lib-flags
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# A preprocessor for linker arguments, which replaces references to .pc
+# files by results of the proper calls to pkg-config.
+#
+# (c) 2007 Martin Mares <mj@ucw.cz>, placed under GNU LGPL
+#
+
+set -e
+
+PC=
+while [ -n "$1" ] ; do
+	case "$1" in
+		*.pc)	PC="$PC `basename $1 .pc`"
+			;;
+		*)	echo -n " $1"
+			;;
+	esac
+	shift
+done
+if [ -n "$PC" ] ; then
+	echo -n " "
+	PKG_CONFIG_PATH="$PKG_CONFIG_PATH:obj/pkgconfig" pkg-config $PKG_CONFIG_OPTS --libs $PC
+fi
diff --git a/libucw/build/mergedeps b/libucw/build/mergedeps
new file mode 100755
index 0000000..e1c467d
--- /dev/null
+++ b/libucw/build/mergedeps
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+@ARGV == 2 or die "Usage: mergedeps <base> <update>";
+foreach $a (@ARGV) {
+	open F, "$a" or next;
+	$t = "";
+	while (<F>) {
+		$t .= $_;
+		if (! /\\$/) {
+			($t =~ /^(.*):/) || die "Parse error at $t";
+			$rules{$1} = $t;
+			$t = "";
+		}
+	}
+	close F;
+}
+open(F,">" . $ARGV[0]) || die "Unable to write output file";
+foreach $a (sort keys %rules) {
+	print F $rules{$a};
+}
+close F;
diff --git a/libucw/build/tester b/libucw/build/tester
new file mode 100755
index 0000000..da45237
--- /dev/null
+++ b/libucw/build/tester
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+# A simple unit testing script
+# (c) 2004--2013 Martin Mares <mj@ucw.cz>
+# (c) 2007 Pavel Charvat <pchar@ucw.cz>
+
+# Tests in the test file have a syntax similar to mail headers,
+# individual test case are separated by blank lines and they can contain
+# the following fields:
+#
+#	Name:	name of the case (default: sequence number since start of file)
+#	Run:	command to run (default: command from the previous test case)
+#		This can be an arbitrary shell pipeline, sequences $0 to $9 are
+#		replaced by file names of In<N> or Out<N> files (see below).
+#	In:	lines to pass to the program as standard input
+#	Out:	lines to expect at the program's standard output
+#	Err:	lines to expect at the program's standard error output
+#	In<N>:	lines to pass to the program as input file <N>
+#	Out<N>:	lines to expect from the program in output file <N>
+#		Both In<N> and Out<N> can be specified simultaneously if we
+#		are testing a program which modifies some of its input files.
+#	Exit:	expected exit code of the program (default: 0)
+#
+# A value of a field can be optionally given as a shell-style here-document:
+#
+#	In <<AMEN
+#	multiple
+#	lines
+#	of input
+#	AMEN
+
+use Getopt::Long;
+
+my $verbose = 0;
+my $rundir = ".";
+GetOptions("verbose!" => \$verbose,
+	   "rundir=s" => \$rundir)
+	or die "Usage: tester [--verbose] [--rundir=<dir>] <tests>\n";
+
+my @tests = ();
+my $tt;
+my $append_to;
+
+while (<>) {
+	/^#/ && next;
+	if (/^\s*$/) {
+		$tt = undef;
+		$append_to = undef;
+	} elsif (defined($append_to) && /^\s+(.*)$/) {
+		$$append_to .= "\n$1";
+	} elsif (my ($n,$v) = /^(\w+):\s+(.*)$/) {
+		if (!$tt) {
+			$tt = {};
+			push @tests, $tt;
+		}
+		($tt->{$n}) && die "$n already defined";
+		$tt->{$n} = $v;
+		$append_to = \($tt->{$n});
+	} elsif (my ($n,$sep) = /^(\w+)\s*<<(\w+)\s*$/) {
+		if (!$tt) {
+			$tt = {};
+			push @tests, $tt;
+		}
+		($tt->{$n}) && die "$n already defined";
+		$tt->{$n} = "";
+		$sep .= "\n";
+		while (1) {
+			my $line = <>;
+			defined $line or die "Here-document not terminated";
+			last if $line eq $sep;
+			$tt->{$n} .= $line;
+		}
+		chomp $tt->{$n};
+	} else {
+		die "Test script syntax error";
+	}
+}
+
+if (! -d "$rundir/tmp") {
+	mkdir "$rundir/tmp" or die "Unable to create $rundir/tmp: $!";
+}
+
+my $i = 0;
+my $errors = 0;
+my $prev_run = undef;
+TEST: foreach $tt (@tests) {
+	$i++;
+	my $name = $tt->{'Name'};
+	printf "Test %03d", $i;
+	print " [$name]" if defined $name;
+	print ": ";
+	$run = ($tt->{'Run'} || $prev_run) or die "Don't know what to run";
+	$prev_run = $run;
+
+	my @out_files = ();
+	my @out_checks = ();
+	my $redirs = "";
+
+	if (defined $tt->{'In'}) {
+		my $ifi = "tmp/test$i.in";
+		open X, ">$rundir/$ifi" or die "Unable to create $ifi";
+		print X $tt->{'In'}, "\n";
+		close X;
+		$redirs .= " <$ifi";
+	} else {
+		$redirs .= " </dev/null";
+	}
+	if (defined $tt->{'Out'}) {
+		my $ofi = "tmp/test$i.out";
+		unlink "$rundir/$ofi";
+		$redirs .= " >$ofi";
+		push @out_files, $ofi;
+		push @out_checks, $tt->{'Out'};
+	} else {
+		$redirs .= " >/dev/null";
+	}
+	if (defined $tt->{'Err'}) {
+		my $efi = "tmp/test$i.err";
+		unlink "$rundir/$efi";
+		$redirs .= " 2>$efi";
+		push @out_files, $efi;
+		push @out_checks, $tt->{'Err'};
+	}
+	foreach my $arg (0..9) {
+		my $f = "tmp/test$i.$arg";
+		if (defined $tt->{"Out$arg"}) {
+			unlink "$rundir/$f";
+			push @out_files, $f;
+			push @out_checks, $tt->{"Out$arg"};
+		}
+		if (defined $tt->{"In$arg"}) {
+			open X, ">$rundir/$f" or die "Unable to create $f";
+			print X $tt->{"In$arg"}, "\n";
+			close X;
+		}
+	}
+	$run =~ s/\$(\d)/tmp\/test$i.$1/g;
+	print "(running $run) " if $verbose;
+	system "cd $rundir && ( $run ) $redirs";
+	if ($? % 256) {
+		print "FAILED with status code $?\n";
+		$errors++;
+		next;
+	}
+	my $ec = $? / 256;
+	my $expect_ec = $tt->{'Exit'} || 0;
+	if ($ec != $expect_ec) {
+		print "FAILED: unexpected exit code $ec\n";
+		$errors++;
+		next;
+	}
+
+	for (my $i=0; $i<=$#out_files; $i++) {
+		my $ofi = $out_files[$i];
+		open X, "<$rundir/$ofi" or die "Unable to read $ofi";
+		my $out;
+		{
+			local $/ = undef;
+			$out = <X>;
+		}
+		close X;
+		$out =~ /\n$/s or $out .= "\n";
+		if ($out ne $out_checks[$i] . "\n") {
+			print "FAILED (see $ofi)\n";
+			$errors++;
+			next TEST;
+		}
+	}
+
+	system "rm -f $rundir/tmp/test$i.*";
+	print "OK\n";
+}
+
+exit !!$errors;
diff --git a/libucw/charset/Makefile b/libucw/charset/Makefile
new file mode 100644
index 0000000..8e351ff
--- /dev/null
+++ b/libucw/charset/Makefile
@@ -0,0 +1,59 @@
+# Makefile for the UCW Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
+
+DIRS+=charset
+
+LIBCHARSET_PROGS=
+LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv stk-charconv mp-charconv
+LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h stk-charconv.h mp-charconv.h
+LIBCHARSET_DEPS=$(LIBUCW)
+
+$(o)/charset/libucw-charset$(LV).a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(LIBCHARSET_DEPS)
+$(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.0
+$(o)/charset/libucw-charset.pc: $(LIBCHARSET_DEPS)
+
+ifdef CONFIG_INSTALL_API
+$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a .so)
+endif
+
+API_LIBS+=libucw-charset
+API_INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+$(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libucw-charset.pc: $(o)/charset/libucw-charset.pc
+
+ifdef CONFIG_CHARSET_UTILS
+LIBCHARSET_PROGS+=$(o)/charset/ucw-cs2cs
+endif
+
+$(o)/charset/ucw-cs2cs: $(o)/charset/ucw-cs2cs.o $(LIBCHARSET) $(LIBUCW)
+
+PROGS+=$(LIBCHARSET_PROGS)
+
+build_charsets:
+	cd $(s)/charset && sh misc/generate
+
+clean::
+	rm -f $(s)/charset/misc/u-*
+
+INSTALL_TARGETS+=install-libucw-charset-lib
+install-libucw-charset-lib:
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw-charset$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0.0
+	ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so.0
+.PHONY: install-libucw-charset-lib
+
+INSTALL_TARGETS+=install-libucw-charset-api
+install-libucw-charset-api:
+	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 $(addprefix run/include/charset/,$(LIBCHARSET_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset
+	install -m 644 run/lib/pkgconfig/libucw-charset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	ln -sf libucw-charset$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so
+	install -m 644 run/lib/libucw-charset$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-charset-api
+
+INSTALL_TARGETS+=install-libucw-charset-utils
+install-libucw-charset-utils:
+	install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
+	install -m 755 $(LIBCHARSET_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
+.PHONY: install-libucw-charset-utils
diff --git a/libucw/charset/U-cat.h b/libucw/charset/U-cat.h
new file mode 100644
index 0000000..bcfe99b
--- /dev/null
+++ b/libucw/charset/U-cat.h
@@ -0,0 +1,1084 @@
+/* Generated automatically by gentab. Please don't edit. */
+
+static const byte _U_cat_00[256] = {
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+_U_SPACE,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,_U_DIGIT,0,0,0,0,0,0,
+0,_U_LUPPER|_U_XDIGIT,_U_LUPPER|_U_XDIGIT,_U_LUPPER|_U_XDIGIT,_U_LUPPER|_U_XDIGIT,_U_LUPPER|_U_XDIGIT,_U_LUPPER|_U_XDIGIT,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,0,0,0,
+0,_U_LLOWER|_U_XDIGIT,_U_LLOWER|_U_XDIGIT,_U_LLOWER|_U_XDIGIT,_U_LLOWER|_U_XDIGIT,_U_LLOWER|_U_XDIGIT,_U_LLOWER|_U_XDIGIT,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,_U_CTRL,
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+_U_SPACE,0,0,0,0,0,0,0,0,0,_U_LLOWER,0,0,_U_CTRL,0,0,
+0,0,0,0,0,_U_LLOWER,0,0,0,0,_U_LLOWER,0,0,0,0,0,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER
+};
+
+static const byte _U_cat_01[256] = {
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LIGATURE,_U_LIGATURE,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,
+_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LETTER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LUPPER,_U_LETTER,_U_LLOWER,_U_LUPPER,_U_LETTER,_U_LLOWER,_U_LUPPER,_U_LETTER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,
+_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LLOWER,_U_LUPPER,_U_LETTER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER
+};
+
+static const byte _U_cat_02[256] = {
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,_U_LETTER,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_03[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,_U_LUPPER,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,_U_LUPPER,0,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,
+_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LLOWER,0,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LLOWER,0,0,0,0
+};
+
+static const byte _U_cat_04[256] = {
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,0,0,0,0,0,0,0,0,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,0,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,0,0,_U_LUPPER,_U_LLOWER,0,0,0,0,0,0
+};
+
+static const byte _U_cat_05[256] = {
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,_U_LETTER,0,0,0,0,0,0,
+0,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LIGATURE,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_06[256] = {
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,0,0,0,0,0,0,_U_CTRL,0,0,
+0,0,0,0,0,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,
+0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER
+};
+
+static const byte _U_cat_07[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_CTRL,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,
+0,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_09[256] = {
+0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,
+_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,0,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0A[256] = {
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,_U_LETTER,
+_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,
+_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0B[256] = {
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,
+_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,0,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,0,_U_LETTER,0,_U_LETTER,_U_LETTER,
+0,0,0,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0C[256] = {
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,0,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0D[256] = {
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0E[256] = {
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LETTER,_U_LETTER,0,_U_LETTER,0,0,_U_LETTER,_U_LETTER,0,_U_LETTER,0,0,_U_LETTER,0,0,
+0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+0,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,_U_LETTER,0,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,0,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_0F[256] = {
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_10[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_11[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0
+};
+
+static const byte _U_cat_12[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_13[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_14[256] = {
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_15[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_16[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,
+_U_SPACE,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_17[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_CTRL,_U_CTRL,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,_U_LETTER,0,0,0,0,_U_LETTER,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_18[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_SPACE,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_19[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_1D[256] = {
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_1E[256] = {
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,
+_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,_U_LUPPER,_U_LLOWER,0,0,0,0,0,0
+};
+
+static const byte _U_cat_1F[256] = {
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,_U_LUPPER,0,_U_LUPPER,0,_U_LUPPER,0,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LETTER,0,_U_LLOWER,0,
+0,0,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LETTER,0,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,0,0,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,0,
+0,0,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,_U_LLOWER,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LETTER,0,0,0
+};
+
+static const byte _U_cat_20[256] = {
+_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_SPACE,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,_U_SPACE,_U_SPACE,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_SPACE,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_SPACE,
+_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,0,0,0,0,0,0,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,_U_CTRL,
+0,_U_LLOWER,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_LLOWER,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_21[256] = {
+0,0,_U_LUPPER,0,0,0,0,_U_LUPPER,0,0,_U_LLOWER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,_U_LLOWER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LLOWER,0,_U_LUPPER,0,0,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,
+0,0,0,0,_U_LUPPER,0,_U_LUPPER,0,_U_LUPPER,0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,_U_LLOWER,
+_U_LUPPER,_U_LUPPER,0,_U_LUPPER,_U_LLOWER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LLOWER,0,0,0,_U_LLOWER,_U_LUPPER,_U_LUPPER,
+0,0,0,0,0,_U_LUPPER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_30[256] = {
+_U_SPACE,0,0,0,0,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,_U_LETTER,_U_LETTER,0,0,0,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_31[256] = {
+0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,
+0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_34[256] = {
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_4D[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_4E[256] = {
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_9F[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,_U_LETTER,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_A0[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_A1[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_A2[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_A3[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_A4[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_AC[256] = {
+_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_D7[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_D8[256] = {
+_U_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_DB[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_CTRL,
+_U_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_CTRL
+};
+
+static const byte _U_cat_DC[256] = {
+_U_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_DF[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_CTRL
+};
+
+static const byte _U_cat_E0[256] = {
+_U_CTRL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_F8[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,_U_CTRL
+};
+
+static const byte _U_cat_F9[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_FA[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const byte _U_cat_FB[256] = {
+_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,0,0,0,0,0,0,0,0,0,
+0,0,0,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,_U_LIGATURE,0,0,0,0,0,_U_LETTER,0,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,0,
+_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LIGATURE,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_FC[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER
+};
+
+static const byte _U_cat_FD[256] = {
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,0
+};
+
+static const byte _U_cat_FE[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_CTRL
+};
+
+static const byte _U_cat_FF[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,
+_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,_U_LUPPER,0,0,0,0,0,
+0,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,
+_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,_U_LLOWER,0,0,0,0,0,
+0,0,0,0,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,
+0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,
+0,0,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,_U_LETTER,0,0,_U_LETTER,_U_LETTER,_U_LETTER,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,_U_CTRL,_U_CTRL,_U_CTRL,0,0,0,0
+};
+
+const byte *_U_cat[256] = {
+_U_cat_00,_U_cat_01,_U_cat_02,_U_cat_03,_U_cat_04,_U_cat_05,_U_cat_06,_U_cat_07,NULL,_U_cat_09,_U_cat_0A,_U_cat_0B,_U_cat_0C,_U_cat_0D,_U_cat_0E,_U_cat_0F,
+_U_cat_10,_U_cat_11,_U_cat_12,_U_cat_13,_U_cat_14,_U_cat_15,_U_cat_16,_U_cat_17,_U_cat_18,_U_cat_19,NULL,NULL,NULL,_U_cat_1D,_U_cat_1E,_U_cat_1F,
+_U_cat_20,_U_cat_21,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+_U_cat_30,_U_cat_31,NULL,NULL,_U_cat_34,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_4D,_U_cat_4E,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_9F,
+_U_cat_A0,_U_cat_A1,_U_cat_A2,_U_cat_A3,_U_cat_A4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_AC,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_D7,_U_cat_D8,NULL,NULL,_U_cat_DB,_U_cat_DC,NULL,NULL,_U_cat_DF,
+_U_cat_E0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_cat_F8,_U_cat_F9,_U_cat_FA,_U_cat_FB,_U_cat_FC,_U_cat_FD,_U_cat_FE,_U_cat_FF
+};
diff --git a/libucw/charset/U-ligatures.h b/libucw/charset/U-ligatures.h
new file mode 100644
index 0000000..667720d
--- /dev/null
+++ b/libucw/charset/U-ligatures.h
@@ -0,0 +1,28 @@
+#define LIG_HASH_SIZE 24
+
+static const u16 *_U_lig_hash[] = {
+	NULL,
+	NULL,
+	NULL,
+	/* FB13 */ (const u16 []) { 0x0574, 0x0576, 0 },
+	/* FB14 */ (const u16 []) { 0x0574, 0x0565, 0 },
+	/* FB15 */ (const u16 []) { 0x0574, 0x056B, 0 },
+	/* FB16 */ (const u16 []) { 0x057E, 0x0576, 0 },
+	/* FB17 */ (const u16 []) { 0x0574, 0x056D, 0 },
+	/* FB00 */ (const u16 []) { 0x0066, 0x0066, 0 },
+	/* FB01 */ (const u16 []) { 0x0066, 0x0069, 0 },
+	/* FB02 */ (const u16 []) { 0x0066, 0x006C, 0 },
+	/* FB03 */ (const u16 []) { 0x0066, 0x0066, 0x0069, 0 },
+	/* FB04 */ (const u16 []) { 0x0066, 0x0066, 0x006C, 0 },
+	/* FB05 */ (const u16 []) { 0x0073, 0x0074, 0 },
+	/* FB06 */ (const u16 []) { 0x0073, 0x0074, 0 },
+	/* FB4F */ (const u16 []) { 0x05D0, 0x05DC, 0 },
+	NULL,
+	NULL,
+	/* 0132 */ (const u16 []) { 0x0049, 0x004A, 0 },
+	/* 0133 */ (const u16 []) { 0x0069, 0x006A, 0 },
+	NULL,
+	NULL,
+	NULL,
+	/* 0587 */ (const u16 []) { 0x0565, 0x0582, 0 },
+};
diff --git a/libucw/charset/U-lower.h b/libucw/charset/U-lower.h
new file mode 100644
index 0000000..2e95fdc
--- /dev/null
+++ b/libucw/charset/U-lower.h
@@ -0,0 +1,229 @@
+/* Generated automatically by gentab. Please don't edit. */
+
+static const u16 _U_lower_00[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
+0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,0x0078,0x0079,0x007A,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
+0x00F0,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0,0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_01[256] = {
+0x0101,0,0x0103,0,0x0105,0,0x0107,0,0x0109,0,0x010B,0,0x010D,0,0x010F,0,
+0x0111,0,0x0113,0,0x0115,0,0x0117,0,0x0119,0,0x011B,0,0x011D,0,0x011F,0,
+0x0121,0,0x0123,0,0x0125,0,0x0127,0,0x0129,0,0x012B,0,0x012D,0,0x012F,0,
+0x0069,0,0x0133,0,0x0135,0,0x0137,0,0,0x013A,0,0x013C,0,0x013E,0,0x0140,
+0,0x0142,0,0x0144,0,0x0146,0,0x0148,0,0,0x014B,0,0x014D,0,0x014F,0,
+0x0151,0,0x0153,0,0x0155,0,0x0157,0,0x0159,0,0x015B,0,0x015D,0,0x015F,0,
+0x0161,0,0x0163,0,0x0165,0,0x0167,0,0x0169,0,0x016B,0,0x016D,0,0x016F,0,
+0x0171,0,0x0173,0,0x0175,0,0x0177,0,0x00FF,0x017A,0,0x017C,0,0x017E,0,0,
+0,0x0253,0x0183,0,0x0185,0,0x0254,0x0188,0,0x0256,0x0257,0x018C,0,0,0x01DD,0x0259,
+0x025B,0x0192,0,0x0260,0x0263,0,0x0269,0x0268,0x0199,0,0,0,0x026F,0x0272,0,0x0275,
+0x01A1,0,0x01A3,0,0x01A5,0,0x0280,0x01A8,0,0x0283,0,0,0x01AD,0,0x0288,0x01B0,
+0,0x028A,0x028B,0x01B4,0,0x01B6,0,0x0292,0x01B9,0,0,0,0x01BD,0,0,0,
+0,0,0,0,0x01C6,0x01C6,0,0x01C9,0x01C9,0,0x01CC,0x01CC,0,0x01CE,0,0x01D0,
+0,0x01D2,0,0x01D4,0,0x01D6,0,0x01D8,0,0x01DA,0,0x01DC,0,0,0x01DF,0,
+0x01E1,0,0x01E3,0,0x01E5,0,0x01E7,0,0x01E9,0,0x01EB,0,0x01ED,0,0x01EF,0,
+0,0x01F3,0x01F3,0,0x01F5,0,0x0195,0x01BF,0x01F9,0,0x01FB,0,0x01FD,0,0x01FF,0
+};
+
+static const u16 _U_lower_02[256] = {
+0x0201,0,0x0203,0,0x0205,0,0x0207,0,0x0209,0,0x020B,0,0x020D,0,0x020F,0,
+0x0211,0,0x0213,0,0x0215,0,0x0217,0,0x0219,0,0x021B,0,0x021D,0,0x021F,0,
+0x019E,0,0x0223,0,0x0225,0,0x0227,0,0x0229,0,0x022B,0,0x022D,0,0x022F,0,
+0x0231,0,0x0233,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_03[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x03AC,0,0x03AD,0x03AE,0x03AF,0,0x03CC,0,0x03CD,0x03CE,
+0,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,
+0x03C0,0x03C1,0,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,0x03CA,0x03CB,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x03D9,0,0x03DB,0,0x03DD,0,0x03DF,0,
+0x03E1,0,0x03E3,0,0x03E5,0,0x03E7,0,0x03E9,0,0x03EB,0,0x03ED,0,0x03EF,0,
+0,0,0,0,0x03B8,0,0,0x03F8,0,0x03F2,0x03FB,0,0,0,0,0
+};
+
+static const u16 _U_lower_04[256] = {
+0x0450,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459,0x045A,0x045B,0x045C,0x045D,0x045E,0x045F,
+0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
+0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0461,0,0x0463,0,0x0465,0,0x0467,0,0x0469,0,0x046B,0,0x046D,0,0x046F,0,
+0x0471,0,0x0473,0,0x0475,0,0x0477,0,0x0479,0,0x047B,0,0x047D,0,0x047F,0,
+0x0481,0,0,0,0,0,0,0,0,0,0x048B,0,0x048D,0,0x048F,0,
+0x0491,0,0x0493,0,0x0495,0,0x0497,0,0x0499,0,0x049B,0,0x049D,0,0x049F,0,
+0x04A1,0,0x04A3,0,0x04A5,0,0x04A7,0,0x04A9,0,0x04AB,0,0x04AD,0,0x04AF,0,
+0x04B1,0,0x04B3,0,0x04B5,0,0x04B7,0,0x04B9,0,0x04BB,0,0x04BD,0,0x04BF,0,
+0,0x04C2,0,0x04C4,0,0x04C6,0,0x04C8,0,0x04CA,0,0x04CC,0,0x04CE,0,0,
+0x04D1,0,0x04D3,0,0x04D5,0,0x04D7,0,0x04D9,0,0x04DB,0,0x04DD,0,0x04DF,0,
+0x04E1,0,0x04E3,0,0x04E5,0,0x04E7,0,0x04E9,0,0x04EB,0,0x04ED,0,0x04EF,0,
+0x04F1,0,0x04F3,0,0x04F5,0,0,0,0x04F9,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_05[256] = {
+0x0501,0,0x0503,0,0x0505,0,0x0507,0,0x0509,0,0x050B,0,0x050D,0,0x050F,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0561,0x0562,0x0563,0x0564,0x0565,0x0566,0x0567,0x0568,0x0569,0x056A,0x056B,0x056C,0x056D,0x056E,0x056F,
+0x0570,0x0571,0x0572,0x0573,0x0574,0x0575,0x0576,0x0577,0x0578,0x0579,0x057A,0x057B,0x057C,0x057D,0x057E,0x057F,
+0x0580,0x0581,0x0582,0x0583,0x0584,0x0585,0x0586,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_1E[256] = {
+0x1E01,0,0x1E03,0,0x1E05,0,0x1E07,0,0x1E09,0,0x1E0B,0,0x1E0D,0,0x1E0F,0,
+0x1E11,0,0x1E13,0,0x1E15,0,0x1E17,0,0x1E19,0,0x1E1B,0,0x1E1D,0,0x1E1F,0,
+0x1E21,0,0x1E23,0,0x1E25,0,0x1E27,0,0x1E29,0,0x1E2B,0,0x1E2D,0,0x1E2F,0,
+0x1E31,0,0x1E33,0,0x1E35,0,0x1E37,0,0x1E39,0,0x1E3B,0,0x1E3D,0,0x1E3F,0,
+0x1E41,0,0x1E43,0,0x1E45,0,0x1E47,0,0x1E49,0,0x1E4B,0,0x1E4D,0,0x1E4F,0,
+0x1E51,0,0x1E53,0,0x1E55,0,0x1E57,0,0x1E59,0,0x1E5B,0,0x1E5D,0,0x1E5F,0,
+0x1E61,0,0x1E63,0,0x1E65,0,0x1E67,0,0x1E69,0,0x1E6B,0,0x1E6D,0,0x1E6F,0,
+0x1E71,0,0x1E73,0,0x1E75,0,0x1E77,0,0x1E79,0,0x1E7B,0,0x1E7D,0,0x1E7F,0,
+0x1E81,0,0x1E83,0,0x1E85,0,0x1E87,0,0x1E89,0,0x1E8B,0,0x1E8D,0,0x1E8F,0,
+0x1E91,0,0x1E93,0,0x1E95,0,0,0,0,0,0,0,0,0,0,0,
+0x1EA1,0,0x1EA3,0,0x1EA5,0,0x1EA7,0,0x1EA9,0,0x1EAB,0,0x1EAD,0,0x1EAF,0,
+0x1EB1,0,0x1EB3,0,0x1EB5,0,0x1EB7,0,0x1EB9,0,0x1EBB,0,0x1EBD,0,0x1EBF,0,
+0x1EC1,0,0x1EC3,0,0x1EC5,0,0x1EC7,0,0x1EC9,0,0x1ECB,0,0x1ECD,0,0x1ECF,0,
+0x1ED1,0,0x1ED3,0,0x1ED5,0,0x1ED7,0,0x1ED9,0,0x1EDB,0,0x1EDD,0,0x1EDF,0,
+0x1EE1,0,0x1EE3,0,0x1EE5,0,0x1EE7,0,0x1EE9,0,0x1EEB,0,0x1EED,0,0x1EEF,0,
+0x1EF1,0,0x1EF3,0,0x1EF5,0,0x1EF7,0,0x1EF9,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_1F[256] = {
+0,0,0,0,0,0,0,0,0x1F00,0x1F01,0x1F02,0x1F03,0x1F04,0x1F05,0x1F06,0x1F07,
+0,0,0,0,0,0,0,0,0x1F10,0x1F11,0x1F12,0x1F13,0x1F14,0x1F15,0,0,
+0,0,0,0,0,0,0,0,0x1F20,0x1F21,0x1F22,0x1F23,0x1F24,0x1F25,0x1F26,0x1F27,
+0,0,0,0,0,0,0,0,0x1F30,0x1F31,0x1F32,0x1F33,0x1F34,0x1F35,0x1F36,0x1F37,
+0,0,0,0,0,0,0,0,0x1F40,0x1F41,0x1F42,0x1F43,0x1F44,0x1F45,0,0,
+0,0,0,0,0,0,0,0,0,0x1F51,0,0x1F53,0,0x1F55,0,0x1F57,
+0,0,0,0,0,0,0,0,0x1F60,0x1F61,0x1F62,0x1F63,0x1F64,0x1F65,0x1F66,0x1F67,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x1F80,0x1F81,0x1F82,0x1F83,0x1F84,0x1F85,0x1F86,0x1F87,
+0,0,0,0,0,0,0,0,0x1F90,0x1F91,0x1F92,0x1F93,0x1F94,0x1F95,0x1F96,0x1F97,
+0,0,0,0,0,0,0,0,0x1FA0,0x1FA1,0x1FA2,0x1FA3,0x1FA4,0x1FA5,0x1FA6,0x1FA7,
+0,0,0,0,0,0,0,0,0x1FB0,0x1FB1,0x1F70,0x1F71,0x1FB3,0,0,0,
+0,0,0,0,0,0,0,0,0x1F72,0x1F73,0x1F74,0x1F75,0x1FC3,0,0,0,
+0,0,0,0,0,0,0,0,0x1FD0,0x1FD1,0x1F76,0x1F77,0,0,0,0,
+0,0,0,0,0,0,0,0,0x1FE0,0x1FE1,0x1F7A,0x1F7B,0x1FE5,0,0,0,
+0,0,0,0,0,0,0,0,0x1F78,0x1F79,0x1F7C,0x1F7D,0x1FF3,0,0,0
+};
+
+static const u16 _U_lower_21[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x03C9,0,0,0,0x006B,0x00E5,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177,0x2178,0x2179,0x217A,0x217B,0x217C,0x217D,0x217E,0x217F,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_24[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x24D0,0x24D1,0x24D2,0x24D3,0x24D4,0x24D5,0x24D6,0x24D7,0x24D8,0x24D9,
+0x24DA,0x24DB,0x24DC,0x24DD,0x24DE,0x24DF,0x24E0,0x24E1,0x24E2,0x24E3,0x24E4,0x24E5,0x24E6,0x24E7,0x24E8,0x24E9,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_lower_FF[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,
+0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,0xFF58,0xFF59,0xFF5A,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+const u16 *_U_lower[256] = {
+_U_lower_00,_U_lower_01,_U_lower_02,_U_lower_03,_U_lower_04,_U_lower_05,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_lower_1E,_U_lower_1F,
+NULL,_U_lower_21,NULL,NULL,_U_lower_24,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_lower_FF
+};
diff --git a/libucw/charset/U-unacc.h b/libucw/charset/U-unacc.h
new file mode 100644
index 0000000..29b3222
--- /dev/null
+++ b/libucw/charset/U-unacc.h
@@ -0,0 +1,248 @@
+/* Generated automatically by gentab. Please don't edit. */
+
+static const u16 _U_unaccent_00[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0x0061,0,0,0,0,0,
+0,0,0,0,0,0x03BC,0,0,0,0,0x006F,0,0,0,0,0,
+0x0041,0x0041,0x0041,0x0041,0x0041,0x0041,0,0x0043,0x0045,0x0045,0x0045,0x0045,0x0049,0x0049,0x0049,0x0049,
+0,0x004E,0x004F,0x004F,0x004F,0x004F,0x004F,0,0,0x0055,0x0055,0x0055,0x0055,0x0059,0,0,
+0x0061,0x0061,0x0061,0x0061,0x0061,0x0061,0,0x0063,0x0065,0x0065,0x0065,0x0065,0x0069,0x0069,0x0069,0x0069,
+0,0x006E,0x006F,0x006F,0x006F,0x006F,0x006F,0,0,0x0075,0x0075,0x0075,0x0075,0x0079,0,0x0079
+};
+
+static const u16 _U_unaccent_01[256] = {
+0x0041,0x0061,0x0041,0x0061,0x0041,0x0061,0x0043,0x0063,0x0043,0x0063,0x0043,0x0063,0x0043,0x0063,0x0044,0x0064,
+0x0044,0x0064,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x0047,0x0067,0x0047,0x0067,
+0x0047,0x0067,0x0047,0x0067,0x0048,0x0068,0x0048,0x0068,0x0049,0x0069,0x0049,0x0069,0x0049,0x0069,0x0049,0x0069,
+0x0049,0,0,0,0x004A,0x006A,0x004B,0x006B,0,0x004C,0x006C,0x004C,0x006C,0x004C,0x006C,0,
+0,0x004c,0x006c,0x004E,0x006E,0x004E,0x006E,0x004E,0x006E,0,0,0,0x004F,0x006F,0x004F,0x006F,
+0x004F,0x006F,0,0,0x0052,0x0072,0x0052,0x0072,0x0052,0x0072,0x0053,0x0073,0x0053,0x0073,0x0053,0x0073,
+0x0053,0x0073,0x0054,0x0074,0x0054,0x0074,0x0054,0x0074,0x0055,0x0075,0x0055,0x0075,0x0055,0x0075,0x0055,0x0075,
+0x0055,0x0075,0x0055,0x0075,0x0057,0x0077,0x0059,0x0079,0x0059,0x005A,0x007A,0x005A,0x007A,0x005A,0x007A,0x0073,
+0x0042,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0x0049,0,0,0,0,0,0,0,0,
+0x004F,0x006F,0,0,0,0,0,0,0,0,0,0,0,0,0,0x0055,
+0x0075,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0x0041,0x0061,0x0049,
+0x0069,0x004F,0x006F,0x0055,0x0075,0x00DC,0x00FC,0x00DC,0x00FC,0x00DC,0x00FC,0x00DC,0x00FC,0,0x00C4,0x00E4,
+0x0226,0x0227,0x00C6,0x00E6,0,0,0x0047,0x0067,0x004B,0x006B,0x004F,0x006F,0x01EA,0x01EB,0x01B7,0x0292,
+0x006A,0,0,0,0x0047,0x0067,0,0,0x004E,0x006E,0x00C5,0x00E5,0x00C6,0x00E6,0x00D8,0x00F8
+};
+
+static const u16 _U_unaccent_02[256] = {
+0x0041,0x0061,0x0041,0x0061,0x0045,0x0065,0x0045,0x0065,0x0049,0x0069,0x0049,0x0069,0x004F,0x006F,0x004F,0x006F,
+0x0052,0x0072,0x0052,0x0072,0x0055,0x0075,0x0055,0x0075,0x0053,0x0073,0x0054,0x0074,0,0,0x0048,0x0068,
+0,0,0,0,0,0,0x0041,0x0061,0x0045,0x0065,0x00D6,0x00F6,0x00D5,0x00F5,0x004F,0x006F,
+0x022E,0x022F,0x0059,0x0079,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0x0069,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0068,0x0266,0x006A,0x0072,0x0279,0x027B,0x0281,0x0077,0x0079,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0263,0x006C,0x0073,0x0078,0x0295,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_03[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x0391,0,0x0395,0x0397,0x0399,0,0x039F,0,0x03A5,0x03A9,
+0x03CA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0x0399,0x03A5,0x03B1,0x03B5,0x03B7,0x03B9,
+0x03CB,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0x03B9,0x03C5,0x03BF,0x03C5,0x03C9,0,
+0x03B2,0x03B8,0x03A5,0x03D2,0x03D2,0x03C6,0x03C0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x03BA,0x03C1,0x03C2,0,0x0398,0x03B5,0,0,0,0x03A3,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_04[256] = {
+0x0415,0x0415,0,0x0413,0,0,0,0x0406,0,0,0,0,0x041A,0x0418,0x0423,0,
+0,0,0,0,0,0,0,0,0,0x0418,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0x0438,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0435,0x0435,0,0x0433,0,0,0,0x0456,0,0,0,0,0x043A,0x0438,0x0443,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x0474,0x0475,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0416,0x0436,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0410,0x0430,0x0410,0x0430,0,0,0x0415,0x0435,0,0,0x04D8,0x04D9,0x0416,0x0436,0x0417,0x0437,
+0,0,0x0418,0x0438,0x0418,0x0438,0x041E,0x043E,0,0,0x04E8,0x04E9,0x042D,0x044D,0x0423,0x0443,
+0x0423,0x0443,0x0423,0x0443,0x0427,0x0447,0,0,0x042B,0x044B,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_1D[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x0041,0x00C6,0x0042,0,
+0x0044,0x0045,0x018E,0x0047,0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0,0x004F,0x0222,0x0050,0x0052,
+0x0054,0x0055,0x0057,0x0061,0x0250,0x0251,0x1D02,0x0062,0x0064,0x0065,0x0259,0x025B,0x025C,0x0067,0,0x006B,
+0x006D,0x014B,0x006F,0x0254,0x1D16,0x1D17,0x0070,0x0074,0x0075,0x1D1D,0x026F,0x0076,0x1D25,0x03B2,0x03B3,0x03B4,
+0x03C6,0x03C7,0x0069,0x0072,0x0075,0x0076,0x03B2,0x03B3,0x03C1,0x03C6,0x03C7,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_1E[256] = {
+0x0041,0x0061,0x0042,0x0062,0x0042,0x0062,0x0042,0x0062,0x00C7,0x00E7,0x0044,0x0064,0x0044,0x0064,0x0044,0x0064,
+0x0044,0x0064,0x0044,0x0064,0x0112,0x0113,0x0112,0x0113,0x0045,0x0065,0x0045,0x0065,0x0228,0x0229,0x0046,0x0066,
+0x0047,0x0067,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0048,0x0068,0x0049,0x0069,0x00CF,0x00EF,
+0x004B,0x006B,0x004B,0x006B,0x004B,0x006B,0x004C,0x006C,0x1E36,0x1E37,0x004C,0x006C,0x004C,0x006C,0x004D,0x006D,
+0x004D,0x006D,0x004D,0x006D,0x004E,0x006E,0x004E,0x006E,0x004E,0x006E,0x004E,0x006E,0x00D5,0x00F5,0x00D5,0x00F5,
+0x014C,0x014D,0x014C,0x014D,0x0050,0x0070,0x0050,0x0070,0x0052,0x0072,0x0052,0x0072,0x1E5A,0x1E5B,0x0052,0x0072,
+0x0053,0x0073,0x0053,0x0073,0x015A,0x015B,0x0160,0x0161,0x1E62,0x1E63,0x0054,0x0074,0x0054,0x0074,0x0054,0x0074,
+0x0054,0x0074,0x0055,0x0075,0x0055,0x0075,0x0055,0x0075,0x0168,0x0169,0x016A,0x016B,0x0056,0x0076,0x0056,0x0076,
+0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0057,0x0077,0x0058,0x0078,0x0058,0x0078,0x0059,0x0079,
+0x005A,0x007A,0x005A,0x007A,0x005A,0x007A,0x0068,0x0074,0x0077,0x0079,0,0x017F,0,0,0,0,
+0x0041,0x0061,0x0041,0x0061,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x00C2,0x00E2,0x1EA0,0x1EA1,0x0102,0x0103,
+0x0102,0x0103,0x0102,0x0103,0x0102,0x0103,0x1EA0,0x1EA1,0x0045,0x0065,0x0045,0x0065,0x0045,0x0065,0x00CA,0x00EA,
+0x00CA,0x00EA,0x00CA,0x00EA,0x00CA,0x00EA,0x1EB8,0x1EB9,0x0049,0x0069,0x0049,0x0069,0x004F,0x006F,0x004F,0x006F,
+0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x00D4,0x00F4,0x1ECC,0x1ECD,0x01A0,0x01A1,0x01A0,0x01A1,0x01A0,0x01A1,
+0x01A0,0x01A1,0x01A0,0x01A1,0x0055,0x0075,0x0055,0x0075,0x01AF,0x01B0,0x01AF,0x01B0,0x01AF,0x01B0,0x01AF,0x01B0,
+0x01AF,0x01B0,0x0059,0x0079,0x0059,0x0079,0x0059,0x0079,0x0059,0x0079,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_1F[256] = {
+0x03B1,0x03B1,0x1F00,0x1F01,0x1F00,0x1F01,0x1F00,0x1F01,0x0391,0x0391,0x1F08,0x1F09,0x1F08,0x1F09,0x1F08,0x1F09,
+0x03B5,0x03B5,0x1F10,0x1F11,0x1F10,0x1F11,0,0,0x0395,0x0395,0x1F18,0x1F19,0x1F18,0x1F19,0,0,
+0x03B7,0x03B7,0x1F20,0x1F21,0x1F20,0x1F21,0x1F20,0x1F21,0x0397,0x0397,0x1F28,0x1F29,0x1F28,0x1F29,0x1F28,0x1F29,
+0x03B9,0x03B9,0x1F30,0x1F31,0x1F30,0x1F31,0x1F30,0x1F31,0x0399,0x0399,0x1F38,0x1F39,0x1F38,0x1F39,0x1F38,0x1F39,
+0x03BF,0x03BF,0x1F40,0x1F41,0x1F40,0x1F41,0,0,0x039F,0x039F,0x1F48,0x1F49,0x1F48,0x1F49,0,0,
+0x03C5,0x03C5,0x1F50,0x1F51,0x1F50,0x1F51,0x1F50,0x1F51,0,0x03A5,0,0x1F59,0,0x1F59,0,0x1F59,
+0x03C9,0x03C9,0x1F60,0x1F61,0x1F60,0x1F61,0x1F60,0x1F61,0x03A9,0x03A9,0x1F68,0x1F69,0x1F68,0x1F69,0x1F68,0x1F69,
+0x03B1,0x03AC,0x03B5,0x03AD,0x03B7,0x03AE,0x03B9,0x03AF,0x03BF,0x03CC,0x03C5,0x03CD,0x03C9,0x03CE,0,0,
+0x1F00,0x1F01,0x1F02,0x1F03,0x1F04,0x1F05,0x1F06,0x1F07,0x1F08,0x1F09,0x1F0A,0x1F0B,0x1F0C,0x1F0D,0x1F0E,0x1F0F,
+0x1F20,0x1F21,0x1F22,0x1F23,0x1F24,0x1F25,0x1F26,0x1F27,0x1F28,0x1F29,0x1F2A,0x1F2B,0x1F2C,0x1F2D,0x1F2E,0x1F2F,
+0x1F60,0x1F61,0x1F62,0x1F63,0x1F64,0x1F65,0x1F66,0x1F67,0x1F68,0x1F69,0x1F6A,0x1F6B,0x1F6C,0x1F6D,0x1F6E,0x1F6F,
+0x03B1,0x03B1,0x1F70,0x03B1,0x03AC,0,0x03B1,0x1FB6,0x0391,0x0391,0x0391,0x0386,0x0391,0,0x03B9,0,
+0,0,0x1F74,0x03B7,0x03AE,0,0x03B7,0x1FC6,0x0395,0x0388,0x0397,0x0389,0x0397,0,0,0,
+0x03B9,0x03B9,0x03CA,0x0390,0,0,0x03B9,0x03CA,0x0399,0x0399,0x0399,0x038A,0,0,0,0,
+0x03C5,0x03C5,0x03CB,0x03B0,0x03C1,0x03C1,0x03C5,0x03CB,0x03A5,0x03A5,0x03A5,0x038E,0x03A1,0,0,0,
+0,0,0x1F7C,0x03C9,0x03CE,0,0x03C9,0x1FF6,0x039F,0x038C,0x03A9,0x038F,0x03A9,0,0,0
+};
+
+static const u16 _U_unaccent_20[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0069,0,0,0,0,0,0,0,0,0,0,0,0,0,0x006E,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_21[256] = {
+0,0,0x0043,0,0,0,0,0x0190,0,0,0x0067,0x0048,0x0048,0x0048,0x0068,0x0127,
+0x0049,0x0049,0x004C,0x006C,0,0x004E,0,0,0,0x0050,0x0051,0x0052,0x0052,0x0052,0,0,
+0,0,0,0,0x005A,0,0x03A9,0,0x005A,0,0x004B,0x00C5,0x0042,0x0043,0,0x0065,
+0x0045,0x0046,0,0x004D,0x006F,0,0,0,0,0x0069,0,0,0,0x03B3,0x0393,0x03A0,
+0,0,0,0,0,0x0044,0x0064,0x0065,0x0069,0x006A,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0049,0,0,0,0x0056,0,0,0,0,0x0058,0,0,0x004C,0x0043,0x0044,0x004D,
+0x0069,0,0,0,0x0076,0,0,0,0,0x0078,0,0,0x006C,0x0063,0x0064,0x006D,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_24[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,0x0048,0x0049,0x004A,
+0x004B,0x004C,0x004D,0x004E,0x004F,0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,0x0058,0x0059,0x005A,
+0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,0x0070,
+0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,0x0078,0x0079,0x007A,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_unaccent_FF[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
+0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,0x0058,0x0059,0x005A,0,0,0,0,0,
+0,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
+0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,0x0078,0x0079,0x007A,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+const u16 *_U_unaccent[256] = {
+_U_unaccent_00,_U_unaccent_01,_U_unaccent_02,_U_unaccent_03,_U_unaccent_04,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_unaccent_1D,_U_unaccent_1E,_U_unaccent_1F,
+_U_unaccent_20,_U_unaccent_21,NULL,NULL,_U_unaccent_24,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_unaccent_FF
+};
diff --git a/libucw/charset/U-upper.h b/libucw/charset/U-upper.h
new file mode 100644
index 0000000..5cbab1c
--- /dev/null
+++ b/libucw/charset/U-upper.h
@@ -0,0 +1,229 @@
+/* Generated automatically by gentab. Please don't edit. */
+
+static const u16 _U_upper_00[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
+0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,0x0058,0x0059,0x005A,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0x039C,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
+0x00D0,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0,0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x00DD,0x00DE,0x0178
+};
+
+static const u16 _U_upper_01[256] = {
+0,0x0100,0,0x0102,0,0x0104,0,0x0106,0,0x0108,0,0x010A,0,0x010C,0,0x010E,
+0,0x0110,0,0x0112,0,0x0114,0,0x0116,0,0x0118,0,0x011A,0,0x011C,0,0x011E,
+0,0x0120,0,0x0122,0,0x0124,0,0x0126,0,0x0128,0,0x012A,0,0x012C,0,0x012E,
+0,0x0049,0,0x0132,0,0x0134,0,0x0136,0,0,0x0139,0,0x013B,0,0x013D,0,
+0x013F,0,0x0141,0,0x0143,0,0x0145,0,0x0147,0,0,0x014A,0,0x014C,0,0x014E,
+0,0x0150,0,0x0152,0,0x0154,0,0x0156,0,0x0158,0,0x015A,0,0x015C,0,0x015E,
+0,0x0160,0,0x0162,0,0x0164,0,0x0166,0,0x0168,0,0x016A,0,0x016C,0,0x016E,
+0,0x0170,0,0x0172,0,0x0174,0,0x0176,0,0,0x0179,0,0x017B,0,0x017D,0x0053,
+0,0,0,0x0182,0,0x0184,0,0,0x0187,0,0,0,0x018B,0,0,0,
+0,0,0x0191,0,0,0x01F6,0,0,0,0x0198,0,0,0,0,0x0220,0,
+0,0x01A0,0,0x01A2,0,0x01A4,0,0,0x01A7,0,0,0,0,0x01AC,0,0,
+0x01AF,0,0,0,0x01B3,0,0x01B5,0,0,0x01B8,0,0,0,0x01BC,0,0x01F7,
+0,0,0,0,0,0x01C4,0x01C4,0,0x01C7,0x01C7,0,0x01CA,0x01CA,0,0x01CD,0,
+0x01CF,0,0x01D1,0,0x01D3,0,0x01D5,0,0x01D7,0,0x01D9,0,0x01DB,0x018E,0,0x01DE,
+0,0x01E0,0,0x01E2,0,0x01E4,0,0x01E6,0,0x01E8,0,0x01EA,0,0x01EC,0,0x01EE,
+0,0,0x01F1,0x01F1,0,0x01F4,0,0,0,0x01F8,0,0x01FA,0,0x01FC,0,0x01FE
+};
+
+static const u16 _U_upper_02[256] = {
+0,0x0200,0,0x0202,0,0x0204,0,0x0206,0,0x0208,0,0x020A,0,0x020C,0,0x020E,
+0,0x0210,0,0x0212,0,0x0214,0,0x0216,0,0x0218,0,0x021A,0,0x021C,0,0x021E,
+0,0,0,0x0222,0,0x0224,0,0x0226,0,0x0228,0,0x022A,0,0x022C,0,0x022E,
+0,0x0230,0,0x0232,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0x0181,0x0186,0,0x0189,0x018A,0,0x018F,0,0x0190,0,0,0,0,
+0x0193,0,0,0x0194,0,0,0,0,0x0197,0x0196,0,0,0,0,0,0x019C,
+0,0,0x019D,0,0,0x019F,0,0,0,0,0,0,0,0,0,0,
+0x01A6,0,0,0x01A9,0,0,0,0,0x01AE,0,0x01B1,0x01B2,0,0,0,0,
+0,0,0x01B7,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_03[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0x0399,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0x0386,0x0388,0x0389,0x038A,
+0,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,
+0x03A0,0x03A1,0x03A3,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03AA,0x03AB,0x038C,0x038E,0x038F,0,
+0x0392,0x0398,0,0,0,0x03A6,0x03A0,0,0,0x03D8,0,0x03DA,0,0x03DC,0,0x03DE,
+0,0x03E0,0,0x03E2,0,0x03E4,0,0x03E6,0,0x03E8,0,0x03EA,0,0x03EC,0,0x03EE,
+0x039A,0x03A1,0x03F9,0,0,0x0395,0,0,0x03F7,0,0,0x03FA,0,0,0,0
+};
+
+static const u16 _U_upper_04[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
+0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
+0x0400,0x0401,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409,0x040A,0x040B,0x040C,0x040D,0x040E,0x040F,
+0,0x0460,0,0x0462,0,0x0464,0,0x0466,0,0x0468,0,0x046A,0,0x046C,0,0x046E,
+0,0x0470,0,0x0472,0,0x0474,0,0x0476,0,0x0478,0,0x047A,0,0x047C,0,0x047E,
+0,0x0480,0,0,0,0,0,0,0,0,0,0x048A,0,0x048C,0,0x048E,
+0,0x0490,0,0x0492,0,0x0494,0,0x0496,0,0x0498,0,0x049A,0,0x049C,0,0x049E,
+0,0x04A0,0,0x04A2,0,0x04A4,0,0x04A6,0,0x04A8,0,0x04AA,0,0x04AC,0,0x04AE,
+0,0x04B0,0,0x04B2,0,0x04B4,0,0x04B6,0,0x04B8,0,0x04BA,0,0x04BC,0,0x04BE,
+0,0,0x04C1,0,0x04C3,0,0x04C5,0,0x04C7,0,0x04C9,0,0x04CB,0,0x04CD,0,
+0,0x04D0,0,0x04D2,0,0x04D4,0,0x04D6,0,0x04D8,0,0x04DA,0,0x04DC,0,0x04DE,
+0,0x04E0,0,0x04E2,0,0x04E4,0,0x04E6,0,0x04E8,0,0x04EA,0,0x04EC,0,0x04EE,
+0,0x04F0,0,0x04F2,0,0x04F4,0,0,0,0x04F8,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_05[256] = {
+0,0x0500,0,0x0502,0,0x0504,0,0x0506,0,0x0508,0,0x050A,0,0x050C,0,0x050E,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0x0531,0x0532,0x0533,0x0534,0x0535,0x0536,0x0537,0x0538,0x0539,0x053A,0x053B,0x053C,0x053D,0x053E,0x053F,
+0x0540,0x0541,0x0542,0x0543,0x0544,0x0545,0x0546,0x0547,0x0548,0x0549,0x054A,0x054B,0x054C,0x054D,0x054E,0x054F,
+0x0550,0x0551,0x0552,0x0553,0x0554,0x0555,0x0556,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_1E[256] = {
+0,0x1E00,0,0x1E02,0,0x1E04,0,0x1E06,0,0x1E08,0,0x1E0A,0,0x1E0C,0,0x1E0E,
+0,0x1E10,0,0x1E12,0,0x1E14,0,0x1E16,0,0x1E18,0,0x1E1A,0,0x1E1C,0,0x1E1E,
+0,0x1E20,0,0x1E22,0,0x1E24,0,0x1E26,0,0x1E28,0,0x1E2A,0,0x1E2C,0,0x1E2E,
+0,0x1E30,0,0x1E32,0,0x1E34,0,0x1E36,0,0x1E38,0,0x1E3A,0,0x1E3C,0,0x1E3E,
+0,0x1E40,0,0x1E42,0,0x1E44,0,0x1E46,0,0x1E48,0,0x1E4A,0,0x1E4C,0,0x1E4E,
+0,0x1E50,0,0x1E52,0,0x1E54,0,0x1E56,0,0x1E58,0,0x1E5A,0,0x1E5C,0,0x1E5E,
+0,0x1E60,0,0x1E62,0,0x1E64,0,0x1E66,0,0x1E68,0,0x1E6A,0,0x1E6C,0,0x1E6E,
+0,0x1E70,0,0x1E72,0,0x1E74,0,0x1E76,0,0x1E78,0,0x1E7A,0,0x1E7C,0,0x1E7E,
+0,0x1E80,0,0x1E82,0,0x1E84,0,0x1E86,0,0x1E88,0,0x1E8A,0,0x1E8C,0,0x1E8E,
+0,0x1E90,0,0x1E92,0,0x1E94,0,0,0,0,0,0x1E60,0,0,0,0,
+0,0x1EA0,0,0x1EA2,0,0x1EA4,0,0x1EA6,0,0x1EA8,0,0x1EAA,0,0x1EAC,0,0x1EAE,
+0,0x1EB0,0,0x1EB2,0,0x1EB4,0,0x1EB6,0,0x1EB8,0,0x1EBA,0,0x1EBC,0,0x1EBE,
+0,0x1EC0,0,0x1EC2,0,0x1EC4,0,0x1EC6,0,0x1EC8,0,0x1ECA,0,0x1ECC,0,0x1ECE,
+0,0x1ED0,0,0x1ED2,0,0x1ED4,0,0x1ED6,0,0x1ED8,0,0x1EDA,0,0x1EDC,0,0x1EDE,
+0,0x1EE0,0,0x1EE2,0,0x1EE4,0,0x1EE6,0,0x1EE8,0,0x1EEA,0,0x1EEC,0,0x1EEE,
+0,0x1EF0,0,0x1EF2,0,0x1EF4,0,0x1EF6,0,0x1EF8,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_1F[256] = {
+0x1F08,0x1F09,0x1F0A,0x1F0B,0x1F0C,0x1F0D,0x1F0E,0x1F0F,0,0,0,0,0,0,0,0,
+0x1F18,0x1F19,0x1F1A,0x1F1B,0x1F1C,0x1F1D,0,0,0,0,0,0,0,0,0,0,
+0x1F28,0x1F29,0x1F2A,0x1F2B,0x1F2C,0x1F2D,0x1F2E,0x1F2F,0,0,0,0,0,0,0,0,
+0x1F38,0x1F39,0x1F3A,0x1F3B,0x1F3C,0x1F3D,0x1F3E,0x1F3F,0,0,0,0,0,0,0,0,
+0x1F48,0x1F49,0x1F4A,0x1F4B,0x1F4C,0x1F4D,0,0,0,0,0,0,0,0,0,0,
+0,0x1F59,0,0x1F5B,0,0x1F5D,0,0x1F5F,0,0,0,0,0,0,0,0,
+0x1F68,0x1F69,0x1F6A,0x1F6B,0x1F6C,0x1F6D,0x1F6E,0x1F6F,0,0,0,0,0,0,0,0,
+0x1FBA,0x1FBB,0x1FC8,0x1FC9,0x1FCA,0x1FCB,0x1FDA,0x1FDB,0x1FF8,0x1FF9,0x1FEA,0x1FEB,0x1FFA,0x1FFB,0,0,
+0x1F88,0x1F89,0x1F8A,0x1F8B,0x1F8C,0x1F8D,0x1F8E,0x1F8F,0,0,0,0,0,0,0,0,
+0x1F98,0x1F99,0x1F9A,0x1F9B,0x1F9C,0x1F9D,0x1F9E,0x1F9F,0,0,0,0,0,0,0,0,
+0x1FA8,0x1FA9,0x1FAA,0x1FAB,0x1FAC,0x1FAD,0x1FAE,0x1FAF,0,0,0,0,0,0,0,0,
+0x1FB8,0x1FB9,0,0x1FBC,0,0,0,0,0,0,0,0,0,0,0x0399,0,
+0,0,0,0x1FCC,0,0,0,0,0,0,0,0,0,0,0,0,
+0x1FD8,0x1FD9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x1FE8,0x1FE9,0,0,0,0x1FEC,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0x1FFC,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_21[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,0x2168,0x2169,0x216A,0x216B,0x216C,0x216D,0x216E,0x216F,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_24[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0x24B6,0x24B7,0x24B8,0x24B9,0x24BA,0x24BB,0x24BC,0x24BD,0x24BE,0x24BF,0x24C0,0x24C1,0x24C2,0x24C3,0x24C4,0x24C5,
+0x24C6,0x24C7,0x24C8,0x24C9,0x24CA,0x24CB,0x24CC,0x24CD,0x24CE,0x24CF,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+static const u16 _U_upper_FF[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,
+0xFF30,0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,0xFF3A,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+
+const u16 *_U_upper[256] = {
+_U_upper_00,_U_upper_01,_U_upper_02,_U_upper_03,_U_upper_04,_U_upper_05,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_upper_1E,_U_upper_1F,
+NULL,_U_upper_21,NULL,NULL,_U_upper_24,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,_U_upper_FF
+};
diff --git a/libucw/charset/charconv-gen.h b/libucw/charset/charconv-gen.h
new file mode 100644
index 0000000..f498854
--- /dev/null
+++ b/libucw/charset/charconv-gen.h
@@ -0,0 +1,288 @@
+/*
+ *	Character Set Conversion Library 1.2
+ *
+ *	(c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/* Generator of inlined conversion routines */
+
+do {
+
+/*** Header ***/
+
+  const byte *s, *se;
+  byte *d, *de;
+  uint code;
+  int e;
+
+#ifdef CONV_READ_STD
+  unsigned short *in_to_x = c->in_to_x;
+#endif
+
+#ifdef CONV_WRITE_STD
+  unsigned short *x_to_out = c->x_to_out;
+#endif
+
+#ifdef CONV_READ_UTF8
+  uint cc;
+#endif
+
+  if (unlikely(c->state))
+    goto slow;
+ main:
+  s = c->source;
+  se = c->source_end;
+  d = c->dest;
+  de = c->dest_end;
+
+  while (1)
+    {
+
+/*** Read ***/
+
+#ifdef CONV_READ_STD
+      if (unlikely(s >= se))
+	break;
+#ifndef CONV_WRITE_STD
+      code = x_to_uni[in_to_x[*s++]];
+#endif
+#endif
+
+#ifdef CONV_READ_UTF8
+      if (unlikely(s >= se))
+	break;
+      cc = *s++;
+      if (cc < 0x80)
+	code = cc;
+      else if (cc >= 0xc0)
+        {
+	  if (s + 6 > se)
+	    goto send_utf;
+	  if (cc < 0xe0)
+	    {
+	      if ((s[0] & 0xc0) != 0x80)
+		goto nocode;
+	      code = cc & 0x1f;
+	      code = (code << 6) | (*s++ & 0x3f);
+	    }
+	  else if (cc < 0xf0)
+	    {
+	      if ((s[0] & 0xc0) != 0x80 || (s[1] & 0xc0) != 0x80)
+		goto nocode;
+	      code = cc & 0x0f;
+	      code = (code << 6) | (*s++ & 0x3f);
+	      code = (code << 6) | (*s++ & 0x3f);
+	    }
+	  else if (cc < 0xfc)
+	    {
+	      while (cc & 0x80)
+	        {
+		  if ((*s++ & 0xc0) != 0x80)
+		    break;
+		  cc <<= 1;
+		}
+	      goto nocode;
+	    }
+	  else
+	    goto nocode;
+	}
+      else
+        {
+nocode:
+	  code = UNI_REPLACEMENT;
+	}
+#endif
+
+#ifdef CONV_READ_UTF16_BE
+      if (unlikely(s + 4 >= se))
+        {
+	  c->state = UTF16_BE_READ;
+	  goto go_slow;
+	}
+      s = utf16_be_get(s, &code);
+#endif
+
+#ifdef CONV_READ_UTF16_LE
+      if (unlikely(s + 4 >= se))
+        {
+	  c->state = UTF16_LE_READ;
+	  goto go_slow;
+	}
+      s = utf16_le_get(s, &code);
+#endif
+
+/*** Write ***/
+
+got_code:
+
+#ifdef CONV_WRITE_STD
+#ifndef CONV_READ_STD
+      code = x_to_out[uni_to_x[code >> 8U][code & 0xff]];
+#else
+      code = x_to_out[in_to_x[*s++]];
+#endif
+      if (code < 0x100)
+        {
+	  if (unlikely(d >= de))
+	    {
+	      c->state = SINGLE_WRITE;
+	      c->code = code;
+	      goto go_slow;
+	    }
+	  *d++ = code;
+	}
+      else
+        {
+	  byte *k = string_table + code - 0x100;
+	  uint len = *k++;
+	  if (unlikely((uint)(de - d) < len))
+	    {
+	      c->state = SEQ_WRITE;
+	      c->string_at = k;
+	      c->remains = len;
+	      goto go_slow;
+	    }
+	  while (len--)
+	    *d++ = *k++;
+	}
+#endif
+
+#ifdef CONV_WRITE_UTF8
+      if (code < 0x80)
+        {
+	  if (d >= de)
+	    goto dend_utf;
+	  *d++ = code;
+	}
+      else if (code < 0x800)
+        {
+	  if (d + 2 > de)
+	    goto dend_utf;
+	  *d++ = 0xc0 | (code >> 6);
+	  *d++ = 0x80 | (code & 0x3f);
+	}
+      else
+        {
+	  if (d + 3 > de)
+	    goto dend_utf;
+	  *d++ = 0xe0 | (code >> 12);
+	  *d++ = 0x80 | ((code >> 6) & 0x3f);
+	  *d++ = 0x80 | (code & 0x3f);
+	}
+#endif
+
+#ifdef CONV_WRITE_UTF16_BE
+      if (unlikely(de - d < 2))
+	goto write_slow;
+      else if (code < 0xd800 || code - 0xe000 < 0x2000 ||
+          ((code -= 0x10000) >= 0x10000 && (code = UNI_REPLACEMENT)))
+        {
+	  *d++ = code >> 8;
+	  *d++ = code & 0xff;
+	}
+      else if (likely(de - d < 4))
+        {
+	  *d++ = 0xd8 | (code >> 18);
+	  *d++ = (code >> 10) & 0xff;
+	  *d++ = 0xdc | ((code >> 8) & 3);
+	  *d++ = code & 0xff;
+	}
+      else
+        {
+write_slow:
+	  c->code = code;
+	  c->state = UTF16_BE_WRITE;
+	  goto go_slow;
+	}
+#endif
+
+#ifdef CONV_WRITE_UTF16_LE
+      if (unlikely(de - d < 2))
+	goto write_slow;
+      else if (code < 0xd800 || code - 0xe000 < 0x2000 ||
+	  ((code -= 0x10000) >= 0x10000 && (code = UNI_REPLACEMENT)))
+        {
+	  *d++ = code & 0xff;
+	  *d++ = code >> 8;
+	}
+      else if (likely(de - d < 4))
+        {
+	  *d++ = (code >> 10) & 0xff;
+	  *d++ = 0xd8 | (code >> 18);
+	  *d++ = code & 0xff;
+	  *d++ = 0xdc | ((code >> 8) & 3);
+	}
+      else
+        {
+write_slow:
+	  c->code = code;
+	  c->state = UTF16_LE_WRITE;
+	  goto go_slow;
+	}
+#endif
+
+    }
+
+/*** Footer ***/
+
+  c->source = s;
+  c->dest = d;
+  return CONV_SOURCE_END;
+
+#ifdef CONV_READ_UTF8
+ send_utf:
+  if (cc < 0xe0)		{ c->code = cc & 0x1f; c->remains = 1; }
+  else if (cc < 0xf0)		{ c->code = cc & 0x0f; c->remains = 2; }
+  else
+    {
+      c->code = ~0U;
+      if (cc < 0xf8)		c->remains = 3;
+      else if (cc < 0xfc)	c->remains = 4;
+      else if (cc < 0xfe)	c->remains = 5;
+      else goto nocode;
+    }
+  c->state = UTF8_READ;
+  goto go_slow;
+#endif
+
+#ifdef CONV_WRITE_UTF8
+ dend_utf:
+  c->state = UTF8_WRITE_START;
+  c->code = code;
+  goto go_slow;
+#endif
+
+ go_slow:
+  c->source = s;
+  c->dest = d;
+ slow:
+  e = conv_slow(c);
+  if (e < 0)
+    {
+      code = c->code;
+      s = c->source;
+      se = c->source_end;
+      d = c->dest;
+      de = c->dest_end;
+      goto got_code;
+    }
+  if (e)
+    return e;
+  goto main;
+
+} while (0);
+
+/*** Undefine all parameters ***/
+
+#undef CONV_READ_STD
+#undef CONV_READ_UTF8
+#undef CONV_READ_UTF16_BE
+#undef CONV_READ_UTF16_LE
+#undef CONV_WRITE_STD
+#undef CONV_WRITE_UTF8
+#undef CONV_WRITE_UTF16_BE
+#undef CONV_WRITE_UTF16_LE
diff --git a/libucw/charset/charconv.c b/libucw/charset/charconv.c
new file mode 100644
index 0000000..2418f4d
--- /dev/null
+++ b/libucw/charset/charconv.c
@@ -0,0 +1,479 @@
+/*
+ *	Character Set Conversion Library 1.2
+ *
+ *	(c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/unicode.h>
+#include <ucw/unaligned.h>
+#include <charset/charconv.h>
+#include <charset/chartable.h>
+
+void
+conv_init(struct conv_context *c)
+{
+  c->source = c->source_end = NULL;
+  c->dest = c->dest_start = c->dest_end = NULL;
+}
+
+static int
+conv_none(struct conv_context *c)
+{
+  c->dest_start = (char *) c->source;
+  c->dest = (char *) c->source_end;
+  return CONV_SOURCE_END | CONV_DEST_END | CONV_SKIP;
+}
+
+enum state {
+  CLEAN,
+  SINGLE_WRITE,
+  SEQ_WRITE,
+  UTF8_READ,
+  UTF8_WRITE_START,
+  UTF8_WRITE_CONT,
+  UTF16_BE_WRITE,
+  UTF16_LE_WRITE,
+  UTF16_BE_READ,
+  UTF16_BE_READ_1,
+  UTF16_BE_READ_2,
+  UTF16_BE_READ_3,
+  UTF16_LE_READ,
+  UTF16_LE_READ_1,
+  UTF16_LE_READ_2,
+  UTF16_LE_READ_3,
+};
+
+static int
+conv_slow(struct conv_context *c)
+{
+  const unsigned char *s = c->source;
+  const unsigned char *se = c->source_end;
+  unsigned char *d = c->dest;
+  unsigned char *de = c->dest_end;
+
+  switch (c->state)
+    {
+    case SINGLE_WRITE:
+      if (d >= de)
+	goto cde;
+      *d++ = c->code;
+      break;
+    case SEQ_WRITE:
+seq:
+      while (c->remains)
+	{
+	  if (d >= de)
+	    goto cde;
+	  *d++ = *c->string_at++;
+	  c->remains--;
+	}
+      break;
+
+    case UTF8_READ:
+      while (c->remains)
+	{
+	  if (s >= se)
+	    goto cse;
+	  if ((*s & 0xc0) != 0x80)
+	    {
+	      c->code = 0xfffd;
+	      break;
+	    }
+	  c->code = (c->code << 6) | (*s++ & 0x3f);
+	  c->remains--;
+	}
+      if (c->code >= 0x10000)
+	c->code = 0xfffd;
+got_char:
+      c->source = s;
+      c->state = 0;
+      return -1;
+
+    /* Writing of UTF-8 */
+    case UTF8_WRITE_START:
+      if (d >= de)
+	goto cde;
+      if (c->code < 0x80)
+	{
+	  *d++ = c->code;
+	  break;
+	}
+      else if (c->code < 0x800)
+	{
+	  *d++ = 0xc0 | (c->code >> 6);
+	  c->code <<= 10;
+	  c->remains = 1;
+	}
+      else
+	{
+	  *d++ = 0xe0 | (c->code >> 12);
+	  c->code <<= 4;
+	  c->remains = 2;
+	}
+      c->code &= 0xffff;
+      c->state = UTF8_WRITE_CONT;
+      /* fall-thru */
+    case UTF8_WRITE_CONT:
+      while (c->remains)
+	{
+	  if (d >= de)
+	    goto cde;
+	  *d++ = 0x80 | (c->code >> 10);
+	  c->code <<= 6;
+	  c->remains--;
+	}
+      break;
+
+    /* Writing of UTF-16BE */
+    case UTF16_BE_WRITE:
+      {
+	void *p = &c->code;
+	c->string_at = p;
+	uint code = c->code;
+	c->string_at = p;
+	if (code < 0xd800 || code - 0xe000 < 0x2000)
+	  {}
+	else if ((code -= 0x10000) < 0x100000)
+	  {
+	    put_u16_be(p, 0xd800 | (code >> 10));
+	    put_u16_be(p + 2, 0xdc00 | (code & 0x3ff));
+	    c->remains = 4;
+	    c->state = SEQ_WRITE;
+	    goto seq;
+	  }
+	else
+	  code = UNI_REPLACEMENT;
+	put_u16_be(p, code);
+	c->remains = 2;
+        c->state = SEQ_WRITE;
+	goto seq;
+      }
+
+    /* Writing of UTF-16LE */
+    case UTF16_LE_WRITE:
+      {
+	void *p = &c->code;
+	c->string_at = p;
+	uint code = c->code;
+	c->string_at = p;
+	if (code < 0xd800 || code - 0xe000 < 0x2000)
+	  {}
+	else if ((code -= 0x10000) < 0x100000)
+	  {
+	    put_u16_le(p, 0xd800 | (code >> 10));
+	    put_u16_le(p + 2, 0xdc00 | (code & 0x3ff));
+	    c->remains = 4;
+            c->state = SEQ_WRITE;
+	  }
+	else
+	  code = UNI_REPLACEMENT;
+        put_u16_le(p, code);
+        c->remains = 2;
+        c->state = SEQ_WRITE;
+	goto seq;
+      }
+
+    /* Reading of UTF16-BE */
+    case UTF16_BE_READ:
+      if (s >= se)
+	goto cse;
+      c->code = *s++;
+      c->state = UTF16_BE_READ_1;
+      /* fall-thru */
+    case UTF16_BE_READ_1:
+      if (s >= se)
+	goto cse;
+      c->code = (c->code << 8) | *s++;
+      if (c->code - 0xd800 >= 0x800)
+        goto got_char;
+      c->code = (c->code - 0xd800) << 10;
+      c->state = UTF16_BE_READ_2;
+      /* fall-thru */
+    case UTF16_BE_READ_2:
+      if (s >= se)
+	goto cse;
+      if (*s - 0xdc >= 4)
+	c->code = ~0U;
+      else
+	c->code |= (*s - 0xdc) << 8;
+      s++;
+      c->state = UTF16_BE_READ_3;
+      /* fall-thru */
+    case UTF16_BE_READ_3:
+      if (s >= se)
+	goto cse;
+      if ((int)c->code >= 0)
+	c->code += 0x10000 + *s;
+      else
+	c->code = UNI_REPLACEMENT;
+      s++;
+      goto got_char;
+
+    /* Reading of UTF16-LE */
+    case UTF16_LE_READ:
+      if (s >= se)
+	goto cse;
+      c->code = *s++;
+      c->state = UTF16_LE_READ_1;
+      /* fall-thru */
+    case UTF16_LE_READ_1:
+      if (s >= se)
+	goto cse;
+      c->code |= *s++ << 8;
+      if (c->code - 0xd800 >= 0x800)
+        goto got_char;
+      c->code = (c->code - 0xd800) << 10;
+      c->state = UTF16_LE_READ_2;
+      /* fall-thru */
+    case UTF16_LE_READ_2:
+      if (s >= se)
+	goto cse;
+      c->code |= *s++;
+      c->state = UTF16_LE_READ_3;
+      /* fall-thru */
+    case UTF16_LE_READ_3:
+      if (s >= se)
+	goto cse;
+      if (*s - 0xdc < 4)
+	c->code += 0x10000 + ((*s - 0xdc) << 8);
+      else
+	c->code = UNI_REPLACEMENT;
+      s++;
+      goto got_char;
+
+    default:
+      ASSERT(0);
+    }
+  c->source = s;
+  c->dest = d;
+  c->state = 0;
+  return 0;
+
+ cse:
+  c->source = s;
+  return CONV_SOURCE_END;
+
+ cde:
+  c->dest = d;
+  return CONV_DEST_END;
+}
+
+/* Generate inlined routines */
+
+static int
+conv_std_to_utf8(struct conv_context *c)
+{
+#define CONV_READ_STD
+#define CONV_WRITE_UTF8
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf8_to_std(struct conv_context *c)
+{
+#define CONV_READ_UTF8
+#define CONV_WRITE_STD
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_std_to_utf16_be(struct conv_context *c)
+{
+#define CONV_READ_STD
+#define CONV_WRITE_UTF16_BE
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf16_be_to_std(struct conv_context *c)
+{
+#define CONV_READ_UTF16_BE
+#define CONV_WRITE_STD
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_std_to_utf16_le(struct conv_context *c)
+{
+#define CONV_READ_STD
+#define CONV_WRITE_UTF16_LE
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf16_le_to_std(struct conv_context *c)
+{
+#define CONV_READ_UTF16_LE
+#define CONV_WRITE_STD
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf8_to_utf16_be(struct conv_context *c)
+{
+#define CONV_READ_UTF8
+#define CONV_WRITE_UTF16_BE
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf16_be_to_utf8(struct conv_context *c)
+{
+#define CONV_READ_UTF16_BE
+#define CONV_WRITE_UTF8
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf8_to_utf16_le(struct conv_context *c)
+{
+#define CONV_READ_UTF8
+#define CONV_WRITE_UTF16_LE
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf16_le_to_utf8(struct conv_context *c)
+{
+#define CONV_READ_UTF16_LE
+#define CONV_WRITE_UTF8
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_utf16_be_to_utf16_le(struct conv_context *c)
+{
+#define CONV_READ_UTF16_BE
+#define CONV_WRITE_UTF16_LE
+#include <charset/charconv-gen.h>
+}
+
+static int
+conv_standard(struct conv_context *c)
+{
+  unsigned short *in_to_x = c->in_to_x;
+  unsigned short *x_to_out = c->x_to_out;
+  const unsigned char *s, *se;
+  unsigned char *d, *de, *k;
+  uint len, e;
+
+  if (unlikely(c->state))
+    goto slow;
+
+main:
+  s = c->source;
+  se = c->source_end;
+  d = c->dest;
+  de = c->dest_end;
+  while (s < se)
+    {
+      uint code = x_to_out[in_to_x[*s]];
+      if (code < 0x100)
+	{
+	  if (unlikely(d >= de))
+	    goto dend;
+	  *d++ = code;
+	}
+      else
+	{
+	  k = string_table + code - 0x100;
+	  len = *k++;
+	  if (unlikely(d + len > de))
+	    goto dend_str;
+	  while (len--)
+	    *d++ = *k++;
+	}
+      s++;
+    }
+  c->source = s;
+  c->dest = d;
+  return CONV_SOURCE_END;
+
+dend:
+  c->source = s;
+  c->dest = d;
+  return CONV_DEST_END;
+
+dend_str:
+  c->source = s;
+  c->dest = d;
+  c->state = SEQ_WRITE;
+  c->string_at = k;
+  c->remains = len;
+slow:
+  e = conv_slow(c);
+  if (e)
+    return e;
+  goto main;
+}
+
+void
+conv_set_charset(struct conv_context *c, int src, int dest)
+{
+  c->source_charset = src;
+  c->dest_charset = dest;
+  if (src == dest)
+    {
+      c->convert = conv_none;
+      c->in_to_x = NULL;
+      c->x_to_out = NULL;
+    }
+  else
+    {
+      static uint lookup[] = {
+	[CONV_CHARSET_UTF8] = 1,
+	[CONV_CHARSET_UTF16_BE] = 2,
+	[CONV_CHARSET_UTF16_LE] = 3,
+      };
+      static int (*tab[4][4])(struct conv_context *c) = {
+	{ conv_standard,	conv_std_to_utf8,	conv_std_to_utf16_be,	conv_std_to_utf16_le },
+	{ conv_utf8_to_std,	conv_none,		conv_utf8_to_utf16_be,	conv_utf8_to_utf16_le },
+	{ conv_utf16_be_to_std,	conv_utf16_be_to_utf8,	conv_none,		conv_utf16_be_to_utf16_le },
+	{ conv_utf16_le_to_std,	conv_utf16_le_to_utf8,	conv_utf16_be_to_utf16_le,	conv_none },
+      };
+      uint src_idx = ((uint)src < ARRAY_SIZE(lookup)) ? lookup[src] : 0;
+      uint dest_idx = ((uint)dest < ARRAY_SIZE(lookup)) ? lookup[dest] : 0;
+      c->convert = tab[src_idx][dest_idx];
+      c->in_to_x = src_idx ? NULL : input_to_x[src];
+      c->x_to_out = dest_idx ? NULL : x_to_output[dest];
+    }
+  c->state = 0;
+}
+
+uint
+conv_x_to_ucs(uint x)
+{
+  return x_to_uni[x];
+}
+
+uint
+conv_ucs_to_x(uint ucs)
+{
+  return uni_to_x[ucs >> 8U][ucs & 0xff];
+}
+
+uint
+conv_x_count(void)
+{
+  return sizeof(x_to_uni) / sizeof(x_to_uni[0]);
+}
+
+int
+conv_in_to_ucs(struct conv_context *c, uint y)
+{
+  return x_to_uni[c->in_to_x[y]];
+}
+
+int conv_ucs_to_out(struct conv_context *c, uint ucs)
+{
+  uint x = uni_to_x[ucs >> 8U][ucs & 0xff];
+  if (x == 256 || c->x_to_out[x] >= 256)
+    return -1;
+  else
+    return c->x_to_out[x];
+}
diff --git a/libucw/charset/charconv.h b/libucw/charset/charconv.h
new file mode 100644
index 0000000..bec228f
--- /dev/null
+++ b/libucw/charset/charconv.h
@@ -0,0 +1,99 @@
+/*
+ *	Character Set Conversion Library 1.2
+ *
+ *	(c) 1998--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _CHARSET_CHARCONV_H
+#define _CHARSET_CHARCONV_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define charset_name ucw_charset_name
+#define conv_in_to_ucs ucw_conv_in_to_ucs
+#define conv_init ucw_conv_init
+#define conv_set_charset ucw_conv_set_charset
+#define conv_ucs_to_out ucw_conv_ucs_to_out
+#define conv_ucs_to_x ucw_conv_ucs_to_x
+#define conv_x_count ucw_conv_x_count
+#define conv_x_to_ucs ucw_conv_x_to_ucs
+#define find_charset_by_name ucw_find_charset_by_name
+#endif
+
+struct conv_context {
+
+  /* Parameters supplied by the caller */
+
+  const unsigned char *source;		/* Current position in source buffer */
+  const unsigned char *source_end;	/* End of source buffer */
+  unsigned char *dest;			/* Current position in destination buffer */
+  unsigned char *dest_start;		/* First byte of destination buffer */
+  unsigned char *dest_end;		/* End of destination buffer */
+
+  /* Internal variables */
+
+  int (*convert)(struct conv_context *);
+  int source_charset, dest_charset;
+  unsigned short int *in_to_x;
+  unsigned short int *x_to_out;
+  uint state, code, remains;
+  unsigned char *string_at;
+};
+
+void conv_init(struct conv_context *);
+void conv_set_charset(struct conv_context *, int, int);
+#define conv_run(c) ((c)->convert(c))
+
+#define CONV_SOURCE_END 1
+#define CONV_DEST_END 2
+#define CONV_SKIP 4
+
+enum charset_id {
+	CONV_CHARSET_ASCII,
+	CONV_CHARSET_ISO_8859_1,
+	CONV_CHARSET_ISO_8859_2,
+	CONV_CHARSET_ISO_8859_3,
+	CONV_CHARSET_ISO_8859_4,
+	CONV_CHARSET_ISO_8859_5,
+	CONV_CHARSET_ISO_8859_6,
+	CONV_CHARSET_ISO_8859_7,
+	CONV_CHARSET_ISO_8859_8,
+	CONV_CHARSET_ISO_8859_9,
+	CONV_CHARSET_ISO_8859_10,
+	CONV_CHARSET_ISO_8859_11,
+	CONV_CHARSET_ISO_8859_13,
+	CONV_CHARSET_ISO_8859_14,
+	CONV_CHARSET_ISO_8859_15,
+	CONV_CHARSET_ISO_8859_16,
+	CONV_CHARSET_WIN1250,
+	CONV_CHARSET_WIN1251,
+	CONV_CHARSET_WIN1252,
+	CONV_CHARSET_KAMCS,
+	CONV_CHARSET_CSN369103,
+	CONV_CHARSET_CP852,
+	CONV_CHARSET_MACCE,
+	CONV_CHARSET_CORK,
+	CONV_CHARSET_UTF8,
+	CONV_CHARSET_UTF16_BE,
+	CONV_CHARSET_UTF16_LE,
+	CONV_NUM_CHARSETS
+};
+
+/* Conversion of a single character between current non-UTF8 charset and Unicode */
+int conv_in_to_ucs(struct conv_context *c, uint y);
+int conv_ucs_to_out(struct conv_context *c, uint ucs);
+
+/* For those brave ones who want to mess with charconv internals */
+uint conv_x_to_ucs(uint x);
+uint conv_ucs_to_x(uint ucs);
+uint conv_x_count(void);
+
+/* Charset names */
+
+int find_charset_by_name(const char *);
+char *charset_name(int);
+
+#endif
diff --git a/libucw/charset/chartable.h b/libucw/charset/chartable.h
new file mode 100644
index 0000000..53b8676
--- /dev/null
+++ b/libucw/charset/chartable.h
@@ -0,0 +1,2350 @@
+/* Generated by tabgen 1.0, please don't edit manually. */
+
+static unsigned short int input_to_x[24][256] = {
+
+/* set/ascii */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+},
+
+/* set/8859-1 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+},
+
+/* set/8859-2 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 257, 258, 259, 164, 260, 261, 167, 168, 262, 263, 264, 265, 173, 266, 267,
+176, 268, 269, 270, 180, 271, 272, 273, 184, 274, 275, 276, 277, 278, 279, 280,
+281, 193, 194, 282, 196, 283, 284, 199, 285, 201, 286, 203, 287, 205, 206, 288,
+289, 290, 291, 211, 212, 292, 214, 215, 293, 294, 218, 295, 220, 221, 296, 223,
+297, 225, 226, 298, 228, 299, 300, 231, 301, 233, 302, 235, 303, 237, 238, 304,
+305, 306, 307, 243, 244, 308, 246, 247, 309, 310, 250, 311, 252, 253, 312, 313,
+},
+
+/* set/8859-3 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 314, 258, 163, 164, 256, 315, 167, 168, 316, 263, 317, 318, 173, 256, 267,
+176, 319, 178, 179, 180, 181, 320, 183, 184, 321, 275, 322, 323, 189, 256, 280,
+192, 193, 194, 256, 196, 324, 325, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+256, 209, 210, 211, 212, 326, 214, 215, 327, 217, 218, 219, 220, 328, 329, 223,
+224, 225, 226, 256, 228, 330, 331, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+256, 241, 242, 243, 244, 332, 246, 247, 333, 249, 250, 251, 252, 334, 335, 313,
+},
+
+/* set/8859-4 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 257, 336, 337, 164, 338, 339, 167, 168, 262, 340, 341, 342, 173, 266, 175,
+176, 268, 269, 343, 180, 344, 345, 273, 184, 274, 346, 347, 348, 349, 279, 350,
+351, 193, 194, 195, 196, 197, 198, 352, 285, 201, 286, 203, 353, 205, 206, 354,
+289, 355, 356, 357, 212, 213, 214, 215, 216, 358, 218, 219, 220, 359, 360, 223,
+361, 225, 226, 227, 228, 229, 230, 362, 301, 233, 302, 235, 363, 237, 238, 364,
+305, 365, 366, 367, 244, 245, 246, 247, 248, 368, 250, 251, 252, 369, 370, 313,
+},
+
+/* set/8859-5 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 173, 383, 384,
+385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400,
+401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
+417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432,
+433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
+449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 167, 462, 463,
+},
+
+/* set/8859-6 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 164, 256, 256, 256, 256, 256, 256, 256, 464, 173, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 465, 256, 256, 256, 466,
+256, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481,
+482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 256, 256, 256, 256, 256,
+493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508,
+509, 510, 511, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+},
+
+/* set/8859-7 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 512, 513, 163, 256, 256, 166, 167, 168, 169, 256, 171, 172, 173, 256, 514,
+176, 177, 178, 179, 515, 516, 517, 183, 518, 519, 520, 187, 521, 189, 522, 523,
+524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539,
+540, 541, 256, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554,
+555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570,
+571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 256,
+},
+
+/* set/8859-8 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 162, 163, 164, 165, 166, 167, 168, 169, 215, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 247, 187, 188, 189, 190, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 586,
+587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602,
+603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 256, 256, 614, 615, 256,
+},
+
+/* set/8859-9 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+317, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 316, 263, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+322, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 321, 275, 255,
+},
+
+/* set/8859-10 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 257, 340, 341, 354, 338, 357, 167, 339, 289, 262, 342, 266, 173, 360, 349,
+176, 268, 346, 347, 364, 344, 367, 183, 345, 305, 274, 348, 279, 514, 370, 350,
+351, 193, 194, 195, 196, 197, 198, 352, 285, 201, 286, 203, 353, 205, 206, 207,
+208, 355, 356, 211, 212, 213, 214, 359, 216, 358, 218, 219, 220, 221, 222, 223,
+361, 225, 226, 227, 228, 229, 230, 362, 301, 233, 302, 235, 363, 237, 238, 239,
+240, 365, 366, 243, 244, 245, 246, 369, 248, 368, 250, 251, 252, 253, 254, 336,
+},
+
+/* set/8859-11 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630,
+631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646,
+647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662,
+663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 256, 256, 256, 256, 674,
+675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690,
+691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 256, 256, 256, 256,
+},
+
+/* set/8859-13 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 703, 162, 163, 164, 704, 166, 167, 216, 169, 337, 171, 172, 173, 174, 198,
+176, 177, 178, 179, 705, 181, 182, 183, 248, 185, 343, 187, 188, 189, 190, 230,
+257, 352, 351, 284, 196, 197, 286, 340, 285, 201, 265, 353, 341, 357, 354, 339,
+262, 290, 355, 211, 356, 213, 214, 215, 358, 259, 261, 360, 220, 267, 266, 223,
+268, 362, 361, 300, 228, 229, 302, 346, 301, 233, 277, 363, 347, 367, 364, 345,
+274, 306, 365, 243, 366, 245, 246, 247, 368, 270, 272, 370, 252, 280, 279, 513,
+},
+
+/* set/8859-14 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 706, 707, 163, 324, 330, 708, 167, 709, 169, 710, 711, 712, 173, 174, 713,
+714, 715, 326, 332, 716, 717, 182, 718, 719, 720, 721, 722, 723, 724, 725, 726,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+727, 209, 210, 211, 212, 213, 214, 728, 216, 217, 218, 219, 220, 221, 729, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+730, 241, 242, 243, 244, 245, 246, 731, 248, 249, 250, 251, 252, 253, 732, 255,
+},
+
+/* set/8859-15 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 733, 165, 262, 167, 274, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 266, 181, 182, 183, 279, 185, 186, 187, 734, 735, 713, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+},
+
+/* set/8859-16 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 257, 268, 259, 733, 704, 262, 167, 274, 169, 736, 171, 265, 173, 277, 267,
+176, 177, 285, 270, 266, 703, 182, 183, 279, 301, 737, 187, 734, 735, 713, 280,
+192, 193, 194, 282, 196, 284, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+289, 290, 210, 211, 212, 292, 214, 261, 295, 217, 218, 219, 220, 286, 738, 223,
+224, 225, 226, 298, 228, 300, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+305, 306, 242, 243, 244, 308, 246, 272, 311, 249, 250, 251, 252, 302, 739, 255,
+},
+
+/* set/win-1250 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+733, 256, 740, 256, 704, 741, 742, 743, 256, 744, 262, 745, 261, 264, 266, 265,
+256, 512, 513, 705, 703, 746, 747, 748, 256, 749, 274, 750, 272, 276, 279, 277,
+160, 273, 258, 259, 164, 257, 166, 167, 168, 169, 263, 171, 172, 173, 174, 267,
+176, 177, 269, 270, 180, 181, 182, 183, 184, 268, 275, 187, 260, 278, 271, 280,
+281, 193, 194, 282, 196, 283, 284, 199, 285, 201, 286, 203, 287, 205, 206, 288,
+289, 290, 291, 211, 212, 292, 214, 215, 293, 294, 218, 295, 220, 221, 296, 223,
+297, 225, 226, 298, 228, 299, 300, 231, 301, 233, 302, 235, 303, 237, 238, 304,
+305, 306, 307, 243, 244, 308, 246, 247, 309, 310, 250, 311, 252, 253, 312, 313,
+},
+
+/* set/win-1251 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+372, 373, 740, 452, 704, 741, 742, 743, 733, 744, 379, 745, 380, 382, 381, 384,
+451, 512, 513, 705, 703, 746, 747, 748, 256, 749, 458, 750, 459, 461, 460, 463,
+160, 383, 462, 378, 164, 751, 166, 167, 371, 169, 374, 171, 172, 173, 174, 377,
+176, 177, 376, 455, 752, 181, 182, 183, 450, 449, 453, 187, 457, 375, 454, 456,
+385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400,
+401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
+417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432,
+433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
+},
+
+/* set/win-1252 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+733, 256, 740, 753, 704, 741, 742, 743, 754, 744, 262, 745, 734, 256, 266, 256,
+256, 512, 513, 705, 703, 746, 747, 748, 755, 749, 274, 750, 735, 256, 279, 713,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+},
+
+/* set/kamen-ctrl */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 756,
+285, 252, 233, 304, 228, 288, 264, 301, 303, 287, 283, 205, 271, 299, 196, 193,
+201, 279, 266, 244, 246, 211, 310, 218, 253, 214, 220, 262, 260, 221, 293, 276,
+225, 237, 243, 250, 307, 291, 294, 212, 274, 309, 297, 281, 188, 167, 187, 171,
+757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772,
+773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788,
+789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804,
+556, 557, 805, 571, 542, 574, 567, 575, 545, 532, 548, 559, 806, 577, 807, 808,
+809, 177, 810, 811, 812, 813, 247, 814, 176, 815, 183, 816, 817, 178, 818, 160,
+},
+
+/* set/koi8 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 225, 256, 301, 304, 303, 297, 819, 252, 237, 310, 299, 271, 246, 307, 243,
+244, 228, 309, 274, 276, 250, 256, 233, 224, 253, 279, 256, 820, 256, 821, 256,
+180, 193, 256, 285, 288, 287, 281, 822, 220, 205, 294, 283, 260, 214, 291, 211,
+212, 196, 293, 262, 264, 218, 256, 201, 282, 221, 266, 256, 256, 256, 176, 256,
+},
+
+/* set/pc-latin-2 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 756,
+199, 252, 233, 226, 228, 310, 300, 231, 270, 235, 292, 308, 238, 265, 196, 284,
+201, 283, 299, 244, 246, 260, 271, 261, 272, 214, 220, 264, 276, 259, 215, 301,
+225, 237, 243, 250, 257, 268, 266, 279, 286, 302, 172, 277, 285, 275, 187, 171,
+757, 758, 759, 760, 761, 193, 194, 287, 263, 766, 767, 768, 769, 267, 280, 772,
+773, 774, 775, 776, 777, 778, 282, 298, 781, 782, 783, 784, 785, 786, 787, 164,
+240, 208, 288, 203, 304, 291, 205, 206, 303, 798, 799, 800, 801, 296, 294, 804,
+211, 223, 212, 290, 306, 307, 262, 274, 281, 218, 297, 295, 253, 221, 312, 180,
+823, 824, 825, 820, 826, 167, 247, 827, 256, 828, 313, 311, 293, 309, 818, 160,
+},
+
+/* set/macce */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+196, 351, 361, 201, 257, 214, 220, 225, 268, 285, 228, 301, 284, 300, 233, 265,
+277, 288, 237, 304, 340, 346, 353, 243, 363, 244, 246, 245, 250, 287, 303, 252,
+742, 176, 286, 163, 167, 746, 182, 223, 174, 169, 749, 302, 828, 829, 830, 352,
+362, 354, 811, 810, 364, 357, 831, 832, 270, 339, 345, 260, 271, 283, 299, 355,
+365, 290, 172, 816, 306, 291, 528, 171, 187, 833, 160, 307, 292, 213, 308, 356,
+748, 747, 705, 703, 512, 513, 247, 834, 366, 281, 297, 293, 745, 750, 309, 337,
+343, 262, 740, 704, 274, 261, 272, 193, 264, 276, 205, 266, 279, 360, 211, 212,
+370, 294, 218, 310, 295, 311, 358, 368, 221, 253, 367, 267, 259, 280, 341, 820,
+},
+
+/* set/cork */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+282, 257, 284, 285, 288, 287, 286, 317, 283, 260, 259, 290, 291, 349, 292, 281,
+293, 261, 262, 263, 264, 296, 295, 294, 713, 265, 266, 267, 835, 316, 240, 167,
+298, 268, 300, 301, 304, 303, 302, 322, 299, 271, 270, 306, 307, 350, 308, 297,
+309, 272, 274, 275, 276, 312, 311, 310, 255, 277, 279, 280, 836, 161, 191, 163,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 734, 216, 217, 218, 219, 220, 221, 222, 837,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 735, 248, 249, 250, 251, 252, 253, 254, 223,
+},
+};
+
+static unsigned short int x_to_uni[838] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+65533, 260, 728, 321, 317, 346, 352, 350, 356, 377, 381, 379, 261, 731, 322, 318,
+347, 711, 353, 351, 357, 378, 733, 382, 380, 340, 258, 313, 262, 268, 280, 282,
+270, 272, 323, 327, 336, 344, 366, 368, 354, 341, 259, 314, 263, 269, 281, 283,
+271, 273, 324, 328, 337, 345, 367, 369, 355, 729, 294, 292, 304, 286, 308, 295,
+293, 305, 287, 309, 266, 264, 288, 284, 364, 348, 267, 265, 289, 285, 365, 349,
+312, 342, 296, 315, 274, 290, 358, 343, 297, 316, 275, 291, 359, 330, 331, 256,
+302, 278, 298, 325, 332, 310, 370, 360, 362, 257, 303, 279, 299, 326, 333, 311,
+371, 361, 363, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1038,
+1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054,
+1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070,
+1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086,
+1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102,
+1103, 8470, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1118, 1119,
+1548, 1563, 1567, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581,
+1582, 1583, 1584, 1585, 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594, 1600, 1601, 1602,
+1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1617, 1618,
+8216, 8217, 8213, 900, 901, 902, 904, 905, 906, 908, 910, 911, 912, 913, 914, 915,
+916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929, 931, 932,
+933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948,
+949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964,
+965, 966, 967, 968, 969, 970, 971, 972, 973, 974, 8215, 1488, 1489, 1490, 1491, 1492,
+1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508,
+1509, 1510, 1511, 1512, 1513, 1514, 8206, 8207, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592,
+3593, 3594, 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608,
+3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624,
+3625, 3626, 3627, 3628, 3629, 3630, 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640,
+3641, 3642, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660,
+3661, 3662, 3663, 3664, 3665, 3666, 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 8221,
+8222, 8220, 7682, 7683, 7690, 7808, 7810, 7691, 7922, 376, 7710, 7711, 7744, 7745, 7766, 7809,
+7767, 7811, 7776, 7923, 7812, 7813, 7777, 372, 7786, 374, 373, 7787, 375, 8364, 338, 339,
+536, 537, 538, 539, 8218, 8230, 8224, 8225, 8240, 8249, 8226, 8211, 8212, 8482, 8250, 1168,
+1169, 402, 710, 732, 8962, 9617, 9618, 9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553,
+9559, 9565, 9564, 9563, 9488, 9492, 9524, 9516, 9500, 9472, 9532, 9566, 9567, 9562, 9556, 9577,
+9574, 9568, 9552, 9580, 9575, 9576, 9572, 9573, 9561, 9560, 9554, 9555, 9579, 9578, 9496, 9484,
+9608, 9604, 9612, 9616, 9600, 404, 8734, 8712, 8745, 8781, 8805, 8804, 8992, 8993, 8776, 8729,
+8730, 8319, 9632, 61442, 780, 770, 61440, 8801, 779, 808, 774, 807, 776, 8800, 501, 8706,
+8721, 3759, 8900, 306, 307, 61663, 
+};
+
+static unsigned short int uni_to_x_0[256] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+};
+
+static unsigned short int uni_to_x_1[256] = {
+351, 361, 282, 298, 257, 268, 284, 300, 325, 331, 324, 330, 285, 301, 288, 304,
+289, 305, 340, 346, 256, 256, 353, 363, 286, 302, 287, 303, 327, 333, 317, 322,
+326, 332, 341, 347, 315, 320, 314, 319, 338, 344, 354, 364, 256, 256, 352, 362,
+316, 321, 835, 836, 318, 323, 357, 367, 336, 283, 299, 339, 345, 260, 271, 256,
+256, 259, 270, 290, 306, 355, 365, 291, 307, 256, 349, 350, 356, 366, 256, 256,
+292, 308, 734, 735, 281, 297, 337, 343, 293, 309, 261, 272, 329, 335, 263, 275,
+262, 274, 296, 312, 264, 276, 342, 348, 359, 369, 360, 370, 328, 334, 294, 310,
+295, 311, 358, 368, 727, 730, 729, 732, 713, 265, 277, 267, 280, 266, 279, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 753, 256, 805, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 830, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_2[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 736, 737, 738, 739, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 754, 273, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 258, 313, 256, 269, 755, 278, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_3[256] = {
+256, 256, 821, 256, 256, 256, 826, 256, 828, 256, 256, 824, 820, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 827, 825, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 515, 516, 517, 256, 518, 519, 520, 256, 521, 256, 522, 523,
+524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539,
+540, 541, 256, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554,
+555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570,
+571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_4[256] = {
+256, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 256, 383, 384,
+385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400,
+401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
+417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432,
+433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
+256, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 256, 462, 463,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+751, 752, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_5[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602,
+603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_6[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 464, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 465, 256, 256, 256, 466,
+256, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481,
+482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 256, 256, 256, 256, 256,
+493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508,
+509, 510, 511, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_14[256] = {
+256, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630,
+631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646,
+647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662,
+663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 256, 256, 256, 256, 674,
+675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690,
+691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 833,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_30[256] = {
+256, 256, 706, 707, 256, 256, 256, 256, 256, 256, 708, 711, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 714, 715,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+716, 717, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 718, 720, 256, 256, 256, 256, 256, 256, 256, 256,
+722, 726, 256, 256, 256, 256, 256, 256, 256, 256, 728, 731, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+709, 719, 710, 721, 724, 725, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 712, 723, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_32[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 614, 615,
+256, 256, 256, 747, 748, 514, 256, 586, 512, 513, 740, 256, 705, 703, 704, 256,
+742, 743, 746, 256, 256, 256, 741, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+744, 256, 256, 256, 256, 256, 256, 256, 256, 745, 750, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 817,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 733, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_33[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 449, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 749, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_34[256] = {
+256, 256, 831, 256, 256, 256, 256, 256, 807, 256, 256, 256, 256, 256, 256, 256,
+256, 832, 256, 256, 256, 256, 256, 256, 256, 815, 816, 256, 256, 256, 806, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 808, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 814, 256, 256, 256, 256, 809, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+829, 823, 256, 256, 811, 810, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 834, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_35[256] = {
+256, 256, 756, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+812, 813, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_37[256] = {
+777, 256, 760, 256, 256, 256, 256, 256, 256, 256, 256, 256, 799, 256, 256, 256,
+772, 256, 256, 256, 773, 256, 256, 256, 798, 256, 256, 256, 776, 256, 256, 256,
+256, 256, 256, 256, 761, 256, 256, 256, 256, 256, 256, 256, 775, 256, 256, 256,
+256, 256, 256, 256, 774, 256, 256, 256, 256, 256, 256, 256, 778, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+786, 767, 794, 795, 782, 765, 764, 768, 793, 792, 781, 771, 770, 769, 779, 780,
+785, 762, 763, 766, 790, 791, 784, 788, 789, 783, 797, 796, 787, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+804, 256, 256, 256, 801, 256, 256, 256, 800, 256, 256, 256, 802, 256, 256, 256,
+803, 757, 758, 759, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+818, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_240[256] = {
+822, 256, 819, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 837,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int uni_to_x_255[256] = {
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+};
+
+static unsigned short int *uni_to_x[256] = {
+uni_to_x_0, uni_to_x_1, uni_to_x_2, uni_to_x_3,
+uni_to_x_4, uni_to_x_5, uni_to_x_6, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_14, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_30, uni_to_x_255,
+uni_to_x_32, uni_to_x_33, uni_to_x_34, uni_to_x_35,
+uni_to_x_255, uni_to_x_37, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_240, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+uni_to_x_255, uni_to_x_255, uni_to_x_255, uni_to_x_255,
+};
+
+static unsigned short int x_to_output[24][838] = {
+
+/* set/ascii */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 97, 256, 256, 256, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-1 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-2 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 164, 256, 256, 167, 168, 256, 97, 256, 256, 173, 256, 256,
+176, 256, 50, 51, 180, 256, 256, 256, 184, 49, 111, 256, 257, 261, 265, 256,
+65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 73,
+256, 78, 79, 211, 212, 79, 214, 215, 79, 85, 218, 85, 220, 221, 256, 223,
+97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 105,
+256, 110, 111, 243, 244, 111, 246, 247, 111, 117, 250, 117, 252, 253, 256, 121,
+256, 161, 162, 163, 165, 166, 169, 170, 171, 172, 174, 175, 177, 178, 179, 181,
+182, 183, 185, 186, 187, 188, 189, 190, 191, 192, 195, 197, 198, 200, 202, 204,
+207, 208, 209, 210, 213, 216, 217, 219, 222, 224, 227, 229, 230, 232, 234, 236,
+239, 240, 241, 242, 245, 248, 249, 251, 254, 255, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-3 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 163, 164, 256, 256, 167, 168, 256, 97, 256, 256, 173, 256, 256,
+176, 256, 178, 179, 180, 181, 256, 183, 184, 49, 111, 256, 257, 189, 265, 256,
+192, 193, 194, 65, 196, 65, 269, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+256, 209, 210, 211, 212, 79, 214, 215, 79, 217, 218, 219, 220, 89, 256, 223,
+224, 225, 226, 97, 228, 97, 272, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+256, 241, 242, 243, 244, 111, 246, 247, 111, 249, 250, 251, 252, 121, 256, 121,
+256, 65, 162, 76, 76, 83, 83, 170, 84, 90, 90, 175, 97, 256, 108, 108,
+115, 256, 115, 186, 116, 122, 256, 122, 191, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 255, 161, 166, 169, 171, 172, 177,
+182, 185, 187, 188, 197, 198, 213, 216, 221, 222, 229, 230, 245, 248, 253, 254,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-4 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 164, 256, 256, 167, 168, 256, 97, 256, 256, 173, 256, 175,
+176, 256, 50, 51, 180, 256, 256, 256, 184, 49, 111, 256, 257, 261, 265, 256,
+65, 193, 194, 195, 196, 197, 198, 67, 69, 201, 69, 203, 73, 205, 206, 73,
+256, 78, 79, 79, 212, 213, 214, 215, 216, 85, 218, 219, 220, 89, 256, 223,
+97, 225, 226, 227, 228, 229, 230, 99, 101, 233, 101, 235, 105, 237, 238, 105,
+256, 110, 111, 111, 244, 245, 246, 247, 248, 117, 250, 251, 252, 121, 256, 121,
+256, 161, 256, 76, 76, 83, 169, 83, 84, 90, 174, 90, 177, 178, 108, 108,
+115, 183, 185, 115, 116, 122, 256, 190, 122, 82, 65, 76, 67, 200, 202, 69,
+68, 208, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 232, 234, 101,
+100, 240, 110, 110, 111, 114, 117, 117, 116, 255, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+162, 163, 165, 166, 170, 171, 172, 179, 181, 182, 186, 187, 188, 189, 191, 192,
+199, 204, 207, 209, 210, 211, 217, 221, 222, 224, 231, 236, 239, 241, 242, 243,
+249, 253, 254, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-5 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 256, 256, 256, 253, 256, 256, 97, 256, 256, 173, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 174,
+175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
+239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 254, 255,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-6 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 164, 256, 256, 256, 256, 256, 97, 256, 256, 173, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+172, 187, 191, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 224, 225, 226,
+227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-7 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 163, 256, 256, 166, 167, 168, 169, 97, 171, 172, 173, 256, 256,
+176, 177, 178, 179, 256, 236, 256, 183, 256, 49, 111, 187, 257, 189, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+161, 162, 175, 180, 181, 182, 184, 185, 186, 188, 190, 191, 192, 193, 194, 195,
+196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 211, 212,
+213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
+229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-8 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 162, 163, 164, 165, 166, 167, 168, 169, 97, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 111, 187, 188, 189, 190, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 170, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 186, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 223, 224, 225, 226, 227, 228,
+229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+245, 246, 247, 248, 249, 250, 253, 254, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-9 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+256, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 89, 256, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+256, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 121, 256, 255,
+256, 65, 256, 76, 76, 83, 83, 222, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 254, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 221, 208, 74, 104,
+104, 253, 240, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-10 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 256, 256, 256, 167, 256, 256, 97, 256, 256, 173, 256, 256,
+176, 256, 50, 51, 256, 256, 256, 183, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 193, 194, 195, 196, 197, 198, 67, 69, 201, 69, 203, 73, 205, 206, 207,
+208, 78, 79, 211, 212, 213, 214, 256, 216, 85, 218, 219, 220, 221, 222, 223,
+97, 225, 226, 227, 228, 229, 230, 99, 101, 233, 101, 235, 105, 237, 238, 239,
+240, 110, 111, 243, 244, 245, 246, 256, 248, 117, 250, 251, 252, 253, 254, 121,
+256, 161, 256, 76, 76, 83, 170, 83, 84, 90, 172, 90, 177, 256, 108, 108,
+115, 256, 186, 115, 116, 122, 256, 188, 122, 82, 65, 76, 67, 200, 202, 69,
+68, 169, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 232, 234, 101,
+100, 185, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+255, 82, 165, 168, 162, 163, 171, 114, 181, 184, 178, 179, 187, 175, 191, 192,
+199, 204, 164, 209, 210, 166, 217, 215, 174, 224, 231, 236, 180, 241, 242, 182,
+249, 247, 190, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 189, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-11 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 256, 256, 256, 256, 256, 256, 97, 256, 256, 256, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 161, 162, 163, 164, 165, 166, 167, 168,
+169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+217, 218, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-13 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 162, 163, 164, 256, 166, 167, 256, 169, 97, 171, 172, 173, 174, 256,
+176, 177, 178, 179, 256, 181, 182, 183, 256, 185, 111, 187, 188, 189, 190, 256,
+65, 65, 65, 65, 196, 197, 175, 67, 69, 201, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 211, 79, 213, 214, 215, 168, 85, 85, 85, 220, 89, 256, 223,
+97, 97, 97, 97, 228, 229, 191, 99, 101, 233, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 243, 111, 245, 246, 247, 184, 117, 117, 117, 252, 121, 256, 121,
+256, 192, 256, 217, 76, 218, 208, 83, 84, 202, 222, 221, 224, 256, 249, 108,
+250, 256, 240, 115, 116, 234, 256, 254, 253, 82, 65, 76, 195, 200, 198, 69,
+68, 68, 209, 78, 79, 82, 85, 85, 84, 114, 97, 108, 227, 232, 230, 101,
+100, 100, 241, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 170, 73, 207, 199, 204, 84, 186, 105, 239, 231, 236, 116, 256, 256, 194,
+193, 203, 206, 210, 212, 205, 216, 85, 219, 226, 225, 235, 238, 242, 244, 237,
+248, 117, 251, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 255, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 161,
+165, 180, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-14 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 163, 256, 256, 256, 167, 256, 169, 97, 256, 256, 173, 174, 256,
+256, 256, 50, 51, 256, 256, 182, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+256, 209, 210, 211, 212, 213, 214, 256, 216, 217, 218, 219, 220, 221, 256, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+256, 241, 242, 243, 244, 245, 246, 256, 248, 249, 250, 251, 252, 253, 256, 255,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 164, 67, 178, 71, 85, 83, 165, 99, 179, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 161, 162, 166, 168, 170, 171, 172, 175, 176, 177, 180, 181, 183, 184,
+185, 186, 187, 188, 189, 190, 191, 208, 215, 222, 240, 247, 254, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-15 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 161, 162, 163, 256, 165, 256, 167, 256, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 256, 181, 182, 183, 256, 185, 186, 187, 257, 261, 265, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 65, 256, 76, 76, 83, 166, 83, 84, 90, 180, 90, 97, 256, 108, 108,
+115, 256, 168, 115, 116, 122, 256, 184, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 190, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 164, 188, 189,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/8859-16 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+160, 256, 256, 256, 256, 256, 256, 167, 256, 169, 97, 171, 256, 173, 256, 256,
+176, 177, 50, 51, 256, 256, 182, 183, 256, 49, 111, 187, 257, 261, 265, 256,
+192, 193, 194, 65, 196, 65, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+256, 78, 210, 211, 212, 79, 214, 256, 79, 217, 218, 219, 220, 89, 256, 223,
+224, 225, 226, 97, 228, 97, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+256, 110, 242, 243, 244, 111, 246, 256, 111, 249, 250, 251, 252, 121, 256, 255,
+256, 161, 256, 163, 76, 215, 166, 83, 84, 172, 180, 175, 162, 256, 179, 108,
+247, 256, 168, 115, 116, 174, 256, 184, 191, 82, 195, 76, 197, 178, 221, 69,
+68, 208, 209, 78, 213, 82, 85, 216, 84, 114, 227, 108, 229, 185, 253, 101,
+100, 240, 241, 110, 245, 114, 117, 248, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 181,
+165, 256, 66, 98, 68, 87, 87, 100, 89, 190, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 164, 188, 189,
+170, 186, 222, 254, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/win-1250 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+160, 256, 256, 256, 164, 256, 166, 167, 168, 169, 97, 171, 172, 173, 174, 256,
+176, 177, 50, 51, 180, 181, 182, 183, 184, 49, 111, 187, 257, 261, 265, 256,
+65, 193, 194, 65, 196, 65, 269, 199, 69, 201, 69, 203, 73, 205, 206, 73,
+256, 78, 79, 211, 212, 79, 214, 215, 79, 85, 218, 85, 220, 221, 256, 223,
+97, 225, 226, 97, 228, 97, 272, 231, 101, 233, 101, 235, 105, 237, 238, 105,
+256, 110, 111, 243, 244, 111, 246, 247, 111, 117, 250, 117, 252, 253, 256, 121,
+256, 165, 162, 163, 188, 140, 138, 170, 141, 143, 142, 175, 185, 178, 179, 190,
+156, 161, 154, 186, 157, 159, 189, 158, 191, 192, 195, 197, 198, 200, 202, 204,
+207, 208, 209, 210, 213, 216, 217, 219, 222, 224, 227, 229, 230, 232, 234, 236,
+239, 240, 241, 242, 245, 248, 249, 251, 254, 255, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+145, 146, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 148,
+132, 147, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 128, 256, 256,
+83, 115, 84, 116, 130, 133, 134, 135, 137, 139, 149, 150, 151, 153, 155, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/win-1251 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+160, 256, 256, 256, 164, 256, 166, 167, 256, 169, 97, 171, 172, 173, 174, 256,
+176, 177, 50, 51, 256, 181, 182, 183, 256, 49, 111, 187, 257, 261, 265, 256,
+65, 65, 65, 65, 65, 65, 269, 67, 69, 69, 69, 69, 73, 73, 73, 73,
+256, 78, 79, 79, 79, 79, 79, 256, 79, 85, 85, 85, 85, 89, 256, 256,
+97, 97, 97, 97, 97, 97, 272, 99, 101, 101, 101, 101, 105, 105, 105, 105,
+256, 110, 111, 111, 111, 111, 111, 256, 111, 117, 117, 117, 117, 121, 256, 121,
+256, 65, 256, 76, 76, 83, 83, 83, 84, 90, 90, 90, 97, 256, 108, 108,
+115, 256, 115, 115, 116, 122, 256, 122, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 168, 128, 129, 170, 189, 178, 175, 163, 138, 140, 142, 141, 161,
+143, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
+239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+255, 185, 184, 144, 131, 186, 190, 179, 191, 188, 154, 156, 158, 157, 162, 159,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+145, 146, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 148,
+132, 147, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 136, 256, 256,
+83, 115, 84, 116, 130, 133, 134, 135, 137, 139, 149, 150, 151, 153, 155, 165,
+180, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/win-1252 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+256, 65, 256, 76, 76, 83, 138, 83, 84, 90, 142, 90, 97, 256, 108, 108,
+115, 256, 154, 115, 116, 122, 256, 158, 122, 82, 65, 76, 67, 67, 69, 69,
+68, 68, 78, 78, 79, 82, 85, 85, 84, 114, 97, 108, 99, 99, 101, 101,
+100, 100, 110, 110, 111, 114, 117, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+145, 146, 256, 256, 168, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 148,
+132, 147, 66, 98, 68, 87, 87, 100, 89, 159, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 128, 140, 156,
+83, 115, 84, 116, 130, 133, 134, 135, 137, 139, 149, 150, 151, 153, 155, 256,
+256, 131, 136, 152, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/kamen-ctrl */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+255, 256, 256, 256, 256, 256, 256, 173, 256, 256, 97, 175, 256, 256, 256, 256,
+248, 241, 253, 51, 256, 230, 256, 250, 256, 49, 111, 174, 172, 261, 265, 256,
+65, 143, 65, 65, 142, 65, 269, 67, 69, 144, 69, 69, 73, 139, 73, 73,
+256, 78, 79, 149, 167, 79, 153, 256, 79, 85, 151, 85, 154, 157, 256, 256,
+97, 160, 97, 97, 132, 97, 272, 99, 101, 130, 101, 101, 105, 161, 105, 105,
+256, 110, 111, 162, 147, 111, 148, 246, 111, 117, 163, 117, 129, 152, 256, 121,
+256, 65, 256, 76, 156, 83, 155, 83, 134, 90, 146, 90, 97, 256, 108, 140,
+115, 256, 168, 115, 159, 122, 256, 145, 122, 171, 65, 138, 67, 128, 69, 137,
+133, 68, 78, 165, 79, 158, 166, 85, 84, 170, 97, 141, 99, 135, 101, 136,
+131, 100, 110, 164, 111, 169, 150, 117, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 234, 256, 256, 256, 256,
+256, 256, 256, 256, 233, 256, 256, 256, 256, 256, 256, 256, 256, 256, 228, 256,
+256, 232, 256, 256, 234, 256, 256, 224, 256, 256, 256, 256, 224, 225, 256, 235,
+256, 256, 256, 256, 256, 256, 256, 230, 256, 256, 256, 227, 256, 256, 229, 231,
+256, 237, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 127, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
+219, 220, 221, 222, 223, 226, 236, 238, 239, 240, 242, 243, 244, 245, 247, 249,
+251, 252, 254, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/koi8 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 97, 256, 256, 256, 256, 256,
+254, 256, 50, 51, 224, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 256,
+65, 225, 291, 65, 241, 65, 269, 67, 69, 247, 294, 69, 73, 233, 297, 73,
+256, 78, 79, 239, 240, 79, 237, 256, 79, 85, 245, 300, 232, 249, 256, 256,
+216, 193, 303, 97, 209, 97, 272, 99, 101, 215, 306, 101, 105, 201, 309, 105,
+256, 110, 111, 207, 208, 111, 205, 256, 111, 117, 213, 312, 200, 217, 256, 121,
+256, 65, 256, 76, 236, 83, 243, 83, 244, 90, 250, 90, 97, 256, 108, 204,
+115, 256, 211, 115, 212, 122, 256, 218, 122, 230, 248, 235, 67, 227, 69, 229,
+228, 68, 78, 238, 79, 242, 234, 85, 84, 198, 97, 203, 99, 195, 101, 197,
+196, 100, 110, 206, 111, 210, 202, 117, 116, 256, 72, 315, 73, 71, 318, 104,
+321, 256, 103, 324, 67, 327, 71, 330, 85, 333, 99, 336, 103, 339, 117, 342,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 256, 256, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 89, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 345, 84, 348, 351, 116, 354, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 199, 220, 222, 231, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/pc-latin-2 */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+255, 256, 256, 256, 207, 256, 256, 245, 249, 256, 97, 175, 170, 256, 256, 256,
+256, 256, 50, 51, 239, 256, 256, 256, 247, 49, 111, 174, 257, 261, 265, 256,
+65, 181, 182, 65, 142, 65, 269, 128, 69, 144, 69, 211, 73, 214, 215, 357,
+209, 78, 79, 224, 226, 79, 153, 158, 79, 85, 233, 85, 154, 237, 256, 225,
+97, 160, 131, 97, 132, 97, 272, 135, 101, 130, 101, 137, 105, 161, 140, 360,
+208, 110, 111, 162, 147, 111, 148, 246, 111, 117, 163, 117, 129, 236, 256, 363,
+256, 164, 244, 157, 149, 151, 230, 184, 155, 141, 166, 189, 165, 242, 136, 150,
+152, 256, 231, 173, 156, 171, 241, 167, 190, 232, 198, 145, 143, 172, 168, 183,
+210, 68, 227, 213, 138, 252, 222, 235, 221, 234, 199, 146, 134, 159, 169, 216,
+212, 100, 228, 229, 139, 253, 133, 251, 238, 250, 72, 72, 73, 366, 74, 104,
+104, 256, 369, 106, 67, 67, 71, 71, 372, 83, 99, 99, 103, 103, 375, 115,
+256, 378, 73, 381, 69, 384, 84, 387, 105, 390, 101, 393, 116, 256, 256, 65,
+396, 69, 73, 399, 79, 402, 405, 85, 85, 97, 408, 101, 105, 411, 111, 414,
+417, 117, 117, 249, 256, 256, 256, 256, 256, 249, 256, 256, 256, 256, 256, 244,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 244, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 244, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 249, 256, 256, 256, 256, 256, 249, 256, 256, 256, 256, 256, 244, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 249, 256, 256, 256, 256, 256, 256, 256, 249, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 249, 249, 256, 256, 256, 256, 249, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 249, 249, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 420, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 423, 426, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 127, 176, 177, 178, 179, 180, 256, 256, 256, 256, 185, 186,
+187, 188, 256, 256, 191, 192, 193, 194, 195, 196, 197, 256, 256, 200, 201, 202,
+203, 204, 205, 206, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 217, 218,
+219, 220, 256, 256, 223, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 254, 256, 243, 256, 256, 240, 241, 242, 244, 247, 249, 61, 103, 256,
+256, 256, 256, 285, 288, 256, 
+},
+
+/* set/macce */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+202, 256, 256, 163, 256, 256, 256, 164, 172, 169, 97, 199, 194, 256, 168, 256,
+161, 256, 50, 51, 256, 256, 166, 256, 256, 49, 111, 200, 257, 261, 265, 256,
+65, 231, 65, 65, 128, 65, 269, 67, 69, 131, 69, 429, 73, 234, 73, 432,
+256, 78, 79, 238, 239, 205, 133, 256, 79, 85, 242, 85, 134, 248, 256, 167,
+97, 135, 97, 97, 138, 97, 272, 99, 101, 142, 101, 435, 105, 146, 105, 438,
+256, 110, 111, 151, 153, 155, 154, 214, 111, 117, 156, 117, 159, 249, 256, 441,
+256, 132, 256, 252, 187, 229, 225, 83, 232, 143, 235, 251, 136, 256, 184, 188,
+230, 256, 228, 115, 233, 144, 256, 236, 253, 217, 65, 189, 140, 137, 162, 157,
+145, 68, 193, 197, 204, 219, 241, 244, 84, 218, 97, 190, 141, 139, 171, 158,
+147, 100, 196, 203, 206, 222, 243, 245, 116, 256, 72, 72, 73, 71, 74, 104,
+104, 256, 103, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 223, 73, 185, 148, 254, 84, 224, 105, 186, 149, 103, 116, 256, 256, 129,
+175, 150, 177, 191, 207, 181, 246, 85, 237, 130, 176, 152, 180, 192, 216, 250,
+247, 117, 240, 172, 256, 256, 256, 256, 256, 172, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 172, 256, 256, 256, 256, 256, 172, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+212, 213, 256, 256, 172, 256, 256, 256, 256, 256, 256, 256, 172, 256, 256, 256,
+198, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 172, 172, 256, 256, 256, 256, 172, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 172, 172, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 211,
+227, 210, 66, 98, 68, 87, 87, 100, 89, 444, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 447, 450, 115, 87, 84, 89, 119, 116, 121, 256, 256, 256,
+83, 115, 84, 116, 226, 278, 160, 256, 256, 220, 165, 209, 208, 170, 221, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 179, 178, 256, 256, 256, 256,
+195, 110, 256, 256, 255, 256, 256, 256, 256, 256, 256, 256, 172, 173, 174, 182,
+183, 201, 215, 285, 288, 256, 
+},
+
+/* set/cork */
+{
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 189, 256, 191, 256, 256, 256, 159, 256, 256, 97, 256, 256, 256, 256, 256,
+256, 256, 50, 51, 256, 256, 256, 256, 256, 49, 111, 256, 257, 261, 265, 190,
+192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+208, 209, 210, 211, 212, 213, 214, 256, 216, 217, 218, 219, 220, 221, 222, 255,
+224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+240, 241, 242, 243, 244, 245, 246, 256, 248, 249, 250, 251, 252, 253, 254, 184,
+256, 129, 256, 138, 137, 145, 146, 147, 148, 153, 154, 155, 161, 256, 170, 169,
+177, 256, 178, 179, 180, 185, 256, 186, 187, 143, 128, 136, 130, 131, 134, 133,
+132, 68, 139, 140, 142, 144, 151, 150, 149, 175, 160, 168, 162, 163, 166, 165,
+164, 100, 171, 172, 174, 176, 183, 182, 181, 256, 72, 72, 157, 135, 74, 104,
+104, 256, 167, 106, 67, 67, 71, 71, 85, 83, 99, 99, 103, 103, 117, 115,
+256, 82, 73, 76, 69, 71, 84, 114, 105, 108, 101, 103, 116, 141, 173, 65,
+73, 69, 73, 78, 79, 75, 85, 85, 85, 97, 105, 101, 105, 110, 111, 107,
+117, 117, 117, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 275, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 66, 98, 68, 87, 87, 100, 89, 152, 70, 102, 77, 109, 80, 119,
+112, 119, 83, 121, 87, 119, 115, 87, 84, 89, 119, 116, 121, 256, 215, 247,
+83, 115, 84, 116, 256, 278, 256, 256, 256, 256, 256, 256, 256, 282, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+256, 110, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 61, 103, 256,
+256, 256, 256, 156, 188, 223, 
+},
+};
+
+static unsigned char string_table[] = {
+0,
+3, 49, 47, 52,
+3, 49, 47, 50,
+3, 51, 47, 52,
+2, 65, 69,
+2, 97, 101,
+2, 78, 111,
+3, 46, 46, 46,
+2, 84, 77,
+2, 73, 74,
+2, 105, 106,
+2, 65, 222,
+2, 69, 222,
+2, 73, 222,
+2, 85, 222,
+2, 97, 222,
+2, 101, 222,
+2, 105, 222,
+2, 117, 222,
+2, 72, 222,
+2, 74, 222,
+2, 104, 222,
+2, 106, 222,
+2, 67, 222,
+2, 71, 222,
+2, 83, 222,
+2, 99, 222,
+2, 103, 222,
+2, 115, 222,
+2, 87, 222,
+2, 89, 222,
+2, 119, 222,
+2, 121, 222,
+2, 73, 249,
+2, 105, 249,
+2, 121, 249,
+2, 71, 244,
+2, 103, 244,
+2, 85, 244,
+2, 117, 244,
+2, 82, 247,
+2, 76, 247,
+2, 71, 247,
+2, 114, 247,
+2, 108, 247,
+2, 103, 247,
+2, 73, 242,
+2, 78, 247,
+2, 75, 247,
+2, 85, 242,
+2, 105, 242,
+2, 110, 247,
+2, 107, 247,
+2, 117, 242,
+2, 89, 249,
+2, 87, 249,
+2, 119, 249,
+2, 69, 172,
+2, 73, 172,
+2, 101, 172,
+2, 105, 172,
+2, 121, 172,
+2, 89, 172,
+2, 87, 172,
+2, 119, 172,
+};
diff --git a/libucw/charset/fb-charconv.c b/libucw/charset/fb-charconv.c
new file mode 100644
index 0000000..c4c6b25
--- /dev/null
+++ b/libucw/charset/fb-charconv.c
@@ -0,0 +1,113 @@
+/*
+ *	UCW Library -- Charset Conversion Wrapper for Fast Buffered I/O
+ *
+ *	(c) 2003--2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <charset/charconv.h>
+#include <charset/fb-charconv.h>
+
+#define BUFSIZE 1024
+
+struct fb_charconv {
+  struct fastbuf fb;
+  struct fastbuf *orig;
+  struct conv_context ctxt;
+  byte buf[BUFSIZE];
+};
+#define FB_CC(f) ((struct fb_charconv *)(f))
+
+static void
+fb_cc_spout(struct fastbuf *f)
+{
+  struct conv_context *ct = &FB_CC(f)->ctxt;
+  int flags;
+
+  ct->source = f->buffer;
+  ct->source_end = f->bptr;
+  do
+    {
+      flags = conv_run(ct);
+      if (ct->dest > ct->dest_start)
+	bdirect_write_commit(FB_CC(f)->orig, ct->dest);
+      uint l = bdirect_write_prepare(FB_CC(f)->orig, &ct->dest_start);
+      ct->dest = ct->dest_start;
+      ct->dest_end = ct->dest + l;
+    }
+  while (!(flags & CONV_SOURCE_END));
+
+  f->bptr = f->buffer;
+}
+
+static int
+fb_cc_refill(struct fastbuf *f)
+{
+  struct conv_context *ct = &FB_CC(f)->ctxt;
+  int flags;
+
+  f->bptr = f->bstop = f->buffer;
+  do
+    {
+      byte *src;
+      uint len = bdirect_read_prepare(FB_CC(f)->orig, &src);
+      if (!len)
+	break;
+      ct->source = src;
+      ct->source_end = ct->source + len;
+      ct->dest = ct->dest_start = f->bstop;
+      ct->dest_end = f->bufend;
+      flags = conv_run(ct);
+      bdirect_read_commit(FB_CC(f)->orig, (byte*)ct->source);
+      f->bstop = ct->dest;
+    }
+  while (!(flags & CONV_DEST_END));
+  return (f->bstop > f->bptr);
+}
+
+static void
+fb_cc_close(struct fastbuf *f)
+{
+  bflush(FB_CC(f)->orig);
+  xfree(f);
+}
+
+struct fastbuf *
+fb_wrap_charconv_out(struct fastbuf *f, int cs_from, int cs_to)
+{
+  if (cs_from == cs_to)
+    return f;
+
+  struct fastbuf *g = xmalloc_zero(sizeof(struct fb_charconv));
+  FB_CC(g)->orig = f;
+  conv_init(&FB_CC(g)->ctxt);
+  conv_set_charset(&FB_CC(g)->ctxt, cs_from, cs_to);
+  g->name = "<charconv-out>";
+  g->spout = fb_cc_spout;
+  g->close = fb_cc_close;
+  g->buffer = g->bstop = g->bptr = FB_CC(g)->buf;
+  g->bufend = g->buffer + BUFSIZE;
+  return g;
+}
+
+struct fastbuf *
+fb_wrap_charconv_in(struct fastbuf *f, int cs_from, int cs_to)
+{
+  if (cs_from == cs_to)
+    return f;
+
+  struct fastbuf *g = xmalloc_zero(sizeof(struct fb_charconv));
+  FB_CC(g)->orig = f;
+  conv_init(&FB_CC(g)->ctxt);
+  conv_set_charset(&FB_CC(g)->ctxt, cs_from, cs_to);
+  g->name = "<charconv-in>";
+  g->refill = fb_cc_refill;
+  g->close = fb_cc_close;
+  g->buffer = g->bstop = g->bptr = FB_CC(g)->buf;
+  g->bufend = g->buffer + BUFSIZE;
+  return g;
+}
diff --git a/libucw/charset/fb-charconv.h b/libucw/charset/fb-charconv.h
new file mode 100644
index 0000000..412c692
--- /dev/null
+++ b/libucw/charset/fb-charconv.h
@@ -0,0 +1,16 @@
+/*
+ *	UCW Library -- Charset Conversion Wrapper for Fast Buffered I/O
+ *
+ *	(c) 2003--2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define fb_wrap_charconv_in ucw_fb_wrap_charconv_in
+#define fb_wrap_charconv_out ucw_fb_wrap_charconv_out
+#endif
+
+struct fastbuf *fb_wrap_charconv_in(struct fastbuf *f, int cs_from, int cs_to);
+struct fastbuf *fb_wrap_charconv_out(struct fastbuf *f, int cs_from, int cs_to);
diff --git a/libucw/charset/libucw-charset.pc b/libucw/charset/libucw-charset.pc
new file mode 100644
index 0000000..a324ef0
--- /dev/null
+++ b/libucw/charset/libucw-charset.pc
@@ -0,0 +1,11 @@
+# pkg-config metadata for libucw-charset
+
+libdir=@LIBDIR@
+incdir=.
+
+Name: libucw-charset
+Description: Character set conversion library
+Version: @UCW_VERSION@
+Cflags: -I${incdir}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-charset@UCW_ABI_SUFFIX@
+Requires.private: @DEPS@
diff --git a/libucw/charset/misc/add-charnames b/libucw/charset/misc/add-charnames
new file mode 100755
index 0000000..5057d5f
--- /dev/null
+++ b/libucw/charset/misc/add-charnames
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+#
+#  Add Unicode Character Names to a character set table file
+#  (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+
+open (UNI, "unidata/UnicodeData.txt") || die "No Unicode Data File";
+while (<UNI>) {
+	($num,$name) = split /;/;
+	$name{$num} = $name;
+}
+close UNI;
+
+while (<>) {
+	($code,$uni) = split /[ \t\n]+/;
+	$name = $name{$uni};
+	($name eq "") && ($name = "????");
+	print "$code\t$uni\t$name\n";
+}
diff --git a/libucw/charset/misc/chartable.in b/libucw/charset/misc/chartable.in
new file mode 100644
index 0000000..ca0c160
--- /dev/null
+++ b/libucw/charset/misc/chartable.in
@@ -0,0 +1,30 @@
+# List of character set tables for tabgen
+# Ordering defines internal charset numbers
+# Remember to change charconv.h and setnames.c accordingly!
+
+set/ascii
+set/8859-1
+set/8859-2
+set/8859-3
+set/8859-4
+set/8859-5
+set/8859-6
+set/8859-7
+set/8859-8
+set/8859-9
+set/8859-10
+set/8859-11
+set/8859-13
+set/8859-14
+set/8859-15
+set/8859-16
+set/win-1250
+set/win-1251
+set/win-1252
+set/kamen-ctrl
+set/koi8
+set/pc-latin-2
+set/macce
+set/cork
+#set/ibm-ctrl
+#set/mac
diff --git a/libucw/charset/misc/gen-basic b/libucw/charset/misc/gen-basic
new file mode 100755
index 0000000..bd0044b
--- /dev/null
+++ b/libucw/charset/misc/gen-basic
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+#
+#  Split Unicode Data File
+#  (c) 1997--2003 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+
+open(I, "unidata/UnicodeData.txt") || die "Unable to open UniCode data file";
+open(C, ">misc/u-cat") || die "cat file open";
+open(U, ">misc/u-upper") || die "upper file open";
+open(L, ">misc/u-lower") || die "lower file open";
+open(G, ">misc/u-ligatures") || die "lig file open";
+while (<I>) {
+	chomp;
+	(/^$/ || /^#/) && next;
+	($code,$name,$cat,$comb,$bidir,$decomp,$d0,$d1,$n0,$mirr,$cmt1,$cmt2,$upper,$lower,$title) = split /;/;
+	$code =~ /^....$/ || next;
+	if ($cat =~ /^C/) { $ccat = "_U_CTRL"; }
+	elsif ($cat =~ /^Z/) { $ccat = "_U_SPACE"; }
+	elsif ($decomp =~ /<compat>/ && $name =~ / LIGATURE /) {
+		$ccat = "_U_LIGATURE";
+		print G "$code\n";
+	} elsif ($cat =~ /^Ll/) { $ccat = "_U_LLOWER"; }
+	elsif ($cat =~ /^Lu/) { $ccat = "_U_LUPPER"; }
+	elsif ($cat =~ /^L/) { $ccat = "_U_LETTER"; }
+	elsif ($code ge "0030" && $code le "0039") { $ccat = "_U_DIGIT | _U_XDIGIT"; }
+	else { $ccat = ""; }
+	if ($code ge "0041" && $code le "0046" || $code ge "0061" && $code le "0066") { $ccat = $ccat . "|_U_XDIGIT"; }
+	if ($ccat ne "") { print C "$code\t$ccat\n"; }
+	if ($upper ne "") { print U "$code\t0x$upper\n"; }
+	if ($lower ne "") { print L "$code\t0x$lower\n"; }
+}
+close I;
+close C;
+close U;
+close L;
+close G;
diff --git a/libucw/charset/misc/gen-charconv b/libucw/charset/misc/gen-charconv
new file mode 100755
index 0000000..ab22b15
--- /dev/null
+++ b/libucw/charset/misc/gen-charconv
@@ -0,0 +1,194 @@
+#!/usr/bin/perl
+#
+#	Character Set Table Generator 1.0
+#	(c) 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+#	This program can be freely distributed and used according to the terms
+#	of the GNU General Public License.
+#
+
+# Internal codes 0..255 are mapped to UniCode 0..255
+# Internal code 256 is the replacement character (U#FFFD)
+
+$ncs = 0;
+
+print "/* Generated by tabgen 1.0, please don't edit manually. */\n\n";
+
+print STDERR "Charset list...\n";
+
+while (<>) {
+	chomp;
+	(/^\w*$/ || /^#/) && next;
+	$charsets[$ncs++] = $_;
+}
+
+print STDERR "Found $ncs charsets, counting unique codes...\n";
+
+for($unique=0; $unique<256; $unique++) {
+	$u2x{$unique} = $unique;
+	$x2u[$unique] = $unique;
+}
+$u2x{0xFFFD} = $unique;
+$x2u[$unique++] = 0xFFFD;
+print "static unsigned short int input_to_x[$ncs][256] = {\n";
+for($x=0; $x<$ncs; $x++) {
+	$a = $charsets[$x];
+	print "\n/* $a */\n{\n";
+	open (A, $a) || die "Error opening $a";
+	while (<A>) {
+		chomp;
+		(/^\w*$/ || /^#/) && next;
+		($i, $u, $c) = split /\t/;
+		$cc[$x][hex $i] = $u;
+	}
+	close A;
+	for($i=0; $i<256; $i++) {
+		$u = hex((defined $cc[$x][$i]) ? $cc[$x][$i] : "FFFD");
+		if (!defined $u2x{$u}) {
+			$x2u[$unique] = $u;
+			$u2x{$u} = $unique++;
+		}
+		$o = $u2x{$u};
+		print "$o,", ($i % 16 == 15) ? "\n" : " ";
+		$cc[$x][$i] = $o;
+		$cx[$x]{$o} = $i;
+	}
+	print "},\n";
+}
+print "};\n\n";
+
+print STDERR "$unique unique codes...\n";
+
+print "static unsigned short int x_to_uni[$unique] = {\n";
+for($i=0; $i<$unique; $i++) {
+	print "$x2u[$i],", ($i % 16 == 15) ? "\n" : " ";
+}
+if ($i % 16) { print "\n"; }
+print "};\n\n";
+
+print STDERR "UNICODE table...\n";
+for($i=0; $i<$unique; $i++) {
+	$u = $x2u[$i];
+	$p = $u / 256;
+	$pg[$p] = 1;
+}
+for($i=0; $i<256; $i++) {
+	if ($pg[$i]) {
+		print "static unsigned short int uni_to_x_$i\[256\] = {\n";
+		for($j=0; $j<256; $j++) {
+			$u = 256*$i + $j;
+			$u = defined($u2x{$u}) ? $u2x{$u} : 256;
+			print "$u,", ($j % 16 == 15) ? "\n" : " ";
+		}
+		print "};\n\n";
+	}
+}
+print "static unsigned short int *uni_to_x[256] = {\n";
+for($i=hex "FF00"; $i<=hex "FFFF"; $i++) {
+	if (defined $u2x{$i} && $i != 0xFFFD) { die "Invalid replacement strategy!"; }
+}
+for($i=0; $i<256; $i++) {
+	print "uni_to_x_", $pg[$i] ? $i : "255", ",", ($i % 4 == 3) ? "\n" : " ";
+}
+print "};\n\n";
+
+print STDERR "UniData file...\n";
+open (U, "unidata/UnicodeData.txt") || die "No UnicodeData file";
+while (<U>) {
+	chomp;
+	($num,$name,$_,$_,$_,$exp) = split /;/;
+	if ($exp ne "") {
+		$exp =~ s/^<.*> *//g;
+		$a = "";
+		foreach $x (split (/ /, $exp)) {
+			if ($x ne "0020") {
+				$a = $a . " " . hex $x;
+			}
+		}
+		($expand{hex $num} = $a) =~ s/^ //;
+	}
+}
+close U;
+
+print STDERR "Accent rules\n";
+if (open(ACC, "misc/user_unacc")) {
+	while (<ACC>) {
+		chomp;
+		(/^\s*$/ || /^#/) && next;
+		s/0x([0-9a-zA-Z]+)/hex($1)/ge;
+		(/^(\d+)\s+(\d+)$/) || die "Syntax error in user accent rules";
+		$expand{$1} = $2;
+	}
+	close ACC;
+}
+
+print STDERR "Character expansions\n";
+if (open(EXTRA, "misc/user_expand")) {
+	while (<EXTRA>) {
+		chomp;
+		(/^\s*$/ || /^#/) && next;
+		s/0x([0-9a-zA-Z]+)/hex($1)/ge;
+		(/^(\d+)\s+(.*)$/) || die "Syntax error in user expansions";
+		$expand{$1} = $2;
+	}
+	close EXTRA;
+}
+
+print "static unsigned short int x_to_output[$ncs][$unique] = {\n";
+$pstr = 256;
+for($c=0; $c<$ncs; $c++) {
+	print "\n/* $charsets[$c] */\n{\n";
+	for($i=0; $i<$unique; $i++) {
+		$u = $x2u[$i];
+		do {
+			$r = $u;
+			$u = "";
+			foreach $x (split (/ /, $r)) {
+				if (defined($k = $u2x{$x}) && defined $cx[$c]{$k}) {
+					$u = "$u $x";
+				} elsif (defined($k = $expand{$x})) {
+					$u = "$u $k";
+				}
+			}
+			$u =~ s/^ //;
+		} while ($r ne $u);
+		$u = "";
+		foreach $x (split (/ /, $r)) {
+			if (defined($k = $u2x{$x})) {
+				if ($k != 256 && defined ($k = $cx[$c]{$k})) {
+					$u = $u . pack("C", $k);
+				}
+			}
+		}
+		if (length($u) == 1) {
+			$z = unpack("C", $u);
+		} else {
+			if (!defined($string{$u})) {
+				$string{$u} = $pstr;
+				$strval{$pstr} = $u;
+				$pstr += 1 + length($u);
+			}
+			$z = $string{$u};
+		}
+		print "$z,", ($i % 16 == 15) ? "\n" : " ";
+	}
+	if ($i % 16) { print "\n"; }
+	print "},\n";
+}
+print "};\n\n";
+
+print STDERR "And Tubular Bells...\n";
+print "static unsigned char string_table[] = {\n";
+$i = 256;
+while ($i < $pstr) {
+	$w = $strval{$i};
+	print length $w, ",";
+	foreach $x (unpack("C256", $w)) {
+		print " $x,";
+	}
+	print "\n";
+	$i += 1 + length $w;
+}
+print "};\n";
+
+print STDERR "Done.\n";
diff --git a/libucw/charset/misc/gen-ligatures b/libucw/charset/misc/gen-ligatures
new file mode 100755
index 0000000..17469ea
--- /dev/null
+++ b/libucw/charset/misc/gen-ligatures
@@ -0,0 +1,73 @@
+#!/usr/bin/perl
+#
+#  Generate Expansion Table of Compatibility Ligatures
+#  (c) 2003 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+
+use strict;
+use warnings;
+
+print STDERR "Reading ligature list\n";
+open(L, "misc/u-ligatures") || die "lig file open";
+my %ligs = ();
+while (<L>) {
+	chomp;
+	$ligs{$_} = 1;
+}
+close L;
+
+print STDERR "Reading decompositions\n";
+open(I, "unidata/UnicodeData.txt") || die "Unable to open UniCode data file";
+my %decs = ();
+while (<I>) {
+	chomp;
+	(/^$/ || /^#/) && next;
+	my ($code,$name,$cat,$comb,$bidir,$decomp,$d0,$d1,$n0,$mirr,$cmt1,$cmt2,$upper,$lower,$title) = split /;/;
+	$code =~ /^....$/ || next;
+	if (my ($d) = ($decomp =~ /^<compat> (.*)/)) {
+		$decs{$code} = $d;
+	}
+}
+close I;
+
+sub expand($) {
+	my ($c) = @_;
+	if (defined $decs{$c}) {
+		return join (" ", map { expand($_) } split(/\s+/, $decs{$c}));
+	} else {
+		return $c;
+	}
+}
+
+print STDERR "Searching for a perfect hash function\n";
+my $n = keys %ligs;
+my $div = $n-1;
+DIV: while (++$div) {
+	#print STDERR "Trying $div... ";
+	my @c = ();
+	foreach my $l (keys %ligs) {
+		my $i = (hex $l) % $div;
+		if (defined $c[$i]) {
+			#print STDERR "collision\n";
+			next DIV;
+		}
+		$c[$i] = 1;
+	}
+	#print STDERR "FOUND\n";
+	last;
+}
+
+print STDERR "Filling hash table with $div entries for $n ligatures\n";
+my @ht = map { "NULL" } 1..$div;
+foreach my $l (keys %ligs) {
+	my $i = (hex $l) % $div;
+	my $w = join(", ", map { "0x$_" } split(/ /, expand($l)));
+	$ht[$i] = "/* $l */ (const u16 []) { $w, 0 }";
+}
+
+print "#define LIG_HASH_SIZE $div\n\n";
+print "static const u16 *_U_lig_hash[] = {\n";
+for (my $i=0; $i<$div; $i++) {
+	print "\t", $ht[$i], ",\n";
+}
+print "};\n";
diff --git a/libucw/charset/misc/gen-unacc b/libucw/charset/misc/gen-unacc
new file mode 100755
index 0000000..9513fa2
--- /dev/null
+++ b/libucw/charset/misc/gen-unacc
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+#
+#  Create Unicode Unaccenting Table
+#  (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+
+open (UNI, "unidata/UnicodeData.txt") || die "No Unicode Data File";
+while (<UNI>) {
+    chomp;
+    ($num,$name,$cat,$_,$_,$exp) = split /;/;
+    if ($cat =~ /^L[ul]$/) { $letter{$num} = 1; }
+    if ($cat =~ /^Mn$/) { $accent{$num} = 1; }
+}
+close UNI;
+
+open (UNI, "unidata/UnicodeData.txt") || die "No Unicode Data File";
+while (<UNI>) {
+    chomp;
+    ($num,$name,$cat,$_,$_,$exp) = split /;/;
+    $num =~ /^....$/ || next;
+    if ($exp ne "") {
+	$exp =~ s/^<.*> *//g;
+	$good = 1;
+	$e = "";
+	foreach $a (split(/\s+/, $exp)) {
+	    if ($accent{$a}) { }
+	    elsif ($letter{$a}) {
+		if ($e ne "") { $good = 0; }
+		else { $e = $a; }
+	    } else { $good = 0; }
+	}
+	if ($good && $e ne "") { print "$num\t0x$e\n"; }
+    }
+}
+close UNI;
diff --git a/libucw/charset/misc/generate b/libucw/charset/misc/generate
new file mode 100644
index 0000000..1d91b76
--- /dev/null
+++ b/libucw/charset/misc/generate
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Generate all data files for the charset conversion library
+# (c) 2001--2003 Martin Mares <mj@ucw.cz>
+
+set -ex
+rm -f U-*.h chartable.h misc/u-*
+misc/gen-basic
+misc/table2h _U_cat byte <misc/u-cat >U-cat.h
+misc/table2h _U_lower u16 <misc/u-lower >U-lower.h
+misc/table2h _U_upper u16 <misc/u-upper >U-upper.h
+( cat misc/user_unacc && misc/gen-unacc ) >misc/u-unacc
+misc/table2h _U_unaccent u16 <misc/u-unacc >U-unacc.h
+misc/gen-ligatures >U-ligatures.h
+misc/gen-charconv <misc/chartable.in >chartable.h
diff --git a/libucw/charset/misc/import-recode b/libucw/charset/misc/import-recode
new file mode 100755
index 0000000..07b5a85
--- /dev/null
+++ b/libucw/charset/misc/import-recode
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+#
+#  Use `recode` to create a translation table
+#  (c) 2003, Robert Spalek <robert@ucw.cz>
+#
+
+use open IN => ":utf8";
+
+foreach $charset (@ARGV)
+{
+	print "Charset: $charset\n";
+	open(fi, "recode -s -f $charset/..utf-8/ <tmp/tab256 |") || die "Recoding error";
+	open(fo, "| ./mkuni >tmp/$charset") || die;
+
+	while (<fi>)
+	{
+		chop;
+		(($number, $char) = /^([0-9A-F]{2})\t(.?)$/) || die "Cannot parse $_";
+		$recode[hex $number] = $char ne "" ? ord $char : -1;
+	}
+	$#recode >= 0 || die "Empty recoding table";
+	$recode[10] = 10;
+	$recode[13] = 13;
+
+	for ($i=0; $i<=$#recode; $i++)
+	{
+		printf fo "%02X\t%04X\n", $i, $recode[$i]
+			if $recode[$i] >= 0;
+	}
+
+	close(fo);
+	close(fi);
+}
diff --git a/libucw/charset/misc/import-unicode_org b/libucw/charset/misc/import-unicode_org
new file mode 100755
index 0000000..6c61034
--- /dev/null
+++ b/libucw/charset/misc/import-unicode_org
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+#	Import charset tables from ftp.unicode.org
+#	(c) 2003, Robert Spalek <robert@ucw.cz>
+
+foreach $file (@ARGV)
+{
+	print "Converting $file\n";
+	($prefix, $filename) = $file =~ m|^(.*/)([^/]*)$|;
+
+	open(fi, "<$file") || die;
+	open(fo, ">$file-tr") || die;
+	print fo "# $filename charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/$file
+# (c) 2003, Robert Spalek <robert\@ucw.cz>
+
+";
+	while (<fi>)
+	{
+		next if /^#/;
+		chop;
+		if (($code, $unicode, $comment) = /^0x(..)\t0x(....)\t#\t?(.*)$/)
+		{
+			print fo "$code\t$unicode\t$comment\n";
+		}
+	}
+	close(fo);
+	close(fi);
+}
diff --git a/libucw/charset/misc/mktab256 b/libucw/charset/misc/mktab256
new file mode 100755
index 0000000..8cfc6e9
--- /dev/null
+++ b/libucw/charset/misc/mktab256
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+#
+#  Simply create a table of all 256 characters
+#  (c) 2003, Robert Spalek <robert@ucw.cz>
+#
+
+use open OUT => ":raw";
+
+open(fo, '>tmp/tab256') || die;
+for ($i=0; $i<256; $i++)
+{
+	next if $i==10 || $i==13;
+	printf fo "%02X\t%c\n", $i, $i;
+}
+close(fo);
diff --git a/libucw/charset/misc/table2h b/libucw/charset/misc/table2h
new file mode 100755
index 0000000..92a35d5
--- /dev/null
+++ b/libucw/charset/misc/table2h
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+#
+#  Generate C Language Table for UniCode Data
+#  (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+
+$name=$ARGV[0];
+$type=$ARGV[1];
+
+while (<STDIN>) {
+	chomp;
+	/^#/ && next;
+	/^\s*$/ && next;
+	s/^0x//;
+	($i,$j) = split/\s+/;
+	($i =~ /^(..)(..)$/) || die "Syntax error at $i";
+	$table{$1} = "$name" . "_$1";
+	die if defined $val{$i};
+	$val{$i} = $j;
+}
+
+print "/* Generated automatically by gentab. Please don't edit. */\n\n";
+
+for($i=0; $i<256; $i++) {
+	$x = sprintf("%02X", $i);
+	if (defined($table{$x})) {
+		print "static const $type $table{$x}\[256\] = \{\n";
+		for($j=0; $j<256; $j++) {
+			$y = $x . sprintf("%02X", $j);
+			if ($val{$y}) { print $val{$y}; }
+			else { print "0"; }
+			if ($j != 255) { print ","; }
+			if ($j % 16 == 15) { print "\n"; }
+		}
+		print "\};\n\n";
+	}
+}
+
+print "const $type \*$name\[256\] = \{\n";
+for($j=0; $j<256; $j++) {
+	$y = sprintf("%02X", $j);
+	if (defined $table{$y}) { print $table{$y}; }
+	else { print "NULL"; }
+	if ($j != 255) { print ","; }
+	if ($j % 16 == 15) { print "\n"; }
+}
+print "\};\n";
diff --git a/libucw/charset/misc/user_expand b/libucw/charset/misc/user_expand
new file mode 100644
index 0000000..c48aa8a
--- /dev/null
+++ b/libucw/charset/misc/user_expand
@@ -0,0 +1,8 @@
+# User-defined character expansions
+
+# Fraction slash
+0x2044	0x002f
+
+# `ae' and `AE'
+0x00c6	0x0041 0x0045
+0x00e6	0x0061 0x0065
diff --git a/libucw/charset/misc/user_unacc b/libucw/charset/misc/user_unacc
new file mode 100644
index 0000000..e08f4d1
--- /dev/null
+++ b/libucw/charset/misc/user_unacc
@@ -0,0 +1,22 @@
+# User-defined unaccenting rules
+
+# Stroked letters
+0x00d8	0x004f
+0x00f8	0x006f
+0x0110	0x0044
+0x0111	0x0064
+0x0126	0x0048
+0x0127	0x0068
+0x0141	0x004c
+0x0142	0x006c
+0x0166	0x0054
+0x0167	0x0074
+0x0180	0x0042
+0x0197	0x0049
+0x01b5	0x005a
+0x01b6	0x007a
+0x01e4	0x0047
+0x01e5	0x0067
+0x01fe	0x004f
+0x01ff	0x006f
+0x0268	0x0069
diff --git a/libucw/charset/mp-charconv.c b/libucw/charset/mp-charconv.c
new file mode 100644
index 0000000..48b08ad
--- /dev/null
+++ b/libucw/charset/mp-charconv.c
@@ -0,0 +1,50 @@
+/*
+ *	UCW Library -- Character Conversion with Allocation on a Memory Pool
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/mp-charconv.h>
+#include <string.h>
+#include <alloca.h>
+
+byte *
+mp_strconv(struct mempool *mp, const byte *s, uint in_cs, uint out_cs)
+{
+  if (in_cs == out_cs)
+    return mp_strdup(mp, s);
+
+  struct conv_context c;
+  char *b[32];
+  uint bs[32], n = 0, sum = 0;
+  uint l = strlen(s) + 1;
+
+  conv_init(&c);
+  conv_set_charset(&c, in_cs, out_cs);
+  c.source = s;
+  c.source_end = s + l;
+
+  for (;;)
+    {
+      l <<= 1;
+      c.dest_start = c.dest = b[n] = alloca(l);
+      c.dest_end = c.dest_start+ l;
+      uint r = conv_run(&c);
+      sum += bs[n++] = c.dest - c.dest_start;
+      if (r & CONV_SOURCE_END)
+        {
+          c.dest_start = c.dest = mp_alloc(mp, sum);
+          for (uint i = 0; i < n; i++)
+            {
+              memcpy(c.dest, b[i], bs[i]);
+              c.dest += bs[i];
+            }
+  	  return c.dest_start;
+        }
+    }
+}
+
diff --git a/libucw/charset/mp-charconv.h b/libucw/charset/mp-charconv.h
new file mode 100644
index 0000000..d31f271
--- /dev/null
+++ b/libucw/charset/mp-charconv.h
@@ -0,0 +1,28 @@
+/*
+ *	UCW Library -- Character Conversion with Allocation on a Memory Pool
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _CHARSET_MP_CHARCONV_H
+#define _CHARSET_MP_CHARCONV_H
+
+#include <ucw/mempool.h>
+#include <charset/charconv.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define mp_strconv ucw_mp_strconv
+#endif
+
+byte *mp_strconv(struct mempool *mp, const byte *s, uint cs_in, uint cs_out);
+
+static inline byte *mp_strconv_to_utf8(struct mempool *mp, const byte *s, uint cs_in)
+{ return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
+
+static inline byte *mp_strconv_from_utf8(struct mempool *mp, const byte *s, uint cs_out)
+{ return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
+
+#endif
diff --git a/libucw/charset/set/8859-1 b/libucw/charset/set/8859-1
new file mode 100644
index 0000000..2a1642e
--- /dev/null
+++ b/libucw/charset/set/8859-1
@@ -0,0 +1,260 @@
+# 8859-1.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-1.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	00A1	INVERTED EXCLAMATION MARK
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A5	00A5	YEN SIGN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AA	00AA	FEMININE ORDINAL INDICATOR
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	00B9	SUPERSCRIPT ONE
+BA	00BA	MASCULINE ORDINAL INDICATOR
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	00BC	VULGAR FRACTION ONE QUARTER
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	00BE	VULGAR FRACTION THREE QUARTERS
+BF	00BF	INVERTED QUESTION MARK
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	00D0	LATIN CAPITAL LETTER ETH (Icelandic)
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	00DE	LATIN CAPITAL LETTER THORN (Icelandic)
+DF	00DF	LATIN SMALL LETTER SHARP S (German)
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	00F0	LATIN SMALL LETTER ETH (Icelandic)
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	00FE	LATIN SMALL LETTER THORN (Icelandic)
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/set/8859-10 b/libucw/charset/set/8859-10
new file mode 100644
index 0000000..131cdf1
--- /dev/null
+++ b/libucw/charset/set/8859-10
@@ -0,0 +1,260 @@
+# 8859-10.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-10.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A2	0112	LATIN CAPITAL LETTER E WITH MACRON
+A3	0122	LATIN CAPITAL LETTER G WITH CEDILLA
+A4	012A	LATIN CAPITAL LETTER I WITH MACRON
+A5	0128	LATIN CAPITAL LETTER I WITH TILDE
+A6	0136	LATIN CAPITAL LETTER K WITH CEDILLA
+A7	00A7	SECTION SIGN
+A8	013B	LATIN CAPITAL LETTER L WITH CEDILLA
+A9	0110	LATIN CAPITAL LETTER D WITH STROKE
+AA	0160	LATIN CAPITAL LETTER S WITH CARON
+AB	0166	LATIN CAPITAL LETTER T WITH STROKE
+AC	017D	LATIN CAPITAL LETTER Z WITH CARON
+AD	00AD	SOFT HYPHEN
+AE	016A	LATIN CAPITAL LETTER U WITH MACRON
+AF	014A	LATIN CAPITAL LETTER ENG
+B0	00B0	DEGREE SIGN
+B1	0105	LATIN SMALL LETTER A WITH OGONEK
+B2	0113	LATIN SMALL LETTER E WITH MACRON
+B3	0123	LATIN SMALL LETTER G WITH CEDILLA
+B4	012B	LATIN SMALL LETTER I WITH MACRON
+B5	0129	LATIN SMALL LETTER I WITH TILDE
+B6	0137	LATIN SMALL LETTER K WITH CEDILLA
+B7	00B7	MIDDLE DOT
+B8	013C	LATIN SMALL LETTER L WITH CEDILLA
+B9	0111	LATIN SMALL LETTER D WITH STROKE
+BA	0161	LATIN SMALL LETTER S WITH CARON
+BB	0167	LATIN SMALL LETTER T WITH STROKE
+BC	017E	LATIN SMALL LETTER Z WITH CARON
+BD	2015	HORIZONTAL BAR
+BE	016B	LATIN SMALL LETTER U WITH MACRON
+BF	014B	LATIN SMALL LETTER ENG
+C0	0100	LATIN CAPITAL LETTER A WITH MACRON
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	012E	LATIN CAPITAL LETTER I WITH OGONEK
+C8	010C	LATIN CAPITAL LETTER C WITH CARON
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	0118	LATIN CAPITAL LETTER E WITH OGONEK
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	0116	LATIN CAPITAL LETTER E WITH DOT ABOVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	00D0	LATIN CAPITAL LETTER ETH (Icelandic)
+D1	0145	LATIN CAPITAL LETTER N WITH CEDILLA
+D2	014C	LATIN CAPITAL LETTER O WITH MACRON
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	0168	LATIN CAPITAL LETTER U WITH TILDE
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	0172	LATIN CAPITAL LETTER U WITH OGONEK
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	00DE	LATIN CAPITAL LETTER THORN (Icelandic)
+DF	00DF	LATIN SMALL LETTER SHARP S (German)
+E0	0101	LATIN SMALL LETTER A WITH MACRON
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	012F	LATIN SMALL LETTER I WITH OGONEK
+E8	010D	LATIN SMALL LETTER C WITH CARON
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	0119	LATIN SMALL LETTER E WITH OGONEK
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	0117	LATIN SMALL LETTER E WITH DOT ABOVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	00F0	LATIN SMALL LETTER ETH (Icelandic)
+F1	0146	LATIN SMALL LETTER N WITH CEDILLA
+F2	014D	LATIN SMALL LETTER O WITH MACRON
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	0169	LATIN SMALL LETTER U WITH TILDE
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	0173	LATIN SMALL LETTER U WITH OGONEK
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	00FE	LATIN SMALL LETTER THORN (Icelandic)
+FF	0138	LATIN SMALL LETTER KRA
diff --git a/libucw/charset/set/8859-11 b/libucw/charset/set/8859-11
new file mode 100644
index 0000000..7ff1e7b
--- /dev/null
+++ b/libucw/charset/set/8859-11
@@ -0,0 +1,252 @@
+# 8859-11.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-11.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0E01	THAI CHARACTER KO KAI
+A2	0E02	THAI CHARACTER KHO KHAI
+A3	0E03	THAI CHARACTER KHO KHUAT
+A4	0E04	THAI CHARACTER KHO KHWAI
+A5	0E05	THAI CHARACTER KHO KHON
+A6	0E06	THAI CHARACTER KHO RAKHANG
+A7	0E07	THAI CHARACTER NGO NGU
+A8	0E08	THAI CHARACTER CHO CHAN
+A9	0E09	THAI CHARACTER CHO CHING
+AA	0E0A	THAI CHARACTER CHO CHANG
+AB	0E0B	THAI CHARACTER SO SO
+AC	0E0C	THAI CHARACTER CHO CHOE
+AD	0E0D	THAI CHARACTER YO YING
+AE	0E0E	THAI CHARACTER DO CHADA
+AF	0E0F	THAI CHARACTER TO PATAK
+B0	0E10	THAI CHARACTER THO THAN
+B1	0E11	THAI CHARACTER THO NANGMONTHO
+B2	0E12	THAI CHARACTER THO PHUTHAO
+B3	0E13	THAI CHARACTER NO NEN
+B4	0E14	THAI CHARACTER DO DEK
+B5	0E15	THAI CHARACTER TO TAO
+B6	0E16	THAI CHARACTER THO THUNG
+B7	0E17	THAI CHARACTER THO THAHAN
+B8	0E18	THAI CHARACTER THO THONG
+B9	0E19	THAI CHARACTER NO NU
+BA	0E1A	THAI CHARACTER BO BAIMAI
+BB	0E1B	THAI CHARACTER PO PLA
+BC	0E1C	THAI CHARACTER PHO PHUNG
+BD	0E1D	THAI CHARACTER FO FA
+BE	0E1E	THAI CHARACTER PHO PHAN
+BF	0E1F	THAI CHARACTER FO FAN
+C0	0E20	THAI CHARACTER PHO SAMPHAO
+C1	0E21	THAI CHARACTER MO MA
+C2	0E22	THAI CHARACTER YO YAK
+C3	0E23	THAI CHARACTER RO RUA
+C4	0E24	THAI CHARACTER RU
+C5	0E25	THAI CHARACTER LO LING
+C6	0E26	THAI CHARACTER LU
+C7	0E27	THAI CHARACTER WO WAEN
+C8	0E28	THAI CHARACTER SO SALA
+C9	0E29	THAI CHARACTER SO RUSI
+CA	0E2A	THAI CHARACTER SO SUA
+CB	0E2B	THAI CHARACTER HO HIP
+CC	0E2C	THAI CHARACTER LO CHULA
+CD	0E2D	THAI CHARACTER O ANG
+CE	0E2E	THAI CHARACTER HO NOKHUK
+CF	0E2F	THAI CHARACTER PAIYANNOI
+D0	0E30	THAI CHARACTER SARA A
+D1	0E31	THAI CHARACTER MAI HAN-AKAT
+D2	0E32	THAI CHARACTER SARA AA
+D3	0E33	THAI CHARACTER SARA AM
+D4	0E34	THAI CHARACTER SARA I
+D5	0E35	THAI CHARACTER SARA II
+D6	0E36	THAI CHARACTER SARA UE
+D7	0E37	THAI CHARACTER SARA UEE
+D8	0E38	THAI CHARACTER SARA U
+D9	0E39	THAI CHARACTER SARA UU
+DA	0E3A	THAI CHARACTER PHINTHU
+DF	0E3F	THAI CURRENCY SYMBOL BAHT
+E0	0E40	THAI CHARACTER SARA E
+E1	0E41	THAI CHARACTER SARA AE
+E2	0E42	THAI CHARACTER SARA O
+E3	0E43	THAI CHARACTER SARA AI MAIMUAN
+E4	0E44	THAI CHARACTER SARA AI MAIMALAI
+E5	0E45	THAI CHARACTER LAKKHANGYAO
+E6	0E46	THAI CHARACTER MAIYAMOK
+E7	0E47	THAI CHARACTER MAITAIKHU
+E8	0E48	THAI CHARACTER MAI EK
+E9	0E49	THAI CHARACTER MAI THO
+EA	0E4A	THAI CHARACTER MAI TRI
+EB	0E4B	THAI CHARACTER MAI CHATTAWA
+EC	0E4C	THAI CHARACTER THANTHAKHAT
+ED	0E4D	THAI CHARACTER NIKHAHIT
+EE	0E4E	THAI CHARACTER YAMAKKAN
+EF	0E4F	THAI CHARACTER FONGMAN
+F0	0E50	THAI DIGIT ZERO
+F1	0E51	THAI DIGIT ONE
+F2	0E52	THAI DIGIT TWO
+F3	0E53	THAI DIGIT THREE
+F4	0E54	THAI DIGIT FOUR
+F5	0E55	THAI DIGIT FIVE
+F6	0E56	THAI DIGIT SIX
+F7	0E57	THAI DIGIT SEVEN
+F8	0E58	THAI DIGIT EIGHT
+F9	0E59	THAI DIGIT NINE
+FA	0E5A	THAI CHARACTER ANGKHANKHU
+FB	0E5B	THAI CHARACTER KHOMUT
diff --git a/libucw/charset/set/8859-13 b/libucw/charset/set/8859-13
new file mode 100644
index 0000000..b670022
--- /dev/null
+++ b/libucw/charset/set/8859-13
@@ -0,0 +1,260 @@
+# 8859-13.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-13.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	201D	RIGHT DOUBLE QUOTATION MARK
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A5	201E	DOUBLE LOW-9 QUOTATION MARK
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+A9	00A9	COPYRIGHT SIGN
+AA	0156	LATIN CAPITAL LETTER R WITH CEDILLA
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00C6	LATIN CAPITAL LETTER AE
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	201C	LEFT DOUBLE QUOTATION MARK
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00F8	LATIN SMALL LETTER O WITH STROKE
+B9	00B9	SUPERSCRIPT ONE
+BA	0157	LATIN SMALL LETTER R WITH CEDILLA
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	00BC	VULGAR FRACTION ONE QUARTER
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	00BE	VULGAR FRACTION THREE QUARTERS
+BF	00E6	LATIN SMALL LETTER AE
+C0	0104	LATIN CAPITAL LETTER A WITH OGONEK
+C1	012E	LATIN CAPITAL LETTER I WITH OGONEK
+C2	0100	LATIN CAPITAL LETTER A WITH MACRON
+C3	0106	LATIN CAPITAL LETTER C WITH ACUTE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	0118	LATIN CAPITAL LETTER E WITH OGONEK
+C7	0112	LATIN CAPITAL LETTER E WITH MACRON
+C8	010C	LATIN CAPITAL LETTER C WITH CARON
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+CB	0116	LATIN CAPITAL LETTER E WITH DOT ABOVE
+CC	0122	LATIN CAPITAL LETTER G WITH CEDILLA
+CD	0136	LATIN CAPITAL LETTER K WITH CEDILLA
+CE	012A	LATIN CAPITAL LETTER I WITH MACRON
+CF	013B	LATIN CAPITAL LETTER L WITH CEDILLA
+D0	0160	LATIN CAPITAL LETTER S WITH CARON
+D1	0143	LATIN CAPITAL LETTER N WITH ACUTE
+D2	0145	LATIN CAPITAL LETTER N WITH CEDILLA
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	014C	LATIN CAPITAL LETTER O WITH MACRON
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	0172	LATIN CAPITAL LETTER U WITH OGONEK
+D9	0141	LATIN CAPITAL LETTER L WITH STROKE
+DA	015A	LATIN CAPITAL LETTER S WITH ACUTE
+DB	016A	LATIN CAPITAL LETTER U WITH MACRON
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+DE	017D	LATIN CAPITAL LETTER Z WITH CARON
+DF	00DF	LATIN SMALL LETTER SHARP S (German)
+E0	0105	LATIN SMALL LETTER A WITH OGONEK
+E1	012F	LATIN SMALL LETTER I WITH OGONEK
+E2	0101	LATIN SMALL LETTER A WITH MACRON
+E3	0107	LATIN SMALL LETTER C WITH ACUTE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	0119	LATIN SMALL LETTER E WITH OGONEK
+E7	0113	LATIN SMALL LETTER E WITH MACRON
+E8	010D	LATIN SMALL LETTER C WITH CARON
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	017A	LATIN SMALL LETTER Z WITH ACUTE
+EB	0117	LATIN SMALL LETTER E WITH DOT ABOVE
+EC	0123	LATIN SMALL LETTER G WITH CEDILLA
+ED	0137	LATIN SMALL LETTER K WITH CEDILLA
+EE	012B	LATIN SMALL LETTER I WITH MACRON
+EF	013C	LATIN SMALL LETTER L WITH CEDILLA
+F0	0161	LATIN SMALL LETTER S WITH CARON
+F1	0144	LATIN SMALL LETTER N WITH ACUTE
+F2	0146	LATIN SMALL LETTER N WITH CEDILLA
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	014D	LATIN SMALL LETTER O WITH MACRON
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	0173	LATIN SMALL LETTER U WITH OGONEK
+F9	0142	LATIN SMALL LETTER L WITH STROKE
+FA	015B	LATIN SMALL LETTER S WITH ACUTE
+FB	016B	LATIN SMALL LETTER U WITH MACRON
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+FE	017E	LATIN SMALL LETTER Z WITH CARON
+FF	2019	RIGHT SINGLE QUOTATION MARK
diff --git a/libucw/charset/set/8859-14 b/libucw/charset/set/8859-14
new file mode 100644
index 0000000..5efde8b
--- /dev/null
+++ b/libucw/charset/set/8859-14
@@ -0,0 +1,260 @@
+# 8859-14.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-14.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	1E02	LATIN CAPITAL LETTER B WITH DOT ABOVE
+A2	1E03	LATIN SMALL LETTER B WITH DOT ABOVE
+A3	00A3	POUND SIGN
+A4	010A	LATIN CAPITAL LETTER C WITH DOT ABOVE
+A5	010B	LATIN SMALL LETTER C WITH DOT ABOVE
+A6	1E0A	LATIN CAPITAL LETTER D WITH DOT ABOVE
+A7	00A7	SECTION SIGN
+A8	1E80	LATIN CAPITAL LETTER W WITH GRAVE
+A9	00A9	COPYRIGHT SIGN
+AA	1E82	LATIN CAPITAL LETTER W WITH ACUTE
+AB	1E0B	LATIN SMALL LETTER D WITH DOT ABOVE
+AC	1EF2	LATIN CAPITAL LETTER Y WITH GRAVE
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+B0	1E1E	LATIN CAPITAL LETTER F WITH DOT ABOVE
+B1	1E1F	LATIN SMALL LETTER F WITH DOT ABOVE
+B2	0120	LATIN CAPITAL LETTER G WITH DOT ABOVE
+B3	0121	LATIN SMALL LETTER G WITH DOT ABOVE
+B4	1E40	LATIN CAPITAL LETTER M WITH DOT ABOVE
+B5	1E41	LATIN SMALL LETTER M WITH DOT ABOVE
+B6	00B6	PILCROW SIGN
+B7	1E56	LATIN CAPITAL LETTER P WITH DOT ABOVE
+B8	1E81	LATIN SMALL LETTER W WITH GRAVE
+B9	1E57	LATIN SMALL LETTER P WITH DOT ABOVE
+BA	1E83	LATIN SMALL LETTER W WITH ACUTE
+BB	1E60	LATIN CAPITAL LETTER S WITH DOT ABOVE
+BC	1EF3	LATIN SMALL LETTER Y WITH GRAVE
+BD	1E84	LATIN CAPITAL LETTER W WITH DIAERESIS
+BE	1E85	LATIN SMALL LETTER W WITH DIAERESIS
+BF	1E61	LATIN SMALL LETTER S WITH DOT ABOVE
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	0174	LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	1E6A	LATIN CAPITAL LETTER T WITH DOT ABOVE
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	0176	LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	0175	LATIN SMALL LETTER W WITH CIRCUMFLEX
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	1E6B	LATIN SMALL LETTER T WITH DOT ABOVE
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	0177	LATIN SMALL LETTER Y WITH CIRCUMFLEX
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/set/8859-15 b/libucw/charset/set/8859-15
new file mode 100644
index 0000000..175e47d
--- /dev/null
+++ b/libucw/charset/set/8859-15
@@ -0,0 +1,260 @@
+# 8859-15.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-15.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	00A1	INVERTED EXCLAMATION MARK
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	20AC	EURO SIGN
+A5	00A5	YEN SIGN
+A6	0160	LATIN CAPITAL LETTER S WITH CARON
+A7	00A7	SECTION SIGN
+A8	0161	LATIN SMALL LETTER S WITH CARON
+A9	00A9	COPYRIGHT SIGN
+AA	00AA	FEMININE ORDINAL INDICATOR
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	017D	LATIN CAPITAL LETTER Z WITH CARON
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	017E	LATIN SMALL LETTER Z WITH CARON
+B9	00B9	SUPERSCRIPT ONE
+BA	00BA	MASCULINE ORDINAL INDICATOR
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	0152	LATIN CAPITAL LIGATURE OE
+BD	0153	LATIN SMALL LIGATURE OE
+BE	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+BF	00BF	INVERTED QUESTION MARK
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	00D0	LATIN CAPITAL LETTER ETH
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	00DE	LATIN CAPITAL LETTER THORN
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	00F0	LATIN SMALL LETTER ETH
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	00FE	LATIN SMALL LETTER THORN
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/set/8859-16 b/libucw/charset/set/8859-16
new file mode 100644
index 0000000..c4127f7
--- /dev/null
+++ b/libucw/charset/set/8859-16
@@ -0,0 +1,260 @@
+# 8859-16.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A2	0105	LATIN SMALL LETTER A WITH OGONEK
+A3	0141	LATIN CAPITAL LETTER L WITH STROKE
+A4	20AC	EURO SIGN
+A5	201E	DOUBLE LOW-9 QUOTATION MARK
+A6	0160	LATIN CAPITAL LETTER S WITH CARON
+A7	00A7	SECTION SIGN
+A8	0161	LATIN SMALL LETTER S WITH CARON
+A9	00A9	COPYRIGHT SIGN
+AA	0218	LATIN CAPITAL LETTER S WITH COMMA BELOW
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+AD	00AD	SOFT HYPHEN
+AE	017A	LATIN SMALL LETTER Z WITH ACUTE
+AF	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	010C	LATIN CAPITAL LETTER C WITH CARON
+B3	0142	LATIN SMALL LETTER L WITH STROKE
+B4	017D	LATIN CAPITAL LETTER Z WITH CARON
+B5	201D	RIGHT DOUBLE QUOTATION MARK
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	017E	LATIN SMALL LETTER Z WITH CARON
+B9	010D	LATIN SMALL LETTER C WITH CARON
+BA	0219	LATIN SMALL LETTER S WITH COMMA BELOW
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	0152	LATIN CAPITAL LIGATURE OE
+BD	0153	LATIN SMALL LIGATURE OE
+BE	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+BF	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	0102	LATIN CAPITAL LETTER A WITH BREVE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	0106	LATIN CAPITAL LETTER C WITH ACUTE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	0110	LATIN CAPITAL LETTER D WITH STROKE
+D1	0143	LATIN CAPITAL LETTER N WITH ACUTE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	015A	LATIN CAPITAL LETTER S WITH ACUTE
+D8	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	0118	LATIN CAPITAL LETTER E WITH OGONEK
+DE	021A	LATIN CAPITAL LETTER T WITH COMMA BELOW
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	0103	LATIN SMALL LETTER A WITH BREVE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	0107	LATIN SMALL LETTER C WITH ACUTE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	0111	LATIN SMALL LETTER D WITH STROKE
+F1	0144	LATIN SMALL LETTER N WITH ACUTE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	015B	LATIN SMALL LETTER S WITH ACUTE
+F8	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	0119	LATIN SMALL LETTER E WITH OGONEK
+FE	021B	LATIN SMALL LETTER T WITH COMMA BELOW
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/set/8859-2 b/libucw/charset/set/8859-2
new file mode 100644
index 0000000..1d3c4dd
--- /dev/null
+++ b/libucw/charset/set/8859-2
@@ -0,0 +1,260 @@
+# 8859-2.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-2.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A2	02D8	BREVE
+A3	0141	LATIN CAPITAL LETTER L WITH STROKE
+A4	00A4	CURRENCY SIGN
+A5	013D	LATIN CAPITAL LETTER L WITH CARON
+A6	015A	LATIN CAPITAL LETTER S WITH ACUTE
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	0160	LATIN CAPITAL LETTER S WITH CARON
+AA	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+AB	0164	LATIN CAPITAL LETTER T WITH CARON
+AC	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+AD	00AD	SOFT HYPHEN
+AE	017D	LATIN CAPITAL LETTER Z WITH CARON
+AF	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+B0	00B0	DEGREE SIGN
+B1	0105	LATIN SMALL LETTER A WITH OGONEK
+B2	02DB	OGONEK
+B3	0142	LATIN SMALL LETTER L WITH STROKE
+B4	00B4	ACUTE ACCENT
+B5	013E	LATIN SMALL LETTER L WITH CARON
+B6	015B	LATIN SMALL LETTER S WITH ACUTE
+B7	02C7	CARON
+B8	00B8	CEDILLA
+B9	0161	LATIN SMALL LETTER S WITH CARON
+BA	015F	LATIN SMALL LETTER S WITH CEDILLA
+BB	0165	LATIN SMALL LETTER T WITH CARON
+BC	017A	LATIN SMALL LETTER Z WITH ACUTE
+BD	02DD	DOUBLE ACUTE ACCENT
+BE	017E	LATIN SMALL LETTER Z WITH CARON
+BF	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+C0	0154	LATIN CAPITAL LETTER R WITH ACUTE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	0102	LATIN CAPITAL LETTER A WITH BREVE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	0139	LATIN CAPITAL LETTER L WITH ACUTE
+C6	0106	LATIN CAPITAL LETTER C WITH ACUTE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	010C	LATIN CAPITAL LETTER C WITH CARON
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	0118	LATIN CAPITAL LETTER E WITH OGONEK
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	011A	LATIN CAPITAL LETTER E WITH CARON
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	010E	LATIN CAPITAL LETTER D WITH CARON
+D0	0110	LATIN CAPITAL LETTER D WITH STROKE
+D1	0143	LATIN CAPITAL LETTER N WITH ACUTE
+D2	0147	LATIN CAPITAL LETTER N WITH CARON
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	0158	LATIN CAPITAL LETTER R WITH CARON
+D9	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	0162	LATIN CAPITAL LETTER T WITH CEDILLA
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	0155	LATIN SMALL LETTER R WITH ACUTE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	0103	LATIN SMALL LETTER A WITH BREVE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	013A	LATIN SMALL LETTER L WITH ACUTE
+E6	0107	LATIN SMALL LETTER C WITH ACUTE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	010D	LATIN SMALL LETTER C WITH CARON
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	0119	LATIN SMALL LETTER E WITH OGONEK
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	011B	LATIN SMALL LETTER E WITH CARON
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	010F	LATIN SMALL LETTER D WITH CARON
+F0	0111	LATIN SMALL LETTER D WITH STROKE
+F1	0144	LATIN SMALL LETTER N WITH ACUTE
+F2	0148	LATIN SMALL LETTER N WITH CARON
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	0159	LATIN SMALL LETTER R WITH CARON
+F9	016F	LATIN SMALL LETTER U WITH RING ABOVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	0163	LATIN SMALL LETTER T WITH CEDILLA
+FF	02D9	DOT ABOVE
diff --git a/libucw/charset/set/8859-3 b/libucw/charset/set/8859-3
new file mode 100644
index 0000000..d047987
--- /dev/null
+++ b/libucw/charset/set/8859-3
@@ -0,0 +1,253 @@
+# 8859-3.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-3.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0126	LATIN CAPITAL LETTER H WITH STROKE
+A2	02D8	BREVE
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A6	0124	LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	0130	LATIN CAPITAL LETTER I WITH DOT ABOVE
+AA	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+AB	011E	LATIN CAPITAL LETTER G WITH BREVE
+AC	0134	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+AD	00AD	SOFT HYPHEN
+AF	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+B0	00B0	DEGREE SIGN
+B1	0127	LATIN SMALL LETTER H WITH STROKE
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	0125	LATIN SMALL LETTER H WITH CIRCUMFLEX
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	0131	LATIN SMALL LETTER DOTLESS I
+BA	015F	LATIN SMALL LETTER S WITH CEDILLA
+BB	011F	LATIN SMALL LETTER G WITH BREVE
+BC	0135	LATIN SMALL LETTER J WITH CIRCUMFLEX
+BD	00BD	VULGAR FRACTION ONE HALF
+BF	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	010A	LATIN CAPITAL LETTER C WITH DOT ABOVE
+C6	0108	LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	0120	LATIN CAPITAL LETTER G WITH DOT ABOVE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	011C	LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	016C	LATIN CAPITAL LETTER U WITH BREVE
+DE	015C	LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	010B	LATIN SMALL LETTER C WITH DOT ABOVE
+E6	0109	LATIN SMALL LETTER C WITH CIRCUMFLEX
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	0121	LATIN SMALL LETTER G WITH DOT ABOVE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	011D	LATIN SMALL LETTER G WITH CIRCUMFLEX
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	016D	LATIN SMALL LETTER U WITH BREVE
+FE	015D	LATIN SMALL LETTER S WITH CIRCUMFLEX
+FF	02D9	DOT ABOVE
diff --git a/libucw/charset/set/8859-4 b/libucw/charset/set/8859-4
new file mode 100644
index 0000000..b5338c1
--- /dev/null
+++ b/libucw/charset/set/8859-4
@@ -0,0 +1,260 @@
+# 8859-4.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-4.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A2	0138	LATIN SMALL LETTER KRA
+A3	0156	LATIN CAPITAL LETTER R WITH CEDILLA
+A4	00A4	CURRENCY SIGN
+A5	0128	LATIN CAPITAL LETTER I WITH TILDE
+A6	013B	LATIN CAPITAL LETTER L WITH CEDILLA
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	0160	LATIN CAPITAL LETTER S WITH CARON
+AA	0112	LATIN CAPITAL LETTER E WITH MACRON
+AB	0122	LATIN CAPITAL LETTER G WITH CEDILLA
+AC	0166	LATIN CAPITAL LETTER T WITH STROKE
+AD	00AD	SOFT HYPHEN
+AE	017D	LATIN CAPITAL LETTER Z WITH CARON
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	0105	LATIN SMALL LETTER A WITH OGONEK
+B2	02DB	OGONEK
+B3	0157	LATIN SMALL LETTER R WITH CEDILLA
+B4	00B4	ACUTE ACCENT
+B5	0129	LATIN SMALL LETTER I WITH TILDE
+B6	013C	LATIN SMALL LETTER L WITH CEDILLA
+B7	02C7	CARON
+B8	00B8	CEDILLA
+B9	0161	LATIN SMALL LETTER S WITH CARON
+BA	0113	LATIN SMALL LETTER E WITH MACRON
+BB	0123	LATIN SMALL LETTER G WITH CEDILLA
+BC	0167	LATIN SMALL LETTER T WITH STROKE
+BD	014A	LATIN CAPITAL LETTER ENG
+BE	017E	LATIN SMALL LETTER Z WITH CARON
+BF	014B	LATIN SMALL LETTER ENG
+C0	0100	LATIN CAPITAL LETTER A WITH MACRON
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	012E	LATIN CAPITAL LETTER I WITH OGONEK
+C8	010C	LATIN CAPITAL LETTER C WITH CARON
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	0118	LATIN CAPITAL LETTER E WITH OGONEK
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	0116	LATIN CAPITAL LETTER E WITH DOT ABOVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	012A	LATIN CAPITAL LETTER I WITH MACRON
+D0	0110	LATIN CAPITAL LETTER D WITH STROKE
+D1	0145	LATIN CAPITAL LETTER N WITH CEDILLA
+D2	014C	LATIN CAPITAL LETTER O WITH MACRON
+D3	0136	LATIN CAPITAL LETTER K WITH CEDILLA
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	0172	LATIN CAPITAL LETTER U WITH OGONEK
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	0168	LATIN CAPITAL LETTER U WITH TILDE
+DE	016A	LATIN CAPITAL LETTER U WITH MACRON
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	0101	LATIN SMALL LETTER A WITH MACRON
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	012F	LATIN SMALL LETTER I WITH OGONEK
+E8	010D	LATIN SMALL LETTER C WITH CARON
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	0119	LATIN SMALL LETTER E WITH OGONEK
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	0117	LATIN SMALL LETTER E WITH DOT ABOVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	012B	LATIN SMALL LETTER I WITH MACRON
+F0	0111	LATIN SMALL LETTER D WITH STROKE
+F1	0146	LATIN SMALL LETTER N WITH CEDILLA
+F2	014D	LATIN SMALL LETTER O WITH MACRON
+F3	0137	LATIN SMALL LETTER K WITH CEDILLA
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	0173	LATIN SMALL LETTER U WITH OGONEK
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	0169	LATIN SMALL LETTER U WITH TILDE
+FE	016B	LATIN SMALL LETTER U WITH MACRON
+FF	02D9	DOT ABOVE
diff --git a/libucw/charset/set/8859-5 b/libucw/charset/set/8859-5
new file mode 100644
index 0000000..cb95544
--- /dev/null
+++ b/libucw/charset/set/8859-5
@@ -0,0 +1,260 @@
+# 8859-5.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-5.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	0401	CYRILLIC CAPITAL LETTER IO
+A2	0402	CYRILLIC CAPITAL LETTER DJE
+A3	0403	CYRILLIC CAPITAL LETTER GJE
+A4	0404	CYRILLIC CAPITAL LETTER UKRAINIAN IE
+A5	0405	CYRILLIC CAPITAL LETTER DZE
+A6	0406	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+A7	0407	CYRILLIC CAPITAL LETTER YI
+A8	0408	CYRILLIC CAPITAL LETTER JE
+A9	0409	CYRILLIC CAPITAL LETTER LJE
+AA	040A	CYRILLIC CAPITAL LETTER NJE
+AB	040B	CYRILLIC CAPITAL LETTER TSHE
+AC	040C	CYRILLIC CAPITAL LETTER KJE
+AD	00AD	SOFT HYPHEN
+AE	040E	CYRILLIC CAPITAL LETTER SHORT U
+AF	040F	CYRILLIC CAPITAL LETTER DZHE
+B0	0410	CYRILLIC CAPITAL LETTER A
+B1	0411	CYRILLIC CAPITAL LETTER BE
+B2	0412	CYRILLIC CAPITAL LETTER VE
+B3	0413	CYRILLIC CAPITAL LETTER GHE
+B4	0414	CYRILLIC CAPITAL LETTER DE
+B5	0415	CYRILLIC CAPITAL LETTER IE
+B6	0416	CYRILLIC CAPITAL LETTER ZHE
+B7	0417	CYRILLIC CAPITAL LETTER ZE
+B8	0418	CYRILLIC CAPITAL LETTER I
+B9	0419	CYRILLIC CAPITAL LETTER SHORT I
+BA	041A	CYRILLIC CAPITAL LETTER KA
+BB	041B	CYRILLIC CAPITAL LETTER EL
+BC	041C	CYRILLIC CAPITAL LETTER EM
+BD	041D	CYRILLIC CAPITAL LETTER EN
+BE	041E	CYRILLIC CAPITAL LETTER O
+BF	041F	CYRILLIC CAPITAL LETTER PE
+C0	0420	CYRILLIC CAPITAL LETTER ER
+C1	0421	CYRILLIC CAPITAL LETTER ES
+C2	0422	CYRILLIC CAPITAL LETTER TE
+C3	0423	CYRILLIC CAPITAL LETTER U
+C4	0424	CYRILLIC CAPITAL LETTER EF
+C5	0425	CYRILLIC CAPITAL LETTER HA
+C6	0426	CYRILLIC CAPITAL LETTER TSE
+C7	0427	CYRILLIC CAPITAL LETTER CHE
+C8	0428	CYRILLIC CAPITAL LETTER SHA
+C9	0429	CYRILLIC CAPITAL LETTER SHCHA
+CA	042A	CYRILLIC CAPITAL LETTER HARD SIGN
+CB	042B	CYRILLIC CAPITAL LETTER YERU
+CC	042C	CYRILLIC CAPITAL LETTER SOFT SIGN
+CD	042D	CYRILLIC CAPITAL LETTER E
+CE	042E	CYRILLIC CAPITAL LETTER YU
+CF	042F	CYRILLIC CAPITAL LETTER YA
+D0	0430	CYRILLIC SMALL LETTER A
+D1	0431	CYRILLIC SMALL LETTER BE
+D2	0432	CYRILLIC SMALL LETTER VE
+D3	0433	CYRILLIC SMALL LETTER GHE
+D4	0434	CYRILLIC SMALL LETTER DE
+D5	0435	CYRILLIC SMALL LETTER IE
+D6	0436	CYRILLIC SMALL LETTER ZHE
+D7	0437	CYRILLIC SMALL LETTER ZE
+D8	0438	CYRILLIC SMALL LETTER I
+D9	0439	CYRILLIC SMALL LETTER SHORT I
+DA	043A	CYRILLIC SMALL LETTER KA
+DB	043B	CYRILLIC SMALL LETTER EL
+DC	043C	CYRILLIC SMALL LETTER EM
+DD	043D	CYRILLIC SMALL LETTER EN
+DE	043E	CYRILLIC SMALL LETTER O
+DF	043F	CYRILLIC SMALL LETTER PE
+E0	0440	CYRILLIC SMALL LETTER ER
+E1	0441	CYRILLIC SMALL LETTER ES
+E2	0442	CYRILLIC SMALL LETTER TE
+E3	0443	CYRILLIC SMALL LETTER U
+E4	0444	CYRILLIC SMALL LETTER EF
+E5	0445	CYRILLIC SMALL LETTER HA
+E6	0446	CYRILLIC SMALL LETTER TSE
+E7	0447	CYRILLIC SMALL LETTER CHE
+E8	0448	CYRILLIC SMALL LETTER SHA
+E9	0449	CYRILLIC SMALL LETTER SHCHA
+EA	044A	CYRILLIC SMALL LETTER HARD SIGN
+EB	044B	CYRILLIC SMALL LETTER YERU
+EC	044C	CYRILLIC SMALL LETTER SOFT SIGN
+ED	044D	CYRILLIC SMALL LETTER E
+EE	044E	CYRILLIC SMALL LETTER YU
+EF	044F	CYRILLIC SMALL LETTER YA
+F0	2116	NUMERO SIGN
+F1	0451	CYRILLIC SMALL LETTER IO
+F2	0452	CYRILLIC SMALL LETTER DJE
+F3	0453	CYRILLIC SMALL LETTER GJE
+F4	0454	CYRILLIC SMALL LETTER UKRAINIAN IE
+F5	0455	CYRILLIC SMALL LETTER DZE
+F6	0456	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+F7	0457	CYRILLIC SMALL LETTER YI
+F8	0458	CYRILLIC SMALL LETTER JE
+F9	0459	CYRILLIC SMALL LETTER LJE
+FA	045A	CYRILLIC SMALL LETTER NJE
+FB	045B	CYRILLIC SMALL LETTER TSHE
+FC	045C	CYRILLIC SMALL LETTER KJE
+FD	00A7	SECTION SIGN
+FE	045E	CYRILLIC SMALL LETTER SHORT U
+FF	045F	CYRILLIC SMALL LETTER DZHE
diff --git a/libucw/charset/set/8859-6 b/libucw/charset/set/8859-6
new file mode 100644
index 0000000..7d23eb8
--- /dev/null
+++ b/libucw/charset/set/8859-6
@@ -0,0 +1,215 @@
+# 8859-6.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-6.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A4	00A4	CURRENCY SIGN
+AC	060C	ARABIC COMMA
+AD	00AD	SOFT HYPHEN
+BB	061B	ARABIC SEMICOLON
+BF	061F	ARABIC QUESTION MARK
+C1	0621	ARABIC LETTER HAMZA
+C2	0622	ARABIC LETTER ALEF WITH MADDA ABOVE
+C3	0623	ARABIC LETTER ALEF WITH HAMZA ABOVE
+C4	0624	ARABIC LETTER WAW WITH HAMZA ABOVE
+C5	0625	ARABIC LETTER ALEF WITH HAMZA BELOW
+C6	0626	ARABIC LETTER YEH WITH HAMZA ABOVE
+C7	0627	ARABIC LETTER ALEF
+C8	0628	ARABIC LETTER BEH
+C9	0629	ARABIC LETTER TEH MARBUTA
+CA	062A	ARABIC LETTER TEH
+CB	062B	ARABIC LETTER THEH
+CC	062C	ARABIC LETTER JEEM
+CD	062D	ARABIC LETTER HAH
+CE	062E	ARABIC LETTER KHAH
+CF	062F	ARABIC LETTER DAL
+D0	0630	ARABIC LETTER THAL
+D1	0631	ARABIC LETTER REH
+D2	0632	ARABIC LETTER ZAIN
+D3	0633	ARABIC LETTER SEEN
+D4	0634	ARABIC LETTER SHEEN
+D5	0635	ARABIC LETTER SAD
+D6	0636	ARABIC LETTER DAD
+D7	0637	ARABIC LETTER TAH
+D8	0638	ARABIC LETTER ZAH
+D9	0639	ARABIC LETTER AIN
+DA	063A	ARABIC LETTER GHAIN
+E0	0640	ARABIC TATWEEL
+E1	0641	ARABIC LETTER FEH
+E2	0642	ARABIC LETTER QAF
+E3	0643	ARABIC LETTER KAF
+E4	0644	ARABIC LETTER LAM
+E5	0645	ARABIC LETTER MEEM
+E6	0646	ARABIC LETTER NOON
+E7	0647	ARABIC LETTER HEH
+E8	0648	ARABIC LETTER WAW
+E9	0649	ARABIC LETTER ALEF MAKSURA
+EA	064A	ARABIC LETTER YEH
+EB	064B	ARABIC FATHATAN
+EC	064C	ARABIC DAMMATAN
+ED	064D	ARABIC KASRATAN
+EE	064E	ARABIC FATHA
+EF	064F	ARABIC DAMMA
+F0	0650	ARABIC KASRA
+F1	0651	ARABIC SHADDA
+F2	0652	ARABIC SUKUN
diff --git a/libucw/charset/set/8859-7 b/libucw/charset/set/8859-7
new file mode 100644
index 0000000..c67c8dc
--- /dev/null
+++ b/libucw/charset/set/8859-7
@@ -0,0 +1,254 @@
+# 8859-7.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-7.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	2018	LEFT SINGLE QUOTATION MARK
+A2	2019	RIGHT SINGLE QUOTATION MARK
+A3	00A3	POUND SIGN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AF	2015	HORIZONTAL BAR
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	0384	GREEK TONOS
+B5	0385	GREEK DIALYTIKA TONOS
+B6	0386	GREEK CAPITAL LETTER ALPHA WITH TONOS
+B7	00B7	MIDDLE DOT
+B8	0388	GREEK CAPITAL LETTER EPSILON WITH TONOS
+B9	0389	GREEK CAPITAL LETTER ETA WITH TONOS
+BA	038A	GREEK CAPITAL LETTER IOTA WITH TONOS
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	038C	GREEK CAPITAL LETTER OMICRON WITH TONOS
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	038E	GREEK CAPITAL LETTER UPSILON WITH TONOS
+BF	038F	GREEK CAPITAL LETTER OMEGA WITH TONOS
+C0	0390	GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+C1	0391	GREEK CAPITAL LETTER ALPHA
+C2	0392	GREEK CAPITAL LETTER BETA
+C3	0393	GREEK CAPITAL LETTER GAMMA
+C4	0394	GREEK CAPITAL LETTER DELTA
+C5	0395	GREEK CAPITAL LETTER EPSILON
+C6	0396	GREEK CAPITAL LETTER ZETA
+C7	0397	GREEK CAPITAL LETTER ETA
+C8	0398	GREEK CAPITAL LETTER THETA
+C9	0399	GREEK CAPITAL LETTER IOTA
+CA	039A	GREEK CAPITAL LETTER KAPPA
+CB	039B	GREEK CAPITAL LETTER LAMDA
+CC	039C	GREEK CAPITAL LETTER MU
+CD	039D	GREEK CAPITAL LETTER NU
+CE	039E	GREEK CAPITAL LETTER XI
+CF	039F	GREEK CAPITAL LETTER OMICRON
+D0	03A0	GREEK CAPITAL LETTER PI
+D1	03A1	GREEK CAPITAL LETTER RHO
+D3	03A3	GREEK CAPITAL LETTER SIGMA
+D4	03A4	GREEK CAPITAL LETTER TAU
+D5	03A5	GREEK CAPITAL LETTER UPSILON
+D6	03A6	GREEK CAPITAL LETTER PHI
+D7	03A7	GREEK CAPITAL LETTER CHI
+D8	03A8	GREEK CAPITAL LETTER PSI
+D9	03A9	GREEK CAPITAL LETTER OMEGA
+DA	03AA	GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+DB	03AB	GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+DC	03AC	GREEK SMALL LETTER ALPHA WITH TONOS
+DD	03AD	GREEK SMALL LETTER EPSILON WITH TONOS
+DE	03AE	GREEK SMALL LETTER ETA WITH TONOS
+DF	03AF	GREEK SMALL LETTER IOTA WITH TONOS
+E0	03B0	GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+E1	03B1	GREEK SMALL LETTER ALPHA
+E2	03B2	GREEK SMALL LETTER BETA
+E3	03B3	GREEK SMALL LETTER GAMMA
+E4	03B4	GREEK SMALL LETTER DELTA
+E5	03B5	GREEK SMALL LETTER EPSILON
+E6	03B6	GREEK SMALL LETTER ZETA
+E7	03B7	GREEK SMALL LETTER ETA
+E8	03B8	GREEK SMALL LETTER THETA
+E9	03B9	GREEK SMALL LETTER IOTA
+EA	03BA	GREEK SMALL LETTER KAPPA
+EB	03BB	GREEK SMALL LETTER LAMDA
+EC	03BC	GREEK SMALL LETTER MU
+ED	03BD	GREEK SMALL LETTER NU
+EE	03BE	GREEK SMALL LETTER XI
+EF	03BF	GREEK SMALL LETTER OMICRON
+F0	03C0	GREEK SMALL LETTER PI
+F1	03C1	GREEK SMALL LETTER RHO
+F2	03C2	GREEK SMALL LETTER FINAL SIGMA
+F3	03C3	GREEK SMALL LETTER SIGMA
+F4	03C4	GREEK SMALL LETTER TAU
+F5	03C5	GREEK SMALL LETTER UPSILON
+F6	03C6	GREEK SMALL LETTER PHI
+F7	03C7	GREEK SMALL LETTER CHI
+F8	03C8	GREEK SMALL LETTER PSI
+F9	03C9	GREEK SMALL LETTER OMEGA
+FA	03CA	GREEK SMALL LETTER IOTA WITH DIALYTIKA
+FB	03CB	GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+FC	03CC	GREEK SMALL LETTER OMICRON WITH TONOS
+FD	03CD	GREEK SMALL LETTER UPSILON WITH TONOS
+FE	03CE	GREEK SMALL LETTER OMEGA WITH TONOS
diff --git a/libucw/charset/set/8859-8 b/libucw/charset/set/8859-8
new file mode 100644
index 0000000..ed0e279
--- /dev/null
+++ b/libucw/charset/set/8859-8
@@ -0,0 +1,224 @@
+# 8859-8.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-8.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A5	00A5	YEN SIGN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AA	00D7	MULTIPLICATION SIGN
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	00B9	SUPERSCRIPT ONE
+BA	00F7	DIVISION SIGN
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	00BC	VULGAR FRACTION ONE QUARTER
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	00BE	VULGAR FRACTION THREE QUARTERS
+DF	2017	DOUBLE LOW LINE
+E0	05D0	HEBREW LETTER ALEF
+E1	05D1	HEBREW LETTER BET
+E2	05D2	HEBREW LETTER GIMEL
+E3	05D3	HEBREW LETTER DALET
+E4	05D4	HEBREW LETTER HE
+E5	05D5	HEBREW LETTER VAV
+E6	05D6	HEBREW LETTER ZAYIN
+E7	05D7	HEBREW LETTER HET
+E8	05D8	HEBREW LETTER TET
+E9	05D9	HEBREW LETTER YOD
+EA	05DA	HEBREW LETTER FINAL KAF
+EB	05DB	HEBREW LETTER KAF
+EC	05DC	HEBREW LETTER LAMED
+ED	05DD	HEBREW LETTER FINAL MEM
+EE	05DE	HEBREW LETTER MEM
+EF	05DF	HEBREW LETTER FINAL NUN
+F0	05E0	HEBREW LETTER NUN
+F1	05E1	HEBREW LETTER SAMEKH
+F2	05E2	HEBREW LETTER AYIN
+F3	05E3	HEBREW LETTER FINAL PE
+F4	05E4	HEBREW LETTER PE
+F5	05E5	HEBREW LETTER FINAL TSADI
+F6	05E6	HEBREW LETTER TSADI
+F7	05E7	HEBREW LETTER QOF
+F8	05E8	HEBREW LETTER RESH
+F9	05E9	HEBREW LETTER SHIN
+FA	05EA	HEBREW LETTER TAV
+FD	200E	LEFT-TO-RIGHT MARK
+FE	200F	RIGHT-TO-LEFT MARK
diff --git a/libucw/charset/set/8859-9 b/libucw/charset/set/8859-9
new file mode 100644
index 0000000..3092624
--- /dev/null
+++ b/libucw/charset/set/8859-9
@@ -0,0 +1,260 @@
+# 8859-9.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-9.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0080	<control>
+81	0081	<control>
+82	0082	<control>
+83	0083	<control>
+84	0084	<control>
+85	0085	<control>
+86	0086	<control>
+87	0087	<control>
+88	0088	<control>
+89	0089	<control>
+8A	008A	<control>
+8B	008B	<control>
+8C	008C	<control>
+8D	008D	<control>
+8E	008E	<control>
+8F	008F	<control>
+90	0090	<control>
+91	0091	<control>
+92	0092	<control>
+93	0093	<control>
+94	0094	<control>
+95	0095	<control>
+96	0096	<control>
+97	0097	<control>
+98	0098	<control>
+99	0099	<control>
+9A	009A	<control>
+9B	009B	<control>
+9C	009C	<control>
+9D	009D	<control>
+9E	009E	<control>
+9F	009F	<control>
+A0	00A0	NO-BREAK SPACE
+A1	00A1	INVERTED EXCLAMATION MARK
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A5	00A5	YEN SIGN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AA	00AA	FEMININE ORDINAL INDICATOR
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	00B9	SUPERSCRIPT ONE
+BA	00BA	MASCULINE ORDINAL INDICATOR
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	00BC	VULGAR FRACTION ONE QUARTER
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	00BE	VULGAR FRACTION THREE QUARTERS
+BF	00BF	INVERTED QUESTION MARK
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	011E	LATIN CAPITAL LETTER G WITH BREVE
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	0130	LATIN CAPITAL LETTER I WITH DOT ABOVE
+DE	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	011F	LATIN SMALL LETTER G WITH BREVE
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	0131	LATIN SMALL LETTER DOTLESS I
+FE	015F	LATIN SMALL LETTER S WITH CEDILLA
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/set/ascii b/libucw/charset/set/ascii
new file mode 100644
index 0000000..826f1f6
--- /dev/null
+++ b/libucw/charset/set/ascii
@@ -0,0 +1,131 @@
+# ASCII Charset File
+# (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	<control>
diff --git a/libucw/charset/set/cork b/libucw/charset/set/cork
new file mode 100644
index 0000000..b5846b7
--- /dev/null
+++ b/libucw/charset/set/cork
@@ -0,0 +1,259 @@
+# Cork Charset File
+# Adapted from CStoCS "cork.enc" by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	<control>
+80	0102	LATIN CAPITAL LETTER A WITH BREVE
+81	0104	LATIN CAPITAL LETTER A WITH OGONEK
+82	0106	LATIN CAPITAL LETTER C WITH ACUTE
+83	010C	LATIN CAPITAL LETTER C WITH CARON
+84	010E	LATIN CAPITAL LETTER D WITH CARON
+85	011A	LATIN CAPITAL LETTER E WITH CARON
+86	0118	LATIN CAPITAL LETTER E WITH OGONEK
+87	011E	LATIN CAPITAL LETTER G WITH BREVE
+88	0139	LATIN CAPITAL LETTER L WITH ACUTE
+89	013D	LATIN CAPITAL LETTER L WITH CARON
+8A	0141	LATIN CAPITAL LETTER L WITH STROKE
+8B	0143	LATIN CAPITAL LETTER N WITH ACUTE
+8C	0147	LATIN CAPITAL LETTER N WITH CARON
+8D	014A	LATIN CAPITAL LETTER ENG
+8E	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+8F	0154	LATIN CAPITAL LETTER R WITH ACUTE
+90	0158	LATIN CAPITAL LETTER R WITH CARON
+91	015A	LATIN CAPITAL LETTER S WITH ACUTE
+92	0160	LATIN CAPITAL LETTER S WITH CARON
+93	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+94	0164	LATIN CAPITAL LETTER T WITH CARON
+95	0162	LATIN CAPITAL LETTER T WITH CEDILLA
+96	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+97	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+98	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+99	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+9A	017D	LATIN CAPITAL LETTER Z WITH CARON
+9B	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+9C	0132	LATIN CAPITAL LIGATURE IJ
+9D	0130	LATIN CAPITAL LETTER I WITH DOT ABOVE
+9E	00F0	LATIN SMALL LETTER ETH
+9F	00A7	SECTION SIGN
+A0	0103	LATIN SMALL LETTER A WITH BREVE
+A1	0105	LATIN SMALL LETTER A WITH OGONEK
+A2	0107	LATIN SMALL LETTER C WITH ACUTE
+A3	010D	LATIN SMALL LETTER C WITH CARON
+A4	010F	LATIN SMALL LETTER D WITH CARON
+A5	011B	LATIN SMALL LETTER E WITH CARON
+A6	0119	LATIN SMALL LETTER E WITH OGONEK
+A7	011F	LATIN SMALL LETTER G WITH BREVE
+A8	013A	LATIN SMALL LETTER L WITH ACUTE
+A9	013E	LATIN SMALL LETTER L WITH CARON
+AA	0142	LATIN SMALL LETTER L WITH STROKE
+AB	0144	LATIN SMALL LETTER N WITH ACUTE
+AC	0148	LATIN SMALL LETTER N WITH CARON
+AD	014B	LATIN SMALL LETTER ENG
+AE	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+AF	0155	LATIN SMALL LETTER R WITH ACUTE
+B0	0159	LATIN SMALL LETTER R WITH CARON
+B1	015B	LATIN SMALL LETTER S WITH ACUTE
+B2	0161	LATIN SMALL LETTER S WITH CARON
+B3	015F	LATIN SMALL LETTER S WITH CEDILLA
+B4	0165	LATIN SMALL LETTER T WITH CARON
+B5	0163	LATIN SMALL LETTER T WITH CEDILLA
+B6	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+B7	016F	LATIN SMALL LETTER U WITH RING ABOVE
+B8	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
+B9	017A	LATIN SMALL LETTER Z WITH ACUTE
+BA	017E	LATIN SMALL LETTER Z WITH CARON
+BB	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+BC	0133	LATIN SMALL LIGATURE IJ
+BD	00A1	INVERTED EXCLAMATION MARK
+BE	00BF	INVERTED QUESTION MARK
+BF	00A3	POUND SIGN
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	00D0	LATIN CAPITAL LETTER ETH
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	0152	LATIN CAPITAL LIGATURE OE
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	00DE	LATIN CAPITAL LETTER THORN
+DF	F0DF	????
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	00F0	LATIN SMALL LETTER ETH
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	0153	LATIN SMALL LIGATURE OE
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	00FE	LATIN SMALL LETTER THORN
+FF	00DF	LATIN SMALL LETTER SHARP S
diff --git a/libucw/charset/set/ibm b/libucw/charset/set/ibm
new file mode 100644
index 0000000..9cf6aaf
--- /dev/null
+++ b/libucw/charset/set/ibm
@@ -0,0 +1,259 @@
+# IBM Charset File
+# (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	263A	WHITE SMILING FACE
+02	263B	BLACK SMILING FACE
+03	2665	BLACK HEART SUIT
+04	2666	BLACK DIAMOND SUIT
+05	2663	BLACK CLUB SUIT
+06	2660	BLACK SPADE SUIT
+07	2022	BULLET
+08	25D8	INVERSE BULLET
+09	25CB	WHITE CIRCLE
+0A	25D9	INVERSE WHITE CIRCLE
+0B	2642	MALE SIGN
+0C	2640	FEMALE SIGN
+0D	266A	EIGHTH NOTE
+0E	266B	BEAMED EIGHTH NOTES
+0F	263C	WHITE SUN WITH RAYS
+10	25B6	BLACK RIGHT-POINTING TRIANGLE
+11	25C0	BLACK LEFT-POINTING TRIANGLE
+12	2195	UP DOWN ARROW
+13	203C	DOUBLE EXCLAMATION MARK
+14	00B6	PILCROW SIGN
+15	00A7	SECTION SIGN
+16	25AC	BLACK RECTANGLE
+17	21A8	UP DOWN ARROW WITH BASE
+18	2191	UPWARDS ARROW
+19	2193	DOWNWARDS ARROW
+1A	2192	RIGHTWARDS ARROW
+1B	2190	LEFTWARDS ARROW
+1C	221F	RIGHT ANGLE
+1D	2194	LEFT RIGHT ARROW
+1E	25B2	BLACK UP-POINTING TRIANGLE
+1F	25BC	BLACK DOWN-POINTING TRIANGLE
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	2302	HOUSE
+80	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+81	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+82	00E9	LATIN SMALL LETTER E WITH ACUTE
+83	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+84	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+85	00E0	LATIN SMALL LETTER A WITH GRAVE
+86	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+87	00E7	LATIN SMALL LETTER C WITH CEDILLA
+88	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+89	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+8A	00E8	LATIN SMALL LETTER E WITH GRAVE
+8B	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+8C	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+8D	00EC	LATIN SMALL LETTER I WITH GRAVE
+8E	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+8F	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+90	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+91	00E6	LATIN SMALL LETTER AE
+92	00C6	LATIN CAPITAL LETTER AE
+93	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+94	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+95	00F2	LATIN SMALL LETTER O WITH GRAVE
+96	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+97	00F9	LATIN SMALL LETTER U WITH GRAVE
+98	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
+99	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+9A	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+9B	00A2	CENT SIGN
+9C	00A3	POUND SIGN
+9D	00A5	YEN SIGN
+9E	20A7	PESETA SIGN
+9F	0192	LATIN SMALL LETTER F WITH HOOK
+A0	00E1	LATIN SMALL LETTER A WITH ACUTE
+A1	00ED	LATIN SMALL LETTER I WITH ACUTE
+A2	00F3	LATIN SMALL LETTER O WITH ACUTE
+A3	00FA	LATIN SMALL LETTER U WITH ACUTE
+A4	00F1	LATIN SMALL LETTER N WITH TILDE
+A5	00D1	LATIN CAPITAL LETTER N WITH TILDE
+A6	00AA	FEMININE ORDINAL INDICATOR
+A7	00BA	MASCULINE ORDINAL INDICATOR
+A8	00BF	INVERTED QUESTION MARK
+A9	2310	REVERSED NOT SIGN
+AA	00AC	NOT SIGN
+AB	00BD	VULGAR FRACTION ONE HALF
+AC	00BC	VULGAR FRACTION ONE QUARTER
+AD	00A1	INVERTED EXCLAMATION MARK
+AE	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AF	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+B0	2591	LIGHT SHADE
+B1	2592	MEDIUM SHADE
+B2	2593	DARK SHADE
+B3	2502	BOX DRAWINGS LIGHT VERTICAL
+B4	2524	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+B5	2561	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+B6	2562	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+B7	2556	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+B8	2555	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+B9	2563	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+BA	2551	BOX DRAWINGS DOUBLE VERTICAL
+BB	2557	BOX DRAWINGS DOUBLE DOWN AND LEFT
+BC	255D	BOX DRAWINGS DOUBLE UP AND LEFT
+BD	255C	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+BE	255B	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+BF	2510	BOX DRAWINGS LIGHT DOWN AND LEFT
+C0	2514	BOX DRAWINGS LIGHT UP AND RIGHT
+C1	2534	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+C2	252C	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+C3	251C	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+C4	2500	BOX DRAWINGS LIGHT HORIZONTAL
+C5	253C	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+C6	255E	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+C7	255F	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+C8	255A	BOX DRAWINGS DOUBLE UP AND RIGHT
+C9	2554	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+CA	2569	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+CB	2566	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+CC	2560	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+CD	2550	BOX DRAWINGS DOUBLE HORIZONTAL
+CE	256C	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+CF	2567	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+D0	2568	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+D1	2564	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+D2	2565	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+D3	2559	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+D4	2558	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+D5	2552	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+D6	2553	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+D7	256B	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+D8	256A	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+D9	2518	BOX DRAWINGS LIGHT UP AND LEFT
+DA	250C	BOX DRAWINGS LIGHT DOWN AND RIGHT
+DB	2588	FULL BLOCK
+DC	2584	LOWER HALF BLOCK
+DD	258C	LEFT HALF BLOCK
+DE	2590	RIGHT HALF BLOCK
+DF	2580	UPPER HALF BLOCK
+E0	03B1	GREEK SMALL LETTER ALPHA
+E1	00DF	LATIN SMALL LETTER SHARP S
+E2	0393	GREEK CAPITAL LETTER GAMMA
+E3	03C0	GREEK SMALL LETTER PI
+E4	03A3	GREEK CAPITAL LETTER SIGMA
+E5	03C3	GREEK SMALL LETTER SIGMA
+E6	00B5	MICRO SIGN
+E7	03C4	GREEK SMALL LETTER TAU
+E8	03A6	GREEK CAPITAL LETTER PHI
+E9	0398	GREEK CAPITAL LETTER THETA
+EA	03A9	GREEK CAPITAL LETTER OMEGA
+EB	03B4	GREEK SMALL LETTER DELTA
+EC	221E	INFINITY
+ED	03C6	GREEK SMALL LETTER PHI
+EE	03B5	GREEK SMALL LETTER EPSILON
+EF	2229	INTERSECTION
+F0	2261	IDENTICAL TO
+F1	00B1	PLUS-MINUS SIGN
+F2	2265	GREATER-THAN OR EQUAL TO
+F3	2264	LESS-THAN OR EQUAL TO
+F4	2320	TOP HALF INTEGRAL
+F5	2321	BOTTOM HALF INTEGRAL
+F6	00F7	DIVISION SIGN
+F7	2248	ALMOST EQUAL TO
+F8	00B0	DEGREE SIGN
+F9	2219	BULLET OPERATOR
+FA	00B7	MIDDLE DOT
+FB	221A	SQUARE ROOT
+FC	207F	SUPERSCRIPT LATIN SMALL LETTER N
+FD	00B2	SUPERSCRIPT TWO
+FE	25A0	BLACK SQUARE
+FF	00A0	NO-BREAK SPACE
diff --git a/libucw/charset/set/ibm-ctrl b/libucw/charset/set/ibm-ctrl
new file mode 100644
index 0000000..f6ee56a
--- /dev/null
+++ b/libucw/charset/set/ibm-ctrl
@@ -0,0 +1,259 @@
+# IBM Charset File With Control Characters
+# (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	2302	HOUSE
+80	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+81	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+82	00E9	LATIN SMALL LETTER E WITH ACUTE
+83	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+84	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+85	00E0	LATIN SMALL LETTER A WITH GRAVE
+86	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+87	00E7	LATIN SMALL LETTER C WITH CEDILLA
+88	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+89	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+8A	00E8	LATIN SMALL LETTER E WITH GRAVE
+8B	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+8C	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+8D	00EC	LATIN SMALL LETTER I WITH GRAVE
+8E	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+8F	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+90	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+91	00E6	LATIN SMALL LETTER AE
+92	00C6	LATIN CAPITAL LETTER AE
+93	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+94	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+95	00F2	LATIN SMALL LETTER O WITH GRAVE
+96	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+97	00F9	LATIN SMALL LETTER U WITH GRAVE
+98	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
+99	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+9A	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+9B	00A2	CENT SIGN
+9C	00A3	POUND SIGN
+9D	00A5	YEN SIGN
+9E	20A7	PESETA SIGN
+9F	0192	LATIN SMALL LETTER F WITH HOOK
+A0	00E1	LATIN SMALL LETTER A WITH ACUTE
+A1	00ED	LATIN SMALL LETTER I WITH ACUTE
+A2	00F3	LATIN SMALL LETTER O WITH ACUTE
+A3	00FA	LATIN SMALL LETTER U WITH ACUTE
+A4	00F1	LATIN SMALL LETTER N WITH TILDE
+A5	00D1	LATIN CAPITAL LETTER N WITH TILDE
+A6	00AA	FEMININE ORDINAL INDICATOR
+A7	00BA	MASCULINE ORDINAL INDICATOR
+A8	00BF	INVERTED QUESTION MARK
+A9	2310	REVERSED NOT SIGN
+AA	00AC	NOT SIGN
+AB	00BD	VULGAR FRACTION ONE HALF
+AC	00BC	VULGAR FRACTION ONE QUARTER
+AD	00A1	INVERTED EXCLAMATION MARK
+AE	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AF	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+B0	2591	LIGHT SHADE
+B1	2592	MEDIUM SHADE
+B2	2593	DARK SHADE
+B3	2502	BOX DRAWINGS LIGHT VERTICAL
+B4	2524	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+B5	2561	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+B6	2562	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+B7	2556	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+B8	2555	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+B9	2563	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+BA	2551	BOX DRAWINGS DOUBLE VERTICAL
+BB	2557	BOX DRAWINGS DOUBLE DOWN AND LEFT
+BC	255D	BOX DRAWINGS DOUBLE UP AND LEFT
+BD	255C	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+BE	255B	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+BF	2510	BOX DRAWINGS LIGHT DOWN AND LEFT
+C0	2514	BOX DRAWINGS LIGHT UP AND RIGHT
+C1	2534	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+C2	252C	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+C3	251C	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+C4	2500	BOX DRAWINGS LIGHT HORIZONTAL
+C5	253C	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+C6	255E	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+C7	255F	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+C8	255A	BOX DRAWINGS DOUBLE UP AND RIGHT
+C9	2554	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+CA	2569	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+CB	2566	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+CC	2560	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+CD	2550	BOX DRAWINGS DOUBLE HORIZONTAL
+CE	256C	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+CF	2567	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+D0	2568	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+D1	2564	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+D2	2565	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+D3	2559	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+D4	2558	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+D5	2552	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+D6	2553	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+D7	256B	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+D8	256A	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+D9	2518	BOX DRAWINGS LIGHT UP AND LEFT
+DA	250C	BOX DRAWINGS LIGHT DOWN AND RIGHT
+DB	2588	FULL BLOCK
+DC	2584	LOWER HALF BLOCK
+DD	258C	LEFT HALF BLOCK
+DE	2590	RIGHT HALF BLOCK
+DF	2580	UPPER HALF BLOCK
+E0	03B1	GREEK SMALL LETTER ALPHA
+E1	00DF	LATIN SMALL LETTER SHARP S
+E2	0393	GREEK CAPITAL LETTER GAMMA
+E3	03C0	GREEK SMALL LETTER PI
+E4	03A3	GREEK CAPITAL LETTER SIGMA
+E5	03C3	GREEK SMALL LETTER SIGMA
+E6	00B5	MICRO SIGN
+E7	03C4	GREEK SMALL LETTER TAU
+E8	03A6	GREEK CAPITAL LETTER PHI
+E9	0398	GREEK CAPITAL LETTER THETA
+EA	03A9	GREEK CAPITAL LETTER OMEGA
+EB	03B4	GREEK SMALL LETTER DELTA
+EC	221E	INFINITY
+ED	03C6	GREEK SMALL LETTER PHI
+EE	03B5	GREEK SMALL LETTER EPSILON
+EF	2229	INTERSECTION
+F0	2261	IDENTICAL TO
+F1	00B1	PLUS-MINUS SIGN
+F2	2265	GREATER-THAN OR EQUAL TO
+F3	2264	LESS-THAN OR EQUAL TO
+F4	2320	TOP HALF INTEGRAL
+F5	2321	BOTTOM HALF INTEGRAL
+F6	00F7	DIVISION SIGN
+F7	2248	ALMOST EQUAL TO
+F8	00B0	DEGREE SIGN
+F9	2219	BULLET OPERATOR
+FA	00B7	MIDDLE DOT
+FB	221A	SQUARE ROOT
+FC	207F	SUPERSCRIPT LATIN SMALL LETTER N
+FD	00B2	SUPERSCRIPT TWO
+FE	25A0	BLACK SQUARE
+FF	00A0	NO-BREAK SPACE
diff --git a/libucw/charset/set/kamen b/libucw/charset/set/kamen
new file mode 100644
index 0000000..8555c8e
--- /dev/null
+++ b/libucw/charset/set/kamen
@@ -0,0 +1,260 @@
+# Kamenicky Brothers Charset File
+# Czech characters extracted from CStoCS "kam.enc" and others copied from
+# IBM charset by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	263A	WHITE SMILING FACE
+02	263B	BLACK SMILING FACE
+03	2665	BLACK HEART SUIT
+04	2666	BLACK DIAMOND SUIT
+05	2663	BLACK CLUB SUIT
+06	2660	BLACK SPADE SUIT
+07	2022	BULLET
+08	25D8	INVERSE BULLET
+09	25CB	WHITE CIRCLE
+0A	25D9	INVERSE WHITE CIRCLE
+0B	2642	MALE SIGN
+0C	2640	FEMALE SIGN
+0D	266A	EIGHTH NOTE
+0E	266B	BEAMED EIGHTH NOTES
+0F	263C	WHITE SUN WITH RAYS
+10	25B6	BLACK RIGHT-POINTING TRIANGLE
+11	25C0	BLACK LEFT-POINTING TRIANGLE
+12	2195	UP DOWN ARROW
+13	203C	DOUBLE EXCLAMATION MARK
+14	00B6	PILCROW SIGN
+15	00A7	SECTION SIGN
+16	25AC	BLACK RECTANGLE
+17	21A8	UP DOWN ARROW WITH BASE
+18	2191	UPWARDS ARROW
+19	2193	DOWNWARDS ARROW
+1A	2192	RIGHTWARDS ARROW
+1B	2190	LEFTWARDS ARROW
+1C	221F	RIGHT ANGLE
+1D	2194	LEFT RIGHT ARROW
+1E	25B2	BLACK UP-POINTING TRIANGLE
+1F	25BC	BLACK DOWN-POINTING TRIANGLE
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	2302	HOUSE
+80	010C	LATIN CAPITAL LETTER C WITH CARON
+81	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+82	00E9	LATIN SMALL LETTER E WITH ACUTE
+83	010F	LATIN SMALL LETTER D WITH CARON
+84	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+85	010E	LATIN CAPITAL LETTER D WITH CARON
+86	0164	LATIN CAPITAL LETTER T WITH CARON
+87	010D	LATIN SMALL LETTER C WITH CARON
+88	011B	LATIN SMALL LETTER E WITH CARON
+89	011A	LATIN CAPITAL LETTER E WITH CARON
+8A	0139	LATIN CAPITAL LETTER L WITH ACUTE
+8B	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+8C	013E	LATIN SMALL LETTER L WITH CARON
+8D	013A	LATIN SMALL LETTER L WITH ACUTE
+8E	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+8F	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+90	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+91	017E	LATIN SMALL LETTER Z WITH CARON
+92	017D	LATIN CAPITAL LETTER Z WITH CARON
+93	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+94	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+95	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+96	016F	LATIN SMALL LETTER U WITH RING ABOVE
+97	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+98	00FD	LATIN SMALL LETTER Y WITH ACUTE
+99	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+9A	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+9B	0160	LATIN CAPITAL LETTER S WITH CARON
+9C	013D	LATIN CAPITAL LETTER L WITH CARON
+9D	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+9E	0158	LATIN CAPITAL LETTER R WITH CARON
+9F	0165	LATIN SMALL LETTER T WITH CARON
+A0	00E1	LATIN SMALL LETTER A WITH ACUTE
+A1	00ED	LATIN SMALL LETTER I WITH ACUTE
+A2	00F3	LATIN SMALL LETTER O WITH ACUTE
+A3	00FA	LATIN SMALL LETTER U WITH ACUTE
+A4	0148	LATIN SMALL LETTER N WITH CARON
+A5	0147	LATIN CAPITAL LETTER N WITH CARON
+A6	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+A7	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+A8	0161	LATIN SMALL LETTER S WITH CARON
+A9	0159	LATIN SMALL LETTER R WITH CARON
+AA	0155	LATIN SMALL LETTER R WITH ACUTE
+AB	0154	LATIN CAPITAL LETTER R WITH ACUTE
+AC	00BC	VULGAR FRACTION ONE QUARTER
+AD	00A7	SECTION SIGN
+AE	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+AF	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+B0	2591	LIGHT SHADE
+B1	2592	MEDIUM SHADE
+B2	2593	DARK SHADE
+B3	2502	BOX DRAWINGS LIGHT VERTICAL
+B4	2524	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+B5	2561	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+B6	2562	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+B7	2556	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+B8	2555	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+B9	2563	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+BA	2551	BOX DRAWINGS DOUBLE VERTICAL
+BB	2557	BOX DRAWINGS DOUBLE DOWN AND LEFT
+BC	255D	BOX DRAWINGS DOUBLE UP AND LEFT
+BD	255C	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+BE	255B	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+BF	2510	BOX DRAWINGS LIGHT DOWN AND LEFT
+C0	2514	BOX DRAWINGS LIGHT UP AND RIGHT
+C1	2534	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+C2	252C	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+C3	251C	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+C4	2500	BOX DRAWINGS LIGHT HORIZONTAL
+C5	253C	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+C6	255E	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+C7	255F	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+C8	255A	BOX DRAWINGS DOUBLE UP AND RIGHT
+C9	2554	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+CA	2569	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+CB	2566	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+CC	2560	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+CD	2550	BOX DRAWINGS DOUBLE HORIZONTAL
+CE	256C	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+CF	2567	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+D0	2568	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+D1	2564	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+D2	2565	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+D3	2559	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+D4	2558	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+D5	2552	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+D6	2553	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+D7	256B	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+D8	256A	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+D9	2518	BOX DRAWINGS LIGHT UP AND LEFT
+DA	250C	BOX DRAWINGS LIGHT DOWN AND RIGHT
+DB	2588	FULL BLOCK
+DC	2584	LOWER HALF BLOCK
+DD	258C	LEFT HALF BLOCK
+DE	2590	RIGHT HALF BLOCK
+DF	2580	UPPER HALF BLOCK
+E0	03B1	GREEK SMALL LETTER ALPHA
+E1	03B2	GREEK SMALL LETTER BETA
+E2	0194	LATIN CAPITAL LETTER GAMMA
+E3	03C0	GREEK SMALL LETTER PI
+E4	03A3	GREEK CAPITAL LETTER SIGMA
+E5	03C3	GREEK SMALL LETTER SIGMA
+E6	03BC	GREEK SMALL LETTER MU
+E7	03C4	GREEK SMALL LETTER TAU
+E8	03A6	GREEK CAPITAL LETTER PHI
+E9	0398	GREEK CAPITAL LETTER THETA
+EA	03A9	GREEK CAPITAL LETTER OMEGA
+EB	03B4	GREEK SMALL LETTER DELTA
+EC	221E	INFINITY
+ED	03C6	GREEK SMALL LETTER PHI
+EE	2208	ELEMENT OF
+EF	2229	INTERSECTION
+F0	224D	EQUIVALENT TO
+F1	00B1	PLUS-MINUS SIGN
+F2	2265	GREATER-THAN OR EQUAL TO
+F3	2264	LESS-THAN OR EQUAL TO
+F4	2320	TOP HALF INTEGRAL
+F5	2321	BOTTOM HALF INTEGRAL
+F6	00F7	DIVISION SIGN
+F7	2248	ALMOST EQUAL TO
+F8	00B0	DEGREE SIGN
+F9	2219	BULLET OPERATOR
+FA	00B7	MIDDLE DOT
+FB	221A	SQUARE ROOT
+FC	207F	SUPERSCRIPT LATIN SMALL LETTER N
+FD	00B2	SUPERSCRIPT TWO
+FE	25A0	BLACK SQUARE
+FF	00A0	NO-BREAK SPACE
diff --git a/libucw/charset/set/kamen-ctrl b/libucw/charset/set/kamen-ctrl
new file mode 100644
index 0000000..da69ead
--- /dev/null
+++ b/libucw/charset/set/kamen-ctrl
@@ -0,0 +1,260 @@
+# Kamenicky Brothers Charset File With Control Characters
+# Czech characters extracted from CStoCS "kam.enc" and others copied from
+# IBM charset by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	2302	HOUSE
+80	010C	LATIN CAPITAL LETTER C WITH CARON
+81	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+82	00E9	LATIN SMALL LETTER E WITH ACUTE
+83	010F	LATIN SMALL LETTER D WITH CARON
+84	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+85	010E	LATIN CAPITAL LETTER D WITH CARON
+86	0164	LATIN CAPITAL LETTER T WITH CARON
+87	010D	LATIN SMALL LETTER C WITH CARON
+88	011B	LATIN SMALL LETTER E WITH CARON
+89	011A	LATIN CAPITAL LETTER E WITH CARON
+8A	0139	LATIN CAPITAL LETTER L WITH ACUTE
+8B	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+8C	013E	LATIN SMALL LETTER L WITH CARON
+8D	013A	LATIN SMALL LETTER L WITH ACUTE
+8E	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+8F	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+90	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+91	017E	LATIN SMALL LETTER Z WITH CARON
+92	017D	LATIN CAPITAL LETTER Z WITH CARON
+93	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+94	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+95	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+96	016F	LATIN SMALL LETTER U WITH RING ABOVE
+97	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+98	00FD	LATIN SMALL LETTER Y WITH ACUTE
+99	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+9A	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+9B	0160	LATIN CAPITAL LETTER S WITH CARON
+9C	013D	LATIN CAPITAL LETTER L WITH CARON
+9D	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+9E	0158	LATIN CAPITAL LETTER R WITH CARON
+9F	0165	LATIN SMALL LETTER T WITH CARON
+A0	00E1	LATIN SMALL LETTER A WITH ACUTE
+A1	00ED	LATIN SMALL LETTER I WITH ACUTE
+A2	00F3	LATIN SMALL LETTER O WITH ACUTE
+A3	00FA	LATIN SMALL LETTER U WITH ACUTE
+A4	0148	LATIN SMALL LETTER N WITH CARON
+A5	0147	LATIN CAPITAL LETTER N WITH CARON
+A6	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+A7	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+A8	0161	LATIN SMALL LETTER S WITH CARON
+A9	0159	LATIN SMALL LETTER R WITH CARON
+AA	0155	LATIN SMALL LETTER R WITH ACUTE
+AB	0154	LATIN CAPITAL LETTER R WITH ACUTE
+AC	00BC	VULGAR FRACTION ONE QUARTER
+AD	00A7	SECTION SIGN
+AE	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+AF	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+B0	2591	LIGHT SHADE
+B1	2592	MEDIUM SHADE
+B2	2593	DARK SHADE
+B3	2502	BOX DRAWINGS LIGHT VERTICAL
+B4	2524	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+B5	2561	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+B6	2562	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+B7	2556	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+B8	2555	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+B9	2563	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+BA	2551	BOX DRAWINGS DOUBLE VERTICAL
+BB	2557	BOX DRAWINGS DOUBLE DOWN AND LEFT
+BC	255D	BOX DRAWINGS DOUBLE UP AND LEFT
+BD	255C	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+BE	255B	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+BF	2510	BOX DRAWINGS LIGHT DOWN AND LEFT
+C0	2514	BOX DRAWINGS LIGHT UP AND RIGHT
+C1	2534	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+C2	252C	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+C3	251C	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+C4	2500	BOX DRAWINGS LIGHT HORIZONTAL
+C5	253C	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+C6	255E	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+C7	255F	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+C8	255A	BOX DRAWINGS DOUBLE UP AND RIGHT
+C9	2554	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+CA	2569	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+CB	2566	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+CC	2560	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+CD	2550	BOX DRAWINGS DOUBLE HORIZONTAL
+CE	256C	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+CF	2567	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+D0	2568	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+D1	2564	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+D2	2565	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+D3	2559	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+D4	2558	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+D5	2552	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+D6	2553	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+D7	256B	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+D8	256A	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+D9	2518	BOX DRAWINGS LIGHT UP AND LEFT
+DA	250C	BOX DRAWINGS LIGHT DOWN AND RIGHT
+DB	2588	FULL BLOCK
+DC	2584	LOWER HALF BLOCK
+DD	258C	LEFT HALF BLOCK
+DE	2590	RIGHT HALF BLOCK
+DF	2580	UPPER HALF BLOCK
+E0	03B1	GREEK SMALL LETTER ALPHA
+E1	03B2	GREEK SMALL LETTER BETA
+E2	0194	LATIN CAPITAL LETTER GAMMA
+E3	03C0	GREEK SMALL LETTER PI
+E4	03A3	GREEK CAPITAL LETTER SIGMA
+E5	03C3	GREEK SMALL LETTER SIGMA
+E6	03BC	GREEK SMALL LETTER MU
+E7	03C4	GREEK SMALL LETTER TAU
+E8	03A6	GREEK CAPITAL LETTER PHI
+E9	0398	GREEK CAPITAL LETTER THETA
+EA	03A9	GREEK CAPITAL LETTER OMEGA
+EB	03B4	GREEK SMALL LETTER DELTA
+EC	221E	INFINITY
+ED	03C6	GREEK SMALL LETTER PHI
+EE	2208	ELEMENT OF
+EF	2229	INTERSECTION
+F0	224D	EQUIVALENT TO
+F1	00B1	PLUS-MINUS SIGN
+F2	2265	GREATER-THAN OR EQUAL TO
+F3	2264	LESS-THAN OR EQUAL TO
+F4	2320	TOP HALF INTEGRAL
+F5	2321	BOTTOM HALF INTEGRAL
+F6	00F7	DIVISION SIGN
+F7	2248	ALMOST EQUAL TO
+F8	00B0	DEGREE SIGN
+F9	2219	BULLET OPERATOR
+FA	00B7	MIDDLE DOT
+FB	221A	SQUARE ROOT
+FC	207F	SUPERSCRIPT LATIN SMALL LETTER N
+FD	00B2	SUPERSCRIPT TWO
+FE	25A0	BLACK SQUARE
+FF	00A0	NO-BREAK SPACE
diff --git a/libucw/charset/set/koi8 b/libucw/charset/set/koi8
new file mode 100644
index 0000000..cc908d5
--- /dev/null
+++ b/libucw/charset/set/koi8
@@ -0,0 +1,259 @@
+# KOI-8 CS Charset File
+# Adapted from CStoCS "koi8.enc" by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	<control>
+80	FFFD	REPLACEMENT CHARACTER
+81	FFFD	REPLACEMENT CHARACTER
+82	FFFD	REPLACEMENT CHARACTER
+83	FFFD	REPLACEMENT CHARACTER
+84	FFFD	REPLACEMENT CHARACTER
+85	FFFD	REPLACEMENT CHARACTER
+86	FFFD	REPLACEMENT CHARACTER
+87	FFFD	REPLACEMENT CHARACTER
+88	FFFD	REPLACEMENT CHARACTER
+89	FFFD	REPLACEMENT CHARACTER
+8A	FFFD	REPLACEMENT CHARACTER
+8B	FFFD	REPLACEMENT CHARACTER
+8C	FFFD	REPLACEMENT CHARACTER
+8D	FFFD	REPLACEMENT CHARACTER
+8E	FFFD	REPLACEMENT CHARACTER
+8F	FFFD	REPLACEMENT CHARACTER
+90	FFFD	REPLACEMENT CHARACTER
+91	FFFD	REPLACEMENT CHARACTER
+92	FFFD	REPLACEMENT CHARACTER
+93	FFFD	REPLACEMENT CHARACTER
+94	FFFD	REPLACEMENT CHARACTER
+95	FFFD	REPLACEMENT CHARACTER
+96	FFFD	REPLACEMENT CHARACTER
+97	FFFD	REPLACEMENT CHARACTER
+98	FFFD	REPLACEMENT CHARACTER
+99	FFFD	REPLACEMENT CHARACTER
+9A	FFFD	REPLACEMENT CHARACTER
+9B	FFFD	REPLACEMENT CHARACTER
+9C	FFFD	REPLACEMENT CHARACTER
+9D	FFFD	REPLACEMENT CHARACTER
+9E	FFFD	REPLACEMENT CHARACTER
+9F	FFFD	REPLACEMENT CHARACTER
+A0	FFFD	REPLACEMENT CHARACTER
+A1	FFFD	REPLACEMENT CHARACTER
+A2	FFFD	REPLACEMENT CHARACTER
+A3	FFFD	REPLACEMENT CHARACTER
+A4	FFFD	REPLACEMENT CHARACTER
+A5	FFFD	REPLACEMENT CHARACTER
+A6	FFFD	REPLACEMENT CHARACTER
+A7	FFFD	REPLACEMENT CHARACTER
+A8	FFFD	REPLACEMENT CHARACTER
+A9	FFFD	REPLACEMENT CHARACTER
+AA	FFFD	REPLACEMENT CHARACTER
+AB	FFFD	REPLACEMENT CHARACTER
+AC	FFFD	REPLACEMENT CHARACTER
+AD	FFFD	REPLACEMENT CHARACTER
+AE	FFFD	REPLACEMENT CHARACTER
+AF	FFFD	REPLACEMENT CHARACTER
+B0	FFFD	REPLACEMENT CHARACTER
+B1	FFFD	REPLACEMENT CHARACTER
+B2	FFFD	REPLACEMENT CHARACTER
+B3	FFFD	REPLACEMENT CHARACTER
+B4	FFFD	REPLACEMENT CHARACTER
+B5	FFFD	REPLACEMENT CHARACTER
+B6	FFFD	REPLACEMENT CHARACTER
+B7	FFFD	REPLACEMENT CHARACTER
+B8	FFFD	REPLACEMENT CHARACTER
+B9	FFFD	REPLACEMENT CHARACTER
+BA	FFFD	REPLACEMENT CHARACTER
+BB	FFFD	REPLACEMENT CHARACTER
+BC	FFFD	REPLACEMENT CHARACTER
+BD	FFFD	REPLACEMENT CHARACTER
+BE	FFFD	REPLACEMENT CHARACTER
+BF	FFFD	REPLACEMENT CHARACTER
+C0	FFFD	REPLACEMENT CHARACTER
+C1	00E1	LATIN SMALL LETTER A WITH ACUTE
+C2	FFFD	REPLACEMENT CHARACTER
+C3	010D	LATIN SMALL LETTER C WITH CARON
+C4	010F	LATIN SMALL LETTER D WITH CARON
+C5	011B	LATIN SMALL LETTER E WITH CARON
+C6	0155	LATIN SMALL LETTER R WITH ACUTE
+C7	F002	????
+C8	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+C9	00ED	LATIN SMALL LETTER I WITH ACUTE
+CA	016F	LATIN SMALL LETTER U WITH RING ABOVE
+CB	013A	LATIN SMALL LETTER L WITH ACUTE
+CC	013E	LATIN SMALL LETTER L WITH CARON
+CD	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+CE	0148	LATIN SMALL LETTER N WITH CARON
+CF	00F3	LATIN SMALL LETTER O WITH ACUTE
+D0	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+D1	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+D2	0159	LATIN SMALL LETTER R WITH CARON
+D3	0161	LATIN SMALL LETTER S WITH CARON
+D4	0165	LATIN SMALL LETTER T WITH CARON
+D5	00FA	LATIN SMALL LETTER U WITH ACUTE
+D6	FFFD	REPLACEMENT CHARACTER
+D7	00E9	LATIN SMALL LETTER E WITH ACUTE
+D8	00E0	LATIN SMALL LETTER A WITH GRAVE
+D9	00FD	LATIN SMALL LETTER Y WITH ACUTE
+DA	017E	LATIN SMALL LETTER Z WITH CARON
+DB	FFFD	REPLACEMENT CHARACTER
+DC	030C	COMBINING CARON
+DD	FFFD	REPLACEMENT CHARACTER
+DE	0302	COMBINING CIRCUMFLEX ACCENT
+DF	FFFD	REPLACEMENT CHARACTER
+E0	00B4	ACUTE ACCENT
+E1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+E2	FFFD	REPLACEMENT CHARACTER
+E3	010C	LATIN CAPITAL LETTER C WITH CARON
+E4	010E	LATIN CAPITAL LETTER D WITH CARON
+E5	011A	LATIN CAPITAL LETTER E WITH CARON
+E6	0154	LATIN CAPITAL LETTER R WITH ACUTE
+E7	F000	????
+E8	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+E9	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+EA	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+EB	0139	LATIN CAPITAL LETTER L WITH ACUTE
+EC	013D	LATIN CAPITAL LETTER L WITH CARON
+ED	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+EE	0147	LATIN CAPITAL LETTER N WITH CARON
+EF	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+F0	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+F1	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+F2	0158	LATIN CAPITAL LETTER R WITH CARON
+F3	0160	LATIN CAPITAL LETTER S WITH CARON
+F4	0164	LATIN CAPITAL LETTER T WITH CARON
+F5	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+F6	FFFD	REPLACEMENT CHARACTER
+F7	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+F8	0102	LATIN CAPITAL LETTER A WITH BREVE
+F9	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+FA	017D	LATIN CAPITAL LETTER Z WITH CARON
+FB	FFFD	REPLACEMENT CHARACTER
+FC	FFFD	REPLACEMENT CHARACTER
+FD	FFFD	REPLACEMENT CHARACTER
+FE	00B0	DEGREE SIGN
+FF	FFFD	REPLACEMENT CHARACTER
diff --git a/libucw/charset/set/mac b/libucw/charset/set/mac
new file mode 100644
index 0000000..004a7d9
--- /dev/null
+++ b/libucw/charset/set/mac
@@ -0,0 +1,259 @@
+# Macintosh Charset File
+# Adapted from CStoCS "mac.enc" by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	<control>
+80	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+81	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+82	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+83	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+84	00D1	LATIN CAPITAL LETTER N WITH TILDE
+85	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+86	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+87	00E1	LATIN SMALL LETTER A WITH ACUTE
+88	00E0	LATIN SMALL LETTER A WITH GRAVE
+89	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+8A	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+8B	00E3	LATIN SMALL LETTER A WITH TILDE
+8C	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+8D	00E7	LATIN SMALL LETTER C WITH CEDILLA
+8E	00E9	LATIN SMALL LETTER E WITH ACUTE
+8F	00E8	LATIN SMALL LETTER E WITH GRAVE
+90	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+91	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+92	00ED	LATIN SMALL LETTER I WITH ACUTE
+93	00EC	LATIN SMALL LETTER I WITH GRAVE
+94	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+95	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+96	00F1	LATIN SMALL LETTER N WITH TILDE
+97	00F3	LATIN SMALL LETTER O WITH ACUTE
+98	00F2	LATIN SMALL LETTER O WITH GRAVE
+99	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+9A	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+9B	00F5	LATIN SMALL LETTER O WITH TILDE
+9C	00FA	LATIN SMALL LETTER U WITH ACUTE
+9D	00F9	LATIN SMALL LETTER U WITH GRAVE
+9E	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+9F	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+A0	2020	DAGGER
+A1	00B0	DEGREE SIGN
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A7	SECTION SIGN
+A5	2022	BULLET
+A6	00B6	PILCROW SIGN
+A7	00DF	LATIN SMALL LETTER SHARP S
+A8	00AE	REGISTERED SIGN
+A9	00A9	COPYRIGHT SIGN
+AA	2122	TRADE MARK SIGN
+AB	00B4	ACUTE ACCENT
+AC	0308	COMBINING DIAERESIS
+AD	2260	NOT EQUAL TO
+AE	00C6	LATIN CAPITAL LETTER AE
+AF	00D8	LATIN CAPITAL LETTER O WITH STROKE
+B0	221E	INFINITY
+B1	00B1	PLUS-MINUS SIGN
+B2	2264	LESS-THAN OR EQUAL TO
+B3	2265	GREATER-THAN OR EQUAL TO
+B4	00A5	YEN SIGN
+B5	03BC	GREEK SMALL LETTER MU
+B6	2202	PARTIAL DIFFERENTIAL
+B7	2211	N-ARY SUMMATION
+B8	220F	N-ARY PRODUCT
+B9	03C0	GREEK SMALL LETTER PI
+BA	222B	INTEGRAL
+BB	00AA	FEMININE ORDINAL INDICATOR
+BC	00BA	MASCULINE ORDINAL INDICATOR
+BD	03A9	GREEK CAPITAL LETTER OMEGA
+BE	00E6	LATIN SMALL LETTER AE
+BF	00F8	LATIN SMALL LETTER O WITH STROKE
+C0	00BF	INVERTED QUESTION MARK
+C1	00A1	INVERTED EXCLAMATION MARK
+C2	00AC	NOT SIGN
+C3	221A	SQUARE ROOT
+C4	F003	????
+C5	2248	ALMOST EQUAL TO
+C6	0394	GREEK CAPITAL LETTER DELTA
+C7	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+C8	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+C9	0EAF	LAO ELLIPSIS
+CA	00A0	NO-BREAK SPACE
+CB	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+CC	00C3	LATIN CAPITAL LETTER A WITH TILDE
+CD	00D5	LATIN CAPITAL LETTER O WITH TILDE
+CE	0152	LATIN CAPITAL LIGATURE OE
+CF	0153	LATIN SMALL LIGATURE OE
+D0	2014	EM DASH
+D1	2013	EN DASH
+D2	201C	LEFT DOUBLE QUOTATION MARK
+D3	201D	RIGHT DOUBLE QUOTATION MARK
+D4	2018	LEFT SINGLE QUOTATION MARK
+D5	2019	RIGHT SINGLE QUOTATION MARK
+D6	00F7	DIVISION SIGN
+D7	22C4	DIAMOND OPERATOR
+D8	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
+D9	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+DA	2044	FRACTION SLASH
+DB	00A4	CURRENCY SIGN
+DC	2039	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+DD	203A	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+DE	FB01	LATIN SMALL LIGATURE FI
+DF	FB02	LATIN SMALL LIGATURE FL
+E0	2021	DOUBLE DAGGER
+E1	00B7	MIDDLE DOT
+E2	201A	SINGLE LOW-9 QUOTATION MARK
+E3	201E	DOUBLE LOW-9 QUOTATION MARK
+E4	2030	PER MILLE SIGN
+E5	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+E6	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+E7	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+E8	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+E9	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+EA	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+EB	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+EC	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+ED	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+EE	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+EF	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+F0	FFFD	REPLACEMENT CHARACTER
+F1	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+F2	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+F3	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+F4	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+F5	0131	LATIN SMALL LETTER DOTLESS I
+F6	0302	COMBINING CIRCUMFLEX ACCENT
+F7	0303	COMBINING TILDE
+F8	0304	COMBINING MACRON
+F9	0306	COMBINING BREVE
+FA	02D9	DOT ABOVE
+FB	030A	COMBINING RING ABOVE
+FC	0327	COMBINING CEDILLA
+FD	030B	COMBINING DOUBLE ACUTE ACCENT
+FE	0328	COMBINING OGONEK
+FF	030C	COMBINING CARON
diff --git a/libucw/charset/set/macce b/libucw/charset/set/macce
new file mode 100644
index 0000000..6e4f3b1
--- /dev/null
+++ b/libucw/charset/set/macce
@@ -0,0 +1,259 @@
+# Czech Macintosh Charset File
+# Adapted from CStoCS "macce.enc" by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	<control>
+80	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+81	0100	LATIN CAPITAL LETTER A WITH MACRON
+82	0101	LATIN SMALL LETTER A WITH MACRON
+83	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+84	0104	LATIN CAPITAL LETTER A WITH OGONEK
+85	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+86	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+87	00E1	LATIN SMALL LETTER A WITH ACUTE
+88	0105	LATIN SMALL LETTER A WITH OGONEK
+89	010C	LATIN CAPITAL LETTER C WITH CARON
+8A	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+8B	010D	LATIN SMALL LETTER C WITH CARON
+8C	0106	LATIN CAPITAL LETTER C WITH ACUTE
+8D	0107	LATIN SMALL LETTER C WITH ACUTE
+8E	00E9	LATIN SMALL LETTER E WITH ACUTE
+8F	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+90	017A	LATIN SMALL LETTER Z WITH ACUTE
+91	010E	LATIN CAPITAL LETTER D WITH CARON
+92	00ED	LATIN SMALL LETTER I WITH ACUTE
+93	010F	LATIN SMALL LETTER D WITH CARON
+94	0112	LATIN CAPITAL LETTER E WITH MACRON
+95	0113	LATIN SMALL LETTER E WITH MACRON
+96	0116	LATIN CAPITAL LETTER E WITH DOT ABOVE
+97	00F3	LATIN SMALL LETTER O WITH ACUTE
+98	0117	LATIN SMALL LETTER E WITH DOT ABOVE
+99	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+9A	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+9B	00F5	LATIN SMALL LETTER O WITH TILDE
+9C	00FA	LATIN SMALL LETTER U WITH ACUTE
+9D	011A	LATIN CAPITAL LETTER E WITH CARON
+9E	011B	LATIN SMALL LETTER E WITH CARON
+9F	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+A0	2020	DAGGER
+A1	00B0	DEGREE SIGN
+A2	0118	LATIN CAPITAL LETTER E WITH OGONEK
+A3	00A3	POUND SIGN
+A4	00A7	SECTION SIGN
+A5	2022	BULLET
+A6	00B6	PILCROW SIGN
+A7	00DF	LATIN SMALL LETTER SHARP S
+A8	00AE	REGISTERED SIGN
+A9	00A9	COPYRIGHT SIGN
+AA	2122	TRADE MARK SIGN
+AB	0119	LATIN SMALL LETTER E WITH OGONEK
+AC	0308	COMBINING DIAERESIS
+AD	2260	NOT EQUAL TO
+AE	01F5	LATIN SMALL LETTER G WITH ACUTE
+AF	012E	LATIN CAPITAL LETTER I WITH OGONEK
+B0	012F	LATIN SMALL LETTER I WITH OGONEK
+B1	012A	LATIN CAPITAL LETTER I WITH MACRON
+B2	2264	LESS-THAN OR EQUAL TO
+B3	2265	GREATER-THAN OR EQUAL TO
+B4	012B	LATIN SMALL LETTER I WITH MACRON
+B5	0136	LATIN CAPITAL LETTER K WITH CEDILLA
+B6	2202	PARTIAL DIFFERENTIAL
+B7	2211	N-ARY SUMMATION
+B8	0142	LATIN SMALL LETTER L WITH STROKE
+B9	013B	LATIN CAPITAL LETTER L WITH CEDILLA
+BA	013C	LATIN SMALL LETTER L WITH CEDILLA
+BB	013D	LATIN CAPITAL LETTER L WITH CARON
+BC	013E	LATIN SMALL LETTER L WITH CARON
+BD	0139	LATIN CAPITAL LETTER L WITH ACUTE
+BE	013A	LATIN SMALL LETTER L WITH ACUTE
+BF	0145	LATIN CAPITAL LETTER N WITH CEDILLA
+C0	0146	LATIN SMALL LETTER N WITH CEDILLA
+C1	0143	LATIN CAPITAL LETTER N WITH ACUTE
+C2	00AC	NOT SIGN
+C3	221A	SQUARE ROOT
+C4	0144	LATIN SMALL LETTER N WITH ACUTE
+C5	0147	LATIN CAPITAL LETTER N WITH CARON
+C6	0394	GREEK CAPITAL LETTER DELTA
+C7	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+C8	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+C9	0EAF	LAO ELLIPSIS
+CA	00A0	NO-BREAK SPACE
+CB	0148	LATIN SMALL LETTER N WITH CARON
+CC	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+CD	00D5	LATIN CAPITAL LETTER O WITH TILDE
+CE	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+CF	014C	LATIN CAPITAL LETTER O WITH MACRON
+D0	2014	EM DASH
+D1	2013	EN DASH
+D2	201C	LEFT DOUBLE QUOTATION MARK
+D3	201D	RIGHT DOUBLE QUOTATION MARK
+D4	2018	LEFT SINGLE QUOTATION MARK
+D5	2019	RIGHT SINGLE QUOTATION MARK
+D6	00F7	DIVISION SIGN
+D7	22C4	DIAMOND OPERATOR
+D8	014D	LATIN SMALL LETTER O WITH MACRON
+D9	0154	LATIN CAPITAL LETTER R WITH ACUTE
+DA	0155	LATIN SMALL LETTER R WITH ACUTE
+DB	0158	LATIN CAPITAL LETTER R WITH CARON
+DC	2039	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+DD	203A	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+DE	0159	LATIN SMALL LETTER R WITH CARON
+DF	0156	LATIN CAPITAL LETTER R WITH CEDILLA
+E0	0157	LATIN SMALL LETTER R WITH CEDILLA
+E1	0160	LATIN CAPITAL LETTER S WITH CARON
+E2	201A	SINGLE LOW-9 QUOTATION MARK
+E3	201E	DOUBLE LOW-9 QUOTATION MARK
+E4	0161	LATIN SMALL LETTER S WITH CARON
+E5	015A	LATIN CAPITAL LETTER S WITH ACUTE
+E6	015B	LATIN SMALL LETTER S WITH ACUTE
+E7	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+E8	0164	LATIN CAPITAL LETTER T WITH CARON
+E9	0165	LATIN SMALL LETTER T WITH CARON
+EA	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+EB	017D	LATIN CAPITAL LETTER Z WITH CARON
+EC	017E	LATIN SMALL LETTER Z WITH CARON
+ED	016A	LATIN CAPITAL LETTER U WITH MACRON
+EE	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+EF	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+F0	016B	LATIN SMALL LETTER U WITH MACRON
+F1	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+F2	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+F3	016F	LATIN SMALL LETTER U WITH RING ABOVE
+F4	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+F5	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+F6	0172	LATIN CAPITAL LETTER U WITH OGONEK
+F7	0173	LATIN SMALL LETTER U WITH OGONEK
+F8	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+F9	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FA	0137	LATIN SMALL LETTER K WITH CEDILLA
+FB	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+FC	0141	LATIN CAPITAL LETTER L WITH STROKE
+FD	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+FE	0122	LATIN CAPITAL LETTER G WITH CEDILLA
+FF	030C	COMBINING CARON
diff --git a/libucw/charset/set/pc-latin-2 b/libucw/charset/set/pc-latin-2
new file mode 100644
index 0000000..8327ceb
--- /dev/null
+++ b/libucw/charset/set/pc-latin-2
@@ -0,0 +1,260 @@
+# PC Latin-2 Charset File
+# Adapted from CStoCS "pc2.enc" and gaps filled by info from the
+# IBM charset by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+
+00	0000	<control>
+01	0001	<control>
+02	0002	<control>
+03	0003	<control>
+04	0004	<control>
+05	0005	<control>
+06	0006	<control>
+07	0007	<control>
+08	0008	<control>
+09	0009	<control>
+0A	000A	<control>
+0B	000B	<control>
+0C	000C	<control>
+0D	000D	<control>
+0E	000E	<control>
+0F	000F	<control>
+10	0010	<control>
+11	0011	<control>
+12	0012	<control>
+13	0013	<control>
+14	0014	<control>
+15	0015	<control>
+16	0016	<control>
+17	0017	<control>
+18	0018	<control>
+19	0019	<control>
+1A	001A	<control>
+1B	001B	<control>
+1C	001C	<control>
+1D	001D	<control>
+1E	001E	<control>
+1F	001F	<control>
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	2302	HOUSE
+80	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+81	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+82	00E9	LATIN SMALL LETTER E WITH ACUTE
+83	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+84	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+85	016F	LATIN SMALL LETTER U WITH RING ABOVE
+86	0107	LATIN SMALL LETTER C WITH ACUTE
+87	00E7	LATIN SMALL LETTER C WITH CEDILLA
+88	0142	LATIN SMALL LETTER L WITH STROKE
+89	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+8A	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+8B	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+8C	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+8D	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+8E	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+8F	0106	LATIN CAPITAL LETTER C WITH ACUTE
+90	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+91	0139	LATIN CAPITAL LETTER L WITH ACUTE
+92	013A	LATIN SMALL LETTER L WITH ACUTE
+93	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+94	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+95	013D	LATIN CAPITAL LETTER L WITH CARON
+96	013E	LATIN SMALL LETTER L WITH CARON
+97	015A	LATIN CAPITAL LETTER S WITH ACUTE
+98	015B	LATIN SMALL LETTER S WITH ACUTE
+99	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+9A	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+9B	0164	LATIN CAPITAL LETTER T WITH CARON
+9C	0165	LATIN SMALL LETTER T WITH CARON
+9D	0141	LATIN CAPITAL LETTER L WITH STROKE
+9E	00D7	MULTIPLICATION SIGN
+9F	010D	LATIN SMALL LETTER C WITH CARON
+A0	00E1	LATIN SMALL LETTER A WITH ACUTE
+A1	00ED	LATIN SMALL LETTER I WITH ACUTE
+A2	00F3	LATIN SMALL LETTER O WITH ACUTE
+A3	00FA	LATIN SMALL LETTER U WITH ACUTE
+A4	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A5	0105	LATIN SMALL LETTER A WITH OGONEK
+A6	017D	LATIN CAPITAL LETTER Z WITH CARON
+A7	017E	LATIN SMALL LETTER Z WITH CARON
+A8	0118	LATIN CAPITAL LETTER E WITH OGONEK
+A9	0119	LATIN SMALL LETTER E WITH OGONEK
+AA	00AC	NOT SIGN
+AB	017A	LATIN SMALL LETTER Z WITH ACUTE
+AC	010C	LATIN CAPITAL LETTER C WITH CARON
+AD	015F	LATIN SMALL LETTER S WITH CEDILLA
+AE	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+AF	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+B0	2591	LIGHT SHADE
+B1	2592	MEDIUM SHADE
+B2	2593	DARK SHADE
+B3	2502	BOX DRAWINGS LIGHT VERTICAL
+B4	2524	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+B5	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+B6	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+B7	011A	LATIN CAPITAL LETTER E WITH CARON
+B8	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+B9	2563	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+BA	2551	BOX DRAWINGS DOUBLE VERTICAL
+BB	2557	BOX DRAWINGS DOUBLE DOWN AND LEFT
+BC	255D	BOX DRAWINGS DOUBLE UP AND LEFT
+BD	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+BE	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+BF	2510	BOX DRAWINGS LIGHT DOWN AND LEFT
+C0	2514	BOX DRAWINGS LIGHT UP AND RIGHT
+C1	2534	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+C2	252C	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+C3	251C	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+C4	2500	BOX DRAWINGS LIGHT HORIZONTAL
+C5	253C	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+C6	0102	LATIN CAPITAL LETTER A WITH BREVE
+C7	0103	LATIN SMALL LETTER A WITH BREVE
+C8	255A	BOX DRAWINGS DOUBLE UP AND RIGHT
+C9	2554	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+CA	2569	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+CB	2566	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+CC	2560	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+CD	2550	BOX DRAWINGS DOUBLE HORIZONTAL
+CE	256C	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+CF	00A4	CURRENCY SIGN
+D0	00F0	LATIN SMALL LETTER ETH
+D1	00D0	LATIN CAPITAL LETTER ETH
+D2	010E	LATIN CAPITAL LETTER D WITH CARON
+D3	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+D4	010F	LATIN SMALL LETTER D WITH CARON
+D5	0147	LATIN CAPITAL LETTER N WITH CARON
+D6	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+D7	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+D8	011B	LATIN SMALL LETTER E WITH CARON
+D9	2518	BOX DRAWINGS LIGHT UP AND LEFT
+DA	250C	BOX DRAWINGS LIGHT DOWN AND RIGHT
+DB	2588	FULL BLOCK
+DC	2584	LOWER HALF BLOCK
+DD	0162	LATIN CAPITAL LETTER T WITH CEDILLA
+DE	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+DF	2580	UPPER HALF BLOCK
+E0	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+E1	00DF	LATIN SMALL LETTER SHARP S
+E2	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+E3	0143	LATIN CAPITAL LETTER N WITH ACUTE
+E4	0144	LATIN SMALL LETTER N WITH ACUTE
+E5	0148	LATIN SMALL LETTER N WITH CARON
+E6	0160	LATIN CAPITAL LETTER S WITH CARON
+E7	0161	LATIN SMALL LETTER S WITH CARON
+E8	0154	LATIN CAPITAL LETTER R WITH ACUTE
+E9	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+EA	0155	LATIN SMALL LETTER R WITH ACUTE
+EB	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+EC	00FD	LATIN SMALL LETTER Y WITH ACUTE
+ED	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+EE	0163	LATIN SMALL LETTER T WITH CEDILLA
+EF	00B4	ACUTE ACCENT
+F0	2261	IDENTICAL TO
+F1	030B	COMBINING DOUBLE ACUTE ACCENT
+F2	0328	COMBINING OGONEK
+F3	030C	COMBINING CARON
+F4	0306	COMBINING BREVE
+F5	00A7	SECTION SIGN
+F6	00F7	DIVISION SIGN
+F7	0327	COMBINING CEDILLA
+F8	FFFD	REPLACEMENT CHARACTER
+F9	0308	COMBINING DIAERESIS
+FA	02D9	DOT ABOVE
+FB	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+FC	0158	LATIN CAPITAL LETTER R WITH CARON
+FD	0159	LATIN SMALL LETTER R WITH CARON
+FE	25A0	BLACK SQUARE
+FF	00A0	NO-BREAK SPACE
diff --git a/libucw/charset/set/win-1250 b/libucw/charset/set/win-1250
new file mode 100644
index 0000000..a934ef6
--- /dev/null
+++ b/libucw/charset/set/win-1250
@@ -0,0 +1,255 @@
+# CP1250.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	20AC	EURO SIGN
+82	201A	SINGLE LOW-9 QUOTATION MARK
+84	201E	DOUBLE LOW-9 QUOTATION MARK
+85	2026	HORIZONTAL ELLIPSIS
+86	2020	DAGGER
+87	2021	DOUBLE DAGGER
+89	2030	PER MILLE SIGN
+8A	0160	LATIN CAPITAL LETTER S WITH CARON
+8B	2039	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+8C	015A	LATIN CAPITAL LETTER S WITH ACUTE
+8D	0164	LATIN CAPITAL LETTER T WITH CARON
+8E	017D	LATIN CAPITAL LETTER Z WITH CARON
+8F	0179	LATIN CAPITAL LETTER Z WITH ACUTE
+91	2018	LEFT SINGLE QUOTATION MARK
+92	2019	RIGHT SINGLE QUOTATION MARK
+93	201C	LEFT DOUBLE QUOTATION MARK
+94	201D	RIGHT DOUBLE QUOTATION MARK
+95	2022	BULLET
+96	2013	EN DASH
+97	2014	EM DASH
+99	2122	TRADE MARK SIGN
+9A	0161	LATIN SMALL LETTER S WITH CARON
+9B	203A	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+9C	015B	LATIN SMALL LETTER S WITH ACUTE
+9D	0165	LATIN SMALL LETTER T WITH CARON
+9E	017E	LATIN SMALL LETTER Z WITH CARON
+9F	017A	LATIN SMALL LETTER Z WITH ACUTE
+A0	00A0	NO-BREAK SPACE
+A1	02C7	CARON
+A2	02D8	BREVE
+A3	0141	LATIN CAPITAL LETTER L WITH STROKE
+A4	00A4	CURRENCY SIGN
+A5	0104	LATIN CAPITAL LETTER A WITH OGONEK
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AA	015E	LATIN CAPITAL LETTER S WITH CEDILLA
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	017B	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	02DB	OGONEK
+B3	0142	LATIN SMALL LETTER L WITH STROKE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	0105	LATIN SMALL LETTER A WITH OGONEK
+BA	015F	LATIN SMALL LETTER S WITH CEDILLA
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	013D	LATIN CAPITAL LETTER L WITH CARON
+BD	02DD	DOUBLE ACUTE ACCENT
+BE	013E	LATIN SMALL LETTER L WITH CARON
+BF	017C	LATIN SMALL LETTER Z WITH DOT ABOVE
+C0	0154	LATIN CAPITAL LETTER R WITH ACUTE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	0102	LATIN CAPITAL LETTER A WITH BREVE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	0139	LATIN CAPITAL LETTER L WITH ACUTE
+C6	0106	LATIN CAPITAL LETTER C WITH ACUTE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	010C	LATIN CAPITAL LETTER C WITH CARON
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	0118	LATIN CAPITAL LETTER E WITH OGONEK
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	011A	LATIN CAPITAL LETTER E WITH CARON
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	010E	LATIN CAPITAL LETTER D WITH CARON
+D0	0110	LATIN CAPITAL LETTER D WITH STROKE
+D1	0143	LATIN CAPITAL LETTER N WITH ACUTE
+D2	0147	LATIN CAPITAL LETTER N WITH CARON
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	0150	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	0158	LATIN CAPITAL LETTER R WITH CARON
+D9	016E	LATIN CAPITAL LETTER U WITH RING ABOVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	0170	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	0162	LATIN CAPITAL LETTER T WITH CEDILLA
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	0155	LATIN SMALL LETTER R WITH ACUTE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	0103	LATIN SMALL LETTER A WITH BREVE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	013A	LATIN SMALL LETTER L WITH ACUTE
+E6	0107	LATIN SMALL LETTER C WITH ACUTE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	010D	LATIN SMALL LETTER C WITH CARON
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	0119	LATIN SMALL LETTER E WITH OGONEK
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	011B	LATIN SMALL LETTER E WITH CARON
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	010F	LATIN SMALL LETTER D WITH CARON
+F0	0111	LATIN SMALL LETTER D WITH STROKE
+F1	0144	LATIN SMALL LETTER N WITH ACUTE
+F2	0148	LATIN SMALL LETTER N WITH CARON
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	0151	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	0159	LATIN SMALL LETTER R WITH CARON
+F9	016F	LATIN SMALL LETTER U WITH RING ABOVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	0171	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	0163	LATIN SMALL LETTER T WITH CEDILLA
+FF	02D9	DOT ABOVE
diff --git a/libucw/charset/set/win-1251 b/libucw/charset/set/win-1251
new file mode 100644
index 0000000..d9b2d7c
--- /dev/null
+++ b/libucw/charset/set/win-1251
@@ -0,0 +1,260 @@
+# CP1252.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
+# (c) 2005, Martin Mares <mj@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	0402	CYRILLIC CAPITAL LETTER DJE
+81	0403	CYRILLIC CAPITAL LETTER GJE
+82	201A	SINGLE LOW-9 QUOTATION MARK
+83	0453	CYRILLIC SMALL LETTER GJE
+84	201E	DOUBLE LOW-9 QUOTATION MARK
+85	2026	HORIZONTAL ELLIPSIS
+86	2020	DAGGER
+87	2021	DOUBLE DAGGER
+88	20AC	EURO SIGN
+89	2030	PER MILLE SIGN
+8A	0409	CYRILLIC CAPITAL LETTER LJE
+8B	2039	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+8C	040A	CYRILLIC CAPITAL LETTER NJE
+8D	040C	CYRILLIC CAPITAL LETTER KJE
+8E	040B	CYRILLIC CAPITAL LETTER TSHE
+8F	040F	CYRILLIC CAPITAL LETTER DZHE
+90	0452	CYRILLIC SMALL LETTER DJE
+91	2018	LEFT SINGLE QUOTATION MARK
+92	2019	RIGHT SINGLE QUOTATION MARK
+93	201C	LEFT DOUBLE QUOTATION MARK
+94	201D	RIGHT DOUBLE QUOTATION MARK
+95	2022	BULLET
+96	2013	EN DASH
+97	2014	EM DASH
+98	FFFD	REPLACEMENT CHARACTER
+99	2122	TRADE MARK SIGN
+9A	0459	CYRILLIC SMALL LETTER LJE
+9B	203A	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+9C	045A	CYRILLIC SMALL LETTER NJE
+9D	045C	CYRILLIC SMALL LETTER KJE
+9E	045B	CYRILLIC SMALL LETTER TSHE
+9F	045F	CYRILLIC SMALL LETTER DZHE
+A0	00A0	NO-BREAK SPACE
+A1	040E	CYRILLIC CAPITAL LETTER SHORT U
+A2	045E	CYRILLIC SMALL LETTER SHORT U
+A3	0408	CYRILLIC CAPITAL LETTER JE
+A4	00A4	CURRENCY SIGN
+A5	0490	CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	0401	CYRILLIC CAPITAL LETTER IO
+A9	00A9	COPYRIGHT SIGN
+AA	0404	CYRILLIC CAPITAL LETTER UKRAINIAN IE
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	0407	CYRILLIC CAPITAL LETTER YI
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	0406	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+B3	0456	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+B4	0491	CYRILLIC SMALL LETTER GHE WITH UPTURN
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	0451	CYRILLIC SMALL LETTER IO
+B9	2116	NUMERO SIGN
+BA	0454	CYRILLIC SMALL LETTER UKRAINIAN IE
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	0458	CYRILLIC SMALL LETTER JE
+BD	0405	CYRILLIC CAPITAL LETTER DZE
+BE	0455	CYRILLIC SMALL LETTER DZE
+BF	0457	CYRILLIC SMALL LETTER YI
+C0	0410	CYRILLIC CAPITAL LETTER A
+C1	0411	CYRILLIC CAPITAL LETTER BE
+C2	0412	CYRILLIC CAPITAL LETTER VE
+C3	0413	CYRILLIC CAPITAL LETTER GHE
+C4	0414	CYRILLIC CAPITAL LETTER DE
+C5	0415	CYRILLIC CAPITAL LETTER IE
+C6	0416	CYRILLIC CAPITAL LETTER ZHE
+C7	0417	CYRILLIC CAPITAL LETTER ZE
+C8	0418	CYRILLIC CAPITAL LETTER I
+C9	0419	CYRILLIC CAPITAL LETTER SHORT I
+CA	041A	CYRILLIC CAPITAL LETTER KA
+CB	041B	CYRILLIC CAPITAL LETTER EL
+CC	041C	CYRILLIC CAPITAL LETTER EM
+CD	041D	CYRILLIC CAPITAL LETTER EN
+CE	041E	CYRILLIC CAPITAL LETTER O
+CF	041F	CYRILLIC CAPITAL LETTER PE
+D0	0420	CYRILLIC CAPITAL LETTER ER
+D1	0421	CYRILLIC CAPITAL LETTER ES
+D2	0422	CYRILLIC CAPITAL LETTER TE
+D3	0423	CYRILLIC CAPITAL LETTER U
+D4	0424	CYRILLIC CAPITAL LETTER EF
+D5	0425	CYRILLIC CAPITAL LETTER HA
+D6	0426	CYRILLIC CAPITAL LETTER TSE
+D7	0427	CYRILLIC CAPITAL LETTER CHE
+D8	0428	CYRILLIC CAPITAL LETTER SHA
+D9	0429	CYRILLIC CAPITAL LETTER SHCHA
+DA	042A	CYRILLIC CAPITAL LETTER HARD SIGN
+DB	042B	CYRILLIC CAPITAL LETTER YERU
+DC	042C	CYRILLIC CAPITAL LETTER SOFT SIGN
+DD	042D	CYRILLIC CAPITAL LETTER E
+DE	042E	CYRILLIC CAPITAL LETTER YU
+DF	042F	CYRILLIC CAPITAL LETTER YA
+E0	0430	CYRILLIC SMALL LETTER A
+E1	0431	CYRILLIC SMALL LETTER BE
+E2	0432	CYRILLIC SMALL LETTER VE
+E3	0433	CYRILLIC SMALL LETTER GHE
+E4	0434	CYRILLIC SMALL LETTER DE
+E5	0435	CYRILLIC SMALL LETTER IE
+E6	0436	CYRILLIC SMALL LETTER ZHE
+E7	0437	CYRILLIC SMALL LETTER ZE
+E8	0438	CYRILLIC SMALL LETTER I
+E9	0439	CYRILLIC SMALL LETTER SHORT I
+EA	043A	CYRILLIC SMALL LETTER KA
+EB	043B	CYRILLIC SMALL LETTER EL
+EC	043C	CYRILLIC SMALL LETTER EM
+ED	043D	CYRILLIC SMALL LETTER EN
+EE	043E	CYRILLIC SMALL LETTER O
+EF	043F	CYRILLIC SMALL LETTER PE
+F0	0440	CYRILLIC SMALL LETTER ER
+F1	0441	CYRILLIC SMALL LETTER ES
+F2	0442	CYRILLIC SMALL LETTER TE
+F3	0443	CYRILLIC SMALL LETTER U
+F4	0444	CYRILLIC SMALL LETTER EF
+F5	0445	CYRILLIC SMALL LETTER HA
+F6	0446	CYRILLIC SMALL LETTER TSE
+F7	0447	CYRILLIC SMALL LETTER CHE
+F8	0448	CYRILLIC SMALL LETTER SHA
+F9	0449	CYRILLIC SMALL LETTER SHCHA
+FA	044A	CYRILLIC SMALL LETTER HARD SIGN
+FB	044B	CYRILLIC SMALL LETTER YERU
+FC	044C	CYRILLIC SMALL LETTER SOFT SIGN
+FD	044D	CYRILLIC SMALL LETTER E
+FE	044E	CYRILLIC SMALL LETTER YU
+FF	044F	CYRILLIC SMALL LETTER YA
diff --git a/libucw/charset/set/win-1252 b/libucw/charset/set/win-1252
new file mode 100644
index 0000000..0e9a324
--- /dev/null
+++ b/libucw/charset/set/win-1252
@@ -0,0 +1,255 @@
+# CP1252.TXT charset file
+# Imported from ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT
+# (c) 2003, Robert Spalek <robert@ucw.cz>
+
+00	0000	NULL
+01	0001	START OF HEADING
+02	0002	START OF TEXT
+03	0003	END OF TEXT
+04	0004	END OF TRANSMISSION
+05	0005	ENQUIRY
+06	0006	ACKNOWLEDGE
+07	0007	BELL
+08	0008	BACKSPACE
+09	0009	HORIZONTAL TABULATION
+0A	000A	LINE FEED
+0B	000B	VERTICAL TABULATION
+0C	000C	FORM FEED
+0D	000D	CARRIAGE RETURN
+0E	000E	SHIFT OUT
+0F	000F	SHIFT IN
+10	0010	DATA LINK ESCAPE
+11	0011	DEVICE CONTROL ONE
+12	0012	DEVICE CONTROL TWO
+13	0013	DEVICE CONTROL THREE
+14	0014	DEVICE CONTROL FOUR
+15	0015	NEGATIVE ACKNOWLEDGE
+16	0016	SYNCHRONOUS IDLE
+17	0017	END OF TRANSMISSION BLOCK
+18	0018	CANCEL
+19	0019	END OF MEDIUM
+1A	001A	SUBSTITUTE
+1B	001B	ESCAPE
+1C	001C	FILE SEPARATOR
+1D	001D	GROUP SEPARATOR
+1E	001E	RECORD SEPARATOR
+1F	001F	UNIT SEPARATOR
+20	0020	SPACE
+21	0021	EXCLAMATION MARK
+22	0022	QUOTATION MARK
+23	0023	NUMBER SIGN
+24	0024	DOLLAR SIGN
+25	0025	PERCENT SIGN
+26	0026	AMPERSAND
+27	0027	APOSTROPHE
+28	0028	LEFT PARENTHESIS
+29	0029	RIGHT PARENTHESIS
+2A	002A	ASTERISK
+2B	002B	PLUS SIGN
+2C	002C	COMMA
+2D	002D	HYPHEN-MINUS
+2E	002E	FULL STOP
+2F	002F	SOLIDUS
+30	0030	DIGIT ZERO
+31	0031	DIGIT ONE
+32	0032	DIGIT TWO
+33	0033	DIGIT THREE
+34	0034	DIGIT FOUR
+35	0035	DIGIT FIVE
+36	0036	DIGIT SIX
+37	0037	DIGIT SEVEN
+38	0038	DIGIT EIGHT
+39	0039	DIGIT NINE
+3A	003A	COLON
+3B	003B	SEMICOLON
+3C	003C	LESS-THAN SIGN
+3D	003D	EQUALS SIGN
+3E	003E	GREATER-THAN SIGN
+3F	003F	QUESTION MARK
+40	0040	COMMERCIAL AT
+41	0041	LATIN CAPITAL LETTER A
+42	0042	LATIN CAPITAL LETTER B
+43	0043	LATIN CAPITAL LETTER C
+44	0044	LATIN CAPITAL LETTER D
+45	0045	LATIN CAPITAL LETTER E
+46	0046	LATIN CAPITAL LETTER F
+47	0047	LATIN CAPITAL LETTER G
+48	0048	LATIN CAPITAL LETTER H
+49	0049	LATIN CAPITAL LETTER I
+4A	004A	LATIN CAPITAL LETTER J
+4B	004B	LATIN CAPITAL LETTER K
+4C	004C	LATIN CAPITAL LETTER L
+4D	004D	LATIN CAPITAL LETTER M
+4E	004E	LATIN CAPITAL LETTER N
+4F	004F	LATIN CAPITAL LETTER O
+50	0050	LATIN CAPITAL LETTER P
+51	0051	LATIN CAPITAL LETTER Q
+52	0052	LATIN CAPITAL LETTER R
+53	0053	LATIN CAPITAL LETTER S
+54	0054	LATIN CAPITAL LETTER T
+55	0055	LATIN CAPITAL LETTER U
+56	0056	LATIN CAPITAL LETTER V
+57	0057	LATIN CAPITAL LETTER W
+58	0058	LATIN CAPITAL LETTER X
+59	0059	LATIN CAPITAL LETTER Y
+5A	005A	LATIN CAPITAL LETTER Z
+5B	005B	LEFT SQUARE BRACKET
+5C	005C	REVERSE SOLIDUS
+5D	005D	RIGHT SQUARE BRACKET
+5E	005E	CIRCUMFLEX ACCENT
+5F	005F	LOW LINE
+60	0060	GRAVE ACCENT
+61	0061	LATIN SMALL LETTER A
+62	0062	LATIN SMALL LETTER B
+63	0063	LATIN SMALL LETTER C
+64	0064	LATIN SMALL LETTER D
+65	0065	LATIN SMALL LETTER E
+66	0066	LATIN SMALL LETTER F
+67	0067	LATIN SMALL LETTER G
+68	0068	LATIN SMALL LETTER H
+69	0069	LATIN SMALL LETTER I
+6A	006A	LATIN SMALL LETTER J
+6B	006B	LATIN SMALL LETTER K
+6C	006C	LATIN SMALL LETTER L
+6D	006D	LATIN SMALL LETTER M
+6E	006E	LATIN SMALL LETTER N
+6F	006F	LATIN SMALL LETTER O
+70	0070	LATIN SMALL LETTER P
+71	0071	LATIN SMALL LETTER Q
+72	0072	LATIN SMALL LETTER R
+73	0073	LATIN SMALL LETTER S
+74	0074	LATIN SMALL LETTER T
+75	0075	LATIN SMALL LETTER U
+76	0076	LATIN SMALL LETTER V
+77	0077	LATIN SMALL LETTER W
+78	0078	LATIN SMALL LETTER X
+79	0079	LATIN SMALL LETTER Y
+7A	007A	LATIN SMALL LETTER Z
+7B	007B	LEFT CURLY BRACKET
+7C	007C	VERTICAL LINE
+7D	007D	RIGHT CURLY BRACKET
+7E	007E	TILDE
+7F	007F	DELETE
+80	20AC	EURO SIGN
+82	201A	SINGLE LOW-9 QUOTATION MARK
+83	0192	LATIN SMALL LETTER F WITH HOOK
+84	201E	DOUBLE LOW-9 QUOTATION MARK
+85	2026	HORIZONTAL ELLIPSIS
+86	2020	DAGGER
+87	2021	DOUBLE DAGGER
+88	02C6	MODIFIER LETTER CIRCUMFLEX ACCENT
+89	2030	PER MILLE SIGN
+8A	0160	LATIN CAPITAL LETTER S WITH CARON
+8B	2039	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+8C	0152	LATIN CAPITAL LIGATURE OE
+8E	017D	LATIN CAPITAL LETTER Z WITH CARON
+91	2018	LEFT SINGLE QUOTATION MARK
+92	2019	RIGHT SINGLE QUOTATION MARK
+93	201C	LEFT DOUBLE QUOTATION MARK
+94	201D	RIGHT DOUBLE QUOTATION MARK
+95	2022	BULLET
+96	2013	EN DASH
+97	2014	EM DASH
+98	02DC	SMALL TILDE
+99	2122	TRADE MARK SIGN
+9A	0161	LATIN SMALL LETTER S WITH CARON
+9B	203A	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+9C	0153	LATIN SMALL LIGATURE OE
+9E	017E	LATIN SMALL LETTER Z WITH CARON
+9F	0178	LATIN CAPITAL LETTER Y WITH DIAERESIS
+A0	00A0	NO-BREAK SPACE
+A1	00A1	INVERTED EXCLAMATION MARK
+A2	00A2	CENT SIGN
+A3	00A3	POUND SIGN
+A4	00A4	CURRENCY SIGN
+A5	00A5	YEN SIGN
+A6	00A6	BROKEN BAR
+A7	00A7	SECTION SIGN
+A8	00A8	DIAERESIS
+A9	00A9	COPYRIGHT SIGN
+AA	00AA	FEMININE ORDINAL INDICATOR
+AB	00AB	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+AC	00AC	NOT SIGN
+AD	00AD	SOFT HYPHEN
+AE	00AE	REGISTERED SIGN
+AF	00AF	MACRON
+B0	00B0	DEGREE SIGN
+B1	00B1	PLUS-MINUS SIGN
+B2	00B2	SUPERSCRIPT TWO
+B3	00B3	SUPERSCRIPT THREE
+B4	00B4	ACUTE ACCENT
+B5	00B5	MICRO SIGN
+B6	00B6	PILCROW SIGN
+B7	00B7	MIDDLE DOT
+B8	00B8	CEDILLA
+B9	00B9	SUPERSCRIPT ONE
+BA	00BA	MASCULINE ORDINAL INDICATOR
+BB	00BB	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+BC	00BC	VULGAR FRACTION ONE QUARTER
+BD	00BD	VULGAR FRACTION ONE HALF
+BE	00BE	VULGAR FRACTION THREE QUARTERS
+BF	00BF	INVERTED QUESTION MARK
+C0	00C0	LATIN CAPITAL LETTER A WITH GRAVE
+C1	00C1	LATIN CAPITAL LETTER A WITH ACUTE
+C2	00C2	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+C3	00C3	LATIN CAPITAL LETTER A WITH TILDE
+C4	00C4	LATIN CAPITAL LETTER A WITH DIAERESIS
+C5	00C5	LATIN CAPITAL LETTER A WITH RING ABOVE
+C6	00C6	LATIN CAPITAL LETTER AE
+C7	00C7	LATIN CAPITAL LETTER C WITH CEDILLA
+C8	00C8	LATIN CAPITAL LETTER E WITH GRAVE
+C9	00C9	LATIN CAPITAL LETTER E WITH ACUTE
+CA	00CA	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+CB	00CB	LATIN CAPITAL LETTER E WITH DIAERESIS
+CC	00CC	LATIN CAPITAL LETTER I WITH GRAVE
+CD	00CD	LATIN CAPITAL LETTER I WITH ACUTE
+CE	00CE	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+CF	00CF	LATIN CAPITAL LETTER I WITH DIAERESIS
+D0	00D0	LATIN CAPITAL LETTER ETH
+D1	00D1	LATIN CAPITAL LETTER N WITH TILDE
+D2	00D2	LATIN CAPITAL LETTER O WITH GRAVE
+D3	00D3	LATIN CAPITAL LETTER O WITH ACUTE
+D4	00D4	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+D5	00D5	LATIN CAPITAL LETTER O WITH TILDE
+D6	00D6	LATIN CAPITAL LETTER O WITH DIAERESIS
+D7	00D7	MULTIPLICATION SIGN
+D8	00D8	LATIN CAPITAL LETTER O WITH STROKE
+D9	00D9	LATIN CAPITAL LETTER U WITH GRAVE
+DA	00DA	LATIN CAPITAL LETTER U WITH ACUTE
+DB	00DB	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+DC	00DC	LATIN CAPITAL LETTER U WITH DIAERESIS
+DD	00DD	LATIN CAPITAL LETTER Y WITH ACUTE
+DE	00DE	LATIN CAPITAL LETTER THORN
+DF	00DF	LATIN SMALL LETTER SHARP S
+E0	00E0	LATIN SMALL LETTER A WITH GRAVE
+E1	00E1	LATIN SMALL LETTER A WITH ACUTE
+E2	00E2	LATIN SMALL LETTER A WITH CIRCUMFLEX
+E3	00E3	LATIN SMALL LETTER A WITH TILDE
+E4	00E4	LATIN SMALL LETTER A WITH DIAERESIS
+E5	00E5	LATIN SMALL LETTER A WITH RING ABOVE
+E6	00E6	LATIN SMALL LETTER AE
+E7	00E7	LATIN SMALL LETTER C WITH CEDILLA
+E8	00E8	LATIN SMALL LETTER E WITH GRAVE
+E9	00E9	LATIN SMALL LETTER E WITH ACUTE
+EA	00EA	LATIN SMALL LETTER E WITH CIRCUMFLEX
+EB	00EB	LATIN SMALL LETTER E WITH DIAERESIS
+EC	00EC	LATIN SMALL LETTER I WITH GRAVE
+ED	00ED	LATIN SMALL LETTER I WITH ACUTE
+EE	00EE	LATIN SMALL LETTER I WITH CIRCUMFLEX
+EF	00EF	LATIN SMALL LETTER I WITH DIAERESIS
+F0	00F0	LATIN SMALL LETTER ETH
+F1	00F1	LATIN SMALL LETTER N WITH TILDE
+F2	00F2	LATIN SMALL LETTER O WITH GRAVE
+F3	00F3	LATIN SMALL LETTER O WITH ACUTE
+F4	00F4	LATIN SMALL LETTER O WITH CIRCUMFLEX
+F5	00F5	LATIN SMALL LETTER O WITH TILDE
+F6	00F6	LATIN SMALL LETTER O WITH DIAERESIS
+F7	00F7	DIVISION SIGN
+F8	00F8	LATIN SMALL LETTER O WITH STROKE
+F9	00F9	LATIN SMALL LETTER U WITH GRAVE
+FA	00FA	LATIN SMALL LETTER U WITH ACUTE
+FB	00FB	LATIN SMALL LETTER U WITH CIRCUMFLEX
+FC	00FC	LATIN SMALL LETTER U WITH DIAERESIS
+FD	00FD	LATIN SMALL LETTER Y WITH ACUTE
+FE	00FE	LATIN SMALL LETTER THORN
+FF	00FF	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/libucw/charset/setnames.c b/libucw/charset/setnames.c
new file mode 100644
index 0000000..3f4cdda
--- /dev/null
+++ b/libucw/charset/setnames.c
@@ -0,0 +1,66 @@
+/*
+ *	Character Set Conversion Library 1.0 -- Character Set Names
+ *
+ *	(c) 1998--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/charconv.h>
+
+#include <string.h>
+
+/* Names according to RFC 1345 (see http://www.iana.org/assignments/character-sets) */
+
+static const char *cs_names[] = {
+	"US-ASCII",
+	"ISO-8859-1",
+	"ISO-8859-2",
+	"ISO-8859-3",
+	"ISO-8859-4",
+	"ISO-8859-5",
+	"ISO-8859-6",
+	"ISO-8859-7",
+	"ISO-8859-8",
+	"ISO-8859-9",
+	"ISO-8859-10",
+	"ISO-8859-11",
+	"ISO-8859-13",
+	"ISO-8859-14",
+	"ISO-8859-15",
+	"ISO-8859-16",
+	"windows-1250",
+	"windows-1251",
+	"windows-1252",
+	"x-kam-cs",
+	"CSN_369103",
+	"cp852",
+	"x-mac-ce",
+	"x-cork",
+	"utf-8",
+	"utf-16be",
+	"utf-16le"
+};
+
+int
+find_charset_by_name(const char *c)
+{
+	uint i;
+
+	for(i=0; i<CONV_NUM_CHARSETS; i++)
+		if (!strcasecmp(cs_names[i], c))
+			return i;
+	return -1;
+}
+
+char *
+charset_name(int i)
+{
+  if (i < 0 || i > CONV_NUM_CHARSETS)
+    return "x-unknown";
+  else
+    return (char *)cs_names[i];
+}
diff --git a/libucw/charset/stk-charconv.c b/libucw/charset/stk-charconv.c
new file mode 100644
index 0000000..b6359d4
--- /dev/null
+++ b/libucw/charset/stk-charconv.c
@@ -0,0 +1,60 @@
+/*
+ *	UCW Library -- Character Conversion with Allocation on the Stack
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/stk-charconv.h>
+#include <string.h>
+
+#define INITIAL_MIN_SIZE	16
+#define INITIAL_SCALE		2
+
+uint
+stk_strconv_init(struct conv_context *c, const byte *s, uint in_cs, uint out_cs)
+{
+  uint l = strlen(s);
+  if (in_cs == out_cs)
+  {
+    c->source = s;
+    c->source_end = NULL;
+    return l + 1;
+  }
+  conv_init(c);
+  conv_set_charset(c, in_cs, out_cs);
+  c->source = s;
+  c->source_end = s + l + 1;
+  if (l < (INITIAL_MIN_SIZE - 1) / INITIAL_SCALE)
+    return INITIAL_MIN_SIZE;
+  else
+    return l * INITIAL_SCALE + 1;
+}
+
+uint
+stk_strconv_step(struct conv_context *c, byte *buf, uint len)
+{
+  if (!c->source_end)
+  {
+    memcpy(buf, c->source, len);
+    c->dest_start = buf;
+    return 0;
+  }
+  if (c->dest_start)
+  {
+    uint l = c->dest_end - c->dest_start;
+    memcpy(buf, c->dest_start, l);
+    c->dest = buf + l;
+  }
+  else
+    c->dest = buf;
+  c->dest_start = buf;
+  c->dest_end = buf + len;
+  if (conv_run(c) & CONV_SOURCE_END)
+    return 0;
+  return len << 1;
+}
+
diff --git a/libucw/charset/stk-charconv.h b/libucw/charset/stk-charconv.h
new file mode 100644
index 0000000..a1d40dd
--- /dev/null
+++ b/libucw/charset/stk-charconv.h
@@ -0,0 +1,35 @@
+/*
+ *	UCW Library -- Character Conversion with Allocation on the Stack
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _CHARSET_STK_CHARCONV_H
+#define _CHARSET_STK_CHARCONV_H
+
+#include <charset/charconv.h>
+#include <alloca.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define stk_strconv_init ucw_stk_strconv_init
+#define stk_strconv_step ucw_stk_strconv_step
+#endif
+
+/* The following macros convert strings between given charsets (CONV_CHARSET_x). */
+
+#define stk_strconv(s, cs_in, cs_out) \
+    ({ struct conv_context _c; uint _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \
+       while (_l) _l=stk_strconv_step(&_c, alloca(_l), _l); _c.dest_start; })
+
+#define stk_strconv_to_utf8(s, cs_in) stk_strconv(s, cs_in, CONV_CHARSET_UTF8)
+#define stk_strconv_from_utf8(s, cs_out) stk_strconv(s, CONV_CHARSET_UTF8, cs_out)
+
+/* Internals */
+
+uint stk_strconv_init(struct conv_context *c, const byte *s, uint cs_in, uint cs_out);
+uint stk_strconv_step(struct conv_context *c, byte *buf, uint len);
+
+#endif
diff --git a/libucw/charset/tocat.c b/libucw/charset/tocat.c
new file mode 100644
index 0000000..a5f9da4
--- /dev/null
+++ b/libucw/charset/tocat.c
@@ -0,0 +1,12 @@
+/*
+ *	The UniCode Library -- Category Table
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/unicat.h>
+#include <charset/U-cat.h>
diff --git a/libucw/charset/toligatures.c b/libucw/charset/toligatures.c
new file mode 100644
index 0000000..8cb5c0f
--- /dev/null
+++ b/libucw/charset/toligatures.c
@@ -0,0 +1,18 @@
+/*
+ *	The UniCode Library -- Table of Ligatures
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/unicat.h>
+#include <charset/U-ligatures.h>
+
+const u16 *
+Uexpand_lig(uint x)
+{
+  return _U_lig_hash[x % LIG_HASH_SIZE];
+}
diff --git a/libucw/charset/tolower.c b/libucw/charset/tolower.c
new file mode 100644
index 0000000..84544d7
--- /dev/null
+++ b/libucw/charset/tolower.c
@@ -0,0 +1,12 @@
+/*
+ *	The UniCode Library -- Lowercase Table
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/unicat.h>
+#include <charset/U-lower.h>
diff --git a/libucw/charset/toupper.c b/libucw/charset/toupper.c
new file mode 100644
index 0000000..5e2b91e
--- /dev/null
+++ b/libucw/charset/toupper.c
@@ -0,0 +1,12 @@
+/*
+ *	The UniCode Library -- Uppercase Table
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/unicat.h>
+#include <charset/U-upper.h>
diff --git a/libucw/charset/ucw-cs2cs.c b/libucw/charset/ucw-cs2cs.c
new file mode 100644
index 0000000..74e092a
--- /dev/null
+++ b/libucw/charset/ucw-cs2cs.c
@@ -0,0 +1,64 @@
+/*
+ *	Simple character set convertor
+ *
+ *	(c) 1998 Pavel Machek <pavel@ucw.cz>
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/charconv.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#ifdef TEST
+#define BUFSIZE 13
+#else
+#define BUFSIZE 4096
+#endif
+
+int
+main(int argc, char **argv)
+{
+  struct conv_context ctxt;
+  int ch_from, ch_to, n, flags;
+  char inbuf[BUFSIZE], outbuf[BUFSIZE];
+
+  if (argc != 3)
+    die("ucw-cs2cs in-charset out-charset");
+  conv_init(&ctxt);
+  ch_from = find_charset_by_name(argv[1]);
+  if (ch_from < 0)
+    die("Unknown charset %s", argv[1]);
+  ch_to = find_charset_by_name(argv[2]);
+  if (ch_to < 0)
+    die("Unknown charset %s", argv[2]);
+
+  conv_set_charset(&ctxt, ch_from, ch_to);
+  while ((n = read(0, inbuf, sizeof(inbuf))) > 0)
+    {
+      ctxt.source = inbuf;
+      ctxt.source_end = inbuf + n;
+      ctxt.dest = ctxt.dest_start = outbuf;
+      ctxt.dest_end = outbuf + sizeof(outbuf);
+      do
+	{
+	  flags = conv_run(&ctxt);
+	  if (flags & (CONV_SOURCE_END | CONV_DEST_END))
+	    {
+	      int w = write(1, ctxt.dest_start, ctxt.dest - ctxt.dest_start);
+	      if (w < 0)
+		die("write error: %m");
+	      ctxt.dest = outbuf;
+	    }
+	}
+      while (! (flags & CONV_SOURCE_END));
+    }
+  if (n < 0)
+    die("read error: %m");
+  return 0;
+}
diff --git a/libucw/charset/unaccent.c b/libucw/charset/unaccent.c
new file mode 100644
index 0000000..4bb97a5
--- /dev/null
+++ b/libucw/charset/unaccent.c
@@ -0,0 +1,12 @@
+/*
+ *	The UniCode Library -- Unaccenting Table
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <charset/unicat.h>
+#include <charset/U-unacc.h>
diff --git a/libucw/charset/unicat.h b/libucw/charset/unicat.h
new file mode 100644
index 0000000..78f99eb
--- /dev/null
+++ b/libucw/charset/unicat.h
@@ -0,0 +1,78 @@
+/*
+ *	The UniCode Character Categorizer
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _CHARSET_UNICAT_H
+#define _CHARSET_UNICAT_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define Uexpand_lig ucw_Uexpand_lig
+#define _U_cat ucw__U_cat
+#define _U_lower ucw__U_lower
+#define _U_unaccent ucw__U_unaccent
+#define _U_upper ucw__U_upper
+#endif
+
+extern const byte *_U_cat[];
+extern const u16 *_U_upper[], *_U_lower[], *_U_unaccent[];
+
+static inline uint Ucategory(uint x)
+{
+  if (_U_cat[x >> 8U])
+    return _U_cat[x >> 8U][x & 0xff];
+  else
+    return 0;
+}
+
+static inline uint Utoupper(uint x)
+{
+  uint w = (_U_upper[x >> 8U]) ? _U_upper[x >> 8U][x & 0xff] : 0;
+  return w ? w : x;
+}
+
+static inline uint Utolower(uint x)
+{
+  uint w = (_U_lower[x >> 8U]) ? _U_lower[x >> 8U][x & 0xff] : 0;
+  return w ? w : x;
+}
+
+static inline uint Uunaccent(uint x)
+{
+  uint w = (_U_unaccent[x >> 8U]) ? _U_unaccent[x >> 8U][x & 0xff] : 0;
+  return w ? w : x;
+}
+
+extern const u16 *Uexpand_lig(uint x);
+
+enum unicode_char_type {
+  _U_LETTER = 1,		/* Letters */
+  _U_UPPER = 2,			/* Upper-case letters */
+  _U_LOWER = 4,			/* Lower-case letters */
+  _U_CTRL = 8,			/* Control characters */
+  _U_DIGIT = 16,		/* Digits */
+  _U_XDIGIT = 32,		/* Hexadecimal digits */
+  _U_SPACE = 64,		/* White spaces (spaces, tabs, newlines) */
+  _U_LIGATURE = 128,		/* Compatibility ligature (to be expanded) */
+};
+
+#define _U_LUPPER (_U_LETTER | _U_UPPER)
+#define _U_LLOWER (_U_LETTER | _U_LOWER)
+
+#define UCat(x,y) (Ucategory(x) & (y))
+
+#define Ualpha(x) UCat(x, _U_LETTER)
+#define Uupper(x) UCat(x, _U_UPPER)
+#define Ulower(x) UCat(x, _U_LOWER)
+#define Udigit(x) UCat(x, _U_DIGIT)
+#define Uxdigit(x) UCat(x, (_U_DIGIT | _U_XDIGIT))
+#define Ualnum(x) UCat(x, (_U_LETTER | _U_DIGIT))
+#define Uctrl(x) UCat(x, _U_CTRL)
+#define Uprint(x) !Uctrl(x)
+#define Uspace(x) UCat(x, _U_SPACE)
+
+#endif
diff --git a/libucw/configure b/libucw/configure
new file mode 100755
index 0000000..d3fca74
--- /dev/null
+++ b/libucw/configure
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# Configure Script for UCW Libraries
+# (c) 2007--2010 Martin Mares <mj@ucw.cz>
+
+use warnings;
+use strict;
+
+our $srcdir;
+BEGIN {
+	my $pkgfile = "ucw/wildmatch.c";
+	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
+		if (-f $pkgfile) {
+			$srcdir=".";
+		} elsif ($0 =~ m@^(.*)/configure$@ && -f "$1/$pkgfile") {
+			$srcdir=$1;
+		} else {
+			die "Don't know how to find myself. Please set SRCDIR manually.\n";
+		}
+	}
+}
+
+use lib "$srcdir/ucw/perl/";
+use UCW::Configure;
+
+Init($srcdir, "default.cfg");
+Include "ucw/default.cfg";
+Log "### Configuring UCW Libraries " . Get("UCW_VERSION") . " with configuration " . Get("CONFIG") . "\n";
+Include Get("CONFIG");
+require UCW::Configure::Paths;
+require UCW::Configure::C;
+require UCW::Configure::LibUCW;
+require UCW::Configure::Doc;
+require UCW::Configure::Perl;
+Finish();
+
+Log "\nConfigured, run `make' to build everything.\n";
diff --git a/libucw/debug/check-configs b/libucw/debug/check-configs
new file mode 100755
index 0000000..e8787bf
--- /dev/null
+++ b/libucw/debug/check-configs
@@ -0,0 +1,65 @@
+#!/bin/bash
+# A script for testing compilability of different configurations
+# (c) 2004--2010 Martin Mares <mj@ucw.cz>
+
+set -e
+
+TEST=0
+ERR=
+CC=${CC:-gcc}
+MAKEOPTS=${MAKEOPTS:--j8}
+
+function die
+{
+	echo >&3 "	$@"
+	exit 1
+}
+
+function try
+{
+	TEST=$(($TEST+1))
+	TDIR=tests/$TEST
+	mkdir $TDIR
+	echo "### Test $TEST: $@ ###" | tee $TDIR/log
+	CONFIG="$1"
+	shift
+	ARGS="$@ CC=$CC"
+
+	(
+		cd $TDIR
+		exec 3>&2 >>log 2>&1
+		case $CONFIG in
+			*)			../../configure $CONFIG CONFIG_LOCAL $ARGS || die "CANNOT CONFIGURE"
+						;;
+		esac
+		make $MAKEOPTS || die FAILED
+		echo >&3 "	COMPILATION PASSED"
+		if [ -z "$SKIP_TESTS" ] ; then
+			make -k -j1 tests || die "TESTS FAILED"
+			echo >&3 "	TESTS PASSED"
+		fi
+	) || ERR=1
+}
+
+rm -rf tests
+mkdir tests
+if [ "$1" == DARWIN ] ; then
+	# All tests on Darwin need CONFIG_SHARED, due to libucw-charset collision
+	# only visible with static linking.
+	FLAGS="CONFIG_SHARED"
+	try debug/default.cfg $FLAGS CONFIG_UCW_PCRE					# `make tests' does not work with non-local builds with shared libs
+elif [ -n "$1" ] ; then
+	try "$@"
+else
+	try default.cfg									# default configuration
+	try default.cfg -CONFIG_DEBUG							# with no debugging code
+	try debug/default.cfg								# debugging configuration
+	try debug/default.cfg -CONFIG_SHARED						# statically linked
+	try debug/default.cfg -CONFIG_UCW_THREADS					# non-threaded configuration
+	try debug/default.cfg -CONFIG_UCW_TLS						# threaded, but no TLS support in gcc
+	try debug/default.cfg -CONFIG_UCW_EPOLL -CONFIG_UCW_MONOTONIC_CLOCK		# without epoll and monotonic clock
+	try debug/default.cfg CONFIG_UCW_POSIX_REGEX					# different regex libs
+	try debug/default.cfg CONFIG_UCW_PCRE
+fi
+
+[ -z "$ERR" ]
diff --git a/libucw/debug/default.cfg b/libucw/debug/default.cfg
new file mode 100644
index 0000000..ce75314
--- /dev/null
+++ b/libucw/debug/default.cfg
@@ -0,0 +1,17 @@
+# Configuration used for debugging LibUCW
+
+Include("default.cfg");
+
+Set("CONFIG_LOCAL");
+# UnSet("CONFIG_SHARED");
+Set("CONFIG_DEBUG");
+Set("CONFIG_UCW_DEBUG_TOOLS");
+Set("CONFIG_EXACT_CPU");
+Set("CONFIG_UCW_OBSOLETE_DAEMON_HELPER");
+
+Set("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_DUP");
+Set("CONFIG_IMAGES_SIM");
+
+Set("CONFIG_CHARSET");
+Set("CONFIG_XML");
diff --git a/libucw/default.cfg b/libucw/default.cfg
new file mode 100644
index 0000000..086ab38
--- /dev/null
+++ b/libucw/default.cfg
@@ -0,0 +1,49 @@
+# Default configuration of UCW libraries
+# (see */default.cfg for the description of all options)
+
+# Do we want shared or static libraries?
+Set("CONFIG_SHARED");
+
+# Include debugging code
+Set("CONFIG_DEBUG");
+
+# We want the public API
+Set("CONFIG_INSTALL_API");
+
+# Enable GCC link-time optimizations (experimental)
+UnSet("CONFIG_LTO");
+
+# LibUCW should support files >2GB and threading
+Set("CONFIG_UCW_LARGE_FILES");
+Set("CONFIG_UCW_THREADS" => 1);
+
+# Libucw extensions
+Set("CONFIG_UCW_PERL" => 1);
+Set("CONFIG_UCW_PERL_MODULES" => 1);
+Set("CONFIG_UCW_SHELL_UTILS" => 1);
+Set("CONFIG_UCW_UTILS" => 1);
+
+# Libucw-images settings
+UnSet("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+UnSet("CONFIG_IMAGES_LIBUNGIF");
+Set("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Libucw-charset
+Set("CONFIG_CHARSET");
+Set("CONFIG_CHARSET_UTILS");
+
+# Libucw-xml
+Set("CONFIG_XML");
+
+# Libucw-json
+Set("CONFIG_JSON");
+
+# Compress .deb packages with gzip (instead of the default algorithm)
+# Hack for Economia's deployment machinery
+UnSet("CONFIG_BUILDDEB_GZIP");
+
+# Return success
+1;
diff --git a/libucw/etc/images b/libucw/etc/images
new file mode 100644
index 0000000..b02c4d0
--- /dev/null
+++ b/libucw/etc/images
@@ -0,0 +1,91 @@
+# Configuration of the image library
+
+######## General parameters #####################################################
+
+ImageLib {
+
+# Default tracing level (0 to disable)
+Trace			0
+
+# Limits for image allocation
+ImageMaxDim		0xffff		# Maximum width/height (at most 64k-1)
+ImageMaxBytes		256M		# Maximum size in bytes
+
+}
+
+#if CONFIG_IMAGES_DUP || CONFIG_IMAGES_SIM
+######## Image signatures #######################################################
+
+ImageSig {
+
+# To find similar images, Sherlock uses comparison based on regions.
+# First of all, the imagesim analyser extracts various region features.
+# Sets of these features are called "image signatures" and they are stored
+# in the `H' attribute of image objects.
+
+# Signatures are later processed by the indexer to build an effective
+# search structure finally used by the search server. See Indexer and Search
+# sections for more options.
+
+# Minimum image size to apply segmentation. Smaller images are always
+# compared by the simple "average" method (see ImageSig.CompareMethod).
+MinWidth		16
+MinHeight		16
+
+# List of subdivision thresholds in the first phase of segmentation.
+# Lower the values to increase the average number of regions and vice versa.
+PreQuantThresholds	6 12 15 20 25 25 30 30 40 40 50 50 60 60 60
+
+# Settings for the second phase of segmentation -- usually not so important.
+# We use an iterative algorithm to improve the average error from the first phase.
+# We stop the process after PostQuantMaxSteps or if we get only PostQuantThreshold
+# percentual improvement over the previous step.
+PostQuantMinSteps	2
+PostQuantMaxSteps	10
+PostQuantThreshold	1
+
+# BorderBonus and BorderSize parameters can increase or decrease the weight
+# of image pixels near the borders. Weight of all pixels more than BorderSize * MIN(cols, rows)
+# pixels far from the edges is 128. Then this value continuously decreses/increses up to 128+BorderSize.
+BorderSize		0.4
+BorderBonus		-50
+
+# Scaling constants for computation of normalized i-th order inertia features (I1, I2, I3).
+InertiaScale		2 0.5 0.05
+
+# Threshold for detecting textured images (see images/sig-txt.c for details).
+# Decrease the threshold if you want less detected textures,
+# set it to zero to disable the algorithm completely.
+TexturedThreshold	0.32
+
+# Signature comparison method:
+#
+#   integrated
+#	based on: James Z. Wang, Jia Li and Gio Wiederhold,
+#	"SIMPLIcity: Semantics-Sensitive Integrated Matching for Picture Libraries",
+#	IEEE Transactions on Pattern Analysis and Machine Intelligence, vol. 23, no. 9, pp. 947-963, 2001.
+#
+#   fuzzy (unstable and unbalanced parameters)
+#	based on: Yixin Chen and James Z. Wang,
+#	"A Region-Based Fuzzy Feature Matching Approach to Content-Based Image Retrieval",
+#	IEEE Transactions on Pattern Analysis and Machine Intelligence, vol. 24, no. 9, pp. 1252-1267, 2002.
+#
+#   average
+#	Simple distance of image features averages (ignores segmentation).
+#
+CompareMethod		integrated
+
+# Array of multiplicative constants in feature vector distance computation
+# (L, u, v, LH, HL, HH, I1, I2, I3, X, Y). Each one must be an integer in range 0..15, default is 4.
+CompareFeaturesWeights	4 6 6 4 4 4 4 4 4 4 4
+
+}
+
+#endif
+#ifdef CONFIG_IMAGES_DUP
+######## Duplicate finder #######################################################
+
+ImageDup {
+# Detection of image duplicates does not work yet.
+}
+#endif
diff --git a/libucw/etc/libucw b/libucw/etc/libucw
new file mode 100644
index 0000000..aa7db8b
--- /dev/null
+++ b/libucw/etc/libucw
@@ -0,0 +1,247 @@
+# Configuration of the UCW library and related utilities
+
+######## Memory Mapped Access to Files ##########################################
+
+# Whenever you specify 0 for I/O buffer size, memory mapping is used instead.
+FBMMap {
+
+# Map this many bytes at once (needs to be a multiple of CPU page size)
+WindowSize		1M
+
+# When in need to extend a file, grow it by so many bytes (>= page size)
+ExtendSize		1M
+
+}
+
+######## Direct Streamed I/O on Files ###########################################
+
+FBDirect {
+
+# Debug: Cheat by turning off O_DIRECT
+#Cheat			1
+
+}
+
+######## Atomic Multi-Threaded I/O on Files #####################################
+
+FBAtomic {
+
+# Enable tracing
+#Trace			1
+
+}
+
+######## Parametrized I/O on Files ##############################################
+
+FBParam {
+
+Defaults {
+
+# Access type (std|direct|mmap).
+Type			std
+
+# Size of I/O buffer. Something of the order of megabytes for fast disks is recommended for direct I/O.
+BufSize			64K
+
+# Optimize for mixed forward/backward reading (standard I/O only)
+KeepBackBuf		0
+
+# Perform read-ahead (direct I/O only)
+ReadAhead		1
+
+# Maximum number of write-back requests queued (direct I/O only)
+WriteBack		1
+
+}
+
+}
+
+######## Temporary files ########################################################
+
+Tempfiles {
+
+# By default, we use the system's default temporary directory ($TMPDIR or /tmp),
+# but sometimes it is better to store the temporary files in the local tree.
+Dir			@INSTALL_VAR_PREFIX@tmp
+
+# Prefix of temporary file names
+Prefix			temp-
+
+# By default, we append a random number to Prefix to get a temporary file name.
+# If Prefix points to a directory that is not writable by malicious users,
+# we can be less careful and use more consistent names of temporary files
+# formed by adding "pid(-tid)-counter" instead.
+PublicDir		0
+
+}
+
+######## Threads ################################################################
+
+Threads {
+
+# Default thread stack size
+DefaultStackSize	64K
+
+}
+
+######## Sorter #################################################################
+
+Sorter {
+
+# Trace sorting (1=basic statistics, 2=more stats, 3 and more for debugging)
+Trace			2
+
+# Trace array sorting (internal sorters)
+TraceArray		0
+
+# How much memory is the sorter allowed to use
+SortBuffer		4M
+
+# File access used by the sorter (see FBParam section for details)
+FileAccess		std 256K
+
+# Use a different file access method for small inputs (less than the specified size)
+SmallFileAccess		std 64K
+SmallInput		64M
+
+# Min-/Maximum number of bits to use in the external radix-sort (beware, we will open
+# 1+2^this files and require a stream buffer for each of them; however, while we are
+# doing that, the sort buffer is not allocated). Set both to zero to disable radix-sorting.
+MinRadixBits		2
+MaxRadixBits		4
+
+# The same for multi-way merging. The memory requirements are also the same,
+# but please keep in mind that this can create lots of SortBuffer-sized files,
+# so it is probably better to keep it disabled if you have a small SortBuffer.
+MinMultiwayBits		2
+MaxMultiwayBits		4
+
+# If we did not use radix-sorter to the full width, we still might add some more
+# bits to the width to get chunks which are even smaller than SortBuffer, because
+# it can speed up internal sorting later. However, we also want to avoid small
+# files, so we add only a little.
+AddRadixBits		2
+
+# Number of threads used for sorting (0=disable threading)
+Threads			0
+
+# Minimum size of input (in bytes) to consider multi-threaded internal sorting
+ThreadThreshold		1M
+
+# Chunks smaller than ThreadThreshold are sorted by a sequential algorithm, but
+# if they are at least of the following size, different chunks are sorted in
+# parallel. There is a slight space penalty for setting up the parallel process,
+# so better avoid setting this number too small.
+ThreadChunk		256
+
+# Internal radix-sort stops at this size and switches to QuickSort (must be >0)
+RadixThreshold		4K
+
+# Debugging switches (see the source)
+Debug			0
+
+}
+
+######## URL processing #########################################################
+
+URL {
+
+# Ignore spaces at the start/end of a URL
+IgnoreSpaces		1
+
+# Ignore underflows in relative paths (/../ from root)
+IgnoreUnderflow		1
+
+# Some URL's with many repeated components are filtered out to avoid infinite
+# URL's (e.g. http://czech.recoder.cz/win/iso/win/iso/file.html, or
+# http://a.com/?a=b&a=b&a=b, ...).
+# The URL is split to components divided by any of the specified separators.
+# Then the separators are forgotten and the components between them are
+# examined.
+ComponentSeparators	/&?
+
+# URL is filtered out if there's a sequence of components in a row with at most
+# MaxRepeatLength components and the sequence is repeated more than MinRepeatCount
+# times.  Default values are high MinRepeatCount and low MaxRepeatLength, so the
+# mechanism is disabled.
+MinRepeatCount		4
+MaxRepeatLength		4
+
+# Maximum number of occurences of a single component in the entire URL (possibly interleaved
+# by different components). The detector is disabled by default.
+MaxOccurences		4
+
+}
+
+######## Logging ################################################################
+
+Logging {
+
+# In this section, you can define various logging streams which can be referred to by other sections.
+
+# Stream {
+#	# The name of the stream
+#	Name		test-log
+#
+#	# When it should log the messages to a file, a name of the file should be specified.
+#	# Escape sequences for current date and time as described in strftime(3) can be used.
+#	FileName	log/test-%Y%m%d
+#
+#	# If you need to log to stderr or another already opened descriptor, you can specify its number.
+#	FileDesc	2
+#
+#	# Instead of a file, a syslog facility can be specified. See syslog(3) for an explanation.
+#	SyslogFacility	daemon
+#
+#	# You can request that syslog includes a process ID in each message. Due to inflexibility
+#	# of the syslog protocol, all syslog streams active at a moment must agree on this setting.
+#	# (default: 0)
+#	SyslogPID	1
+#
+#	# When logging to files, timestamps with microsecond precision can be requested. (default: 0)
+#	Microseconds	1
+#
+#	# Messages logged to this stream can be restricted to a subset of severity levels.
+#	# Available levels are: debug info warn error info_r warn_r error_r fatal.
+#	# This configuration item is a bitmap with a default of "all", so we need the ":reset" operator.
+#	Levels:reset	info warn error fatal
+#
+#	# Similarly, messages can be restricted to a subset of message types. The types are
+#	# specific for each program. This configuration item is a list of type names; by default
+#	# it is empty, which is equivalent to all types being enabled.
+#	Types:reset	default foo
+#
+#	# Should the message types be logged? They usually do not carry much useful
+#	# information for the viewer of the log, so they are not included by default,
+#	# but you might want to see them when tuning the Types setting. (default: 0)
+#	ShowTypes	1
+#
+#	# If an error occurs when logging a message to this stream, the program normally
+#	# logs a special error message to the other streams and continues running. You can
+#	# however request to exit the program in such cases, so that the log files are
+#	# guaranteed to be complete. (default: 0)
+#	ErrorsFatal	1
+#
+#	# Let stderr of the program point to this file-based log_stream (default: 0)
+#	StdErrFollows	1
+#
+#	# Some events are logworthy, but they could happen too frequently and flood the log.
+#	# You can avoid the flooding by setting up a rate limiter for a specific subset of
+#	# message types. If more limiters match the type of a message, only the last one applies.
+#	Limit {
+#		# A list of message types (default: empty = all types)
+#		Types		default foo
+#
+#		# The maximum allowed sustained rate (messages/second, may be fractional)
+#		Rate		1
+#
+#		# Maximum length of a burst temporarily exceeding the rate (default: try to guess)
+#		Burst		2
+#	}
+#
+#	# The messages that have passed the filters and limiters can be forwarded to other
+#	# log streams. Logging loops are not healthy for your program :)  (a list of stream names)
+#	Substream	another-stream
+# }
+
+}
diff --git a/libucw/examples/external-ucw-build/Makefile b/libucw/examples/external-ucw-build/Makefile
new file mode 100644
index 0000000..5715c25
--- /dev/null
+++ b/libucw/examples/external-ucw-build/Makefile
@@ -0,0 +1,34 @@
+# Example Makefile for a stand-alone program using the libucw build system
+# (c) 2007 Martin Mares <mj@ucw.cz>
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+# The default target
+all: runtree programs
+
+# Include configuration
+s=.
+-include obj/config.mk
+obj/config.mk:
+	@echo "You need to run configure first." && false
+
+# Do not show strange errors if the BUILDSYS is not set
+# (it happens if noone called configure as reported above)
+ifdef BUILDSYS
+
+# We will use the libucw build system
+include $(BUILDSYS)/Maketop
+
+# Add the detected flags to all the global flags
+CFLAGS+=$(LIBUCW_CFLAGS)
+LIBS+=$(LIBUCW_LIBS)
+
+# Programs we want to compile
+PROGS+=$(o)/test
+
+# And how they are created
+$(o)/test: $(o)/test.o $(LIBUCW)
+
+# And finally the default rules of the build system
+include $(BUILDSYS)/Makebottom
+
+endif
diff --git a/libucw/examples/external-ucw-build/configure b/libucw/examples/external-ucw-build/configure
new file mode 100755
index 0000000..ec4b279
--- /dev/null
+++ b/libucw/examples/external-ucw-build/configure
@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+# Configure script for the libucw example (inspired by ../external/configure)
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+use warnings;
+use strict;
+
+our($srcdir, $libdir);
+BEGIN {
+	# Find the sources
+	my $pkgfile = "test.c";
+	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
+		if (-f $pkgfile) {
+			$srcdir=".";
+		} elsif ($0 =~ m@^(.*)/configure$@ && -f "$1/$pkgfile") {
+			$srcdir=$1;
+		} else {
+			die "Don't know how to find myself. Please set SRCDIR manually.\n";
+		}
+	}
+	# Ask pkg-config if libucw is installed and find its configure modules
+	`pkg-config libucw --atleast-version=3.13`;
+	!$? or die "Package `libucw' (version 3.13 or newer) not found. Is PKG_CONFIG_PATH set properly?\n";
+	$libdir=`pkg-config libucw --variable=perl_modules_dir`;
+	chomp $libdir;
+	die "Unable to find the libucw configure system\n" if $? || not defined $libdir;
+}
+use lib $libdir;
+use UCW::Configure;
+
+Init($srcdir, 'default.cfg');
+Log "### Configuring TestApp ###\n\n";
+Include Get("CONFIG");
+# What should be detected?
+require UCW::Configure::Build;
+require UCW::Configure::Paths;
+require UCW::Configure::C;
+require UCW::Configure::Pkg;
+# You could generate your own documentation, too
+# require UCW::Configure::Doc;
+
+# Get some libraries
+UCW::Configure::Pkg::PkgConfig("libucw") or Fail("libUCW is required");
+Finish();
+
+Log "\nConfigured, run `make' to build everything.\n";
diff --git a/libucw/examples/external-ucw-build/default.cfg b/libucw/examples/external-ucw-build/default.cfg
new file mode 100644
index 0000000..48f5ec2
--- /dev/null
+++ b/libucw/examples/external-ucw-build/default.cfg
@@ -0,0 +1,5 @@
+
+# You can specify default configuration here:
+# Set("SOME_SYMBOL");
+
+1;
diff --git a/libucw/examples/external-ucw-build/test.c b/libucw/examples/external-ucw-build/test.c
new file mode 100644
index 0000000..19a2685
--- /dev/null
+++ b/libucw/examples/external-ucw-build/test.c
@@ -0,0 +1,8 @@
+#include <ucw/lib.h>
+
+int main(void)
+{
+	log_init("test");
+	msg(L_INFO, "Hoooot!");
+	return 0;
+}
diff --git a/libucw/examples/external/Makefile b/libucw/examples/external/Makefile
new file mode 100644
index 0000000..0cb26a1
--- /dev/null
+++ b/libucw/examples/external/Makefile
@@ -0,0 +1,8 @@
+# Example Makefile for a stand-alone program using libucw
+
+CFLAGS:=$(shell pkg-config --cflags libucw)
+LDLIBS:=$(shell pkg-config --libs libucw)
+
+all: test
+
+test: test.c
diff --git a/libucw/examples/external/test.c b/libucw/examples/external/test.c
new file mode 100644
index 0000000..28e45c8
--- /dev/null
+++ b/libucw/examples/external/test.c
@@ -0,0 +1,8 @@
+#include <ucw/lib.h>
+
+int main(void)
+{
+  log_init("test");
+  msg(L_INFO, "Hoooot!");
+  return 0;
+}
diff --git a/libucw/examples/internal/Makefile b/libucw/examples/internal/Makefile
new file mode 100644
index 0000000..817029d
--- /dev/null
+++ b/libucw/examples/internal/Makefile
@@ -0,0 +1,35 @@
+# Example Makefile for a stand-alone program using the libucw build system
+# (c) 2007 Martin Mares <mj@ucw.cz>
+
+# The default target
+all: runtree programs
+
+# Include configuration
+s=.
+-include obj/config.mk
+obj/config.mk:
+	@echo "You need to run configure first." && false
+
+BUILDSYS=$(s)/build
+
+# We will use the libucw build system
+include $(BUILDSYS)/Maketop
+
+# Set up names of common libraries (to avoid forward references in rules)
+LIBCHARSET=$(o)/charset/libucw-charset.pc
+LIBIMAGES=$(o)/images/libucw-images.pc
+
+# Include makefiles of libraries we wish to use
+include $(s)/ucw/Makefile
+include $(s)/charset/Makefile
+include $(s)/images/Makefile
+
+# Programs we want to compile
+PROGS+=$(o)/test
+$(o)/test: $(o)/test.o $(LIBUCW) $(LIBCHARSET) $(LIBIMAGES)
+
+# All tests (%-t) get automatically linked with libucw
+TESTING_DEPS=$(LIBUCW)
+
+# And finally the default rules of the build system
+include $(BUILDSYS)/Makebottom
diff --git a/libucw/examples/internal/configure b/libucw/examples/internal/configure
new file mode 100755
index 0000000..d914789
--- /dev/null
+++ b/libucw/examples/internal/configure
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+# Configure script for the libucw example
+# (c) 2007 Martin Mares <mj@ucw.cz>
+
+use warnings;
+use strict;
+
+our $srcdir;
+BEGIN {
+	my $pkgfile = "ucw/wildmatch.c";
+	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
+		if (-f $pkgfile) {
+			$srcdir=".";
+		} elsif ($0 =~ m@^(.*)/configure$@ && -f "$1/$pkgfile") {
+			$srcdir=$1;
+		} else {
+			die "Don't know how to find myself. Please set SRCDIR manually.\n";
+		}
+	}
+}
+
+use lib "$srcdir/ucw/perl/";
+use UCW::Configure;
+
+Init($srcdir, "default.cfg");
+Include "ucw/default.cfg";
+Log "### Configuring TestApp ###\n\n";
+Include Get("CONFIG");
+require UCW::Configure::Paths;
+require UCW::Configure::C;
+require UCW::Configure::LibUCW;
+Finish();
+
+Log "\nConfigured, run `make' to build everything.\n";
diff --git a/libucw/examples/internal/default.cfg b/libucw/examples/internal/default.cfg
new file mode 100644
index 0000000..984be67
--- /dev/null
+++ b/libucw/examples/internal/default.cfg
@@ -0,0 +1,18 @@
+# Default configuration file for our test application
+
+# Do a local build
+Set("CONFIG_LOCAL");
+
+# We want to build all libraries shared
+Set("CONFIG_SHARED");
+
+# Libucw-images settings
+Set("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+Set("CONFIG_IMAGES_LIBUNGIF");
+UnSet("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Return success
+1;
diff --git a/libucw/examples/internal/test.c b/libucw/examples/internal/test.c
new file mode 100644
index 0000000..28e45c8
--- /dev/null
+++ b/libucw/examples/internal/test.c
@@ -0,0 +1,8 @@
+#include <ucw/lib.h>
+
+int main(void)
+{
+  log_init("test");
+  msg(L_INFO, "Hoooot!");
+  return 0;
+}
diff --git a/libucw/examples/openwrt-package/Makefile b/libucw/examples/openwrt-package/Makefile
new file mode 100644
index 0000000..f8c76ff
--- /dev/null
+++ b/libucw/examples/openwrt-package/Makefile
@@ -0,0 +1,45 @@
+# Package Makefile for OpenWRT
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libucw
+PKG_VERSION:=6.5.9
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/libucw-$(PKG_VERSION)
+PKG_SOURCE:=libucw-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR=libucw-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.ucw.cz/libucw.git
+# PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_SOURCE_VERSION:=9ef73a67dd942f6e369c2719847d2cc35e920c88
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libucw
+  SECTION:=ucw
+  CATEGORY:=Libraries
+  TITLE:=The UCW Library
+  URL:=http://www.ucw.cz/libucw/
+  DEPENDS:=+libpthread +librt
+endef
+
+define Package/libucw/description
+ The UCW library aims to provide a set general purpose tools for programming in
+ the C language. In other words, to make writing of complex and very efficient
+ programs in plain C a pleasure.
+endef
+
+define Build/Configure
+	( cd $(PKG_BUILD_DIR) && ./configure PREFIX=/ CC=$(TARGET_CC) AR=$(TARGET_AR) OS=Linux -CONFIG_DEBUG -CONFIG_UCW_PERL -CONFIG_UCW_PERL_MODULES -CONFIG_UCW_SHELL_UTILS -CONFIG_UCW_UTILS -CONFIG_CHARSET -CONFIG_JSON -CONFIG_XML )
+endef
+
+define Build/InstallDev
+	make -C $(PKG_BUILD_DIR) DESTDIR=$(1) install-libucw-lib install-libucw-api
+endef
+
+define Package/libucw/install
+	make -C $(PKG_BUILD_DIR) DESTDIR=$(1) install-libucw-lib
+endef
+
+$(eval $(call BuildPackage,libucw))
diff --git a/libucw/images/Makefile b/libucw/images/Makefile
new file mode 100644
index 0000000..d418f75
--- /dev/null
+++ b/libucw/images/Makefile
@@ -0,0 +1,120 @@
+# Makefile for the Image Library (c) 2006 Pavel Charvat <pchar@ucw.cz>
+
+DIRS+=images
+
+LIBIMAGES_PROGS=$(o)/images/ucw-image-tool $(o)/images/ucw-color-tool
+LIBIMAGES_CONFIGS+=images
+LIBIMAGES_MODS=math config context image scale color io-main
+LIBIMAGES_INCLUDES=images.h error.h color.h math.h
+export LIBIMAGES_LIBS=-lm
+
+ifdef CONFIG_SHERLOCK
+LIBIMAGES_MODS+=object
+LIBIMAGES_DEPS=$(LIBSH)
+else
+LIBIMAGES_DEPS=$(LIBUCW)
+endif
+
+ifdef CONFIG_INSTALL_API
+$(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images$(LV),.a .so)
+endif
+
+ifdef CONFIG_IMAGES_DUP
+LIBIMAGES_PROGS+=$(o)/images/ucw-image-dup-test
+LIBIMAGES_MODS+=dup-init dup-cmp
+LIBIMAGES_INCLUDES+=duplicates.h
+endif
+ifdef CONFIG_IMAGES_SIM
+LIBIMAGES_PROGS+=$(o)/images/ucw-image-sim-test
+LIBIMAGES_MODS+=sig-cmp
+endif
+ifneq ($(CONFIG_IMAGES_DUP)$(CONFIG_IMAGES_SIM),)
+LIBIMAGES_MODS+=sig-dump sig-init sig-seg sig-txt
+LIBIMAGES_INCLUDES+=signature.h
+endif
+
+ifdef CONFIG_IMAGES_LIBJPEG
+LIBIMAGES_MODS+=io-libjpeg
+LIBIMAGES_LIBS+=-ljpeg
+endif
+
+ifdef CONFIG_IMAGES_LIBPNG
+LIBIMAGES_MODS+=io-libpng
+LIBIMAGES_LIBS+=-lpng
+endif
+
+ifdef CONFIG_IMAGES_LIBUNGIF
+LIBIMAGES_MODS+=io-libungif
+LIBIMAGES_LIBS+=-lungif
+else
+ifdef CONFIG_IMAGES_LIBGIF
+LIBIMAGES_MODS+=io-libungif
+LIBIMAGES_LIBS+=-lgif
+endif
+endif
+
+ifdef CONFIG_IMAGES_LIBMAGICK
+LIBIMAGES_MODS+=io-libmagick
+MAGICK_LIBS:=$(shell GraphicsMagick-config --libs)
+MAGICK_CPPFLAGS:=$(shell GraphicsMagick-config --cppflags)
+LIBIMAGES_LIBS+=$(MAGICK_LIBS) -lpthread
+$(addprefix $(o)/images/io-libmagick,.o .oo): CFLAGS+=$(MAGICK_CPPFLAGS) -Wno-redundant-decls -Wno-undef
+endif
+
+PROGS+=$(LIBIMAGES_PROGS)
+CONFIGS+=$(LIBIMAGES_CONFIGS)
+
+$(o)/images/libucw-images$(LV).a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
+$(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(LIBIMAGES_DEPS)
+$(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.0
+$(o)/images/libucw-images$(LV).so: LIBS+=$(LIBIMAGES_LIBS)
+$(o)/images/libucw-images.pc: $(LIBIMAGES_DEPS)
+
+$(o)/images/ucw-image-tool: $(o)/images/ucw-image-tool.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-color-tool: $(o)/images/ucw-color-tool.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-image-dup-test: $(o)/images/ucw-image-dup-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-image-sim-test: $(o)/images/ucw-image-sim-test.o $(LIBIMAGES) $(LIBUCW)
+
+TESTS+=$(o)/images/image-test.test
+$(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/image-test: LIBS+=-lpthread
+$(o)/images/image-test.test: $(o)/images/image-test
+
+TESTS+=$(o)/images/color.test
+$(o)/images/color-t: $(LIBIMAGES) $(LIBUCW)
+$(o)/images/color-t: LIBS+=-lm
+$(o)/images/color.test: $(o)/images/color-t
+
+API_LIBS+=libucw-images
+API_INCLUDES+=$(o)/images/.include-stamp
+$(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
+$(o)/images/.include-stamp: IDST=images
+run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc
+
+INSTALL_TARGETS+=install-libucw-images-lib
+install-libucw-images-lib:
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw-images$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.0.0
+	ln -sf libucw-images$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so.0
+.PHONY: install-libucw-images-lib
+
+INSTALL_TARGETS+=install-libucw-images-api
+install-libucw-images-api:
+	install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR))
+	install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
+	install -m 644 run/lib/pkgconfig/libucw-images.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	ln -sf libucw-images$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so
+	install -m 644 run/lib/libucw-images$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-images-api
+
+INSTALL_TARGETS+=install-libucw-images-utils
+install-libucw-images-utils:
+	install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
+	install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
+.PHONY: install-libucw-images-utils
+
+INSTALL_TARGETS+=install-libucw-images-config
+install-libucw-images-config:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+.PHONY: install-libucw-images-config
diff --git a/libucw/images/color.c b/libucw/images/color.c
new file mode 100644
index 0000000..50c38c6
--- /dev/null
+++ b/libucw/images/color.c
@@ -0,0 +1,1369 @@
+/*
+ *	Image Library -- Color Spaces
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/time.h>
+#include <images/images.h>
+#include <images/color.h>
+#include <images/error.h>
+#include <images/math.h>
+
+#include <string.h>
+#include <math.h>
+
+uint color_space_channels[COLOR_SPACE_MAX] = {
+  [COLOR_SPACE_UNKNOWN] = 0,
+  [COLOR_SPACE_UNKNOWN_1] = 1,
+  [COLOR_SPACE_UNKNOWN_2] = 2,
+  [COLOR_SPACE_UNKNOWN_3] = 3,
+  [COLOR_SPACE_UNKNOWN_4] = 4,
+  [COLOR_SPACE_GRAYSCALE] = 1,
+  [COLOR_SPACE_RGB] = 3,
+  [COLOR_SPACE_XYZ] = 3,
+  [COLOR_SPACE_LAB] = 3,
+  [COLOR_SPACE_YCBCR] = 3,
+  [COLOR_SPACE_CMYK] = 4,
+  [COLOR_SPACE_YCCK] = 4,
+};
+
+byte *color_space_name[COLOR_SPACE_MAX] = {
+  [COLOR_SPACE_UNKNOWN] = "Unknown",
+  [COLOR_SPACE_UNKNOWN_1] = "1-channel",
+  [COLOR_SPACE_UNKNOWN_2] = "2-channels",
+  [COLOR_SPACE_UNKNOWN_3] = "3-channels",
+  [COLOR_SPACE_UNKNOWN_4] = "4-channels",
+  [COLOR_SPACE_GRAYSCALE] = "Grayscale",
+  [COLOR_SPACE_RGB] = "RGB",
+  [COLOR_SPACE_XYZ] = "XYZ",
+  [COLOR_SPACE_LAB] = "LAB",
+  [COLOR_SPACE_YCBCR] = "YCbCr",
+  [COLOR_SPACE_CMYK] = "CMYK",
+  [COLOR_SPACE_YCCK] = "YCCK",
+};
+
+byte *
+color_space_id_to_name(uint id)
+{
+  ASSERT(id < COLOR_SPACE_MAX);
+  return color_space_name[id];
+}
+
+uint
+color_space_name_to_id(byte *name)
+{
+  for (uint i = 1; i < COLOR_SPACE_MAX; i++)
+    if (color_space_name[i] && !strcasecmp(name, color_space_name[i]))
+      return i;
+  return 0;
+}
+
+struct color color_black = { .color_space = COLOR_SPACE_GRAYSCALE };
+struct color color_white = { .c = { 255 }, .color_space = COLOR_SPACE_GRAYSCALE };
+
+int
+color_get(struct color *color, byte *src, uint src_space)
+{
+  color->color_space = src_space;
+  memcpy(color->c, src, color_space_channels[src_space]);
+  return 1;
+}
+
+int
+color_put(struct image_context *ctx, struct color *color, byte *dest, uint dest_space)
+{
+  switch (dest_space)
+    {
+      case COLOR_SPACE_GRAYSCALE:
+	switch (color->color_space)
+	  {
+            case COLOR_SPACE_GRAYSCALE:
+	      dest[0] = color->c[0];
+	      return 1;
+            case COLOR_SPACE_RGB:
+	      dest[0] = rgb_to_gray_func(color->c[0], color->c[1], color->c[2]);
+	      return 1;
+	  }
+	break;
+      case COLOR_SPACE_RGB:
+        switch (color->color_space)
+          {
+            case COLOR_SPACE_GRAYSCALE:
+	      dest[0] = dest[1] = dest[2] = color->c[0];
+	      return 1;
+            case COLOR_SPACE_RGB:
+	      dest[0] = color->c[0];
+	      dest[1] = color->c[1];
+	      dest[2] = color->c[2];
+	      return 1;
+	    case COLOR_SPACE_CMYK:
+	      {
+	        double rgb[3], cmyk[4];
+	        for (uint i = 0; i < 4; i++)
+		  cmyk[i] = color->c[i] * (1.0 / 255);
+	        cmyk_to_rgb_exact(rgb, cmyk);
+	        for (uint i = 0; i < 3; i++)
+		  dest[i] = CLAMP(rgb[i] * 255, 0, 255);
+	      }
+	      return 1;
+          }
+	break;
+      case COLOR_SPACE_CMYK:
+	switch (color->color_space)
+	  {
+	    case COLOR_SPACE_GRAYSCALE:
+	      dest[0] = dest[1] = dest[2] = 0;
+	      dest[3] = 255 - color->c[0];
+	      return 1;
+	    case COLOR_SPACE_RGB:
+	      {
+	        double rgb[3], cmyk[4];
+		for (uint i = 0; i < 3; i++)
+		  rgb[i] = color->c[i] * (1.0 / 255);
+		rgb_to_cmyk_exact(cmyk, rgb);
+		for (uint i = 0; i < 4; i++)
+		  dest[i] = CLAMP(cmyk[i] * 255, 0, 255);
+	      }
+	      return 1;
+	  }
+	break;
+    }
+  if (dest_space != COLOR_SPACE_RGB )
+    {
+      /* Try to convert the color via RGB */
+      struct color rgb;
+      if (!color_put(ctx, color, rgb.c, COLOR_SPACE_RGB))
+	return 0;
+      rgb.color_space = COLOR_SPACE_RGB;
+      return color_put(ctx, &rgb, dest, dest_space);
+    }
+  IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Conversion from %s to %s is not supported",
+      color_space_id_to_name(color->color_space), color_space_id_to_name(color->color_space));
+  return 0;
+}
+
+
+/********************* IMAGE CONVERSION ROUTINES **********************/
+
+struct image_conv_options image_conv_defaults = {
+  .flags = IMAGE_CONV_COPY_ALPHA | IMAGE_CONV_FILL_ALPHA | IMAGE_CONV_APPLY_ALPHA,
+  .background = { .color_space = COLOR_SPACE_GRAYSCALE } };
+
+/* Grayscale <-> RGB */
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_gray_1_to_rgb_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 1
+#define IMAGE_WALK_UNROLL 4
+#define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_pos[1] = walk_pos[2] = walk_sec_pos[0]; }while(0)
+#include <images/image-walk.h>
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_gray_1
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 1
+#define IMAGE_WALK_UNROLL 2
+#define IMAGE_WALK_DO_STEP do{ walk_pos[0] = rgb_to_gray_func(walk_sec_pos[0], walk_sec_pos[1], walk_sec_pos[2]); }while(0)
+#include <images/image-walk.h>
+
+/* Grayscale <-> YCbCr */
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_gray_1_to_ycbcr_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 1
+#define IMAGE_WALK_UNROLL 4
+#define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_pos[2] = 0; }while(0)
+#include <images/image-walk.h>
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_gray_1
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 1
+#define IMAGE_WALK_UNROLL 4
+#define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; }while(0)
+#include <images/image-walk.h>
+
+/* YCbCr <-> RGB */
+
+static inline void
+pixel_conv_ycbcr_to_rgb(byte *dest, byte *src)
+{
+  /* R = Y                + 1.40200 * Cr
+   * G = Y - 0.34414 * Cb - 0.71414 * Cr
+   * B = Y + 1.77200 * Cb */
+  int y = src[0], cb = src[1] - 128, cr = src[2] - 128;
+  dest[0] = CLAMP(y + (91881 * cr) / 0x10000, 0, 255);
+  dest[1] = CLAMP(y - (22553 * cb + 46801 * cr) / 0x10000, 0, 255);
+  dest[2] = CLAMP(y + (116129 * cb) / 0x10000, 0, 255);
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_rgb_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+static inline void
+pixel_conv_rgb_to_ycbcr(byte *dest, byte *src)
+{
+  /* Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B
+   * Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B + CENTER
+   * Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B + CENTER */
+  uint r = src[0], g = src[1], b = src[2];
+  dest[0] = (19595 * r + 38470 * g + 7471 * b) / 0x10000;
+  dest[1] = (0x800000 + 0x8000 * b - 11058 * r - 21710 * g) / 0x10000;
+  dest[2] = (0x800000 + 0x8000 * r - 27439 * g - 5329 * b) / 0x10000;
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_ycbcr_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_ycbcr(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+/* CMYK <-> RGB */
+
+static inline void
+pixel_conv_cmyk_to_rgb(byte *dest, byte *src)
+{
+  uint d = (255 - src[3]) * (0xffffffffU / 255 /255);
+  dest[0] = d * (255 - src[0]) >> 24;
+  dest[1] = d * (255 - src[1]) >> 24;
+  dest[2] = d * (255 - src[2]) >> 24;
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_cmyk_4_to_rgb_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_cmyk_to_rgb(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+static inline void
+pixel_conv_rgb_to_cmyk(byte *dest, byte *src)
+{
+  uint k = MAX(src[0], src[1]);
+  k = MAX(k, src[2]);
+  uint d = fast_div_u32_u8(0x7fffffffU, k); /* == 0 for zero K */
+  dest[0] = (d * (k - src[0])) >> 23;
+  dest[1] = (d * (k - src[1])) >> 23;
+  dest[2] = (d * (k - src[2])) >> 23;
+  dest[3] = 255 - k;
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_cmyk_4
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_cmyk(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+/* CMYK <-> YCbCr */
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_cmyk_4_to_ycbcr_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_cmyk_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycbcr(walk_pos, walk_pos); }while(0)
+#include <images/image-walk.h>
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_cmyk_4
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_cmyk(walk_pos, walk_pos); }while(0)
+#include <images/image-walk.h>
+
+/* YCCK <-> RGB */
+
+static inline void
+pixel_conv_ycck_to_rgb(byte *dest, byte *src)
+{
+  int y = src[0], cb = src[1] - 128, cr = src[2] - 128;
+  uint d = (255 - src[3]) * (0xffffffffU / 255 /255);
+  dest[0] = (d * CLAMP(y + (91881 * cr) / 0x10000, 0, 255) >> 24);
+  dest[1] = (d * CLAMP(y - (22553 * cb + 46801 * cr) / 0x10000, 0, 255) >> 24);
+  dest[2] = (d * CLAMP(y + (116129 * cb) / 0x10000, 0, 255) >> 24);
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycck_4_to_rgb_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_ycck_to_rgb(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+static inline void
+pixel_conv_rgb_to_ycck(byte *dest, byte *src)
+{
+  uint k = MAX(src[0], src[1]);
+  k = MAX(k, src[2]);
+  uint d = fast_div_u32_u8(0x7fffffffU, k); /* == 0 for zero K */
+  uint r = 255 - ((d * (k - src[0])) >> 23);
+  uint g = 255 - ((d * (k - src[1])) >> 23);
+  uint b = 255 - ((d * (k - src[2])) >> 23);
+  dest[0] = (19595 * r + 38470 * g + 7471 * b) / 0x10000;
+  dest[1] = (0x800000 + 0x8000 * b - 11058 * r - 21710 * g) / 0x10000;
+  dest[2] = (0x800000 + 0x8000 * r - 27439 * g - 5329 * b) / 0x10000;
+  dest[3] = 255 - k;
+}
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_ycck_4
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_ycck(walk_pos, walk_sec_pos); }while(0)
+#include <images/image-walk.h>
+
+/* YCCK <-> YCbCr */
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycck_4_to_ycbcr_n
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_SEC_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_ycck_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycbcr(walk_pos, walk_pos); }while(0)
+#include <images/image-walk.h>
+
+#define IMAGE_WALK_PREFIX(x) walk_##x
+#define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_ycck_4
+#define IMAGE_WALK_DOUBLE
+#define IMAGE_WALK_COL_STEP 4
+#define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycck(walk_pos, walk_pos); }while(0)
+#include <images/image-walk.h>
+
+/* Main functions */
+
+static int
+image_conv_color_space(struct image_context *ctx UNUSED, struct image *dest, struct image *src, struct image_conv_options *opt UNUSED)
+{
+  switch (dest->flags & IMAGE_COLOR_SPACE)
+    {
+      case COLOR_SPACE_GRAYSCALE:
+        switch (src->flags & IMAGE_COLOR_SPACE)
+          {
+	    case COLOR_SPACE_RGB:
+	      if (dest->pixel_size == 1)
+	        {
+	          image_conv_rgb_n_to_gray_1(dest, src);
+	          return 1;
+	        }
+	      break;
+            case COLOR_SPACE_YCBCR:
+              if (dest->pixel_size == 1)
+		{
+	          image_conv_ycbcr_n_to_gray_1(dest, src);
+	          return 1;
+		}
+	      break;
+	  }
+	break;
+      case COLOR_SPACE_RGB:
+	switch (src->flags & IMAGE_CHANNELS_FORMAT)
+	  {
+	    case COLOR_SPACE_GRAYSCALE:
+	      if (src->pixel_size == 1)
+	        {
+	          image_conv_gray_1_to_rgb_n(dest, src);
+	          return 1;
+	        }
+	      break;
+	    case COLOR_SPACE_YCBCR:
+	      image_conv_ycbcr_n_to_rgb_n(dest, src);
+	      return 1;
+	    case COLOR_SPACE_CMYK:
+	      if (src->pixel_size == 4)
+	        {
+	          image_conv_cmyk_4_to_rgb_n(dest, src);
+	          return 1;
+	        }
+	      break;
+	    case COLOR_SPACE_YCCK:
+	      if (src->pixel_size == 4)
+	        {
+		  image_conv_ycck_4_to_rgb_n(dest, src);
+		  return 1;
+		}
+	      break;
+	}
+	break;
+      case COLOR_SPACE_YCBCR:
+        switch (src->flags & IMAGE_CHANNELS_FORMAT)
+	  {
+            case COLOR_SPACE_GRAYSCALE:
+              if (src->pixel_size == 1)
+		{
+                  image_conv_gray_1_to_ycbcr_n(dest, src);
+		  return 1;
+		}
+	      break;
+	    case COLOR_SPACE_RGB:
+	      image_conv_rgb_n_to_ycbcr_n(dest, src);
+	      return 1;
+	    case COLOR_SPACE_CMYK:
+	      if (src->pixel_size == 4)
+	        {
+	          image_conv_cmyk_4_to_ycbcr_n(dest, src);
+	          return 1;
+	        }
+	      break;
+	    case COLOR_SPACE_YCCK:
+	      if (src->pixel_size == 4)
+	        {
+		  image_conv_ycck_4_to_ycbcr_n(dest, src);
+		  return 1;
+		}
+	      break;
+	  }
+	break;
+      case COLOR_SPACE_CMYK:
+        switch (src->flags & IMAGE_CHANNELS_FORMAT)
+          {
+	    case COLOR_SPACE_RGB:
+	      if (dest->pixel_size == 4)
+	        {
+	          image_conv_rgb_n_to_cmyk_4(dest, src);
+	          return 1;
+	        }
+	      break;
+	    case COLOR_SPACE_YCBCR:
+	      if (dest->pixel_size == 4)
+	        {
+	          image_conv_ycbcr_n_to_cmyk_4(dest, src);
+	          return 1;
+	        }
+	      break;
+          }
+        break;
+      case COLOR_SPACE_YCCK:
+	switch (src->flags & IMAGE_CHANNELS_FORMAT)
+	  {
+	    case COLOR_SPACE_RGB:
+	      if (dest->pixel_size == 4)
+	        {
+		  image_conv_rgb_n_to_ycck_4(dest, src);
+		  return 1;
+		}
+	      break;
+	    case COLOR_SPACE_YCBCR:
+	      if (dest->pixel_size == 4)
+	        {
+		  image_conv_ycbcr_n_to_ycck_4(dest, src);
+		  return 1;
+		}
+	      break;
+	  }
+	break;
+    }
+  return 0;
+}
+
+static void
+image_conv_copy(struct image *dest, struct image *src)
+{
+  if (dest->pixels == src->pixels)
+    return;
+  else if (dest->pixel_size != src->pixel_size)
+    {
+      uint channels = MIN(dest->channels, src->channels);
+      switch (channels)
+        {
+	  case 1:
+	    {
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#	      define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_DOUBLE
+#             define IMAGE_WALK_IMAGE dest
+#             define IMAGE_WALK_SEC_IMAGE src
+#	      define IMAGE_WALK_UNROLL 4
+#	      define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; }while(0)
+#	      include <images/image-walk.h>
+            }
+	    return;
+	  case 2:
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#	      define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_DOUBLE
+#             define IMAGE_WALK_IMAGE dest
+#             define IMAGE_WALK_SEC_IMAGE src
+#	      define IMAGE_WALK_UNROLL 4
+#	      define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; }while(0)
+#	      include <images/image-walk.h>
+	    return;
+	  case 3:
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#	      define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_DOUBLE
+#             define IMAGE_WALK_IMAGE dest
+#             define IMAGE_WALK_SEC_IMAGE src
+#	      define IMAGE_WALK_UNROLL 2
+#	      define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; }while(0)
+#	      include <images/image-walk.h>
+	    return;
+	  case 4:
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#	      define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_DOUBLE
+#             define IMAGE_WALK_IMAGE dest
+#             define IMAGE_WALK_SEC_IMAGE src
+#	      define IMAGE_WALK_UNROLL 2
+#	      define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; walk_pos[3] = walk_sec_pos[3]; }while(0)
+#	      include <images/image-walk.h>
+	    return;
+	  default:
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#	      define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_DOUBLE
+#             define IMAGE_WALK_IMAGE dest
+#             define IMAGE_WALK_SEC_IMAGE src
+#	      define IMAGE_WALK_DO_STEP do{ for (uint i = 0; i < channels; i++) walk_pos[i] = walk_sec_pos[i]; }while(0)
+#             include <images/image-walk.h>
+	    return;
+	}
+    }
+  else if (dest->row_size != src->row_size || ((dest->flags | src->flags) & IMAGE_GAPS_PROTECTED))
+    {
+      byte *s = src->pixels;
+      byte *d = dest->pixels;
+      for (uint row = src->rows; row--; )
+        {
+          memcpy(d, s, src->row_pixels_size);
+          d += dest->row_size;
+          s += src->row_size;
+        }
+    }
+  else if (dest->pixels != src->pixels)
+    memcpy(dest->pixels, src->pixels, src->image_size);
+}
+
+static void
+image_conv_fill_alpha(struct image *dest)
+{
+  switch (dest->channels)
+    {
+      case 2:
+	if (dest->pixel_size == 2)
+	  {
+#           define IMAGE_WALK_PREFIX(x) walk_##x
+#           define IMAGE_WALK_INLINE
+#           define IMAGE_WALK_IMAGE dest
+#           define IMAGE_WALK_COL_STEP 2
+#           define IMAGE_WALK_UNROLL 4
+#           define IMAGE_WALK_DO_STEP do{ walk_pos[1] = 255; }while(0)
+#           include <images/image-walk.h>
+	    return;
+	  }
+	break;
+      case 4:
+	if (dest->pixel_size == 4)
+	  {
+#           define IMAGE_WALK_PREFIX(x) walk_##x
+#           define IMAGE_WALK_INLINE
+#           define IMAGE_WALK_IMAGE dest
+#           define IMAGE_WALK_COL_STEP 4
+#           define IMAGE_WALK_UNROLL 4
+#           define IMAGE_WALK_DO_STEP do{ walk_pos[3] = 255; }while(0)
+#           include <images/image-walk.h>
+	    return;
+	  }
+	break;
+    }
+  {
+#   define IMAGE_WALK_PREFIX(x) walk_##x
+#   define IMAGE_WALK_INLINE
+#   define IMAGE_WALK_IMAGE dest
+#   define IMAGE_WALK_UNROLL 4
+#   define IMAGE_WALK_DO_STEP do{ walk_pos[dest->channels - 1] = 255; }while(0)
+#   include <images/image-walk.h>
+  }
+}
+
+static void
+image_conv_copy_alpha(struct image *dest, struct image *src)
+{
+  if (dest->pixels != src->pixels || dest->channels != src->channels)
+    {
+#     define IMAGE_WALK_PREFIX(x) walk_##x
+#     define IMAGE_WALK_INLINE
+#     define IMAGE_WALK_DOUBLE
+#     define IMAGE_WALK_IMAGE dest
+#     define IMAGE_WALK_SEC_IMAGE src
+#     define IMAGE_WALK_UNROLL 4
+#     define IMAGE_WALK_DO_STEP do{ walk_pos[dest->channels - 1] = walk_sec_pos[src->channels - 1]; }while(0)
+#     include <images/image-walk.h>
+    }
+}
+
+static inline uint
+image_conv_alpha_func(uint value, uint alpha, uint acoef, uint bcoef)
+{
+  return ((uint)(acoef + (int)alpha * (int)(value - bcoef)) * (0xffffffffU / 255 / 255)) >> 24;
+}
+
+static int
+image_conv_apply_alpha_from(struct image_context *ctx, struct image *dest, struct image *src, struct image_conv_options *opt)
+{
+  if (!opt->background.color_space)
+    return 1;
+  byte background[IMAGE_MAX_CHANNELS];
+  if (unlikely(!color_put(ctx, &opt->background, background, dest->flags & IMAGE_COLOR_SPACE)))
+    return 0;
+  uint a[IMAGE_MAX_CHANNELS], b[IMAGE_MAX_CHANNELS];
+  for (uint i = 0; i < dest->channels; i++)
+    a[i] = 255 * (b[i] = background[i]);
+  switch (dest->channels)
+    {
+      case 1:
+	{
+#         define IMAGE_WALK_PREFIX(x) walk_##x
+#         define IMAGE_WALK_INLINE
+#         define IMAGE_WALK_IMAGE dest
+#         define IMAGE_WALK_SEC_IMAGE src
+#         define IMAGE_WALK_DOUBLE
+#	  define IMAGE_WALK_UNROLL 2
+#         define IMAGE_WALK_DO_STEP do{ \
+              walk_pos[0] = image_conv_alpha_func(walk_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); }while(0)
+#         include <images/image-walk.h>
+	}
+	return 1;
+      case 3:
+	{
+#         define IMAGE_WALK_PREFIX(x) walk_##x
+#         define IMAGE_WALK_INLINE
+#         define IMAGE_WALK_IMAGE dest
+#         define IMAGE_WALK_SEC_IMAGE src
+#         define IMAGE_WALK_DOUBLE
+#         define IMAGE_WALK_DO_STEP do{ \
+              walk_pos[0] = image_conv_alpha_func(walk_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); \
+              walk_pos[1] = image_conv_alpha_func(walk_pos[1], walk_sec_pos[src->channels - 1], a[1], b[1]); \
+              walk_pos[2] = image_conv_alpha_func(walk_pos[2], walk_sec_pos[src->channels - 1], a[2], b[2]); }while(0)
+#         include <images/image-walk.h>
+	}
+	return 1;
+    }
+  {
+#   define IMAGE_WALK_PREFIX(x) walk_##x
+#   define IMAGE_WALK_INLINE
+#   define IMAGE_WALK_IMAGE dest
+#   define IMAGE_WALK_SEC_IMAGE src
+#   define IMAGE_WALK_DOUBLE
+#   define IMAGE_WALK_DO_STEP do{ for (uint i = 0; i < dest->channels; i++) \
+        walk_pos[i] = image_conv_alpha_func(walk_pos[i], walk_sec_pos[src->channels - 1], a[i], b[i]); }while(0)
+#   include <images/image-walk.h>
+  }
+  return 1;
+}
+
+static int
+image_conv_apply_alpha_to(struct image_context *ctx, struct image *dest, struct image *src, struct image_conv_options *opt)
+{
+  if (!opt->background.color_space)
+    {
+      image_conv_copy(dest, src);
+      return 1;
+    }
+  byte background[IMAGE_MAX_CHANNELS];
+  if (unlikely(!color_put(ctx, &opt->background, background, dest->flags & IMAGE_COLOR_SPACE)))
+    return 0;
+  uint a[IMAGE_MAX_CHANNELS], b[IMAGE_MAX_CHANNELS];
+  for (uint i = 0; i < dest->channels; i++)
+    a[i] = 255 * (b[i] = background[i]);
+  switch (dest->channels)
+    {
+      case 1:
+	{
+#         define IMAGE_WALK_PREFIX(x) walk_##x
+#         define IMAGE_WALK_INLINE
+#         define IMAGE_WALK_IMAGE dest
+#         define IMAGE_WALK_SEC_IMAGE src
+#         define IMAGE_WALK_DOUBLE
+#	  define IMAGE_WALK_UNROLL 2
+#         define IMAGE_WALK_DO_STEP do{ \
+              walk_pos[0] = image_conv_alpha_func(walk_sec_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); }while(0)
+#         include <images/image-walk.h>
+	}
+	return 1;
+      case 3:
+	{
+#         define IMAGE_WALK_PREFIX(x) walk_##x
+#         define IMAGE_WALK_INLINE
+#         define IMAGE_WALK_IMAGE dest
+#         define IMAGE_WALK_SEC_IMAGE src
+#         define IMAGE_WALK_DOUBLE
+#         define IMAGE_WALK_DO_STEP do{ \
+              walk_pos[0] = image_conv_alpha_func(walk_sec_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); \
+              walk_pos[1] = image_conv_alpha_func(walk_sec_pos[1], walk_sec_pos[src->channels - 1], a[1], b[1]); \
+              walk_pos[2] = image_conv_alpha_func(walk_sec_pos[2], walk_sec_pos[src->channels - 1], a[2], b[2]); }while(0)
+#         include <images/image-walk.h>
+	}
+	return 1;
+    }
+  {
+#   define IMAGE_WALK_PREFIX(x) walk_##x
+#   define IMAGE_WALK_INLINE
+#   define IMAGE_WALK_IMAGE dest
+#   define IMAGE_WALK_SEC_IMAGE src
+#   define IMAGE_WALK_DOUBLE
+#   define IMAGE_WALK_DO_STEP do{ for (uint i = 0; i < dest->channels; i++) \
+        walk_pos[i] = image_conv_alpha_func(walk_sec_pos[i], walk_sec_pos[src->channels - 1], a[i], b[i]); }while(0)
+#   include <images/image-walk.h>
+  }
+  return 1;
+}
+
+int
+image_conv(struct image_context *ctx, struct image *dest, struct image *src, struct image_conv_options *opt)
+{
+  ASSERT(dest->cols == src->cols && dest->rows == src->rows);
+  if (!((dest->flags ^ src->flags) & IMAGE_COLOR_SPACE))
+    {
+      if (!(src->flags & IMAGE_ALPHA) || (dest->flags & IMAGE_ALPHA))
+	image_conv_copy(dest, src);
+      else if (unlikely(!image_conv_apply_alpha_to(ctx, dest, src, opt)))
+	return 0;
+    }
+  else
+    {
+      if (!(src->flags & IMAGE_ALPHA))
+        {
+	  if (unlikely(!image_conv_color_space(ctx, dest, src, opt)))
+	    goto error;
+	  if ((dest->flags & IMAGE_ALPHA) && (opt->flags & IMAGE_CONV_FILL_ALPHA))
+	    image_conv_fill_alpha(dest);
+	}
+      else
+        {
+	  if (dest->flags & IMAGE_ALPHA)
+	    {
+	      if (dest->channels <= src->channels)
+	        {
+	          if (unlikely(!image_conv_color_space(ctx, dest, src, opt)))
+	            goto error;
+		  if (opt->flags & IMAGE_CONV_COPY_ALPHA)
+		    image_conv_copy_alpha(dest, src);
+		  else if (opt->flags & IMAGE_CONV_FILL_ALPHA)
+		    image_conv_fill_alpha(dest);
+		}
+	      else
+	        {
+		  if (opt->flags & IMAGE_CONV_COPY_ALPHA)
+		    image_conv_copy_alpha(dest, src);
+		  else
+		    image_conv_fill_alpha(dest);
+	          if (unlikely(!image_conv_color_space(ctx, dest, src, opt)))
+	            goto error;
+		}
+	    }
+	  else
+	    {
+	      if (dest->channels <= src->channels)
+	        {
+	          if (unlikely(!image_conv_color_space(ctx, dest, src, opt)))
+	            goto error;
+		  if (unlikely(!image_conv_apply_alpha_from(ctx, dest, src, opt)))
+		    return 0;
+		}
+	      else
+	        {
+		  if (unlikely(!image_conv_apply_alpha_to(ctx, dest, src, opt)))
+		    return 0;
+	          if (unlikely(!image_conv_color_space(ctx, dest, dest, opt)))
+	            goto error;
+		}
+	    }
+	}
+    }
+  return 1;
+error:
+  IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Image conversion not supported for such pixel formats");
+  return 0;
+}
+
+/********************* EXACT CONVERSION ROUTINES **********************/
+
+/* Reference whites */
+#define COLOR_ILLUMINANT_A	0.44757, 0.40744
+#define COLOR_ILLUMINANT_B	0.34840, 0.35160
+#define COLOR_ILLUMINANT_C	0.31006, 0.31615
+#define COLOR_ILLUMINANT_D50    0.34567, 0.35850
+#define COLOR_ILLUMINANT_D55	0.33242, 0.34743
+#define COLOR_ILLUMINANT_D65    0.31273, 0.32902
+#define COLOR_ILLUMINANT_D75	0.29902, 0.31485
+#define COLOR_ILLUMINANT_9300K	0.28480, 0.29320
+#define COLOR_ILLUMINANT_E      (1./3.), (1./3.)
+#define COLOR_ILLUMINANT_F2	0.37207, 0.37512
+#define COLOR_ILLUMINANT_F7	0.31285, 0.32918
+#define COLOR_ILLUMINANT_F11	0.38054, 0.37691
+
+const double
+  color_illuminant_d50[2] = {COLOR_ILLUMINANT_D50},
+  color_illuminant_d65[2] = {COLOR_ILLUMINANT_D65},
+  color_illuminant_e[2] = {COLOR_ILLUMINANT_E};
+
+/* RGB profiles (many missing) */
+const struct color_space_info
+  color_adobe_rgb_info = {"Adobe RGB", {{0.6400, 0.3300}, {0.2100, 0.7100}, {0.1500, 0.0600}, {COLOR_ILLUMINANT_D65}}, {0.45, 0.45, 0, 0, 0}},
+  color_apple_rgb_info = {"Apple RGB", {{0.6250, 0.3400}, {0.2800, 0.5950}, {0.1550, 0.0700}, {COLOR_ILLUMINANT_D65}}, {0.56, 0.56, 0, 0, 0}},
+  color_cie_rgb_info = {"CIE RGB", {{0.7350, 0.2650}, {0.2740, 0.7170}, {0.1670, 0.0090}, {COLOR_ILLUMINANT_E}}, {0.45, 0.45, 0, 0, 0}},
+  color_color_match_rgb_info = {"ColorMatch RGB", {{0.6300, 0.3400}, {0.2950, 0.6050}, {0.1500, 0.0750}, {COLOR_ILLUMINANT_D50}}, {0.56, 0.56, 0, 0, 0}},
+  color_srgb_info = {"sRGB", {{0.6400, 0.3300}, {0.3000, 0.6000}, {0.1500, 0.0600}, {COLOR_ILLUMINANT_D65}}, {0.45, 0.42, 0.055, 0.003, 12.92}};
+
+#define CLIP(x, min, max) (((x) < (min)) ? (min) : ((x) > (max)) ? (max) : (x))
+
+static inline void
+clip(double a[3])
+{
+  a[0] = CLIP(a[0], 0, 1);
+  a[1] = CLIP(a[1], 0, 1);
+  a[2] = CLIP(a[2], 0, 1);
+}
+
+static inline void
+correct_gamma_simple(double dest[3], double src[3], const struct color_space_gamma_info *info)
+{
+  dest[0] = pow(src[0], info->simple_gamma);
+  dest[1] = pow(src[1], info->simple_gamma);
+  dest[2] = pow(src[2], info->simple_gamma);
+}
+
+static inline void
+invert_gamma_simple(double dest[3], double src[3], const struct color_space_gamma_info *info)
+{
+  dest[0] = pow(src[0], 1 / info->simple_gamma);
+  dest[1] = pow(src[1], 1 / info->simple_gamma);
+  dest[2] = pow(src[2], 1 / info->simple_gamma);
+}
+
+static inline void
+correct_gamma_detailed(double dest[3], double src[3], const struct color_space_gamma_info *info)
+{
+  for (uint i = 0; i < 3; i++)
+    if (src[i] > info->transition)
+      dest[i] = (1 + info->offset) * pow(src[i], info->detailed_gamma) - info->offset;
+    else
+      dest[i] = info->slope * src[i];
+}
+
+static inline void
+invert_gamma_detailed(double dest[3], double src[3], const struct color_space_gamma_info *info)
+{
+  for (uint i = 0; i < 3; i++)
+    if (src[i] > info->transition * info->slope)
+      dest[i] = pow((src[i] + info->offset) / (1 + info->offset), 1 / info->detailed_gamma);
+    else
+      dest[i] = src[i] / info->slope;
+}
+
+static inline void
+apply_matrix(double dest[3], double src[3], double matrix[9])
+{
+  dest[0] = src[0] * matrix[0] + src[1] * matrix[1] + src[2] * matrix[2];
+  dest[1] = src[0] * matrix[3] + src[1] * matrix[4] + src[2] * matrix[5];
+  dest[2] = src[0] * matrix[6] + src[1] * matrix[7] + src[2] * matrix[8];
+}
+
+void
+color_invert_matrix(double dest[9], double matrix[9])
+{
+  double *i = dest, *m = matrix;
+  double a0 = m[4] * m[8] - m[5] * m[7];
+  double a1 = m[3] * m[8] - m[5] * m[6];
+  double a2 = m[3] * m[7] - m[4] * m[6];
+  double d = 1 / (m[0] * a0 - m[1] * a1 + m[2] * a2);
+  i[0] = d * a0;
+  i[3] = -d * a1;
+  i[6] = d * a2;
+  i[1] = -d * (m[1] * m[8] - m[2] * m[7]);
+  i[4] = d * (m[0] * m[8] - m[2] * m[6]);
+  i[7] = -d * (m[0] * m[7] - m[1] * m[6]);
+  i[2] = d * (m[1] * m[5] - m[2] * m[4]);
+  i[5] = -d * (m[0] * m[5] - m[2] * m[3]);
+  i[8] = d * (m[0] * m[4] - m[1] * m[3]);
+}
+
+static void
+mul_matrices(double r[9], double a[9], double b[9])
+{
+  r[0] = a[0] * b[0] + a[1] * b[3] + a[2] * b[6];
+  r[1] = a[0] * b[1] + a[1] * b[4] + a[2] * b[7];
+  r[2] = a[0] * b[2] + a[1] * b[5] + a[2] * b[8];
+  r[3] = a[3] * b[0] + a[4] * b[3] + a[5] * b[6];
+  r[4] = a[3] * b[1] + a[4] * b[4] + a[5] * b[7];
+  r[5] = a[3] * b[2] + a[4] * b[5] + a[5] * b[8];
+  r[6] = a[6] * b[0] + a[7] * b[3] + a[8] * b[6];
+  r[7] = a[6] * b[1] + a[7] * b[4] + a[8] * b[7];
+  r[8] = a[6] * b[2] + a[7] * b[5] + a[8] * b[8];
+}
+
+/* computes conversion matrix from a given color space to CIE XYZ */
+void
+color_compute_color_space_to_xyz_matrix(double matrix[9], const struct color_space_chromacity_info *space)
+{
+  double wX = space->white[0] / space->white[1];
+  double wZ = (1 - space->white[0] - space->white[1]) / space->white[1];
+  double a[9], b[9];
+  a[0] = space->prim1[0]; a[3] = space->prim1[1]; a[6] = 1 - a[0] - a[3];
+  a[1] = space->prim2[0]; a[4] = space->prim2[1]; a[7] = 1 - a[1] - a[4];
+  a[2] = space->prim3[0]; a[5] = space->prim3[1]; a[8] = 1 - a[2] - a[5];
+  color_invert_matrix(b, a);
+  double ra = wX * b[0] + b[1] + wZ * b[2];
+  double rb = wX * b[3] + b[4] + wZ * b[5];
+  double rc = wX * b[6] + b[7] + wZ * b[8];
+  matrix[0] = a[0] * ra;
+  matrix[1] = a[1] * rb;
+  matrix[2] = a[2] * rc;
+  matrix[3] = a[3] * ra;
+  matrix[4] = a[4] * rb;
+  matrix[5] = a[5] * rc;
+  matrix[6] = a[6] * ra;
+  matrix[7] = a[7] * rb;
+  matrix[8] = a[8] * rc;
+}
+
+/* computes matrix to join transformations with different reference whites */
+void
+color_compute_bradford_matrix(double matrix[9], const double source[2], const double dest[2])
+{
+  /* cone response matrix and its inversion */
+  static double r[9] = {
+    0.8951, 0.2664, -0.1614,
+    -0.7502, 1.7135, 0.0367,
+    0.0389, -0.0685, 1.0296};
+  //static double i[9] = {0.9870, -0.1471, 0.1600, 0.4323, 0.5184, 0.0493, -0.0085, 0.0400, 0.9685};
+  double i[9];
+  color_invert_matrix(i, r);
+  double aX = source[0] / source[1];
+  double aZ = (1 - source[0] - source[1]) / source[1];
+  double bX = dest[0] / dest[1];
+  double bZ = (1 - dest[0] - dest[1]) / dest[1];
+  double x = (r[0] * bX + r[1] + r[2] * bZ) / (r[0] * aX + r[1] + r[2] * aZ);
+  double y = (r[3] * bX + r[4] + r[5] * bZ) / (r[3] * aX + r[4] + r[5] * aZ);
+  double z = (r[6] * bX + r[7] + r[8] * bZ) / (r[6] * aX + r[7] + r[8] * aZ);
+  double m[9];
+  m[0] = i[0] * x; m[1] = i[1] * y; m[2] = i[2] * z;
+  m[3] = i[3] * x; m[4] = i[4] * y; m[5] = i[5] * z;
+  m[6] = i[6] * x; m[7] = i[7] * y; m[8] = i[8] * z;
+  mul_matrices(matrix, m, r);
+}
+
+void
+color_compute_color_spaces_conversion_matrix(double matrix[9], const struct color_space_chromacity_info *src, const struct color_space_chromacity_info *dest)
+{
+  double a_to_xyz[9], b_to_xyz[9], xyz_to_b[9], bradford[9], m[9];
+  color_compute_color_space_to_xyz_matrix(a_to_xyz, src);
+  color_compute_color_space_to_xyz_matrix(b_to_xyz, dest);
+  color_invert_matrix(xyz_to_b, b_to_xyz);
+  if (src->white[0] == dest->white[0] && src->white[1] == dest->white[1])
+    mul_matrices(matrix, a_to_xyz, xyz_to_b);
+  else
+    {
+      color_compute_bradford_matrix(bradford, src->white, dest->white);
+      mul_matrices(m, a_to_xyz, bradford);
+      mul_matrices(matrix, m, xyz_to_b);
+    }
+}
+
+/* sRGB to XYZ */
+void
+srgb_to_xyz_exact(double xyz[3], double srgb[3])
+{
+  static double matrix[9] = {
+    0.41248031, 0.35756952, 0.18043951,
+    0.21268516, 0.71513904, 0.07217580,
+    0.01933501, 0.11918984, 0.95031473};
+  double srgb_lin[3];
+  invert_gamma_detailed(srgb_lin, srgb, &color_srgb_info.gamma);
+  apply_matrix(xyz, srgb_lin, matrix);
+  xyz_to_srgb_exact(srgb_lin, xyz);
+}
+
+/* XYZ to sRGB */
+void
+xyz_to_srgb_exact(double srgb[3], double xyz[3])
+{
+  static double matrix[9] = {
+     3.24026666, -1.53704957, -0.49850256,
+    -0.96928381,  1.87604525,  0.04155678,
+     0.05564281, -0.20402363,  1.05721334};
+  double srgb_lin[3];
+  apply_matrix(srgb_lin, xyz, matrix);
+  clip(srgb_lin);
+  correct_gamma_detailed(srgb, srgb_lin, &color_srgb_info.gamma);
+}
+
+/* XYZ to CIE-Luv */
+void
+xyz_to_luv_exact(double luv[3], double xyz[3])
+{
+  double sum = xyz[0] + 15 * xyz[1] + 3 * xyz[2];
+  if (sum < 0.000001)
+    luv[0] = luv[1] = luv[2] = 0;
+  else
+    {
+      double var_u = 4 * xyz[0] / sum;
+      double var_v = 9 * xyz[1] / sum;
+      if (xyz[1] > 0.008856)
+        luv[0] = 116 * pow(xyz[1], 1 / 3.) - 16;
+      else
+        luv[0] = (116 * 7.787) * xyz[1];
+     luv[1] = luv[0] * (13 * (var_u - 4 * REF_WHITE_X / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z)));
+     luv[2] = luv[0] * (13 * (var_v - 9 * REF_WHITE_Y / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z)));
+     /* intervals [0..100], [-134..220], [-140..122] */
+   }
+}
+
+/* CIE-Luv to XYZ */
+void
+luv_to_xyz_exact(double xyz[3], double luv[3])
+{
+  double var_u = luv[1] / (13 * luv[0]) + (4 * REF_WHITE_X / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z));
+  double var_v = luv[2] / (13 * luv[0]) + (9 * REF_WHITE_Y / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z));
+  double var_y = (luv[0] + 16) / 116;
+  double pow_y = var_y * var_y * var_y;
+  if (pow_y > 0.008856)
+    var_y = pow_y;
+  else
+    var_y = (var_y - 16 / 116) / 7.787;
+  xyz[1] = var_y;
+  xyz[0] = -(9 * xyz[1] * var_u) / ((var_u - 4) * var_v - var_u * var_v);
+  xyz[2] = (9 * xyz[1] - 15 * var_v * xyz[1] - var_v * xyz[0]) / (3 * var_v);
+}
+
+/* RGB to CMYK - a very simple version, not too accureate  */
+void
+rgb_to_cmyk_exact(double cmyk[4], double rgb[3])
+{
+  cmyk[0] = 1 - rgb[0];
+  cmyk[1] = 1 - rgb[1];
+  cmyk[2] = 1 - rgb[2];
+  cmyk[3] = MIN(cmyk[0], cmyk[1]);
+  cmyk[3] = MIN(cmyk[3], cmyk[2]);
+  if (cmyk[3] > 0.9999)
+    {
+      cmyk[3] = 1;
+      cmyk[0] = cmyk[1] = cmyk[2] = 0;
+    }
+  else
+    {
+      double d = 1 / (1 - cmyk[3]);
+      for (uint i = 0; i < 3; i++)
+        cmyk[i] = d * (cmyk[i] - cmyk[3]);
+    }
+}
+
+/* CMYK to RGB */
+void
+cmyk_to_rgb_exact(double rgb[3], double cmyk[4])
+{
+  double d = 1 - cmyk[1];
+  for (uint i = 0; i < 3; i++)
+    rgb[i] = d * (1 - cmyk[i]);
+}
+
+/***************** OPTIMIZED SRGB -> LUV CONVERSION *********************/
+
+u16 srgb_to_luv_tab1[256];
+u16 srgb_to_luv_tab2[9 << SRGB_TO_LUV_TAB2_SIZE];
+u32 srgb_to_luv_tab3[20 << SRGB_TO_LUV_TAB3_SIZE];
+
+void
+srgb_to_luv_init(void)
+{
+  DBG("Initializing sRGB -> Luv table");
+  for (uint i = 0; i < 256; i++)
+    {
+      double t = i / 255.;
+      if (t > 0.04045)
+        t = pow((t + 0.055) * (1 / 1.055), 2.4);
+      else
+        t = t * (1 / 12.92);
+      srgb_to_luv_tab1[i] = CLAMP(t * 0xfff + 0.5, 0, 0xfff);
+    }
+  for (uint i = 0; i < (9 << SRGB_TO_LUV_TAB2_SIZE); i++)
+    {
+      double t = i / (double)((9 << SRGB_TO_LUV_TAB2_SIZE) - 1);
+      if (t > 0.008856)
+        t = 1.16 * pow(t, 1 / 3.) - 0.16;
+      else
+        t = (1.16 * 7.787) * t;
+      srgb_to_luv_tab2[i] =
+	CLAMP(t * ((1 << SRGB_TO_LUV_TAB2_SCALE) - 1) + 0.5,
+          0, (1 << SRGB_TO_LUV_TAB2_SCALE) - 1);
+    }
+  for (uint i = 0; i < (20 << SRGB_TO_LUV_TAB3_SIZE); i++)
+    {
+      srgb_to_luv_tab3[i] = i ? (13 << (SRGB_TO_LUV_TAB3_SCALE + SRGB_TO_LUV_TAB3_SIZE)) / i : 0;
+    }
+}
+
+void
+srgb_to_luv_pixels(byte *dest, byte *src, uint count)
+{
+  while (count--)
+    {
+      srgb_to_luv_pixel(dest, src);
+      dest += 3;
+      src += 3;
+    }
+}
+
+
+/************************ GRID INTERPOLATION ALGORITHM ************************/
+
+struct color_grid_node *srgb_to_luv_grid;
+struct color_interpolation_node *color_interpolation_table;
+
+/* Returns volume of a given tetrahedron multiplied by 6 */
+static inline uint
+tetrahedron_volume(uint *v1, uint *v2, uint *v3, uint *v4)
+{
+  int a[3], b[3], c[3];
+  for (uint i = 0; i < 3; i++)
+    {
+      a[i] = v2[i] - v1[i];
+      b[i] = v3[i] - v1[i];
+      c[i] = v4[i] - v1[i];
+    }
+  int result =
+    a[0] * (b[1] * c[2] - b[2] * c[1]) -
+    a[1] * (b[0] * c[2] - b[2] * c[0]) +
+    a[2] * (b[0] * c[1] - b[1] * c[0]);
+  return (result > 0) ? result : -result;
+}
+
+static void
+interpolate_tetrahedron(struct color_interpolation_node *n, uint *p, const uint *c)
+{
+  uint v[4][3];
+  for (uint i = 0; i < 4; i++)
+    {
+      v[i][0] = (c[i] & 0001) ? (1 << COLOR_CONV_OFS) : 0;
+      v[i][1] = (c[i] & 0010) ? (1 << COLOR_CONV_OFS) : 0;
+      v[i][2] = (c[i] & 0100) ? (1 << COLOR_CONV_OFS) : 0;
+      n->ofs[i] =
+	((c[i] & 0001) ? 1 : 0) +
+	((c[i] & 0010) ? (1 << COLOR_CONV_SIZE) : 0) +
+	((c[i] & 0100) ? (1 << (COLOR_CONV_SIZE * 2)) : 0);
+    }
+  uint vol = tetrahedron_volume(v[0], v[1], v[2], v[3]);
+  n->mul[0] = ((tetrahedron_volume(p, v[1], v[2], v[3]) << 8) + (vol >> 1)) / vol;
+  n->mul[1] = ((tetrahedron_volume(v[0], p, v[2], v[3]) << 8) + (vol >> 1)) / vol;
+  n->mul[2] = ((tetrahedron_volume(v[0], v[1], p, v[3]) << 8) + (vol >> 1)) / vol;
+  n->mul[3] = ((tetrahedron_volume(v[0], v[1], v[2], p) << 8) + (vol >> 1)) / vol;
+  uint j;
+  for (j = 0; j < 4; j++)
+    if (n->mul[j])
+      break;
+  for (uint i = 0; i < 4; i++)
+    if (n->mul[i] == 0)
+      n->ofs[i] = n->ofs[j];
+}
+
+static void
+interpolation_table_init(void)
+{
+  DBG("Initializing color interpolation table");
+  struct color_interpolation_node *n = color_interpolation_table =
+    xmalloc(sizeof(struct color_interpolation_node) << (COLOR_CONV_OFS * 3));
+  uint p[3];
+  for (p[2] = 0; p[2] < (1 << COLOR_CONV_OFS); p[2]++)
+    for (p[1] = 0; p[1] < (1 << COLOR_CONV_OFS); p[1]++)
+      for (p[0] = 0; p[0] < (1 << COLOR_CONV_OFS); p[0]++)
+        {
+	  uint index;
+          static const uint tetrahedra[5][4] = {
+            {0000, 0001, 0010, 0100},
+            {0110, 0111, 0100, 0010},
+            {0101, 0100, 0111, 0001},
+            {0011, 0010, 0001, 0111},
+            {0111, 0001, 0010, 0100}};
+	  if (p[0] + p[1] + p[2] <= (1 << COLOR_CONV_OFS))
+	    index = 0;
+	  else if ((1 << COLOR_CONV_OFS) + p[0] <= p[1] + p[2])
+	    index = 1;
+	  else if ((1 << COLOR_CONV_OFS) + p[1] <= p[0] + p[2])
+	    index = 2;
+	  else if ((1 << COLOR_CONV_OFS) + p[2] <= p[0] + p[1])
+	    index = 3;
+	  else
+	    index = 4;
+	  interpolate_tetrahedron(n, p, tetrahedra[index]);
+	  n++;
+	}
+}
+
+typedef void color_conv_func(double dest[3], double src[3]);
+
+static void
+conv_grid_init(struct color_grid_node **grid, color_conv_func func)
+{
+  if (*grid)
+    return;
+  struct color_grid_node *g = *grid = xmalloc((sizeof(struct color_grid_node)) << (COLOR_CONV_SIZE * 3));
+  double src[3], dest[3];
+  for (uint k = 0; k < (1 << COLOR_CONV_SIZE); k++)
+    {
+      src[2] = k * (255 / (double)((1 << COLOR_CONV_SIZE) - 1));
+      for (uint j = 0; j < (1 << COLOR_CONV_SIZE); j++)
+        {
+          src[1] = j * (255/ (double)((1 << COLOR_CONV_SIZE) - 1));
+          for (uint i = 0; i < (1 << COLOR_CONV_SIZE); i++)
+            {
+              src[0] = i * (255 / (double)((1 << COLOR_CONV_SIZE) - 1));
+	      func(dest, src);
+	      g->val[0] = CLAMP(dest[0] + 0.5, 0, 255);
+	      g->val[1] = CLAMP(dest[1] + 0.5, 0, 255);
+	      g->val[2] = CLAMP(dest[2] + 0.5, 0, 255);
+	      g++;
+	    }
+	}
+    }
+}
+
+static void
+srgb_to_luv_func(double dest[3], double src[3])
+{
+  double srgb[3], xyz[3], luv[3];
+  srgb[0] = src[0] / 255.;
+  srgb[1] = src[1] / 255.;
+  srgb[2] = src[2] / 255.;
+  srgb_to_xyz_exact(xyz, srgb);
+  xyz_to_luv_exact(luv, xyz);
+  dest[0] = luv[0] * 2.55;
+  dest[1] = luv[1] * (2.55 / 4) + 128;
+  dest[2] = luv[2] * (2.55 / 4) + 128;
+}
+
+void
+color_conv_init(void)
+{
+  interpolation_table_init();
+  conv_grid_init(&srgb_to_luv_grid, srgb_to_luv_func);
+}
+
+void
+color_conv_pixels(byte *dest, byte *src, uint count, struct color_grid_node *grid)
+{
+  while (count--)
+    {
+      color_conv_pixel(dest, src, grid);
+      dest += 3;
+      src += 3;
+    }
+}
+
+
+/**************************** TESTS *******************************/
+
+#ifdef TEST
+#include <string.h>
+
+static double
+conv_error(u32 color, struct color_grid_node *grid, color_conv_func func)
+{
+  byte src[3], dest[3];
+  src[0] = color & 255;
+  src[1] = (color >> 8) & 255;
+  src[2] = (color >> 16) & 255;
+  color_conv_pixel(dest, src, grid);
+  double src2[3], dest2[3];
+  for (uint i = 0; i < 3; i++)
+    src2[i] = src[i];
+  func(dest2, src2);
+  double err = 0;
+  for (uint i = 0; i < 3; i++)
+    err += (dest[i] - dest2[i]) * (dest[i] - dest2[i]);
+  return err;
+}
+
+typedef void test_fn(byte *dest, byte *src);
+
+static double
+func_error(u32 color, test_fn test, color_conv_func func)
+{
+  byte src[3], dest[3];
+  src[0] = color & 255;
+  src[1] = (color >> 8) & 255;
+  src[2] = (color >> 16) & 255;
+  test(dest, src);
+  double src2[3], dest2[3];
+  for (uint i = 0; i < 3; i++)
+    src2[i] = src[i];
+  func(dest2, src2);
+  double err = 0;
+  for (uint i = 0; i < 3; i++)
+    err += (dest[i] - dest2[i]) * (dest[i] - dest2[i]);
+  return err;
+}
+
+static void
+test_grid(byte *name, struct color_grid_node *grid, color_conv_func func)
+{
+  double max_err = 0, sum_err = 0;
+  uint count = 100000;
+  for (uint i = 0; i < count; i++)
+    {
+      double err = conv_error(random_max(0x1000000), grid, func);
+      max_err = MAX(err, max_err);
+      sum_err += err;
+    }
+  DBG("%s: error max=%f avg=%f", name, max_err, sum_err / count);
+  if (max_err > 12)
+    die("Too large error in %s conversion", name);
+}
+
+static void
+test_func(byte *name, test_fn test, color_conv_func func)
+{
+  double max_err = 0, sum_err = 0;
+  uint count = 100000;
+  for (uint i = 0; i < count; i++)
+    {
+      double err = func_error(random_max(0x1000000), test, func);
+      max_err = MAX(err, max_err);
+      sum_err += err;
+    }
+  DBG("%s: error max=%f avg=%f", name, max_err, sum_err / count);
+  if (max_err > 12)
+    die("Too large error in %s conversion", name);
+}
+
+int
+main(void)
+{
+  srgb_to_luv_init();
+  test_func("func sRGB -> Luv", srgb_to_luv_pixel, srgb_to_luv_func);
+  color_conv_init();
+  test_grid("grid sRGB -> Luv", srgb_to_luv_grid, srgb_to_luv_func);
+#ifdef LOCAL_DEBUG
+#define CNT 1000000
+#define TESTS 10
+  byte *a = xmalloc(3 * CNT), *b = xmalloc(3 * CNT);
+  for (uint i = 0; i < 3 * CNT; i++)
+    a[i] = random_max(256);
+  timestamp_t timer;
+  init_timer(&timer);
+  for (uint i = 0; i < TESTS; i++)
+    memcpy(b, a, CNT * 3);
+  DBG("memcpy time=%d", get_timer(&timer));
+  init_timer(&timer);
+  for (uint i = 0; i < TESTS; i++)
+    srgb_to_luv_pixels(b, a, CNT);
+  DBG("direct time=%d", get_timer(&timer));
+  init_timer(&timer);
+  for (uint i = 0; i < TESTS; i++)
+    color_conv_pixels(b, a, CNT, srgb_to_luv_grid);
+  DBG("grid time=%d", get_timer(&timer));
+#endif
+  return 0;
+}
+#endif
+
diff --git a/libucw/images/color.h b/libucw/images/color.h
new file mode 100644
index 0000000..71fa061
--- /dev/null
+++ b/libucw/images/color.h
@@ -0,0 +1,298 @@
+/*
+ *	Image Library -- Color Spaces
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ *
+ *
+ *	References:
+ *	- A Review of RGB Color Spaces, Danny Pascale (2003)
+ *	- http://www.adobe.com/digitalimag/pdfs/AdobeRGB1998.pdf
+ *	- http://www.tecgraf.puc-rio.br/~mgattass/color/ColorIndex.html
+ *
+ *	FIXME:
+ *	- fix theoretical problems with rounding errors in srgb_to_luv_pixel()
+ *	- SIMD should help to speed up conversion of large arrays
+ *	- maybe try to generate a long switch in color_conv_pixel()
+ *	  with optimized entries instead of access to interpolation table
+ *	- most of multiplications in srgb_to_luv_pixels can be replaced
+ *	  with tables lookup... tests shows almost the same speed for random
+ *	  input and cca 40% gain when input colors fit in CPU chache
+ */
+
+#ifndef _IMAGES_COLOR_H
+#define _IMAGES_COLOR_H
+
+#include <images/images.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cmyk_to_rgb_exact ucw_cmyk_to_rgb_exact
+#define color_adobe_rgb_info ucw_color_adobe_rgb_info
+#define color_apple_rgb_info ucw_color_apple_rgb_info
+#define color_black ucw_color_black
+#define color_cie_rgb_info ucw_color_cie_rgb_info
+#define color_color_match_rgb_info ucw_color_color_match_rgb_info
+#define color_compute_bradford_matrix ucw_color_compute_bradford_matrix
+#define color_compute_color_space_to_xyz_matrix ucw_color_compute_color_space_to_xyz_matrix
+#define color_compute_color_spaces_conversion_matrix ucw_color_compute_color_spaces_conversion_matrix
+#define color_conv_init ucw_color_conv_init
+#define color_conv_pixels ucw_color_conv_pixels
+#define color_get ucw_color_get
+#define color_illuminant_d50 ucw_color_illuminant_d50
+#define color_illuminant_d65 ucw_color_illuminant_d65
+#define color_illuminant_e ucw_color_illuminant_e
+#define color_interpolation_table ucw_color_interpolation_table
+#define color_invert_matrix ucw_color_invert_matrix
+#define color_put ucw_color_put
+#define color_space_channels ucw_color_space_channels
+#define color_space_id_to_name ucw_color_space_id_to_name
+#define color_space_name ucw_color_space_name
+#define color_space_name_to_id ucw_color_space_name_to_id
+#define color_srgb_info ucw_color_srgb_info
+#define color_white ucw_color_white
+#define image_conv ucw_image_conv
+#define image_conv_defaults ucw_image_conv_defaults
+#define luv_to_xyz_exact ucw_luv_to_xyz_exact
+#define rgb_to_cmyk_exact ucw_rgb_to_cmyk_exact
+#define srgb_to_luv_grid ucw_srgb_to_luv_grid
+#define srgb_to_luv_init ucw_srgb_to_luv_init
+#define srgb_to_luv_pixels ucw_srgb_to_luv_pixels
+#define srgb_to_luv_tab1 ucw_srgb_to_luv_tab1
+#define srgb_to_luv_tab2 ucw_srgb_to_luv_tab2
+#define srgb_to_luv_tab3 ucw_srgb_to_luv_tab3
+#define srgb_to_xyz_exact ucw_srgb_to_xyz_exact
+#define xyz_to_luv_exact ucw_xyz_to_luv_exact
+#define xyz_to_srgb_exact ucw_xyz_to_srgb_exact
+#endif
+
+/* Basic color spaces */
+enum {
+  COLOR_SPACE_UNKNOWN = 0,
+  COLOR_SPACE_UNKNOWN_1 = 1,	/* unknown 1-channel color space */
+  COLOR_SPACE_UNKNOWN_2 = 2,	/* unknown 2-channels color space */
+  COLOR_SPACE_UNKNOWN_3 = 3,	/* unknown 3-channels color space */
+  COLOR_SPACE_UNKNOWN_4 = 4,	/* unknown 4-channels color space */
+  COLOR_SPACE_UNKNOWN_MAX = 4,
+  COLOR_SPACE_GRAYSCALE,
+  COLOR_SPACE_RGB,
+  COLOR_SPACE_XYZ,
+  COLOR_SPACE_LAB,
+  COLOR_SPACE_LUV,
+  COLOR_SPACE_YCBCR,
+  COLOR_SPACE_CMYK,
+  COLOR_SPACE_YCCK,
+  COLOR_SPACE_MAX
+};
+
+extern uint color_space_channels[COLOR_SPACE_MAX];
+extern byte *color_space_name[COLOR_SPACE_MAX];
+
+/* Color space ID <-> name conversions */
+byte *color_space_id_to_name(uint id);
+uint color_space_name_to_id(byte *name);
+
+/* Struct color manipulation */
+int color_get(struct color *color, byte *src, uint src_space);
+int color_put(struct image_context *ctx, struct color *color, byte *dest, uint dest_space);
+
+static inline void color_make_gray(struct color *color, uint gray)
+{
+  color->c[0] = gray;
+  color->color_space = COLOR_SPACE_GRAYSCALE;
+}
+
+static inline void color_make_rgb(struct color *color, uint r, uint g, uint b)
+{
+  color->c[0] = r;
+  color->c[1] = g;
+  color->c[2] = b;
+  color->color_space = COLOR_SPACE_RGB;
+}
+
+extern struct color color_black, color_white;
+
+/* Conversion between various pixel formats */
+
+enum {
+  IMAGE_CONV_FILL_ALPHA = 1,
+  IMAGE_CONV_COPY_ALPHA = 2,
+  IMAGE_CONV_APPLY_ALPHA = 4,
+};
+
+struct image_conv_options {
+  uint flags;
+  struct color background;
+};
+
+extern struct image_conv_options image_conv_defaults;
+
+int image_conv(struct image_context *ctx, struct image *dest, struct image *src, struct image_conv_options *opt);
+
+/* Color spaces in the CIE 1931 chromacity diagram */
+
+struct color_space_chromacity_info {
+  double prim1[2];
+  double prim2[2];
+  double prim3[2];
+  double white[2];
+};
+
+struct color_space_gamma_info {
+  double simple_gamma;
+  double detailed_gamma;
+  double offset;
+  double transition;
+  double slope;
+};
+
+struct color_space_info {
+  byte *name;
+  struct color_space_chromacity_info chromacity;
+  struct color_space_gamma_info gamma;
+};
+
+extern const double
+  color_illuminant_d50[2],
+  color_illuminant_d65[2],
+  color_illuminant_e[2];
+
+extern const struct color_space_info
+  color_adobe_rgb_info,		/* Adobe RGB (1998) */
+  color_apple_rgb_info,		/* Apple RGB */
+  color_cie_rgb_info,		/* CIE RGB */
+  color_color_match_rgb_info,	/* ColorMatch RGB */
+  color_srgb_info;		/* sRGB */
+
+/* These routines do not check numeric errors! */
+void color_compute_color_space_to_xyz_matrix(double matrix[9], const struct color_space_chromacity_info *space);
+void color_compute_bradford_matrix(double matrix[9], const double src[2], const double dest[2]);
+void color_compute_color_spaces_conversion_matrix(double matrix[9], const struct color_space_chromacity_info *src, const struct color_space_chromacity_info *dest);
+void color_invert_matrix(double dest[9], double matrix[9]);
+
+static inline uint rgb_to_gray_func(uint r, uint g, uint b)
+{
+  return (r * 19660 + g * 38666 + b * 7210) >> 16;
+}
+
+/* Exact slow conversion routines */
+void srgb_to_xyz_exact(double dest[3], double src[3]);
+void xyz_to_srgb_exact(double dest[3], double src[3]);
+void xyz_to_luv_exact(double dest[3], double src[3]);
+void luv_to_xyz_exact(double dest[3], double src[3]);
+void rgb_to_cmyk_exact(double dest[4], double src[3]);
+void cmyk_to_rgb_exact(double dest[3], double src[4]);
+
+/* Reference white */
+#define REF_WHITE_X 0.96422
+#define REF_WHITE_Y 1.
+#define REF_WHITE_Z 0.82521
+
+/* sRGB -> XYZ matrix */
+#define SRGB_XYZ_XR 0.412424
+#define SRGB_XYZ_XG 0.357579
+#define SRGB_XYZ_XB 0.180464
+#define SRGB_XYZ_YR 0.212656
+#define SRGB_XYZ_YG 0.715158
+#define SRGB_XYZ_YB 0.072186
+#define SRGB_XYZ_ZR 0.019332
+#define SRGB_XYZ_ZG 0.119193
+#define SRGB_XYZ_ZB 0.950444
+
+
+/*********************** OPTIMIZED CONVERSION ROUTINES **********************/
+
+/* sRGB -> Luv parameters */
+#define SRGB_TO_LUV_TAB2_SIZE 9
+#define SRGB_TO_LUV_TAB2_SCALE 11
+#define SRGB_TO_LUV_TAB3_SIZE 8
+#define SRGB_TO_LUV_TAB3_SCALE (39 - SRGB_TO_LUV_TAB2_SCALE - SRGB_TO_LUV_TAB3_SIZE)
+
+extern u16 srgb_to_luv_tab1[256];
+extern u16 srgb_to_luv_tab2[9 << SRGB_TO_LUV_TAB2_SIZE];
+extern u32 srgb_to_luv_tab3[20 << SRGB_TO_LUV_TAB3_SIZE];
+
+void srgb_to_luv_init(void);
+void srgb_to_luv_pixels(byte *dest, byte *src, uint count);
+
+/* L covers the interval [0..255]; u and v are centered to 128 and scaled by 1/4 in respect of L */
+static inline void srgb_to_luv_pixel(byte *dest, byte *src)
+{
+  uint r = srgb_to_luv_tab1[src[0]];
+  uint g = srgb_to_luv_tab1[src[1]];
+  uint b = srgb_to_luv_tab1[src[2]];
+  uint x =
+    (uint)(4 * SRGB_XYZ_XR * 0xffff) * r +
+    (uint)(4 * SRGB_XYZ_XG * 0xffff) * g +
+    (uint)(4 * SRGB_XYZ_XB * 0xffff) * b;
+  uint y =
+    (uint)(9 * SRGB_XYZ_YR * 0xffff) * r +
+    (uint)(9 * SRGB_XYZ_YG * 0xffff) * g +
+    (uint)(9 * SRGB_XYZ_YB * 0xffff) * b;
+  uint l = srgb_to_luv_tab2[y >> (28 - SRGB_TO_LUV_TAB2_SIZE)];
+    dest[0] = l >> (SRGB_TO_LUV_TAB2_SCALE - 8);
+  uint sum =
+    (uint)((SRGB_XYZ_XR + 15 * SRGB_XYZ_YR + 3 * SRGB_XYZ_ZR) * 0x7fff) * r +
+    (uint)((SRGB_XYZ_XG + 15 * SRGB_XYZ_YG + 3 * SRGB_XYZ_ZG) * 0x7fff) * g +
+    (uint)((SRGB_XYZ_XB + 15 * SRGB_XYZ_YB + 3 * SRGB_XYZ_ZB) * 0x7fff) * b;
+  uint s = srgb_to_luv_tab3[sum >> (27 - SRGB_TO_LUV_TAB3_SIZE)];
+  int xs = ((u64)x * s) >> 32;
+  int ys = ((u64)y * s) >> 32;
+  int xw = ((4 * 13) << (SRGB_TO_LUV_TAB3_SCALE - 4)) *
+    REF_WHITE_X / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z);
+  int yw = ((9 * 13) << (SRGB_TO_LUV_TAB3_SCALE - 4)) *
+    REF_WHITE_Y / (REF_WHITE_X + 15 * REF_WHITE_Y + 3 * REF_WHITE_Z);
+  int u = (int)(l) * (xs - xw);
+  int v = (int)(l) * (ys - yw);
+  dest[1] = 128 + (u >> (SRGB_TO_LUV_TAB3_SCALE + SRGB_TO_LUV_TAB2_SCALE - 10));
+  dest[2] = 128 + (v >> (SRGB_TO_LUV_TAB3_SCALE + SRGB_TO_LUV_TAB2_SCALE - 10));
+}
+
+
+/****************** GENERAL INTERPOLATION IN 3D GRID ********************/
+
+#define COLOR_CONV_SIZE	5  /* 128K conversion grid size */
+#define COLOR_CONV_OFS	3  /* 8K interpolation table size */
+
+struct color_grid_node {
+  byte val[4];
+};
+
+struct color_interpolation_node {
+  u16 ofs[4];
+  u16 mul[4];
+};
+
+extern struct color_grid_node *srgb_to_luv_grid;
+extern struct color_interpolation_node *color_interpolation_table;
+
+void color_conv_init(void);
+void color_conv_pixels(byte *dest, byte *src, uint count, struct color_grid_node *grid);
+
+#define COLOR_CONV_SCALE_CONST (((((1 << COLOR_CONV_SIZE) - 1) << 16) + (1 << (16 - COLOR_CONV_OFS))) / 255)
+
+static inline void color_conv_pixel(byte *dest, byte *src, struct color_grid_node *grid)
+{
+  uint s0 = src[0] * COLOR_CONV_SCALE_CONST;
+  uint s1 = src[1] * COLOR_CONV_SCALE_CONST;
+  uint s2 = src[2] * COLOR_CONV_SCALE_CONST;
+  struct color_grid_node *g0, *g1, *g2, *g3, *g = grid +
+    ((s0 >> 16) + ((s1 >> 16) << COLOR_CONV_SIZE) + ((s2 >> 16) << (2 * COLOR_CONV_SIZE)));
+  struct color_interpolation_node *n = color_interpolation_table +
+    (((s0 & (0x10000 - (0x10000 >> COLOR_CONV_OFS))) >> (16 - COLOR_CONV_OFS)) +
+    ((s1 & (0x10000 - (0x10000 >> COLOR_CONV_OFS))) >> (16 - 2 * COLOR_CONV_OFS)) +
+    ((s2 & (0x10000 - (0x10000 >> COLOR_CONV_OFS))) >> (16 - 3 * COLOR_CONV_OFS)));
+  g0 = g + n->ofs[0];
+  g1 = g + n->ofs[1];
+  g2 = g + n->ofs[2];
+  g3 = g + n->ofs[3];
+  dest[0] = (g0->val[0] * n->mul[0] + g1->val[0] * n->mul[1] +
+             g2->val[0] * n->mul[2] + g3->val[0] * n->mul[3] + 128) >> 8;
+  dest[1] = (g0->val[1] * n->mul[0] + g1->val[1] * n->mul[1] +
+             g2->val[1] * n->mul[2] + g3->val[1] * n->mul[3] + 128) >> 8;
+  dest[2] = (g0->val[2] * n->mul[0] + g1->val[2] * n->mul[1] +
+             g2->val[2] * n->mul[2] + g3->val[2] * n->mul[3] + 128) >> 8;
+}
+
+#endif
diff --git a/libucw/images/color.t b/libucw/images/color.t
new file mode 100644
index 0000000..510a320
--- /dev/null
+++ b/libucw/images/color.t
@@ -0,0 +1,3 @@
+# Tests for color conversion module
+
+Run:	../obj/images/color-t
diff --git a/libucw/images/config.c b/libucw/images/config.c
new file mode 100644
index 0000000..286097e
--- /dev/null
+++ b/libucw/images/config.c
@@ -0,0 +1,76 @@
+/*
+ *	Image Library -- Configuration
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <images/images.h>
+#include <images/error.h>
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+#include <images/signature.h>
+#endif
+
+#include <string.h>
+
+/* ImageLib section */
+uint image_trace;
+uint image_max_dim = 0xffff;
+uint image_max_bytes = ~0U;
+
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+/* ImageSig section */
+uint image_sig_min_width;
+uint image_sig_min_height;
+uint *image_sig_prequant_thresholds;
+uint image_sig_postquant_min_steps;
+uint image_sig_postquant_max_steps;
+uint image_sig_postquant_threshold;
+double image_sig_border_size;
+int image_sig_border_bonus;
+double image_sig_inertia_scale[3];
+double image_sig_textured_threshold;
+int image_sig_compare_method;
+uint image_sig_cmp_features_weights[IMAGE_REG_F + IMAGE_REG_H];
+#endif
+
+static struct cf_section image_lib_config = {
+  CF_ITEMS{
+    CF_UINT("Trace", &image_trace),
+    CF_UINT("ImageMaxDim", &image_max_dim),
+    CF_UINT("ImageMaxBytes", &image_max_bytes),
+    CF_END
+  }
+};
+
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+static struct cf_section image_sig_config = {
+  CF_ITEMS{
+    CF_UINT("MinWidth", &image_sig_min_width),
+    CF_UINT("MinHeight", &image_sig_min_height),
+    CF_UINT_DYN("PreQuantThresholds", &image_sig_prequant_thresholds, CF_ANY_NUM),
+    CF_UINT("PostQuantMinSteps", &image_sig_postquant_min_steps),
+    CF_UINT("PostQuantMaxSteps", &image_sig_postquant_max_steps),
+    CF_UINT("PostQuantThreshold", &image_sig_postquant_threshold),
+    CF_DOUBLE("BorderSize", &image_sig_border_size),
+    CF_INT("BorderBonus", &image_sig_border_bonus),
+    CF_DOUBLE_ARY("InertiaScale", image_sig_inertia_scale, 3),
+    CF_DOUBLE("TexturedThreshold", &image_sig_textured_threshold),
+    CF_LOOKUP("CompareMethod", &image_sig_compare_method, ((const char * const []){"integrated", "fuzzy", "average", NULL})),
+    CF_UINT_ARY("CompareFeaturesWeights", image_sig_cmp_features_weights, IMAGE_REG_F + IMAGE_REG_H),
+    CF_END
+  }
+};
+#endif
+
+static void CONSTRUCTOR
+images_init_config(void)
+{
+  cf_declare_section("ImageLib", &image_lib_config, 0);
+#if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP)
+  cf_declare_section("ImageSig", &image_sig_config, 0);
+#endif
+}
diff --git a/libucw/images/context.c b/libucw/images/context.c
new file mode 100644
index 0000000..82ff165
--- /dev/null
+++ b/libucw/images/context.c
@@ -0,0 +1,61 @@
+/*
+ *	Image Library -- Image contexts
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/bbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+
+#include <string.h>
+
+void
+image_context_init(struct image_context *ctx)
+{
+  bzero(ctx, sizeof(*ctx));
+  bb_init(&ctx->msg_buf);
+  ctx->tracing_level = image_trace;
+  ctx->msg_callback = image_context_msg_default;
+}
+
+void
+image_context_cleanup(struct image_context *ctx)
+{
+  IMAGE_TRACE(ctx, 10, "Destroying image thread");
+  bb_done(&ctx->msg_buf);
+}
+
+void
+image_context_msg_default(struct image_context *ctx)
+{
+  msg(ctx->msg_code >> 24, "%s", ctx->msg);
+}
+
+void
+image_context_msg_silent(struct image_context *ctx UNUSED)
+{
+}
+
+void
+image_context_msg(struct image_context *ctx, uint code, char *msg, ...)
+{
+  va_list args;
+  va_start(args, msg);
+  image_context_vmsg(ctx, code, msg, args);
+  va_end(args);
+}
+
+void
+image_context_vmsg(struct image_context *ctx, uint code, char *msg, va_list args)
+{
+  ctx->msg_code = code;
+  ctx->msg = bb_vprintf(&ctx->msg_buf, msg, args);
+  ctx->msg_callback(ctx);
+}
diff --git a/libucw/images/dup-cmp.c b/libucw/images/dup-cmp.c
new file mode 100644
index 0000000..e0a2812
--- /dev/null
+++ b/libucw/images/dup-cmp.c
@@ -0,0 +1,302 @@
+/*
+ *      Image Library -- Duplicates Comparison
+ *
+ *      (c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *      This software may be freely distributed and used according to the terms
+ *      of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/duplicates.h>
+
+#include <fcntl.h>
+
+static inline uint
+err (int a, int b)
+{
+  a -= b;
+  return a * a;
+}
+
+static inline u64
+err_sum(byte *pos1, byte *pos2, uint count)
+{
+  uint e64 = 0;
+  while (count--)
+    {
+      uint e = err(*pos1++, *pos2++);
+      e += err(*pos1++, *pos2++);
+      e += err(*pos1++, *pos2++);
+      e64 += e;
+    }
+  return e64;
+}
+
+static inline u64
+err_sum_transformed(byte *pos1, byte *pos2, uint cols, uint rows, int row_step_1, int col_step_2, int row_step_2)
+{
+  DBG("err_sum_transformed(pos1=%p pos2=%p cols=%u rows=%u row_step_1=%d col_step_2=%d row_step_2=%d)",
+      pos1, pos2, cols, rows, row_step_1, col_step_2, row_step_2);
+  u64 e64 = 0;
+  for (uint j = rows; j--; )
+    {
+      byte *p1 = pos1;
+      byte *p2 = pos2;
+      uint e = 0;
+      for (uint i = cols; i--; )
+      {
+	e += err(p1[0], p2[0]);
+	e += err(p1[1], p2[1]);
+	e += err(p1[2], p2[2]);
+	p1 += 3;
+	p2 += col_step_2;
+      }
+      pos1 += row_step_1;
+      pos2 += row_step_2;
+      e64 += e;
+    }
+  return e64;
+}
+
+static inline int
+aspect_ratio_test(struct image_dup_context *ctx, uint cols1, uint rows1, uint cols2, uint rows2)
+{
+  DBG("aspect_ratio_test(cols1=%u rows1=%u cols2=%u rows2=%u)", cols1, rows1, cols2, rows2);
+  uint r1 = cols1 * rows2;
+  uint r2 = rows1 * cols2;
+  return
+    r1 <= ((r2 * ctx->ratio_threshold) >> 7) &&
+    r2 <= ((r1 * ctx->ratio_threshold) >> 7);
+}
+
+static inline int
+average_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2)
+{
+  byte *block1 = image_dup_block(dup1, 0, 0);
+  byte *block2 = image_dup_block(dup2, 0, 0);
+  uint e =
+    err(block1[0], block2[0]) +
+    err(block1[1], block2[1]) +
+    err(block1[2], block2[2]);
+  return e <= ctx->error_threshold;
+}
+
+static int
+blocks_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2, uint tab_col, uint tab_row, uint trans)
+{
+  DBG("blocks_compare(tab_col=%d tab_row=%d trans=%d)", tab_col, tab_row, trans);
+  ctx->sum_pixels += 1 << (tab_col + tab_row);
+  byte *block1 = image_dup_block(dup1, tab_col, tab_row);
+  byte *block2;
+  int col_step, row_step;
+  if (trans < 4)
+    block2 = image_dup_block(dup2, tab_col, tab_row);
+  else
+    block2 = image_dup_block(dup2, tab_row, tab_col);
+  switch (trans)
+    {
+      case 0: ;
+	uint err = (err_sum(block1, block2, 1 << (tab_col + tab_row)) >> (tab_col + tab_row));
+	DBG("average error=%d", err);
+	ctx->error = err;
+	return err <= ctx->error_threshold;
+      case 1:
+	col_step = -3;
+	row_step = (3 << tab_col);
+	block2 += row_step - 3;
+	break;
+      case 2:
+	col_step = 3;
+	row_step = -(3 << tab_col);
+	block2 += (3 << (tab_col + tab_row)) + row_step;
+	break;
+      case 3:
+	col_step = -3;
+	row_step = -(3 << tab_col);
+	block2 += (3 << (tab_col + tab_row)) - 3;
+	break;
+      case 4:
+	col_step = (3 << tab_row);
+	row_step = 3;
+	break;
+      case 5:
+	col_step = -(3 << tab_row);
+	row_step = 3;
+	block2 += (3 << (tab_col + tab_row)) + col_step;
+	break;
+      case 6:
+	col_step = (3 << tab_row);
+	row_step = -3;
+	block2 += col_step - 3;
+	break;
+      case 7:
+	col_step = -(3 << tab_row);
+	row_step = -3;
+	block2 += (3 << (tab_col + tab_row)) - 3;
+	break;
+      default:
+	ASSERT(0);
+    }
+  uint err = (err_sum_transformed(block1, block2, (1 << tab_col), (1 << tab_row), (3 << tab_col), col_step, row_step) >> (tab_col + tab_row));
+  DBG("average error=%d", err);
+  ctx->error = err;
+  return err <= ctx->error_threshold;
+}
+
+static int
+same_size_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2, uint trans)
+{
+  struct image *img1 = &dup1->image;
+  struct image *img2 = &dup2->image;
+  if (!img1->pixels || !img2->pixels)
+    return 1;
+  ctx->sum_pixels += img1->cols * img1->rows;
+  byte *block1 = img1->pixels;
+  byte *block2 = img2->pixels;
+  int col_step, row_step;
+  DBG("same_size_compare(trans=%d)",  trans);
+  switch (trans)
+    {
+      case 0: ;
+	col_step = 3;
+	row_step = img2->row_size;
+	break;
+      case 1:
+	col_step = -3;
+	row_step = img2->row_size;
+	block2 += 3 * (img2->cols - 1);
+	break;
+      case 2:
+	col_step = 3;
+	row_step = -img2->row_size;
+	block2 += img2->row_size * (img2->rows - 1);
+	break;
+      case 3:
+	col_step = -3;
+	row_step = -img2->row_size;
+	block2 += img2->row_size * (img2->rows - 1) + 3 * (img2->cols - 1);
+	break;
+      case 4:
+	col_step = img2->row_size;
+	row_step = 3;
+	break;
+      case 5:
+	col_step = -img2->row_size;
+	row_step = 3;
+	block2 += img2->row_size * (img2->rows - 1);
+	break;
+      case 6:
+	col_step = img2->row_size;
+	row_step = -3;
+	block2 += 3 * (img2->cols - 1);
+	break;
+      case 7:
+	col_step = -img2->row_size;
+	row_step = -3;
+	block2 += img2->row_size * (img2->rows - 1) + 3 * (img2->cols - 1);
+	break;
+      default:
+	ASSERT(0);
+    }
+  uint err = (err_sum_transformed(block1, block2, img1->cols, img1->rows, img1->row_size, col_step, row_step) / ((u64)img1->cols * img1->rows));
+  DBG("average error=%d", err);
+  ctx->error = err;
+  return err <= ctx->error_threshold;
+}
+
+uint
+image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2)
+{
+  DBG("image_dup_compare(%p, %p)", dup1, dup2);
+  if (!average_compare(ctx, dup1, dup2))
+    return 0;
+  struct image *img1 = &dup1->image;
+  struct image *img2 = &dup2->image;
+  uint flags = ctx->flags;
+  if (flags & IMAGE_DUP_SCALE)
+    {
+      DBG("Scale support");
+      if (!aspect_ratio_test(ctx, img1->cols, img1->rows, img2->cols, img2->rows))
+	flags &= ~0x0f;
+      if (!aspect_ratio_test(ctx, img1->cols, img1->rows, img2->rows, img2->cols))
+	flags &= ~0xf0;
+    }
+  else
+    {
+      DBG("No scale support");
+      if (!(img1->cols == img2->cols && img1->rows == img2->rows))
+	flags &= ~0x0f;
+      if (!(img1->cols == img2->rows && img1->rows == img2->cols))
+	flags &= ~0xf0;
+    }
+  if (!(flags & 0xff))
+    return 0;
+  uint result = 0;
+  if (flags & 0x0f)
+    {
+      uint cols = MIN(dup1->tab_cols, dup2->tab_cols);
+      uint rows = MIN(dup1->tab_rows, dup2->tab_rows);
+      for (uint t = 0; t < 4; t++)
+	if (flags & (1 << t))
+	  {
+	    DBG("Testing trans %d", t);
+	    uint i = MAX(cols, rows), depth = 1;
+            while (i--)
+              {
+		depth++;
+	        uint col = MAX(0, (int)(cols - i));
+	        uint row = MAX(0, (int)(rows - i));
+	        if (!blocks_compare(ctx, dup1, dup2, col, row, t))
+		  break;
+		if (!i &&
+		    (img1->cols != img2->cols || img1->rows != img2->rows ||
+		    same_size_compare(ctx, dup1, dup2, t)))
+		  {
+		    result |= 1 << t;
+		    if (!(flags & IMAGE_DUP_WANT_ALL))
+		      return result;
+		    else
+		      break;
+		  }
+	      }
+	    ctx->sum_depth += depth;
+	  }
+    }
+  if (flags & 0xf0)
+    {
+      uint cols = MIN(dup1->tab_cols, dup2->tab_rows);
+      uint rows = MIN(dup1->tab_rows, dup2->tab_cols);
+      for (uint t = 4; t < 8; t++)
+	if (flags & (1 << t))
+	  {
+	    DBG("Testing trans %d", t);
+	    uint i = MAX(cols, rows), depth = 1;
+            while (i--)
+              {
+		depth++;
+	        uint col = MAX(0, (int)(cols - i));
+	        uint row = MAX(0, (int)(rows - i));
+	        if (!blocks_compare(ctx, dup1, dup2, col, row, t))
+		  break;
+		if (!i &&
+		    (img1->cols != img2->rows || img1->rows != img2->cols ||
+		    same_size_compare(ctx, dup1, dup2, t)) )
+		  {
+		    result |= 1 << t;
+		    if (!(flags & IMAGE_DUP_WANT_ALL))
+		      return result;
+		    else
+		      break;
+		  }
+	      }
+	    ctx->sum_depth += depth;
+	  }
+    }
+  return result;
+}
diff --git a/libucw/images/dup-init.c b/libucw/images/dup-init.c
new file mode 100644
index 0000000..c4c5f4d
--- /dev/null
+++ b/libucw/images/dup-init.c
@@ -0,0 +1,153 @@
+/*
+ *      Image Library -- Duplicates Comparison
+ *
+ *      (c) 2006--2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *      This software may be freely distributed and used according to the terms
+ *      of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/color.h>
+#include <images/duplicates.h>
+
+#include <fcntl.h>
+
+void
+image_dup_context_init(struct image_context *ic, struct image_dup_context *ctx)
+{
+  *ctx = (struct image_dup_context) {
+    .ic = ic,
+    .flags = IMAGE_DUP_TRANS_ID,
+    .ratio_threshold = 140,
+    .error_threshold = 100,
+    .qtree_limit = 8,
+  };
+}
+
+void
+image_dup_context_cleanup(struct image_dup_context *ctx UNUSED)
+{
+}
+
+static inline struct image *
+image_dup_subimage(struct image_context *ctx, struct image_dup *dup, struct image *block, uint tab_col, uint tab_row)
+{
+  return image_init_matrix(ctx, block, image_dup_block(dup, tab_col, tab_row),
+      1 << tab_col, 1 << tab_row, 3 << tab_col, COLOR_SPACE_RGB);
+}
+
+static inline void
+pixels_average(byte *dest, byte *src1, byte *src2)
+{
+  dest[0] = ((uint)src1[0] + (uint)src2[0]) >> 1;
+  dest[1] = ((uint)src1[1] + (uint)src2[1]) >> 1;
+  dest[2] = ((uint)src1[2] + (uint)src2[2]) >> 1;
+}
+
+uint
+image_dup_estimate_size(uint cols, uint rows, uint same_size_compare, uint qtree_limit)
+{
+  uint tab_cols, tab_rows;
+  for (tab_cols = 0; (uint)(2 << tab_cols) < cols && tab_cols < qtree_limit; tab_cols++);
+  for (tab_rows = 0; (uint)(2 << tab_rows) < rows && tab_rows < qtree_limit; tab_rows++);
+  uint size = sizeof(struct image_dup) + (12 << (tab_cols + tab_rows)) + 2 * CPU_STRUCT_ALIGN;
+  if (same_size_compare)
+    size += cols * rows * 3 + CPU_STRUCT_ALIGN;
+  return ALIGN_TO(size, CPU_STRUCT_ALIGN);
+}
+
+uint
+image_dup_new(struct image_dup_context *ctx, struct image *img, void *buffer, uint same_size_compare)
+{
+  DBG("image_dup_init()");
+  ASSERT(!((uintptr_t)buffer & (CPU_STRUCT_ALIGN - 1)));
+  void *ptr = buffer;
+
+  /* Allocate the structure */
+  struct image_dup *dup = ptr;
+  ptr += ALIGN_TO(sizeof(*dup), CPU_STRUCT_ALIGN);
+  bzero(dup, sizeof(*dup));
+
+  ASSERT((img->flags & IMAGE_PIXEL_FORMAT) == COLOR_SPACE_RGB);
+
+  /* Clone image */
+  if (same_size_compare)
+    {
+      if (!image_init_matrix(ctx->ic, &dup->image, ptr, img->cols, img->rows, img->cols * 3, COLOR_SPACE_RGB))
+        return 0;
+      uint size = img->rows * img->cols * 3;
+      ptr += ALIGN_TO(size, CPU_STRUCT_ALIGN);
+      byte *s = img->pixels;
+      byte *d = dup->image.pixels;
+      for (uint row = img->rows; row--; )
+        {
+	  memcpy(d, s, img->row_pixels_size);
+	  d += dup->image.row_size;
+	  s += img->row_size;
+	}
+    }
+  else
+    {
+      dup->image.cols = img->cols;
+      dup->image.rows = img->rows;
+    }
+
+  for (dup->tab_cols = 0; (uint)(2 << dup->tab_cols) < img->cols && dup->tab_cols < ctx->qtree_limit; dup->tab_cols++);
+  for (dup->tab_rows = 0; (uint)(2 << dup->tab_rows) < img->rows && dup->tab_rows < ctx->qtree_limit; dup->tab_rows++);
+  dup->tab_row_size = 6 << dup->tab_cols;
+  dup->tab_pixels = ptr;
+  uint size = 12 << (dup->tab_cols + dup->tab_rows);
+  ptr += ALIGN_TO(size, CPU_STRUCT_ALIGN);
+
+  /* Scale original image to right bottom block */
+  {
+    struct image block;
+    if (!image_dup_subimage(ctx->ic, dup, &block, dup->tab_cols, dup->tab_rows))
+      return 0;
+    if (!image_scale(ctx->ic, &block, img))
+      return 0;
+  }
+
+  /* Complete bottom row */
+  for (uint i = dup->tab_cols; i--; )
+    {
+      byte *d = image_dup_block(dup, i, dup->tab_rows);
+      byte *s = image_dup_block(dup, i + 1, dup->tab_rows);
+      for (uint y = 0; y < (uint)(1 << dup->tab_rows); y++)
+	for (uint x = 0; x < (uint)(1 << i); x++)
+	  {
+	    pixels_average(d, s, s + 3);
+	    d += 3;
+	    s += 6;
+	  }
+    }
+
+  /* Complete remaining blocks */
+  for (uint i = 0; i <= dup->tab_cols; i++)
+    {
+      uint line_size = (3 << i);
+      for (uint j = dup->tab_rows; j--; )
+        {
+          byte *d = image_dup_block(dup, i, j);
+          byte *s = image_dup_block(dup, i, j + 1);
+          for (uint y = 0; y < (uint)(1 << j); y++)
+            {
+              for (uint x = 0; x < (uint)(1 << i); x++)
+                {
+	          pixels_average(d, s, s + line_size);
+		  d += 3;
+		  s += 3;
+		}
+	      s += line_size;
+	    }
+        }
+    }
+
+  return ptr - buffer;
+}
diff --git a/libucw/images/duplicates.h b/libucw/images/duplicates.h
new file mode 100644
index 0000000..d824c8c
--- /dev/null
+++ b/libucw/images/duplicates.h
@@ -0,0 +1,65 @@
+#ifndef _IMAGES_DUPLICATES_H
+#define _IMAGES_DUPLICATES_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_dup_compare ucw_image_dup_compare
+#define image_dup_context_cleanup ucw_image_dup_context_cleanup
+#define image_dup_context_init ucw_image_dup_context_init
+#define image_dup_estimate_size ucw_image_dup_estimate_size
+#define image_dup_new ucw_image_dup_new
+#endif
+
+enum image_dup_flags {
+  IMAGE_DUP_TRANS_ID =		0x0001,
+  IMAGE_DUP_FLIP_X =		0x0002,
+  IMAGE_DUP_FLIP_Y =		0x0004,
+  IMAGE_DUP_ROT_180 =		0x0008,
+  IMAGE_DUP_FLIP_BACK =		0x0010,
+  IMAGE_DUP_ROT_CCW =		0x0020,
+  IMAGE_DUP_ROT_CW =		0x0040,
+  IMAGE_DUP_FLIP_SLASH =	0x0080,
+  IMAGE_DUP_TRANS_ALL =		0x00ff,
+  IMAGE_DUP_SCALE =		0x0100,
+  IMAGE_DUP_WANT_ALL =		0x0200,
+};
+
+struct image_dup_context {
+  struct image_context *ic;
+  uint flags;
+  uint ratio_threshold;
+  uint error_threshold;
+  uint qtree_limit;
+  u64 sum_depth;
+  u64 sum_pixels;
+  uint error;
+};
+
+struct image_dup {
+  struct image image;
+  byte *tab_pixels;
+  u32 tab_cols;
+  u32 tab_rows;
+  u32 tab_row_size;
+  u32 tab_size;
+};
+
+/* dup-init.c */
+
+void image_dup_context_init(struct image_context *ic, struct image_dup_context *ctx);
+void image_dup_context_cleanup(struct image_dup_context *ctx);
+
+uint image_dup_estimate_size(uint cols, uint rows, uint same_size_compare, uint qtree_limit);
+uint image_dup_new(struct image_dup_context *ctx, struct image *image, void *buffer, uint same_size_compare);
+
+/* dup-cmp.c */
+
+uint image_dup_compare(struct image_dup_context *ctx, struct image_dup *dup1, struct image_dup *dup2);
+
+/* internals */
+
+static inline byte *image_dup_block(struct image_dup *dup, uint tab_col, uint tab_row)
+{
+  return dup->tab_pixels + (dup->tab_row_size << tab_row) + (3 << (tab_row + tab_col));
+}
+
+#endif
diff --git a/libucw/images/error.h b/libucw/images/error.h
new file mode 100644
index 0000000..77760b2
--- /dev/null
+++ b/libucw/images/error.h
@@ -0,0 +1,39 @@
+#ifndef _IMAGES_ERROR_H
+#define _IMAGES_ERROR_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_trace ucw_image_trace
+#endif
+
+extern uint image_trace; /* ImageLib.Trace */
+
+/* Error codes */
+
+enum image_msg_code {
+  IMAGE_MSG_TYPE = 0xff000000,
+  IMAGE_MSG_TRACE = (L_DEBUG << 24),
+  IMAGE_MSG_WARN = (L_WARN << 24),
+  IMAGE_MSG_ERROR = (L_ERROR << 24),
+  IMAGE_TRACE_LEVEL = 0x0000ffff,
+  IMAGE_WARN_TYPE = 0x0000ffff,
+  IMAGE_WARN_SUBTYPE = 0x00ff0000,
+  IMAGE_ERROR_TYPE = 0x0000ffff,
+  IMAGE_ERROR_SUBTYPE = 0x00ff0000,
+  IMAGE_ERROR_NOT_IMPLEMENTED = 1,
+  IMAGE_ERROR_INVALID_DIMENSIONS = 2,
+  IMAGE_ERROR_INVALID_FILE_FORMAT = 3,
+  IMAGE_ERROR_INVALID_PIXEL_FORMAT = 4,
+  IMAGE_ERROR_READ_FAILED = 5,
+  IMAGE_ERROR_WRITE_FAILED = 6,
+};
+
+/* Useful macros */
+
+#define IMAGE_WARN(ctx, type, msg...) image_context_msg((ctx), IMAGE_MSG_WARN | (type), msg)
+#define IMAGE_ERROR(ctx, type, msg...) image_context_msg((ctx), IMAGE_MSG_ERROR | (type), msg)
+
+#define IMAGE_TRACE(ctx, level, msg...) do { \
+	struct image_context *_ctx = (ctx); uint _level = (level); \
+	if (_level < _ctx->tracing_level) image_context_msg(_ctx, IMAGE_MSG_TRACE | _level, msg); } while (0)
+
+#endif
diff --git a/libucw/images/image-test.c b/libucw/images/image-test.c
new file mode 100644
index 0000000..8098def
--- /dev/null
+++ b/libucw/images/image-test.c
@@ -0,0 +1,235 @@
+/*
+ *	Image Library -- Simple automatic tests
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <ucw/threads.h>
+#include <images/images.h>
+#include <images/color.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+
+static uint want_image_iface;
+static uint want_threads;
+
+#define TRY(x) do { if (!(x)) ASSERT(0); } while (0)
+
+static void
+test_image_iface(void)
+{
+  struct mempool *pool;
+  struct image_context ctx;
+  struct image *i1, *i2;
+  struct image s1;
+
+  pool = mp_new(1024);
+  image_context_init(&ctx);
+
+  /* Image allocation */
+  i1 = image_new(&ctx, 731, 327, COLOR_SPACE_RGB, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 3);
+  image_destroy(i1);
+
+  /* Test invalid image size  */
+  ctx.msg_callback = image_context_msg_silent;
+  i1 = image_new(&ctx, 2214, 0, COLOR_SPACE_RGB, NULL);
+  ASSERT(!i1);
+  i1 = image_new(&ctx, 0xffffff, 0xffffff, COLOR_SPACE_RGB, NULL);
+  ASSERT(!i1);
+  ctx.msg_callback = image_context_msg_default;
+
+  /* Various image allocatio parameters */
+  i1 = image_new(&ctx, 370, 100, COLOR_SPACE_GRAYSCALE, pool);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 1);
+  image_destroy(i1);
+  mp_flush(pool);
+
+  i1 = image_new(&ctx, 373, 101, COLOR_SPACE_RGB | IMAGE_ALIGNED, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 4);
+  ASSERT(IMAGE_SSE_ALIGN_SIZE >= 16);
+  ASSERT(!(i1->row_size & (IMAGE_SSE_ALIGN_SIZE - 1)));
+  ASSERT(!((uintptr_t)i1->pixels & (IMAGE_SSE_ALIGN_SIZE - 1)));
+  image_destroy(i1);
+
+  i1 = image_new(&ctx, 283, 329, COLOR_SPACE_RGB, NULL);
+  ASSERT(i1);
+  ASSERT(i1->pixel_size == 3);
+
+  /* Image structures cloning */
+  i2 = image_clone(&ctx, i1, COLOR_SPACE_RGB, NULL);
+  ASSERT(i2);
+  ASSERT(i2->pixel_size == 3);
+  image_destroy(i2);
+
+  i2 = image_clone(&ctx, i1, COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED, NULL);
+  ASSERT(i2);
+  ASSERT(i2->pixel_size == 4);
+  image_destroy(i2);
+
+  /* Subimages */
+  i2 = image_init_subimage(&ctx, &s1, i1, 29, 39, 283 - 29, 100);
+  ASSERT(i2);
+  image_destroy(&s1);
+
+  image_destroy(i1);
+
+  image_context_cleanup(&ctx);
+  mp_delete(pool);
+}
+
+#ifdef CONFIG_UCW_THREADS
+
+#define TEST_THREADS_COUNT 4
+
+static void *
+test_threads_thread(void *param UNUSED)
+{
+  DBG("Starting thread");
+  struct image_context ctx;
+  struct image_io io;
+  image_context_init(&ctx);
+  TRY(image_io_init(&ctx, &io));
+
+  for (uint num = 0; num < 200; num++)
+    {
+      int r0 = random_max(100);
+
+      /* realloc context */
+      if ((r0 -= 2) < 0)
+        {
+	  image_io_cleanup(&io);
+	  image_context_cleanup(&ctx);
+	  image_context_init(&ctx);
+	  TRY(image_io_init(&ctx, &io));
+	}
+
+      /* realloc I/O */
+      else if ((r0 -= 2) < 0)
+        {
+	  image_io_cleanup(&io);
+	  TRY(image_io_init(&ctx, &io));
+	}
+
+      /* encode and decode random image */
+      else
+        {
+          struct image *img;
+
+          TRY(img = image_new(&ctx, 10 + random_max(140), 10 + random_max(140), COLOR_SPACE_RGB, NULL));
+	  image_clear(&ctx, img);
+
+#if defined(CONFIG_IMAGES_LIBJPEG) || defined(CONFIG_IMAGES_LIBPNG) || defined(CONFIG_IMAGES_LIBMAGICK)
+
+	  struct fastbuf *wfb = fbmem_create(10000);
+	  struct fastbuf *rfb;
+	  uint format = 0;
+	  while (!format)
+	    {
+	      switch (random_max(3))
+	        {
+		  case 0:
+#if defined(CONFIG_IMAGES_LIBJPEG) || defined(CONFIG_IMAGES_LIBMAGICK)
+		    format = IMAGE_FORMAT_JPEG;
+#endif
+		    break;
+		  case 1:
+#if defined(CONFIG_IMAGES_LIBPNG) || defined(CONFIG_IMAGES_LIBMAGICK)
+		    format = IMAGE_FORMAT_PNG;
+#endif
+		    break;
+		  case 2:
+#if defined(CONFIG_IMAGES_LIBMAGICK)
+		    format = IMAGE_FORMAT_GIF;
+#endif
+		    break;
+		  default:
+		    ASSERT(0);
+		}
+	    }
+
+	  io.format = format;
+	  io.fastbuf = wfb;
+	  io.image = img;
+	  TRY(image_io_write(&io));
+	  image_io_reset(&io);
+
+	  rfb = fbmem_clone_read(wfb);
+	  io.format = format;
+	  io.fastbuf = rfb;
+	  TRY(image_io_read(&io, 0));
+	  image_io_reset(&io);
+
+	  bclose(rfb);
+	  bclose(wfb);
+
+#endif
+          image_destroy(img);
+	}
+    }
+
+  image_io_cleanup(&io);
+  image_context_cleanup(&ctx);
+  DBG("Stopping thread");
+  return NULL;
+}
+
+#endif
+
+static void
+test_threads(void)
+{
+#ifdef CONFIG_UCW_THREADS
+  pthread_t threads[TEST_THREADS_COUNT - 1];
+  pthread_attr_t attr;
+  if (pthread_attr_init(&attr) < 0 ||
+      pthread_attr_setstacksize(&attr, ucwlib_thread_stack_size) < 0)
+    ASSERT(0);
+  for (uint i = 0; i < TEST_THREADS_COUNT - 1; i++)
+    {
+      if (pthread_create(threads + i, &attr, test_threads_thread, NULL) < 0)
+        die("Unable to create thread: %m");
+    }
+  test_threads_thread(NULL);
+  for (uint i = 0; i < TEST_THREADS_COUNT - 1; i++)
+    if (pthread_join(threads[i], NULL) < 0)
+      die("Cannot join thread: %m");
+#else
+  msg(L_WARN, "Disabled CONFIG_UCW_THREADS, threaded tests skipped");
+#endif
+}
+
+int
+main(int argc, char **argv)
+{
+  for (int i = 1; i < argc; i++)
+    if (!strcmp(argv[i], "image-iface"))
+      want_image_iface++;
+    else if (!strcmp(argv[i], "threads"))
+      want_threads++;
+    else
+      die("Invalid parameter");
+
+  random_gen_seed();
+
+  if (want_image_iface)
+    test_image_iface();
+  if (want_threads)
+    test_threads();
+
+  return 0;
+}
+
diff --git a/libucw/images/image-walk.h b/libucw/images/image-walk.h
new file mode 100644
index 0000000..1cdbbf2
--- /dev/null
+++ b/libucw/images/image-walk.h
@@ -0,0 +1,174 @@
+/*
+ *	Image Library -- Pixels iteration
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef IMAGE_WALK_PREFIX
+#  error Undefined IMAGE_WALK_PREFIX
+#endif
+
+#define P(x) IMAGE_WALK_PREFIX(x)
+
+#if !defined(IMAGE_WALK_UNROLL)
+#  define IMAGE_WALK_UNROLL 1
+#elif IMAGE_WALK_UNROLL != 1 && IMAGE_WALK_UNROLL != 2 && IMAGE_WALK_UNROLL != 4
+#  error IMAGE_WALK_UNROLL must be 1, 2 or 4
+#endif
+
+#ifndef IMAGE_WALK_IMAGE
+#  define IMAGE_WALK_IMAGE P(img)
+#endif
+#ifndef IMAGE_WALK_PIXELS
+#  define IMAGE_WALK_PIXELS (IMAGE_WALK_IMAGE->pixels)
+#endif
+#ifndef IMAGE_WALK_COLS
+#  define IMAGE_WALK_COLS (IMAGE_WALK_IMAGE->cols)
+#endif
+#ifndef IMAGE_WALK_ROWS
+#  define IMAGE_WALK_ROWS (IMAGE_WALK_IMAGE->rows)
+#endif
+#ifndef IMAGE_WALK_COL_STEP
+#  define IMAGE_WALK_COL_STEP (IMAGE_WALK_IMAGE->pixel_size)
+#endif
+#ifndef IMAGE_WALK_ROW_STEP
+#  define IMAGE_WALK_ROW_STEP (IMAGE_WALK_IMAGE->row_size)
+#endif
+
+#ifdef IMAGE_WALK_DOUBLE
+#  ifndef IMAGE_WALK_SEC_IMAGE
+#    define IMAGE_WALK_SEC_IMAGE P(sec_img)
+#  endif
+#  ifndef IMAGE_WALK_SEC_PIXELS
+#    define IMAGE_WALK_SEC_PIXELS (IMAGE_WALK_SEC_IMAGE->pixels)
+#  endif
+#  ifndef IMAGE_WALK_SEC_COLS
+#    define IMAGE_WALK_SEC_COLS (IMAGE_WALK_SEC_IMAGE->cols)
+#  endif
+#  ifndef IMAGE_WALK_SEC_ROWS
+#    define IMAGE_WALK_SEC_ROWS (IMAGE_WALK_SEC_IMAGE->rows)
+#  endif
+#  ifndef IMAGE_WALK_SEC_COL_STEP
+#    define IMAGE_WALK_SEC_COL_STEP (IMAGE_WALK_SEC_IMAGE->pixel_size)
+#  endif
+#  ifndef IMAGE_WALK_SEC_ROW_STEP
+#    define IMAGE_WALK_SEC_ROW_STEP (IMAGE_WALK_SEC_IMAGE->row_size)
+#  endif
+#  define IMAGE_WALK__STEP IMAGE_WALK_DO_STEP; P(pos) += P(col_step); P(sec_pos) += P(sec_col_step)
+#else
+#  define IMAGE_WALK__STEP IMAGE_WALK_DO_STEP; P(pos) += P(col_step)
+#endif
+
+#ifndef IMAGE_WALK_DO_START
+#  define IMAGE_WALK_DO_START
+#endif
+
+#ifndef IMAGE_WALK_DO_END
+#  define IMAGE_WALK_DO_END
+#endif
+
+#ifndef IMAGE_WALK_DO_ROW_START
+#  define IMAGE_WALK_DO_ROW_START
+#endif
+
+#ifndef IMAGE_WALK_DO_ROW_END
+#  define IMAGE_WALK_DO_ROW_END
+#endif
+
+#ifndef IMAGE_WALK_DO_STEP
+#  define IMAGE_WALK_DO_STEP
+#endif
+
+#ifndef IMAGE_WALK_INLINE
+static void
+#ifdef IMAGE_WALK_FUNC_NAME
+IMAGE_WALK_FUNC_NAME
+#else
+P(walk)
+#endif
+    (struct image *P(img)
+#   ifdef IMAGE_WALK_DOUBLE
+    , struct image *P(sec_img)
+#   endif
+#   ifdef IMAGE_WALK_EXTRA_ARGS
+    , IMAGE_WALK_EXTRA_ARGS
+#   endif
+    )
+#endif
+{
+  uint P(cols) = IMAGE_WALK_COLS;
+  uint P(rows) = IMAGE_WALK_ROWS;
+# if IMAGE_WALK_UNROLL > 1
+  uint P(cols_unroll_block_count) = P(cols) / IMAGE_WALK_UNROLL;
+  uint P(cols_unroll_end_count) = P(cols) % IMAGE_WALK_UNROLL;
+# endif
+  byte *P(pos) = IMAGE_WALK_PIXELS, *P(row_start) = P(pos);
+  int P(col_step) = IMAGE_WALK_COL_STEP;
+  int P(row_step) = IMAGE_WALK_ROW_STEP;
+# ifdef IMAGE_WALK_DOUBLE
+  byte *P(sec_pos) = IMAGE_WALK_SEC_PIXELS, *P(sec_row_start) = P(sec_pos);
+  int P(sec_col_step) = IMAGE_WALK_SEC_COL_STEP;
+  int P(sec_row_step) = IMAGE_WALK_SEC_ROW_STEP;
+# endif
+  IMAGE_WALK_DO_START;
+  while (P(rows)--)
+    {
+      IMAGE_WALK_DO_ROW_START;
+#     if IMAGE_WALK_UNROLL == 1
+      for (uint P(_i) = P(cols); P(_i)--; )
+#     else
+      for (uint P(_i) = P(cols_unroll_block_count); P(_i)--; )
+#     endif
+        {
+#         if IMAGE_WALK_UNROLL >= 4
+	  IMAGE_WALK__STEP;
+	  IMAGE_WALK__STEP;
+#         endif
+#         if IMAGE_WALK_UNROLL >= 2
+	  IMAGE_WALK__STEP;
+#         endif
+	  IMAGE_WALK__STEP;
+	}
+#     if IMAGE_WALK_UNROLL > 1
+      for (uint P(_i) = P(cols_unroll_end_count); P(_i)--; )
+        {
+	  IMAGE_WALK__STEP;
+	}
+#     endif
+      IMAGE_WALK_DO_ROW_END;
+      P(pos) = (P(row_start) += P(row_step));
+#     ifdef IMAGE_WALK_DOUBLE
+      P(sec_pos) = (P(sec_row_start) += P(sec_row_step));
+#     endif
+    }
+  IMAGE_WALK_DO_END;
+}
+
+#undef IMAGE_WALK_PREFIX
+#undef IMAGE_WALK_FUNC_NAME
+#undef IMAGE_WALK_INLINE
+#undef IMAGE_WALK_UNROLL
+#undef IMAGE_WALK_DOUBLE
+#undef IMAGE_WALK_EXTRA_ARGS
+#undef IMAGE_WALK_IMAGE
+#undef IMAGE_WALK_PIXELS
+#undef IMAGE_WALK_COLS
+#undef IMAGE_WALK_ROWS
+#undef IMAGE_WALK_COL_STEP
+#undef IMAGE_WALK_ROW_STEP
+#undef IMAGE_WALK_SEC_IMAGE
+#undef IMAGE_WALK_SEC_PIXELS
+#undef IMAGE_WALK_SEC_COLS
+#undef IMAGE_WALK_SEC_ROWS
+#undef IMAGE_WALK_SEC_COL_STEP
+#undef IMAGE_WALK_SEC_ROW_STEP
+#undef IMAGE_WALK_DO_START
+#undef IMAGE_WALK_DO_END
+#undef IMAGE_WALK_DO_ROW_START
+#undef IMAGE_WALK_DO_ROW_END
+#undef IMAGE_WALK_DO_STEP
+#undef IMAGE_WALK__STEP
+#undef P
diff --git a/libucw/images/image.c b/libucw/images/image.c
new file mode 100644
index 0000000..8c0779b
--- /dev/null
+++ b/libucw/images/image.c
@@ -0,0 +1,227 @@
+/*
+ *	Image Library -- Basic image manipulation
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+
+#include <string.h>
+
+static inline uint
+flags_to_pixel_size(uint flags)
+{
+  uint pixel_size = color_space_channels[flags & IMAGE_COLOR_SPACE];
+  if (flags & IMAGE_ALPHA)
+    pixel_size++;
+  return pixel_size;
+}
+
+struct image *
+image_new(struct image_context *ctx, uint cols, uint rows, uint flags, struct mempool *pool)
+{
+  DBG("image_new(cols=%u rows=%u flags=0x%x pool=%p)", cols, rows, flags, pool);
+  flags &= IMAGE_NEW_FLAGS;
+  if (unlikely(!image_dimensions_valid(cols, rows)))
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
+      return NULL;
+    }
+  struct image *img;
+  uint channels, pixel_size, row_pixels_size, row_size, align;
+  pixel_size = channels = flags_to_pixel_size(flags);
+  if (!channels || channels > 4)
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Invalid number of color channels (%u)", channels);
+      return NULL;
+    }
+  switch (channels)
+    {
+      case 1:
+      case 2:
+      case 4:
+	flags |= IMAGE_PIXELS_ALIGNED;
+	break;
+      case 3:
+	if (flags & IMAGE_PIXELS_ALIGNED)
+	  pixel_size = 4;
+	break;
+      default:
+	ASSERT(0);
+    }
+  if (flags & IMAGE_SSE_ALIGNED)
+    align = IMAGE_SSE_ALIGN_SIZE;
+  else if (flags & IMAGE_PIXELS_ALIGNED)
+    align = pixel_size;
+  else
+    align = 1;
+  row_pixels_size = cols * pixel_size;
+  row_size = ALIGN_TO(row_pixels_size, align);
+  u64 image_size_64 = (u64)row_size * rows;
+  u64 bytes_64 = image_size_64 + (sizeof(struct image) + IMAGE_SSE_ALIGN_SIZE - 1 + sizeof(uint));
+  if (unlikely(bytes_64 > image_max_bytes))
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Image does not fit in memory");
+      return NULL;
+    }
+  if (pool)
+    img = mp_alloc(pool, bytes_64);
+  else
+    {
+      img = xmalloc(bytes_64);
+      flags |= IMAGE_NEED_DESTROY;
+    }
+  bzero(img, sizeof(struct image));
+  byte *p = (byte *)img + sizeof(struct image);
+  img->pixels = ALIGN_PTR(p, IMAGE_SSE_ALIGN_SIZE);
+  img->flags = flags;
+  img->channels = channels;
+  img->pixel_size = pixel_size;
+  img->cols = cols;
+  img->rows = rows;
+  img->row_size = row_size;
+  img->row_pixels_size = row_pixels_size;
+  img->image_size = image_size_64;
+  DBG("img=%p flags=0x%x pixel_size=%u row_size=%u image_size=%u pixels=%p",
+    img, img->flags, img->pixel_size, img->row_size, img->image_size, img->pixels);
+  return img;
+}
+
+struct image *
+image_clone(struct image_context *ctx, struct image *src, uint flags, struct mempool *pool)
+{
+  DBG("image_clone(src=%p flags=0x%x pool=%p)", src, src->flags, pool);
+  struct image *img;
+  flags &= IMAGE_NEW_FLAGS & ~IMAGE_CHANNELS_FORMAT;
+  flags |= src->flags & IMAGE_CHANNELS_FORMAT;
+  if (!(img = image_new(ctx, src->cols, src->rows, flags, pool)))
+    return NULL;
+  ASSERT(src->channels == img->channels);
+  if (img->image_size)
+    {
+      if (src->pixel_size != img->pixel_size) /* conversion between aligned and unaligned RGB */
+        {
+	  ASSERT(src->channels == 3);
+#	  define IMAGE_WALK_PREFIX(x) walk_##x
+#         define IMAGE_WALK_INLINE
+#	  define IMAGE_WALK_IMAGE img
+#	  define IMAGE_WALK_SEC_IMAGE src
+#         define IMAGE_WALK_DOUBLE
+#         define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; }while(0)
+#         include <images/image-walk.h>
+	}
+      else if (src->row_size != img->row_size || ((img->flags | src->flags) & IMAGE_GAPS_PROTECTED))
+        {
+          byte *s = src->pixels;
+          byte *d = img->pixels;
+	  for (uint row = src->rows; row--; )
+            {
+	      memcpy(d, s, src->row_pixels_size);
+	      d += img->row_size;
+	      s += src->row_size;
+	    }
+        }
+      else
+        memcpy(img->pixels, src->pixels, img->image_size);
+    }
+  return img;
+}
+
+void
+image_destroy(struct image *img)
+{
+  DBG("image_destroy(img=%p)", img);
+  if (img->flags & IMAGE_NEED_DESTROY)
+    xfree(img);
+}
+
+void
+image_clear(struct image_context *ctx UNUSED, struct image *img)
+{
+  DBG("image_clear(img=%p)", img);
+  if (img->image_size)
+    if (img->flags & IMAGE_GAPS_PROTECTED)
+      {
+        byte *p = img->pixels;
+        uint bytes = img->cols * img->pixel_size;
+	for (uint row = img->rows; row--; p += img->row_size)
+	  bzero(p, bytes);
+      }
+    else
+      bzero(img->pixels, img->image_size);
+}
+
+struct image *
+image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uint cols, uint rows, uint row_size, uint flags)
+{
+  DBG("image_init_matrix(img=%p pixels=%p cols=%u rows=%u row_size=%u flags=0x%x)", img, pixels, cols, rows, row_size, flags);
+  if (unlikely(!image_dimensions_valid(cols, rows)))
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid image dimensions (%ux%u)", cols, rows);
+      return NULL;
+    }
+  img->pixels = pixels;
+  img->cols = cols;
+  img->rows = rows;
+  img->pixel_size = img->channels = flags_to_pixel_size(flags);
+  img->row_size = row_size;
+  img->row_pixels_size = cols * img->pixel_size;
+  img->image_size = rows * row_size;
+  img->flags = flags & (IMAGE_NEW_FLAGS | IMAGE_GAPS_PROTECTED);
+  return img;
+}
+
+struct image *
+image_init_subimage(struct image_context *ctx UNUSED, struct image *img, struct image *src, uint left, uint top, uint cols, uint rows)
+{
+  DBG("image_init_subimage(img=%p src=%p left=%u top=%u cols=%u rows=%u)", img, src, left, top, cols, rows);
+  ASSERT(left + cols <= src->cols && top + rows <= src->rows);
+  img->pixels = src->pixels + left * src->pixel_size + top * src->row_size;
+  img->cols = cols;
+  img->rows = rows;
+  img->pixel_size = img->channels = src->pixel_size;
+  img->row_size = src->row_size;
+  img->row_pixels_size = cols * src->pixel_size;
+  img->image_size = src->row_size * rows;
+  img->flags = src->flags & IMAGE_NEW_FLAGS;
+  img->flags |= IMAGE_GAPS_PROTECTED;
+  return img;
+}
+
+byte *
+image_channels_format_to_name(uint format, byte *buf)
+{
+  byte *cs_name = color_space_id_to_name(format & IMAGE_COLOR_SPACE);
+  uint l = strlen(cs_name);
+  memcpy(buf, cs_name, l + 1);
+  if (format & IMAGE_ALPHA)
+    strcpy(buf + l, "+Alpha");
+  return buf;
+}
+
+uint
+image_name_to_channels_format(byte *name)
+{
+  uint i;
+  if (i = color_space_name_to_id(name))
+    return i;
+  uint l = strlen(name);
+  if (l > 6 && !strcasecmp(name + l - 5, "+alpha"))
+    {
+      byte buf[l + 1];
+      memcpy(buf, name, l - 6);
+      buf[l - 6] = 0;
+      if (i = color_space_name_to_id(name))
+	return i;
+    }
+  return 0;
+}
diff --git a/libucw/images/images.h b/libucw/images/images.h
new file mode 100644
index 0000000..f59b825
--- /dev/null
+++ b/libucw/images/images.h
@@ -0,0 +1,200 @@
+/*
+ *	Image Library -- Main header file
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _IMAGES_IMAGES_H
+#define _IMAGES_IMAGES_H
+
+#include <ucw/bbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_channels_format_to_name ucw_image_channels_format_to_name
+#define image_clear ucw_image_clear
+#define image_clone ucw_image_clone
+#define image_context_cleanup ucw_image_context_cleanup
+#define image_context_init ucw_image_context_init
+#define image_context_msg ucw_image_context_msg
+#define image_context_msg_default ucw_image_context_msg_default
+#define image_context_msg_silent ucw_image_context_msg_silent
+#define image_context_vmsg ucw_image_context_vmsg
+#define image_destroy ucw_image_destroy
+#define image_dimensions_fit_to_box ucw_image_dimensions_fit_to_box
+#define image_extension_to_format ucw_image_extension_to_format
+#define image_file_name_to_format ucw_image_file_name_to_format
+#define image_format_to_extension ucw_image_format_to_extension
+#define image_init_matrix ucw_image_init_matrix
+#define image_init_subimage ucw_image_init_subimage
+#define image_io_cleanup ucw_image_io_cleanup
+#define image_io_init ucw_image_io_init
+#define image_io_read ucw_image_io_read
+#define image_io_read_data ucw_image_io_read_data
+#define image_io_read_header ucw_image_io_read_header
+#define image_io_reset ucw_image_io_reset
+#define image_io_write ucw_image_io_write
+#define image_max_bytes ucw_image_max_bytes
+#define image_max_dim ucw_image_max_dim
+#define image_name_to_channels_format ucw_image_name_to_channels_format
+#define image_new ucw_image_new
+#define image_scale ucw_image_scale
+#endif
+
+struct mempool;
+struct fastbuf;
+
+
+/* context.c
+ * - contexts with error/message handling
+ * - imagelib is thread-safe as long as threads work in different contexts */
+
+struct image_context {
+  byte *msg;				/* last message */
+  uint msg_code;			/* last message code (see images/error.h for details) */
+  bb_t msg_buf;				/* message buffer */
+  void (*msg_callback)(struct image_context *ctx); /* called for each message (in msg_{str,code}) */
+  uint tracing_level;			/* tracing level (zero to disable) */
+};
+
+/* initialization/cleanup */
+void image_context_init(struct image_context *ctx);
+void image_context_cleanup(struct image_context *ctx);
+
+/* message handling, see images/error.h for useful macros */
+void image_context_msg(struct image_context *ctx, uint code, char *msg, ...);
+void image_context_vmsg(struct image_context *ctx, uint code, char *msg, va_list args);
+
+/* default callback, displays messages with standard libucw's log() routine */
+void image_context_msg_default(struct image_context *ctx);
+
+/* empty callback */
+void image_context_msg_silent(struct image_context *ctx);
+
+
+/* image.c
+ * - basic manipulation with images
+ * - image structure is not directly connected to a single context
+ *   but manipulation routines are (user must synchronize the access himself)! */
+
+extern uint image_max_dim;		/* ImageLib.ImageMaxDim */
+extern uint image_max_bytes;		/* ImageLib.ImageMaxBytes */
+
+/* SSE aligning size, see IMAGE_SSE_ALIGNED */
+#define IMAGE_SSE_ALIGN_SIZE 16
+
+enum image_flag {
+  IMAGE_COLOR_SPACE = 0xf,		/* mask for enum color_space */
+  IMAGE_ALPHA = 0x10,			/* alpha channel */
+  IMAGE_PIXELS_ALIGNED = 0x20,		/* align pixel size to the nearest power of two  */
+  IMAGE_SSE_ALIGNED = 0x40,		/* align scanlines to multiples of 16 bytes (both start and size) */
+  IMAGE_NEED_DESTROY = 0x80,		/* image is allocated with xmalloc */
+  IMAGE_GAPS_PROTECTED = 0x100,		/* cannot access gaps between rows */
+  IMAGE_CHANNELS_FORMAT = IMAGE_COLOR_SPACE | IMAGE_ALPHA,
+  IMAGE_PIXEL_FORMAT = IMAGE_CHANNELS_FORMAT | IMAGE_PIXELS_ALIGNED,
+  IMAGE_ALIGNED = IMAGE_PIXELS_ALIGNED | IMAGE_SSE_ALIGNED,
+  IMAGE_NEW_FLAGS = IMAGE_PIXEL_FORMAT | IMAGE_SSE_ALIGNED,
+  IMAGE_INTERNAL_FLAGS = IMAGE_NEED_DESTROY | IMAGE_GAPS_PROTECTED,
+};
+
+#define IMAGE_MAX_CHANNELS 4
+#define IMAGE_CHANNELS_FORMAT_MAX_SIZE 128
+byte *image_channels_format_to_name(uint format, byte *buf);
+uint image_name_to_channels_format(byte *name);
+
+struct color {
+  byte c[IMAGE_MAX_CHANNELS];
+  byte color_space;
+};
+
+struct image {
+  byte *pixels;			/* aligned top left pixel, there are at least sizeof(uint)
+				   unused bytes after the buffer (possible optimizations) */
+  uint cols;			/* number of columns */
+  uint rows;			/* number of rows */
+  uint channels;		/* number of color channels including the alpha channel */
+  uint pixel_size;		/* size of pixel in bytes (1, 2, 3 or 4) */
+  uint row_size;		/* scanline size in bytes */
+  uint row_pixels_size;		/* scanline size in bytes excluding rows gaps */
+  uint image_size;		/* rows * row_size */
+  uint flags;			/* enum image_flag */
+};
+
+struct image *image_new(struct image_context *ctx, uint cols, uint rows, uint flags, struct mempool *pool);
+struct image *image_clone(struct image_context *ctx, struct image *src, uint flags, struct mempool *pool);
+void image_destroy(struct image *img);
+void image_clear(struct image_context *ctx, struct image *img);
+struct image *image_init_matrix(struct image_context *ctx, struct image *img, byte *pixels, uint cols, uint rows, uint row_size, uint flags);
+struct image *image_init_subimage(struct image_context *ctx, struct image *img, struct image *src, uint left, uint top, uint cols, uint rows);
+
+static inline int image_dimensions_valid(uint cols, uint rows)
+{
+  return cols && rows && cols <= image_max_dim && rows <= image_max_dim;
+}
+/* scale.c */
+
+int image_scale(struct image_context *ctx, struct image *dest, struct image *src);
+void image_dimensions_fit_to_box(uint *cols, uint *rows, uint max_cols, uint max_rows, uint upsample);
+
+/* image-io.c */
+
+enum image_format {
+  IMAGE_FORMAT_UNDEFINED,
+  IMAGE_FORMAT_JPEG,
+  IMAGE_FORMAT_PNG,
+  IMAGE_FORMAT_GIF,
+  IMAGE_FORMAT_MAX
+};
+
+struct image_io {
+					/*  R - read_header input */
+					/*   H - read_header output */
+					/*    I - read_data input */
+					/*     O - read_data output */
+					/*      W - write input */
+
+  struct image *image;			/* [   OW] - image data */
+  enum image_format format;		/* [R   W] - file format (IMAGE_FORMAT_x) */
+  struct fastbuf *fastbuf;		/* [R   W] - source/destination stream */
+  struct mempool *pool;			/* [  I  ] - parameter to image_new */
+  uint cols;				/* [ HI  ] - number of columns, parameter to image_new */
+  uint rows;				/* [ HI  ] - number of rows, parameter to image_new */
+  uint flags;				/* [ HI  ] - see enum image_io_flags */
+  uint jpeg_quality;			/* [    W] - JPEG compression quality (1..100) */
+  uint number_of_colors;		/* [ H   ] - number of image colors */
+  struct color background_color;	/* [ HI  ] - background color, zero if undefined */
+  uint exif_size;			/* [ H  W] - EXIF size in bytes (zero if not present) */
+  byte *exif_data;			/* [ H  W] - EXIF data */
+
+  /* internals */
+  struct image_context *context;
+  struct mempool *internal_pool;
+  void *read_data;
+  void (*read_cancel)(struct image_io *io);
+};
+
+enum image_io_flags {
+  IMAGE_IO_IMAGE_FLAGS = 0xffff,	/* [ HI  ] - mask of parameters to image new, read_header fills IMAGE_CHANNELS_FORMAT */
+  IMAGE_IO_NEED_DESTROY = 0x10000,	/* [   O ] - enables automatic call of image_destroy */
+  IMAGE_IO_HAS_PALETTE = 0x20000,	/* [ H   ] - true for image with indexed colors */
+  IMAGE_IO_USE_BACKGROUND = 0x40000,	/* [  I  ] - merge transparent pixels with background_color */
+  IMAGE_IO_WANT_EXIF = 0x80000,		/* [R    ] - read EXIF data if present */
+};
+
+int image_io_init(struct image_context *ctx, struct image_io *io);
+void image_io_cleanup(struct image_io *io);
+void image_io_reset(struct image_io *io);
+
+int image_io_read_header(struct image_io *io);
+struct image *image_io_read_data(struct image_io *io, int ref);
+struct image *image_io_read(struct image_io *io, int ref);
+
+int image_io_write(struct image_io *io);
+
+byte *image_format_to_extension(enum image_format format);
+enum image_format image_extension_to_format(byte *extension);
+enum image_format image_file_name_to_format(byte *file_name);
+
+#endif
diff --git a/libucw/images/io-libjpeg.c b/libucw/images/io-libjpeg.c
new file mode 100644
index 0000000..cc2f206
--- /dev/null
+++ b/libucw/images/io-libjpeg.c
@@ -0,0 +1,605 @@
+/*
+ *	Image Library -- libjpeg
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/io-main.h>
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <jpeglib.h>
+#include <jerror.h>
+#include <setjmp.h>
+
+struct libjpeg_err {
+  struct jpeg_error_mgr pub;
+  jmp_buf setjmp_buf;
+  struct image_io *io;
+};
+
+struct libjpeg_read_internals {
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_source_mgr src;
+  struct libjpeg_err err;
+  struct fastbuf *fastbuf;
+  byte *fastbuf_pos;
+};
+
+struct libjpeg_write_internals {
+  struct jpeg_compress_struct cinfo;
+  struct jpeg_destination_mgr dest;
+  struct libjpeg_err err;
+  struct fastbuf *fastbuf;
+  byte *fastbuf_pos;
+};
+
+static void NONRET
+libjpeg_read_error_exit(j_common_ptr cinfo)
+{
+  DBG("libjpeg_error_exit()");
+  struct libjpeg_err *e = (struct libjpeg_err *)cinfo->err;
+  byte buf[JMSG_LENGTH_MAX];
+  e->pub.format_message(cinfo, buf);
+  IMAGE_ERROR(e->io->context, IMAGE_ERROR_READ_FAILED, "libjpeg: %s", buf);
+  longjmp(e->setjmp_buf, 1);
+}
+
+static void NONRET
+libjpeg_write_error_exit(j_common_ptr cinfo)
+{
+  DBG("libjpeg_error_exit()");
+  struct libjpeg_err *e = (struct libjpeg_err *)cinfo->err;
+  byte buf[JMSG_LENGTH_MAX];
+  e->pub.format_message(cinfo, buf);
+  IMAGE_ERROR(e->io->context, IMAGE_ERROR_WRITE_FAILED, "libjpeg: %s", buf);
+  longjmp(e->setjmp_buf, 1);
+}
+
+static void
+libjpeg_emit_message(j_common_ptr cinfo UNUSED, int msg_level UNUSED)
+{
+#ifdef LOCAL_DEBUG
+  byte buf[JMSG_LENGTH_MAX];
+  cinfo->err->format_message(cinfo, buf);
+  DBG("libjpeg_emit_message(): [%d] %s", msg_level, buf);
+#endif
+#if 0
+  // Terminate on warning?
+  if (unlikely(msg_level == -1))
+    {
+      struct libjpeg_err *e = (struct libjpeg_err *)cinfo->err;
+      byte buf[JMSG_LENGTH_MAX];
+      cinfo->err->format_message(cinfo, buf);
+      IMAGE_ERROR(e->io->context, 0, "libjpeg: %s", buf);
+      longjmp(e->setjmp_buf, 1);
+    }
+#endif
+}
+
+static inline uint
+libjpeg_fastbuf_read_prepare(struct libjpeg_read_internals *i)
+{
+  DBG("libjpeg_fb_read_prepare()");
+  byte *start;
+  uint len = bdirect_read_prepare(i->fastbuf, &start);
+  DBG("readed %u bytes at %p", len, start);
+  if (!len)
+    {
+      // XXX: maybe only generate a warning and return EOI markers to recover from such errors (also in skip_input_data)
+      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file");
+      longjmp(i->err.setjmp_buf, 1);
+    }
+  i->fastbuf_pos = start + len;
+  i->src.next_input_byte = start;
+  i->src.bytes_in_buffer = len;
+  return len;
+}
+
+static inline void
+libjpeg_fastbuf_read_commit(struct libjpeg_read_internals *i)
+{
+  DBG("libjpeg_fb_read_commit()");
+  bdirect_read_commit(i->fastbuf, i->fastbuf_pos);
+}
+
+static void
+libjpeg_init_source(j_decompress_ptr cinfo)
+{
+  DBG("libjpeg_init_source()");
+  libjpeg_fastbuf_read_prepare((struct libjpeg_read_internals *)cinfo);
+}
+
+static void
+libjpeg_term_source(j_decompress_ptr cinfo UNUSED)
+{
+  DBG("libjpeg_term_source()");
+  //libjpeg_fastbuf_read_commit((struct libjpeg_read_internals *)cinfo);
+}
+
+static boolean
+libjpeg_fill_input_buffer(j_decompress_ptr cinfo)
+{
+  DBG("libjpeg_fill_input_buffer()");
+  struct libjpeg_read_internals *i = (struct libjpeg_read_internals *)cinfo;
+  libjpeg_fastbuf_read_commit(i);
+  libjpeg_fastbuf_read_prepare(i);
+  return 1;
+}
+
+static void
+libjpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+{
+  DBG("libjpeg_skip_input_data(num_bytes=%d)", (int)num_bytes);
+  if (num_bytes > 0)
+    {
+      struct libjpeg_read_internals *i = (struct libjpeg_read_internals *)cinfo;
+      if ((unsigned long)num_bytes <= i->src.bytes_in_buffer)
+        {
+          i->src.next_input_byte += num_bytes;
+          i->src.bytes_in_buffer -= num_bytes;
+	}
+      else
+        {
+	  num_bytes -= i->src.bytes_in_buffer;
+	  libjpeg_fastbuf_read_commit(i);
+	  if (!bskip(i->fastbuf, num_bytes))
+	    {
+	      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_READ_FAILED, "Incomplete JPEG file");
+	      longjmp(i->err.setjmp_buf, 1);
+	    }
+	  libjpeg_fastbuf_read_prepare(i);
+	}
+    }
+}
+
+static inline void
+libjpeg_fastbuf_write_prepare(struct libjpeg_write_internals *i)
+{
+  byte *start;
+  uint len = bdirect_write_prepare(i->fastbuf, &start);
+  i->fastbuf_pos = start + len;
+  i->dest.next_output_byte = start;
+  i->dest.free_in_buffer = len;
+  if (!len)
+    {
+      IMAGE_ERROR(i->err.io->context, IMAGE_ERROR_WRITE_FAILED, "Unexpected end of stream");
+      longjmp(i->err.setjmp_buf, 1);
+    }
+}
+
+static void
+libjpeg_init_destination(j_compress_ptr cinfo)
+{
+  DBG("libjpeg_init_destination()");
+  libjpeg_fastbuf_write_prepare((struct libjpeg_write_internals *)cinfo);
+}
+
+static void
+libjpeg_term_destination(j_compress_ptr cinfo)
+{
+  DBG("libjpeg_term_destination()");
+  struct libjpeg_write_internals *i = (struct libjpeg_write_internals *)cinfo;
+  bdirect_write_commit(i->fastbuf, (byte *)i->dest.next_output_byte);
+}
+
+static boolean
+libjpeg_empty_output_buffer(j_compress_ptr cinfo)
+{
+  DBG("libjpeg_empty_output_buffer()");
+  struct libjpeg_write_internals *i = (struct libjpeg_write_internals *)cinfo;
+  bdirect_write_commit(i->fastbuf, i->fastbuf_pos);
+  libjpeg_fastbuf_write_prepare(i);
+  return TRUE;
+}
+
+static inline uint
+libjpeg_read_byte(struct libjpeg_read_internals *i)
+{
+  DBG("libjpeg_read_byte()");
+  if (!i->src.bytes_in_buffer)
+    if (!libjpeg_fill_input_buffer(&i->cinfo))
+      ERREXIT(&i->cinfo, JERR_CANT_SUSPEND);
+  i->src.bytes_in_buffer--;
+  return *i->src.next_input_byte++;
+}
+
+static inline void
+libjpeg_read_buf(struct libjpeg_read_internals *i, byte *buf, uint len)
+{
+  DBG("libjpeg_read_buf(len=%u)", len);
+  while (len)
+    {
+      if (!i->src.bytes_in_buffer)
+	if (!libjpeg_fill_input_buffer(&i->cinfo))
+	  ERREXIT(&i->cinfo, JERR_CANT_SUSPEND);
+      uint buf_size = i->src.bytes_in_buffer;
+      uint read_size = MIN(buf_size, len);
+      memcpy(buf, i->src.next_input_byte, read_size);
+      i->src.bytes_in_buffer -= read_size;
+      i->src.next_input_byte += read_size;
+      len -= read_size;
+    }
+}
+
+static byte libjpeg_exif_header[6] = { 'E', 'x', 'i', 'f', 0, 0 };
+
+static boolean
+libjpeg_app1_preprocessor(j_decompress_ptr cinfo)
+{
+  struct libjpeg_read_internals *i = (struct libjpeg_read_internals *)cinfo;
+  struct image_io *io = i->err.io;
+  uint len = libjpeg_read_byte(i) << 8;
+  len += libjpeg_read_byte(i);
+  DBG("Found APP1 marker, len=%u", len);
+  if (len < 2)
+    return TRUE;
+  len -= 2;
+  if (len < 7 /*|| io->exif_size*/)
+    {
+      libjpeg_skip_input_data(cinfo, len);
+      return TRUE;
+    }
+  byte header[6];
+  libjpeg_read_buf(i, header, 6);
+  if (memcmp(header, libjpeg_exif_header, 6))
+    {
+      libjpeg_skip_input_data(cinfo, len - 6);
+      return TRUE;
+    }
+  io->exif_size = len;
+  io->exif_data = mp_alloc(io->internal_pool, len);
+  memcpy(io->exif_data, header, 6);
+  libjpeg_read_buf(i, io->exif_data + 6, len - 6);
+  DBG("Parsed EXIF of length %u", len);
+  return TRUE;
+}
+
+static void
+libjpeg_read_cancel(struct image_io *io)
+{
+  DBG("libjpeg_read_cancel()");
+  struct libjpeg_read_internals *i = io->read_data;
+  jpeg_destroy_decompress(&i->cinfo);
+}
+
+int
+libjpeg_read_header(struct image_io *io)
+{
+  DBG("libjpeg_read_header()");
+  struct libjpeg_read_internals *i = io->read_data = mp_alloc(io->internal_pool, sizeof(*i));
+  i->fastbuf = io->fastbuf;
+
+  /* Create libjpeg read structure */
+  DBG("Creating libjpeg read structure");
+  i->cinfo.err = jpeg_std_error(&i->err.pub);
+  i->err.pub.error_exit = libjpeg_read_error_exit;
+  i->err.pub.emit_message = libjpeg_emit_message;
+  i->err.io = io;
+  if (setjmp(i->err.setjmp_buf))
+    {
+      DBG("Libjpeg failed to read the image, longjump saved us");
+      jpeg_destroy_decompress(&i->cinfo);
+      return 0;
+    }
+  jpeg_create_decompress(&i->cinfo);
+
+  /* Initialize source manager */
+  i->cinfo.src = &i->src;
+  i->src.init_source = libjpeg_init_source;
+  i->src.fill_input_buffer = libjpeg_fill_input_buffer;
+  i->src.skip_input_data = libjpeg_skip_input_data;
+  i->src.resync_to_restart = jpeg_resync_to_restart;
+  i->src.term_source = libjpeg_term_source;
+
+  if (io->flags & IMAGE_IO_WANT_EXIF)
+    jpeg_set_marker_processor(&i->cinfo, JPEG_APP0 + 1, libjpeg_app1_preprocessor);
+
+  /* Read JPEG header and setup decompression options */
+  DBG("Reading image header");
+  jpeg_read_header(&i->cinfo, TRUE);
+  switch (i->cinfo.jpeg_color_space)
+    {
+      case JCS_GRAYSCALE:
+        io->flags = COLOR_SPACE_GRAYSCALE;
+        break;
+      case JCS_RGB:
+	io->flags = COLOR_SPACE_RGB;
+	break;
+      case JCS_YCbCr:
+	io->flags = COLOR_SPACE_YCBCR;
+	break;
+      case JCS_CMYK:
+	io->flags = COLOR_SPACE_CMYK;
+	break;
+      case JCS_YCCK:
+	io->flags = COLOR_SPACE_YCCK;
+	break;
+      default:
+	if (unlikely(i->cinfo.num_components < 1 || i->cinfo.num_components > 4))
+	  {
+	    jpeg_destroy_decompress(&i->cinfo);
+	    IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Invalid color space.");
+	    return 0;
+	  }
+	io->flags = COLOR_SPACE_UNKNOWN + i->cinfo.num_components;
+	break;
+    }
+  if (unlikely(i->cinfo.num_components != (int)color_space_channels[io->flags]))
+    {
+      jpeg_destroy_decompress(&i->cinfo);
+      IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Invalid number of color channels.");
+      return 0;
+    }
+  io->cols = i->cinfo.image_width;
+  io->rows = i->cinfo.image_height;
+  io->number_of_colors = (i->cinfo.num_components < 4) ? (1U << (i->cinfo.num_components * 8)) : 0xffffffff;
+  io->read_cancel = libjpeg_read_cancel;
+  return 1;
+}
+
+int
+libjpeg_read_data(struct image_io *io)
+{
+  DBG("libjpeg_read_data()");
+
+  struct libjpeg_read_internals *i = io->read_data;
+  uint read_flags = io->flags;
+
+  /* Select color space */
+  switch (i->cinfo.jpeg_color_space)
+    {
+      case JCS_GRAYSCALE:
+        read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_YCBCR; 
+        i->cinfo.out_color_space = JCS_YCbCr;
+        break;
+      case JCS_YCbCr:
+	read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_YCBCR; 
+	i->cinfo.out_color_space = JCS_YCbCr;
+	break;
+      case JCS_CMYK:
+	read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_CMYK; 
+	i->cinfo.out_color_space = JCS_CMYK;
+	break;
+      case JCS_YCCK:
+	read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_YCCK; 
+	i->cinfo.out_color_space = JCS_YCCK;
+	break;
+      default:
+	read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB; 
+	i->cinfo.out_color_space = JCS_RGB;
+	break;
+  }
+
+  /* Prepare the image  */
+  struct image_io_read_data_internals rdi;
+  if (io->cols <= (i->cinfo.image_width >> 3) && io->rows <= (i->cinfo.image_height >> 3))
+    {
+      DBG("Scaling to 1/8");
+      i->cinfo.scale_num = 1;
+      i->cinfo.scale_denom = 8;
+    }
+  else if (io->cols <= (i->cinfo.image_width >> 2) && io->rows <= (i->cinfo.image_height >> 2))
+    {
+      DBG("Scaling to 1/4");
+      i->cinfo.scale_num = 1;
+      i->cinfo.scale_denom = 4;
+    }
+  else if (io->cols <= (i->cinfo.image_width >> 1) && io->rows <= (i->cinfo.image_height >> 1))
+    {
+      DBG("Scaling to 1/2");
+      i->cinfo.scale_num = 1;
+      i->cinfo.scale_denom = 2;
+    }
+  jpeg_calc_output_dimensions(&i->cinfo);
+  DBG("Output dimensions %ux%u", (uint)i->cinfo.output_width, (uint)i->cinfo.output_height);
+  if (unlikely(!image_io_read_data_prepare(&rdi, io, i->cinfo.output_width, i->cinfo.output_height, read_flags)))
+    {
+      jpeg_destroy_decompress(&i->cinfo);
+      return 0;
+    }
+
+  /* Setup fallback */
+  if (setjmp(i->err.setjmp_buf))
+    {
+      DBG("Libjpeg failed to read the image, longjump saved us");
+      jpeg_destroy_decompress(&i->cinfo);
+      image_io_read_data_break(&rdi, io);
+      return 0;
+    }
+
+  /* Decompress the image */
+  struct image *img = rdi.image;
+  jpeg_start_decompress(&i->cinfo);
+  if ((int)img->pixel_size == i->cinfo.output_components)
+    {
+      byte *pixels = img->pixels;
+      for (uint r = img->rows; r--; )
+        {
+          jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&pixels, 1);
+          pixels += img->row_size;
+        }
+    }
+  else
+    {
+      switch (img->pixel_size)
+        {
+	  case 2: /* Grayscale -> Grayscale+Alpha */
+	    {
+	      ASSERT(i->cinfo.output_components == 1);
+	      byte buf[img->cols], *src;
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#             define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_IMAGE img
+#             define IMAGE_WALK_UNROLL 4
+#             define IMAGE_WALK_COL_STEP 2
+#             define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0)
+#             define IMAGE_WALK_DO_STEP do{ walk_pos[0] = *src++; walk_pos[1] = 255; }while(0)
+#             include <images/image-walk.h>
+	    }
+	    break;
+	  case 4: /* * -> *+Alpha or aligned * */
+	    {
+	      ASSERT(i->cinfo.output_components == 3);
+	      byte buf[img->cols * 3], *src;
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#             define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_IMAGE img
+#             define IMAGE_WALK_UNROLL 4
+#             define IMAGE_WALK_COL_STEP 4
+#             define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0)
+#             define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = *(u32 *)src; walk_pos[3] = 255; src += 3; }while(0)
+#             include <images/image-walk.h>
+	    }
+	    break;
+	  default:
+	    ASSERT(0);
+	}
+
+    }
+
+  ASSERT(i->cinfo.output_scanline == i->cinfo.output_height);
+
+  /* Destroy libjpeg object */
+  jpeg_finish_decompress(&i->cinfo);
+  jpeg_destroy_decompress(&i->cinfo);
+
+  /* Finish the image */
+  return image_io_read_data_finish(&rdi, io);
+}
+
+int
+libjpeg_write(struct image_io *io)
+{
+  DBG("libjpeg_write()");
+  struct libjpeg_write_internals i;
+  i.fastbuf = io->fastbuf;
+
+  /* Create libjpeg write structure */
+  DBG("Creating libjpeg write structure");
+  i.cinfo.err = jpeg_std_error(&i.err.pub);
+  i.err.pub.error_exit = libjpeg_write_error_exit;
+  i.err.pub.emit_message = libjpeg_emit_message;
+  i.err.io = io;
+  if (setjmp(i.err.setjmp_buf))
+    {
+      DBG("Libjpeg failed to write the image, longjump saved us");
+      jpeg_destroy_compress(&i.cinfo);
+      return 0;
+    }
+  jpeg_create_compress(&i.cinfo);
+
+  /* Initialize destination manager */
+  i.cinfo.dest = &i.dest;
+  i.dest.init_destination = libjpeg_init_destination;
+  i.dest.term_destination = libjpeg_term_destination;
+  i.dest.empty_output_buffer = libjpeg_empty_output_buffer;
+
+  /* Set output parameters */
+  struct image *img = io->image;
+  i.cinfo.image_width = img->cols;
+  i.cinfo.image_height = img->rows;
+  switch (img->flags & IMAGE_COLOR_SPACE)
+    {
+      case COLOR_SPACE_GRAYSCALE:
+	i.cinfo.in_color_space = JCS_GRAYSCALE;
+	break;
+      case COLOR_SPACE_RGB:
+	i.cinfo.in_color_space = JCS_RGB;
+	break;
+      case COLOR_SPACE_YCBCR:
+	i.cinfo.in_color_space = JCS_YCbCr;
+	break;
+      case COLOR_SPACE_CMYK:
+	i.cinfo.in_color_space = JCS_CMYK;
+	break;
+      case COLOR_SPACE_YCCK:
+	i.cinfo.in_color_space = JCS_YCCK;
+	break;
+      default:
+	jpeg_destroy_compress(&i.cinfo);
+	IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Unsupported pixel format.");
+	return 0;
+    }
+  i.cinfo.input_components = color_space_channels[img->flags & IMAGE_COLOR_SPACE];
+  jpeg_set_defaults(&i.cinfo);
+  jpeg_set_colorspace(&i.cinfo, i.cinfo.in_color_space);
+  if (io->jpeg_quality)
+    jpeg_set_quality(&i.cinfo, MIN(io->jpeg_quality, 100), 1);
+  if (io->exif_size)
+    {
+      /* According to the Exif specification, the Exif APP1 marker has to follow immediately after the SOI,
+       * just as the JFIF specification requires the same for the JFIF APP0 marker!
+       * Therefore a JPEG file cannot legally be both Exif and JFIF.  */
+      i.cinfo.write_JFIF_header = FALSE;
+      i.cinfo.write_Adobe_marker = FALSE;
+    }
+
+  /* Compress the image */
+  jpeg_start_compress(&i.cinfo, TRUE);
+  if (io->exif_size)
+    {
+      DBG("Writing EXIF");
+      jpeg_write_marker(&i.cinfo, JPEG_APP0 + 1, io->exif_data, io->exif_size);
+    }
+  if ((int)img->pixel_size == i.cinfo.input_components)
+    {
+      byte *pixels = img->pixels;
+      for (uint r = img->rows; r--; )
+        {
+          jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&pixels, 1);
+          pixels += img->row_size;
+        }
+    }
+  else
+    {
+      switch (img->pixel_size)
+        {
+	  case 2: /* Grayscale+Alpha -> Grayscale */
+	    {
+	      ASSERT(i.cinfo.input_components == 1);
+	      byte buf[img->cols], *dest = buf;
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#             define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_IMAGE img
+#             define IMAGE_WALK_UNROLL 4
+#             define IMAGE_WALK_COL_STEP 2
+#             define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0)
+#             define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; }while(0)
+#             include <images/image-walk.h>
+	      break;
+	    }
+	  case 4: /* *+Alpha or aligned * -> * */
+	    {
+	      ASSERT(i.cinfo.input_components == 3);
+	      byte buf[img->cols * 3], *dest = buf;
+#	      define IMAGE_WALK_PREFIX(x) walk_##x
+#             define IMAGE_WALK_INLINE
+#	      define IMAGE_WALK_IMAGE img
+#             define IMAGE_WALK_UNROLL 4
+#             define IMAGE_WALK_COL_STEP 4
+#             define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0)
+#             define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; *dest++ = walk_pos[1]; *dest++ = walk_pos[2]; }while(0)
+#             include <images/image-walk.h>
+	      break;
+	    }
+	  default:
+	    ASSERT(0);
+	}
+    }
+  ASSERT(i.cinfo.next_scanline == i.cinfo.image_height);
+  jpeg_finish_compress(&i.cinfo);
+  jpeg_destroy_compress(&i.cinfo);
+  return 1;
+}
diff --git a/libucw/images/io-libmagick.c b/libucw/images/io-libmagick.c
new file mode 100644
index 0000000..3636163
--- /dev/null
+++ b/libucw/images/io-libmagick.c
@@ -0,0 +1,421 @@
+/*
+ *	Image Library -- GraphicsMagick (slow fallback library)
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/io-main.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <magick/api.h>
+#include <pthread.h>
+
+#define MAX_FILE_SIZE (1 << 30)
+#define QUANTUM_SCALE (QuantumDepth - 8)
+#define QUANTUM_TO_BYTE(x) ((uint)(x) >> QUANTUM_SCALE)
+#define BYTE_TO_QUANTUM(x) ((uint)(x) << QUANTUM_SCALE)
+#define ALPHA_TO_BYTE(x) (255 - QUANTUM_TO_BYTE(x))
+#define BYTE_TO_ALPHA(x) (BYTE_TO_QUANTUM(255 - (x)))
+
+static pthread_mutex_t libmagick_mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint libmagick_counter;
+
+struct magick_read_data {
+  ExceptionInfo exception;
+  ImageInfo *info;
+  Image *image;
+};
+
+int
+libmagick_init(struct image_io *io UNUSED)
+{
+  pthread_mutex_lock(&libmagick_mutex);
+  if (!libmagick_counter++)
+    InitializeMagick(NULL);
+  pthread_mutex_unlock(&libmagick_mutex);
+  return 1;
+}
+
+void
+libmagick_cleanup(struct image_io *io UNUSED)
+{
+  pthread_mutex_lock(&libmagick_mutex);
+  if (!--libmagick_counter)
+    DestroyMagick();
+  pthread_mutex_unlock(&libmagick_mutex);
+}
+
+static void
+libmagick_destroy_read_data(struct magick_read_data *rd)
+{
+  if (rd->image)
+    DestroyImage(rd->image);
+  DestroyImageInfo(rd->info);
+  DestroyExceptionInfo(&rd->exception);
+}
+
+static void
+libmagick_read_cancel(struct image_io *io)
+{
+  DBG("libmagick_read_cancel()");
+
+  struct magick_read_data *rd = io->read_data;
+  libmagick_destroy_read_data(rd);
+}
+
+int
+libmagick_read_header(struct image_io *io)
+{
+  DBG("libmagick_read_header()");
+
+  /* Read entire stream */
+  ucw_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf);
+  if (unlikely(file_size > MAX_FILE_SIZE))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too long stream.");
+      return 0;
+    }
+  uint buf_size = file_size;
+  byte *buf = xmalloc(buf_size);
+  breadb(io->fastbuf, buf, buf_size);
+
+  /* Allocate read structure */
+  struct magick_read_data *rd = io->read_data = mp_alloc_zero(io->internal_pool, sizeof(*rd));
+
+  /* Initialize GraphicsMagick */
+  GetExceptionInfo(&rd->exception);
+  rd->info = CloneImageInfo(NULL);
+  rd->info->subrange = 1;
+
+  /* Read the image */
+  rd->image = BlobToImage(rd->info, buf, buf_size, &rd->exception);
+  xfree(buf);
+  if (unlikely(!rd->image))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "GraphicsMagick failed to read the image.");
+      goto err;
+    }
+  if (unlikely(rd->image->columns > image_max_dim || rd->image->rows > image_max_dim))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_DIMENSIONS, "Image too large.");
+      goto err;
+    }
+
+  /* Fill image parameters */
+  io->cols = rd->image->columns;
+  io->rows = rd->image->rows;
+  switch (rd->image->colorspace)
+    {
+      case GRAYColorspace:
+        io->flags = COLOR_SPACE_GRAYSCALE;
+        break;
+      default:
+        io->flags = COLOR_SPACE_RGB;
+        break;
+    }
+  if (rd->image->matte)
+    io->flags |= IMAGE_ALPHA;
+  io->number_of_colors = rd->image->colors;
+  if (rd->image->storage_class == PseudoClass && rd->image->compression != JPEGCompression)
+    io->flags |= IMAGE_IO_HAS_PALETTE;
+
+  io->read_cancel = libmagick_read_cancel;
+  return 1;
+
+err:
+  libmagick_destroy_read_data(rd);
+  return 0;
+}
+
+static inline byte
+libmagick_pixel_to_gray(PixelPacket *pixel)
+{
+  return rgb_to_gray_func(pixel->red, pixel->green, pixel->blue) >> QUANTUM_SCALE;
+}
+
+int
+libmagick_read_data(struct image_io *io)
+{
+  DBG("libmagick_read_data()");
+
+  struct magick_read_data *rd = io->read_data;
+
+  /* Quantize image */
+  switch (rd->image->colorspace)
+    {
+      case RGBColorspace:
+      case GRAYColorspace:
+        break;
+      default: ;
+        QuantizeInfo quantize;
+        GetQuantizeInfo(&quantize);
+        quantize.colorspace = RGBColorspace;
+        QuantizeImage(&quantize, rd->image);
+	break;
+    }
+
+  /* Prepare the image */
+  struct image_io_read_data_internals rdi;
+  uint read_flags = io->flags;
+  uint cs = read_flags & IMAGE_COLOR_SPACE;
+  if (cs != COLOR_SPACE_GRAYSCALE && cs != COLOR_SPACE_RGB)
+    read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_PIXEL_FORMAT) | COLOR_SPACE_RGB;
+  if ((read_flags & IMAGE_IO_USE_BACKGROUND) && !(read_flags & IMAGE_ALPHA))
+    read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA;
+  if (unlikely(!image_io_read_data_prepare(&rdi, io, rd->image->columns, rd->image->rows, read_flags)))
+    {
+      libmagick_destroy_read_data(rd);
+      return 0;
+    }
+
+  /* Acquire pixels */
+  PixelPacket *src = (PixelPacket *)AcquireImagePixels(rd->image, 0, 0, rd->image->columns, rd->image->rows, &rd->exception);
+  if (unlikely(!src))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot acquire image pixels.");
+      libmagick_destroy_read_data(rd);
+      image_io_read_data_break(&rdi, io);
+      return 0;
+    }
+
+  /* Convert pixels */
+  switch (rdi.image->pixel_size)
+    {
+      case 1:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE (rdi.image)
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 1
+#       define IMAGE_WALK_DO_STEP do{ \
+	  walk_pos[0] = libmagick_pixel_to_gray(src); \
+	  src++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 2:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE (rdi.image)
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 2
+#       define IMAGE_WALK_DO_STEP do{ \
+	  walk_pos[0] = libmagick_pixel_to_gray(src); \
+	  walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \
+	  src++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 3:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE (rdi.image)
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 3
+#       define IMAGE_WALK_DO_STEP do{ \
+	  walk_pos[0] = QUANTUM_TO_BYTE(src->red); \
+	  walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
+	  walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
+	  src++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 4:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE (rdi.image)
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 4
+#       define IMAGE_WALK_DO_STEP do{ \
+	  walk_pos[0] = QUANTUM_TO_BYTE(src->red); \
+	  walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
+	  walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
+	  walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \
+	  src++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      default:
+	ASSERT(0);
+    }
+
+  /* Free GraphicsMagick structures */
+  libmagick_destroy_read_data(rd);
+
+  /* Finish the image */
+  return image_io_read_data_finish(&rdi, io);
+}
+
+int
+libmagick_write(struct image_io *io)
+{
+  DBG("libmagick_write()");
+
+  /* Initialize GraphicsMagick */
+  int result = 0;
+  ExceptionInfo exception;
+  ImageInfo *info;
+  GetExceptionInfo(&exception);
+  info = CloneImageInfo(NULL);
+
+  /* Setup image parameters and allocate the image*/
+  struct image *img = io->image;
+  switch (img->flags & IMAGE_COLOR_SPACE)
+    {
+      case COLOR_SPACE_GRAYSCALE:
+	info->colorspace = GRAYColorspace;
+	break;
+      case COLOR_SPACE_RGB:
+        info->colorspace = RGBColorspace;
+        break;
+      default:
+        IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Unsupported color space.");
+        goto err;
+    }
+  switch (io->format)
+    {
+      case IMAGE_FORMAT_JPEG:
+	strcpy(info->magick, "JPEG");
+	if (io->jpeg_quality)
+	  info->quality = MIN(io->jpeg_quality, 100);
+	break;
+      case IMAGE_FORMAT_PNG:
+	strcpy(info->magick, "PNG");
+	break;
+      case IMAGE_FORMAT_GIF:
+        strcpy(info->magick, "GIF");
+	break;
+      default:
+        ASSERT(0);
+    }
+  Image *image = AllocateImage(info);
+  if (unlikely(!image))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to allocate the image.");
+      goto err;
+    }
+  image->columns = img->cols;
+  image->rows = img->rows;
+
+  /* Get pixels */
+  PixelPacket *pixels = SetImagePixels(image, 0, 0, img->cols, img->rows), *dest = pixels;
+  if (unlikely(!pixels))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot get GraphicsMagick pixels.");
+      goto err2;
+    }
+
+  /* Convert pixels */
+  switch (img->pixel_size)
+    {
+      case 1:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE img
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 1
+#       define IMAGE_WALK_DO_STEP do{ \
+	  dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->opacity = 0; \
+	  dest++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 2:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE img
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 2
+#       define IMAGE_WALK_DO_STEP do{ \
+	  dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->green = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \
+	  dest++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 3:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE img
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 3
+#       define IMAGE_WALK_DO_STEP do{ \
+	  dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
+	  dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
+	  dest->opacity = 0; \
+	  dest++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      case 4:
+#	define IMAGE_WALK_PREFIX(x) walk_##x
+#       define IMAGE_WALK_INLINE
+#	define IMAGE_WALK_IMAGE img
+#       define IMAGE_WALK_UNROLL 4
+#       define IMAGE_WALK_COL_STEP 4
+#       define IMAGE_WALK_DO_STEP do{ \
+	  dest->red = BYTE_TO_QUANTUM(walk_pos[0]); \
+	  dest->green = BYTE_TO_QUANTUM(walk_pos[1]); \
+	  dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
+	  dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \
+	  dest++; }while(0)
+#       include <images/image-walk.h>
+	break;
+
+      default:
+	ASSERT(0);
+    }
+
+  /* Store pixels */
+  if (unlikely(!SyncImagePixels(image)))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot sync GraphicsMagick pixels.");
+      goto err2;
+    }
+
+  /* Write image */
+  size_t buf_len = 0;
+  void *buf = ImageToBlob(info, image, &buf_len, &exception);
+  if (unlikely(!buf))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "GraphicsMagick failed to compress the image.");
+      goto err2;
+    }
+  if (unlikely(buf_len > MAX_FILE_SIZE))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Image too large.");
+      goto err2;
+    }
+
+  /* Write to stream */
+  bwrite(io->fastbuf, buf, buf_len);
+
+  /* Success */
+  result = 1;
+
+err2:
+  DestroyImage(image);
+err:
+  DestroyImageInfo(info);
+  DestroyExceptionInfo(&exception);
+  return result;
+}
diff --git a/libucw/images/io-libpng.c b/libucw/images/io-libpng.c
new file mode 100644
index 0000000..e39c8b7
--- /dev/null
+++ b/libucw/images/io-libpng.c
@@ -0,0 +1,382 @@
+/*
+ *	Image Library -- libpng
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/io-main.h>
+
+#include <png.h>
+#include <setjmp.h>
+
+struct libpng_read_data {
+  png_structp png_ptr;
+  png_infop info_ptr;
+  png_infop end_ptr;
+  png_uint_32 cols;
+  png_uint_32 rows;
+  int bit_depth;
+  int color_type;
+};
+
+static png_voidp
+libpng_malloc(png_structp png_ptr, png_size_t size)
+{
+  DBG("libpng_malloc(size=%u)", (uint)size);
+  return mp_alloc(png_get_mem_ptr(png_ptr), size);
+}
+
+static void
+libpng_free(png_structp png_ptr UNUSED, png_voidp ptr UNUSED)
+{
+  DBG("libpng_free()");
+}
+
+static void NONRET
+libpng_read_error(png_structp png_ptr, png_const_charp msg)
+{
+  DBG("libpng_read_error()");
+  IMAGE_ERROR(png_get_error_ptr(png_ptr), IMAGE_ERROR_READ_FAILED, "%s", msg);
+  longjmp(png_jmpbuf(png_ptr), 1);
+}
+
+static void NONRET
+libpng_write_error(png_structp png_ptr, png_const_charp msg)
+{
+  DBG("libpng_write_error()");
+  IMAGE_ERROR(png_get_error_ptr(png_ptr), IMAGE_ERROR_WRITE_FAILED, "%s", msg);
+  longjmp(png_jmpbuf(png_ptr), 1);
+}
+
+static void
+libpng_warning(png_structp png_ptr UNUSED, png_const_charp msg UNUSED)
+{
+  DBG("libpng_warning(): %s", (byte *)msg);
+}
+
+static void
+libpng_read_fn(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+  DBG("libpng_read_fn(len=%u)", (uint)length);
+  if (unlikely(bread((struct fastbuf *)png_get_io_ptr(png_ptr), (byte *)data, length) < length))
+    png_error(png_ptr, "Incomplete data");
+}
+
+static void
+libpng_write_fn(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+  DBG("libpng_write_fn(len=%u)", (uint)length);
+  bwrite((struct fastbuf *)png_get_io_ptr(png_ptr), (byte *)data, length);
+}
+
+static void
+libpng_flush_fn(png_structp png_ptr UNUSED)
+{
+  DBG("libpng_flush_fn()");
+}
+
+static void
+libpng_read_cancel(struct image_io *io)
+{
+  DBG("libpng_read_cancel()");
+
+  struct libpng_read_data *rd = io->read_data;
+  png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+}
+
+int
+libpng_read_header(struct image_io *io)
+{
+  DBG("libpng_read_header()");
+
+  /* Create libpng structures */
+  struct libpng_read_data *rd = io->read_data = mp_alloc(io->internal_pool, sizeof(*rd));
+  rd->png_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING,
+      io->context, libpng_read_error, libpng_warning,
+      io->internal_pool, libpng_malloc, libpng_free);
+  if (unlikely(!rd->png_ptr))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot create libpng read structure.");
+      return 0;
+    }
+  rd->info_ptr = png_create_info_struct(rd->png_ptr);
+  if (unlikely(!rd->info_ptr))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot create libpng info structure.");
+      png_destroy_read_struct(&rd->png_ptr, NULL, NULL);
+      return 0;
+    }
+  rd->end_ptr = png_create_info_struct(rd->png_ptr);
+  if (unlikely(!rd->end_ptr))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot create libpng info structure.");
+      png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, NULL);
+      return 0;
+    }
+
+  /* Setup libpng longjump */
+  if (unlikely(setjmp(png_jmpbuf(rd->png_ptr))))
+    {
+      DBG("Libpng failed to read the image, longjump saved us");
+      png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+      return 0;
+    }
+
+  /* Setup libpng IO */
+  png_set_read_fn(rd->png_ptr, io->fastbuf, libpng_read_fn);
+  png_set_user_limits(rd->png_ptr, image_max_dim, image_max_dim);
+
+  /* Read header */
+  png_read_info(rd->png_ptr, rd->info_ptr);
+  png_get_IHDR(rd->png_ptr, rd->info_ptr, &rd->cols, &rd->rows, &rd->bit_depth, &rd->color_type, NULL, NULL, NULL);
+
+  /* Fill image_io values */
+  io->cols = rd->cols;
+  io->rows = rd->rows;
+  switch (rd->color_type)
+    {
+      case PNG_COLOR_TYPE_GRAY:
+        io->flags = COLOR_SPACE_GRAYSCALE;
+	io->number_of_colors = 1 << 8;
+        break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+        io->flags = COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA;
+	io->number_of_colors = 1 << 8;
+        break;
+      case PNG_COLOR_TYPE_RGB:
+        io->flags = COLOR_SPACE_RGB;
+	io->number_of_colors = 1 << 24;
+        break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+	io->number_of_colors = 1 << 24;
+        io->flags = COLOR_SPACE_RGB | IMAGE_ALPHA;
+        break;
+      case PNG_COLOR_TYPE_PALETTE:
+        io->flags = COLOR_SPACE_RGB | IMAGE_ALPHA | IMAGE_IO_HAS_PALETTE;
+	int num_palette;
+	if (png_get_PLTE(rd->png_ptr, rd->info_ptr, NULL, &num_palette))
+	  io->number_of_colors = num_palette;
+	else
+	  io->number_of_colors = 1 << rd->bit_depth;
+        break;
+      default:
+        png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+        IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Unknown color type");
+        break;
+    }
+
+  /* Success */
+  io->read_cancel = libpng_read_cancel;
+  return 1;
+}
+
+int
+libpng_read_data(struct image_io *io)
+{
+  DBG("libpng_read_data()");
+
+  struct libpng_read_data *rd = io->read_data;
+
+  struct image_io_read_data_internals rdi;
+  rdi.image = NULL;
+
+  if (setjmp(png_jmpbuf(rd->png_ptr)))
+    {
+      DBG("Libpng failed to read the image, longjump saved us");
+      png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+      if (rdi.image)
+        image_io_read_data_break(&rdi, io);
+      return 0;
+    }
+
+  uint read_flags = io->flags;
+
+  /* Apply transformations */
+  if (rd->bit_depth == 16)
+    png_set_strip_16(rd->png_ptr);
+  switch (rd->color_type)
+    {
+      case PNG_COLOR_TYPE_PALETTE:
+	if ((read_flags & IMAGE_COLOR_SPACE) == COLOR_SPACE_GRAYSCALE)
+	  {
+	    png_set_palette_to_rgb(rd->png_ptr);
+	    png_set_rgb_to_gray_fixed(rd->png_ptr, 1, 21267, 71514);
+	  }
+	else
+	  {
+	    png_set_palette_to_rgb(rd->png_ptr);
+	    read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+	  }
+	if (!(read_flags & IMAGE_ALPHA))
+	  {
+	    if (io->flags & IMAGE_IO_USE_BACKGROUND)
+	      {
+                png_set_add_alpha(rd->png_ptr, 255, PNG_FILLER_AFTER);
+	        read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA;
+	      }
+	    else if ((read_flags & IMAGE_PIXEL_FORMAT) == (COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED))
+              png_set_add_alpha(rd->png_ptr, 255, PNG_FILLER_AFTER);
+            else
+	      png_set_strip_alpha(rd->png_ptr);
+	  }
+	else
+          png_set_add_alpha(rd->png_ptr, 255, PNG_FILLER_AFTER);
+	break;
+      case PNG_COLOR_TYPE_GRAY:
+	if ((read_flags & IMAGE_COLOR_SPACE) != COLOR_SPACE_GRAYSCALE)
+	  {
+            png_set_gray_to_rgb(rd->png_ptr);
+	    read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+	  }
+	if (read_flags & IMAGE_ALPHA)
+	  png_set_add_alpha(rd->png_ptr, 255, PNG_FILLER_AFTER);
+	break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+	if ((read_flags & IMAGE_COLOR_SPACE) != COLOR_SPACE_GRAYSCALE)
+	  {
+            png_set_gray_to_rgb(rd->png_ptr);
+	    read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+	  }
+	if (!(read_flags & IMAGE_ALPHA))
+	  {
+	    if (io->flags & IMAGE_IO_USE_BACKGROUND)
+	      read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA;
+	    else
+              png_set_strip_alpha(rd->png_ptr);
+	  }
+	break;
+      case PNG_COLOR_TYPE_RGB:
+	if ((read_flags & IMAGE_COLOR_SPACE) == COLOR_SPACE_GRAYSCALE)
+	  png_set_rgb_to_gray_fixed(rd->png_ptr, 1, 21267, 71514);
+	else
+	  read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+	if ((read_flags & IMAGE_ALPHA) || (read_flags & IMAGE_PIXEL_FORMAT) == (COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED))
+	  png_set_add_alpha(rd->png_ptr, 255, PNG_FILLER_AFTER);
+	break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+	if ((read_flags & IMAGE_COLOR_SPACE) == COLOR_SPACE_GRAYSCALE)
+	  png_set_rgb_to_gray_fixed(rd->png_ptr, 1, 21267, 71514);
+	else
+	  read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+	if (!(read_flags & IMAGE_ALPHA))
+	  if (io->flags & IMAGE_IO_USE_BACKGROUND)
+	    read_flags = (read_flags & IMAGE_CHANNELS_FORMAT) | IMAGE_ALPHA;
+	  else if ((read_flags & IMAGE_PIXEL_FORMAT) != (COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED))
+            png_set_strip_alpha(rd->png_ptr);
+	break;
+      default:
+	ASSERT(0);
+    }
+  png_read_update_info(rd->png_ptr, rd->info_ptr);
+
+  /* Prepare the image */
+  if (unlikely(!image_io_read_data_prepare(&rdi, io, rd->cols, rd->rows, read_flags)))
+    {
+      png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+      return 0;
+    }
+  /* Read image data */
+  DBG("Reading image data");
+  struct image *img = rdi.image;
+  byte *pixels = img->pixels;
+  png_bytep rows[img->rows];
+  for (uint r = 0; r < img->rows; r++, pixels += img->row_size)
+    rows[r] = (png_bytep)pixels;
+  png_read_image(rd->png_ptr, rows);
+  png_read_end(rd->png_ptr, rd->end_ptr);
+
+  /* Destroy libpng read structure */
+  png_destroy_read_struct(&rd->png_ptr, &rd->info_ptr, &rd->end_ptr);
+
+  /* Finish the image  */
+  return image_io_read_data_finish(&rdi, io);
+}
+
+int
+libpng_write(struct image_io *io)
+{
+  DBG("libpng_write()");
+
+  /* Create libpng structures */
+  png_structp png_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING,
+      io->context, libpng_write_error, libpng_warning,
+      io->internal_pool, libpng_malloc, libpng_free);
+  if (unlikely(!png_ptr))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot create libpng write structure.");
+      return 0;
+    }
+  png_infop info_ptr = png_create_info_struct(png_ptr);
+  if (unlikely(!info_ptr))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Cannot create libpng info structure.");
+      png_destroy_write_struct(&png_ptr, NULL);
+      return 0;
+    }
+
+  /* Setup libpng longjump */
+  if (unlikely(setjmp(png_jmpbuf(png_ptr))))
+    {
+      DBG("Libpng failed to write the image, longjump saved us.");
+      png_destroy_write_struct(&png_ptr, &info_ptr);
+      return 0;
+    }
+
+  /* Setup libpng IO */
+  png_set_write_fn(png_ptr, io->fastbuf, libpng_write_fn, libpng_flush_fn);
+
+  /* Setup PNG parameters */
+  struct image *img = io->image;
+  switch (img->flags & IMAGE_PIXEL_FORMAT)
+    {
+      case COLOR_SPACE_GRAYSCALE | IMAGE_PIXELS_ALIGNED:
+        png_set_IHDR(png_ptr, info_ptr, img->cols, img->rows, 8, PNG_COLOR_TYPE_GRAY,
+	  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	break;
+      case COLOR_SPACE_GRAYSCALE | IMAGE_ALPHA | IMAGE_PIXELS_ALIGNED:
+        png_set_IHDR(png_ptr, info_ptr, img->cols, img->rows, 8, PNG_COLOR_TYPE_GRAY_ALPHA,
+	  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	break;
+      case COLOR_SPACE_RGB:
+        png_set_IHDR(png_ptr, info_ptr, img->cols, img->rows, 8, PNG_COLOR_TYPE_RGB,
+	  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	break;
+      case COLOR_SPACE_RGB | IMAGE_ALPHA | IMAGE_PIXELS_ALIGNED:
+        png_set_IHDR(png_ptr, info_ptr, img->cols, img->rows, 8, PNG_COLOR_TYPE_RGB_ALPHA,
+	  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	break;
+      case COLOR_SPACE_RGB | IMAGE_PIXELS_ALIGNED:
+        png_set_IHDR(png_ptr, info_ptr, img->cols, img->rows, 8, PNG_COLOR_TYPE_RGB,
+	  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+	png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+	break;
+      default:
+        IMAGE_ERROR(io->context, IMAGE_ERROR_WRITE_FAILED, "Libpng does not support this pixel format (0x%x)", img->flags & IMAGE_PIXEL_FORMAT);
+        png_destroy_write_struct(&png_ptr, &info_ptr);
+	return 0;
+    }
+  png_write_info(png_ptr, info_ptr);
+
+  /* Write pixels */
+  byte *pixels = img->pixels;
+  png_bytep rows[img->rows];
+  for (uint r = 0; r < img->rows; r++, pixels += img->row_size)
+    rows[r] = (png_bytep)pixels;
+  png_write_image(png_ptr, rows);
+  png_write_end(png_ptr, info_ptr);
+
+  /* Free libpng structure */
+  png_destroy_write_struct(&png_ptr, &info_ptr);
+  return 1;
+}
diff --git a/libucw/images/io-libungif.c b/libucw/images/io-libungif.c
new file mode 100644
index 0000000..f444fc5
--- /dev/null
+++ b/libucw/images/io-libungif.c
@@ -0,0 +1,306 @@
+/*
+ *	Image Library -- libungif
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/io-main.h>
+
+#include <gif_lib.h>
+
+// API of gif_lib has changed recenly
+#ifndef GIFLIB_MAJOR
+#define GIFLIB_MAJOR 0
+#endif
+#if GIFLIB_MAJOR > 5 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
+static int dgif_error_code;	// Scratch pad only, no locking needed
+#define DGIF_OPEN(_userptr, _readfunc) DGifOpen(_userptr, _readfunc, &dgif_error_code)
+#define DGIF_CLOSE_FILE(_gif) DGifCloseFile(_gif, &dgif_error_code)
+#else
+#define DGIF_OPEN(_userptr, _readfunc) DGifOpen(_userptr, _readfunc)
+#define DGIF_CLOSE_FILE(_gif) DGifCloseFile(_gif)
+#endif
+
+struct libungif_read_data {
+  GifFileType *gif;
+  int transparent_index;
+};
+
+static int
+libungif_read_func(GifFileType *gif, GifByteType *ptr, int len)
+{
+  DBG("libungif_read_func(len=%d)", len);
+  return bread((struct fastbuf *)gif->UserData, (byte *)ptr, len);
+}
+
+static void
+libungif_read_cancel(struct image_io *io)
+{
+  DBG("libungif_read_cancel()");
+
+  struct libungif_read_data *rd = io->read_data;
+  DGIF_CLOSE_FILE(rd->gif);
+}
+
+int
+libungif_read_header(struct image_io *io)
+{
+  DBG("libungif_read_header()");
+
+  /* Create libungif structure */
+  GifFileType *gif;
+  if (unlikely(!(gif = DGIF_OPEN(io->fastbuf, libungif_read_func))))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Cannot create libungif structure.");
+      return 0;
+    }
+
+  struct libungif_read_data *rd = io->read_data = mp_alloc(io->internal_pool, sizeof(*rd));
+  rd->gif = gif;
+
+  DBG("executing DGifSlurp()");
+  if (unlikely(DGifSlurp(gif) != GIF_OK))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Gif read failed.");
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+
+  DBG("ImageCount=%d ColorResolution=%d SBackGroundColor=%d SColorMap=%p", gif->ImageCount, gif->SColorResolution, gif->SBackGroundColor, gif->SColorMap);
+  if (unlikely(!gif->ImageCount))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "There are no images in gif file.");
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+
+  /* Read image parameters */
+  SavedImage *image = gif->SavedImages;
+  if (unlikely(image->ImageDesc.Width <= 0 || image->ImageDesc.Height <= 0 ||
+      image->ImageDesc.Width > (int)image_max_dim || image->ImageDesc.Height > (int)image_max_dim))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_DIMENSIONS, "Invalid gif dimensions.");
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+  ColorMapObject *color_map = image->ImageDesc.ColorMap ? : gif->SColorMap;
+  if (unlikely(!color_map))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Missing palette.");
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+  io->cols = image->ImageDesc.Width;
+  io->rows = image->ImageDesc.Height;
+  if (unlikely((io->number_of_colors = color_map->ColorCount) > 256))
+    {
+      IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too many gif colors.");
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+  io->flags = COLOR_SPACE_RGB | IMAGE_IO_HAS_PALETTE;
+
+  /* Search extension blocks */
+  rd->transparent_index = -1;
+  for (int i = 0; i < image->ExtensionBlockCount; i++)
+    {
+      ExtensionBlock *e = image->ExtensionBlocks + i;
+      if (e->Function == 0xF9)
+        {
+	  DBG("Found graphics control extension");
+	  if (unlikely(e->ByteCount != 4))
+	    {
+              IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Invalid graphics control extension.");
+              DGIF_CLOSE_FILE(gif);
+              return 0;
+	    }
+	  byte *b = e->Bytes;
+	  /* transparent color present */
+	  if (b[0] & 1)
+	    {
+	      rd->transparent_index = b[3];
+	      io->flags |= IMAGE_ALPHA;
+	      if (gif->SColorMap)
+	        {
+                  GifColorType *background = color_map->Colors + gif->SBackGroundColor;
+                  color_make_rgb(&io->background_color, background->Red, background->Green, background->Blue);
+		}
+	    }
+	  /* We've got everything we need :-) */
+	  break;
+	}
+      else
+	DBG("Found unknown extension: type=%d size=%d", e->Function, e->ByteCount);
+    }
+
+  /* Success */
+  io->read_cancel = libungif_read_cancel;
+  return 1;
+}
+
+int
+libungif_read_data(struct image_io *io)
+{
+  DBG("libungif_read_data()");
+
+  struct libungif_read_data *rd = io->read_data;
+  GifFileType *gif = rd->gif;
+  SavedImage *image = gif->SavedImages;
+
+  /* Prepare image */
+  struct image_io_read_data_internals rdi;
+  uint read_flags = io->flags;
+  uint cs = read_flags & IMAGE_COLOR_SPACE;
+  if (cs != COLOR_SPACE_GRAYSCALE && cs != COLOR_SPACE_RGB)
+    read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_CHANNELS_FORMAT) | COLOR_SPACE_RGB;
+  if (unlikely(!image_io_read_data_prepare(&rdi, io, image->ImageDesc.Width, image->ImageDesc.Height, read_flags)))
+    {
+      DGIF_CLOSE_FILE(gif);
+      return 0;
+    }
+
+  /* Get pixels and palette */
+  byte *pixels = (byte *)image->RasterBits;
+  ColorMapObject *color_map = image->ImageDesc.ColorMap ? : gif->SColorMap;
+  GifColorType *palette = color_map->Colors;
+  byte *img_end = rdi.image->pixels + rdi.image->image_size;
+
+  /* Handle deinterlacing */
+  uint dein_step, dein_next;
+  if (image->ImageDesc.Interlace)
+    {
+      DBG("Deinterlaced image");
+      dein_step = dein_next = rdi.image->row_size << 3;
+    }
+  else
+    dein_step = dein_next = rdi.image->row_size;
+
+  /* Convert pixels */
+  switch (rdi.image->pixel_size)
+    {
+      case 1:
+	{
+	  byte pal[256], *pal_pos = pal, *pal_end = pal + 256;
+	  for (uint i = 0; i < (uint)color_map->ColorCount; i++, pal_pos++, palette++)
+	    *pal_pos = rgb_to_gray_func(palette->Red, palette->Green, palette->Blue);
+	  if (pal_pos != pal_end)
+	    bzero(pal_pos, pal_end - pal_pos);
+	  if (rd->transparent_index >= 0 && (io->flags & IMAGE_IO_USE_BACKGROUND))
+	    if (!color_put(io->context, &io->background_color, pal + rd->transparent_index, COLOR_SPACE_GRAYSCALE))
+	      {
+		DGIF_CLOSE_FILE(gif);
+		return 0;
+	      }
+#	  define DO_ROW_END do{ \
+	      walk_row_start += dein_step; \
+	      while (walk_row_start >= img_end) \
+		{ uint n = dein_next >> 1; walk_row_start = rdi.image->pixels + n, dein_step = dein_next; dein_next = n; } \
+	    }while(0)
+#	  define IMAGE_WALK_PREFIX(x) walk_##x
+#	  define IMAGE_WALK_INLINE
+#	  define IMAGE_WALK_IMAGE (rdi.image)
+#	  define IMAGE_WALK_UNROLL 4
+#	  define IMAGE_WALK_COL_STEP 1
+#	  define IMAGE_WALK_ROW_STEP 0
+#	  define IMAGE_WALK_DO_STEP do{ *walk_pos = pal[*pixels++]; }while(0)
+#	  define IMAGE_WALK_DO_ROW_END DO_ROW_END
+#	  include <images/image-walk.h>
+	  break;
+	}
+      case 2:
+	{
+	  byte pal[256 * 2], *pal_pos = pal, *pal_end = pal + 256 * 2;
+	  for (uint i = 0; i < (uint)color_map->ColorCount; i++, pal_pos += 2, palette++)
+	    {
+	      pal_pos[0] = rgb_to_gray_func(palette->Red, palette->Green, palette->Blue);
+	      pal_pos[1] = 255;
+	    }
+	  if (pal_pos != pal_end)
+	    bzero(pal_pos, pal_end - pal_pos);
+	  if (rd->transparent_index >= 0)
+	    pal[rd->transparent_index * 2 + 1] = 0;
+#	  define IMAGE_WALK_PREFIX(x) walk_##x
+#	  define IMAGE_WALK_INLINE
+#	  define IMAGE_WALK_IMAGE (rdi.image)
+#	  define IMAGE_WALK_UNROLL 4
+#	  define IMAGE_WALK_COL_STEP 2
+#	  define IMAGE_WALK_ROW_STEP 0
+#	  define IMAGE_WALK_DO_STEP do{ *(u16 *)walk_pos = ((u16 *)pal)[*pixels++]; }while(0)
+#	  define IMAGE_WALK_DO_ROW_END DO_ROW_END
+#	  include <images/image-walk.h>
+	  break;
+	}
+      case 3:
+	{
+	  byte pal[256 * 4], *pal_pos = pal, *pal_end = pal + 256 * 4;
+	  for (uint i = 0; i < (uint)color_map->ColorCount; i++, pal_pos += 4, palette++)
+	    {
+	      pal_pos[0] = palette->Red;
+	      pal_pos[1] = palette->Green;
+	      pal_pos[2] = palette->Blue;
+	    }
+	  if (pal_pos != pal_end)
+	    bzero(pal_pos, pal_end - pal_pos);
+	  if (rd->transparent_index >= 0 && (io->flags & IMAGE_IO_USE_BACKGROUND))
+	    if (!color_put(io->context, &io->background_color, pal + 4 * rd->transparent_index, COLOR_SPACE_RGB))
+	      {
+		DGIF_CLOSE_FILE(gif);
+		return 0;
+	      }
+#	  define IMAGE_WALK_PREFIX(x) walk_##x
+#	  define IMAGE_WALK_INLINE
+#	  define IMAGE_WALK_IMAGE (rdi.image)
+#	  define IMAGE_WALK_UNROLL 4
+#	  define IMAGE_WALK_COL_STEP 3
+#	  define IMAGE_WALK_ROW_STEP 0
+#	  define IMAGE_WALK_DO_STEP do{ byte *p = pal + 4 * (*pixels++); walk_pos[0] = p[0]; walk_pos[1] = p[1]; walk_pos[2] = p[2]; }while(0)
+#	  define IMAGE_WALK_DO_ROW_END DO_ROW_END
+#	  include <images/image-walk.h>
+	  break;
+	}
+      case 4:
+	{
+	  byte pal[256 * 4], *pal_pos = pal, *pal_end = pal + 256 * 4;
+	  for (uint i = 0; i < (uint)color_map->ColorCount; i++, pal_pos += 4, palette++)
+	    {
+	      pal_pos[0] = palette->Red;
+	      pal_pos[1] = palette->Green;
+	      pal_pos[2] = palette->Blue;
+	      pal_pos[3] = 255;
+	    }
+	  if (pal_pos != pal_end)
+	    bzero(pal_pos, pal_end - pal_pos);
+	  if (rd->transparent_index >= 0)
+	    pal[rd->transparent_index * 4 + 3] = 0;
+#	  define IMAGE_WALK_PREFIX(x) walk_##x
+#	  define IMAGE_WALK_INLINE
+#	  define IMAGE_WALK_IMAGE (rdi.image)
+#	  define IMAGE_WALK_UNROLL 4
+#	  define IMAGE_WALK_COL_STEP 4
+#	  define IMAGE_WALK_ROW_STEP 0
+#	  define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = ((u32 *)pal)[*pixels++]; }while(0)
+#	  define IMAGE_WALK_DO_ROW_END DO_ROW_END
+#	  include <images/image-walk.h>
+	  break;
+	}
+      default:
+        ASSERT(0);
+    }
+
+  /* Destroy libungif structure */
+  DGIF_CLOSE_FILE(gif);
+
+  /* Finish image */
+  return image_io_read_data_finish(&rdi, io);
+}
diff --git a/libucw/images/io-main.c b/libucw/images/io-main.c
new file mode 100644
index 0000000..2244cf8
--- /dev/null
+++ b/libucw/images/io-main.c
@@ -0,0 +1,378 @@
+/*
+ *	Image Library -- Image compression/decompression interface
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/io-main.h>
+#include <images/color.h>
+
+#include <string.h>
+
+int
+image_io_init(struct image_context *ctx, struct image_io *io)
+{
+  DBG("image_io_init()");
+  bzero(io, sizeof(*io));
+  io->context = ctx;
+#ifdef CONFIG_IMAGES_LIBJPEG
+  if (!libjpeg_init(io))
+    goto libjpeg_failed;
+#endif
+#ifdef CONFIG_IMAGES_LIBPNG
+  if (!libpng_init(io))
+    goto libpng_failed;
+#endif
+#ifdef CONFIG_IMAGES_LIBUNGIF
+  if (!libungif_init(io))
+    goto libungif_failed;
+#endif
+#ifdef CONFIG_IMAGES_LIBMAGICK
+  if (!libmagick_init(io))
+    goto libmagick_failed;
+#endif
+  io->internal_pool = mp_new(1024);
+  return 1;
+#ifdef CONFIG_IMAGES_LIBMAGICK
+  libmagick_cleanup(io);
+libmagick_failed:
+#endif
+#ifdef CONFIG_IMAGES_LIBUNGIF
+  libungif_cleanup(io);
+libungif_failed:
+#endif
+#ifdef CONFIG_IMAGES_LIBPNG
+  libpng_cleanup(io);
+libpng_failed:
+#endif
+#ifdef CONFIG_IMAGES_LIBJPEG
+  libjpeg_cleanup(io);
+libjpeg_failed:
+#endif
+  return 0;
+}
+
+static inline void
+image_io_read_cancel(struct image_io *io)
+{
+  if (io->read_cancel)
+    {
+      io->read_cancel(io);
+      io->read_cancel = NULL;
+    }
+}
+
+static inline void
+image_io_image_destroy(struct image_io *io)
+{
+  if (io->image && (io->flags & IMAGE_IO_NEED_DESTROY))
+    {
+      image_destroy(io->image);
+      io->flags &= ~IMAGE_IO_NEED_DESTROY;
+      io->image = NULL;
+    }
+}
+
+void
+image_io_cleanup(struct image_io *io)
+{
+  DBG("image_io_cleanup()");
+  image_io_read_cancel(io);
+  image_io_image_destroy(io);
+#ifdef CONFIG_IMAGES_LIBMAGICK
+  libmagick_cleanup(io);
+#endif
+#ifdef CONFIG_IMAGES_LIBUNGIF
+  libungif_cleanup(io);
+#endif
+#ifdef CONFIG_IMAGES_LIBPNG
+  libpng_cleanup(io);
+#endif
+#ifdef CONFIG_IMAGES_LIBJPEG
+  libjpeg_cleanup(io);
+#endif
+  mp_delete(io->internal_pool);
+}
+
+void
+image_io_reset(struct image_io *io)
+{
+  DBG("image_io_reset()");
+  image_io_read_cancel(io);
+  image_io_image_destroy(io);
+  struct mempool *pool = io->internal_pool;
+  struct image_context *ctx = io->context;
+  mp_flush(pool);
+  bzero(io, sizeof(*io));
+  io->internal_pool = pool;
+  io->context = ctx;
+}
+
+int
+image_io_read_header(struct image_io *io)
+{
+  DBG("image_io_read_header()");
+  image_io_read_cancel(io);
+  image_io_image_destroy(io);
+  switch (io->format) {
+    case IMAGE_FORMAT_JPEG:
+#if defined(CONFIG_IMAGES_LIBJPEG)
+      return libjpeg_read_header(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_read_header(io);
+#endif
+      break;
+
+    case IMAGE_FORMAT_PNG:
+#if defined(CONFIG_IMAGES_LIBPNG)
+      return libpng_read_header(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_read_header(io);
+#endif
+      break;
+
+    case IMAGE_FORMAT_GIF:
+#if defined(CONFIG_IMAGES_LIBUNGIF) || defined(CONFIG_IMAGES_LIBGIF)
+      return libungif_read_header(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_read_header(io);
+#endif
+      break;
+
+    case IMAGE_FORMAT_UNDEFINED:
+#if defined (CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_read_header(io);
+#endif
+      break;
+
+    default:
+      ASSERT(0);
+  }
+  IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_FILE_FORMAT, "Image format not supported.");
+  return 0;
+}
+
+struct image *
+image_io_read_data(struct image_io *io, int ref)
+{
+  DBG("image_io_read_data()");
+  ASSERT(io->read_cancel);
+  io->read_cancel = NULL;
+  int result;
+  switch (io->format) {
+    case IMAGE_FORMAT_JPEG:
+#if defined(CONFIG_IMAGES_LIBJPEG)
+      result = libjpeg_read_data(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      result = libmagick_read_data(io);
+#else
+      ASSERT(0);
+#endif
+      break;
+
+    case IMAGE_FORMAT_PNG:
+#if defined(CONFIG_IMAGES_LIBPNG)
+      result = libpng_read_data(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      result = libmagick_read_data(io);
+#else
+      ASSERT(0);
+#endif
+      break;
+
+    case IMAGE_FORMAT_GIF:
+#if defined(CONFIG_IMAGES_LIBUNGIF) || defined(CONFIG_IMAGES_LIBGIF)
+      result = libungif_read_data(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      result = libmagick_read_data(io);
+#else
+      ASSERT(0);
+#endif
+      break;
+
+    case IMAGE_FORMAT_UNDEFINED:
+#if defined(CONFIG_IMAGES_LIBMAGICK)
+      result = libmagick_read_data(io);
+#else
+      ASSERT(0);
+#endif
+      break;
+
+    default:
+      ASSERT(0);
+  }
+  if (result)
+    {
+      if (!ref)
+	io->flags |= IMAGE_IO_NEED_DESTROY;
+      else
+	io->flags &= ~IMAGE_IO_NEED_DESTROY;
+      return io->image;
+    }
+  else
+    return NULL;
+}
+
+struct image *
+image_io_read(struct image_io *io, int ref)
+{
+  if (!image_io_read_header(io))
+    return NULL;
+  return image_io_read_data(io, ref);
+}
+
+int
+image_io_write(struct image_io *io)
+{
+  DBG("image_io_write()");
+  image_io_read_cancel(io);
+  switch (io->format) {
+    case IMAGE_FORMAT_JPEG:
+#if defined(CONFIG_IMAGES_LIBJPEG)
+      return libjpeg_write(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_write(io);
+#endif
+      break;
+
+    case IMAGE_FORMAT_PNG:
+#if defined(CONFIG_IMAGES_LIBPNG)
+      return libpng_write(io);
+#elif defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_write(io);
+#endif
+      break;
+
+    case IMAGE_FORMAT_GIF:
+#if defined(CONFIG_IMAGES_LIBMAGICK)
+      return libmagick_write(io);
+#endif
+      break;
+
+    default:
+      break;
+  }
+  IMAGE_ERROR(io->context, IMAGE_ERROR_INVALID_FILE_FORMAT, "Output format not supported.");
+  return 0;
+}
+
+byte *
+image_format_to_extension(enum image_format format)
+{
+  switch (format)
+    {
+      case IMAGE_FORMAT_JPEG:
+	return "jpg";
+      case IMAGE_FORMAT_PNG:
+	return "png";
+      case IMAGE_FORMAT_GIF:
+	return "gif";
+      default:
+	return NULL;
+    }
+}
+
+enum image_format
+image_extension_to_format(byte *extension)
+{
+  if (!strcasecmp(extension, "jpg"))
+    return IMAGE_FORMAT_JPEG;
+  if (!strcasecmp(extension, "jpeg"))
+    return IMAGE_FORMAT_JPEG;
+  if (!strcasecmp(extension, "png"))
+    return IMAGE_FORMAT_PNG;
+  if (!strcasecmp(extension, "gif"))
+    return IMAGE_FORMAT_GIF;
+  return IMAGE_FORMAT_UNDEFINED;
+}
+
+enum image_format
+image_file_name_to_format(byte *file_name)
+{
+  byte *extension = strrchr(file_name, '.');
+  return extension ? image_extension_to_format(extension + 1) : IMAGE_FORMAT_UNDEFINED;
+}
+
+struct image *
+image_io_read_data_prepare(struct image_io_read_data_internals *rdi, struct image_io *io, uint cols, uint rows, uint flags)
+{
+  DBG("image_io_read_data_prepare()");
+  if (rdi->need_transformations = io->cols != cols || io->rows != rows ||
+      ((io->flags ^ flags) & IMAGE_NEW_FLAGS))
+    return rdi->image = image_new(io->context, cols, rows, flags & IMAGE_IO_IMAGE_FLAGS, NULL);
+  else
+    return rdi->image = image_new(io->context, io->cols, io->rows, io->flags & IMAGE_IO_IMAGE_FLAGS, io->pool);
+}
+
+int
+image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image_io *io)
+{
+  DBG("image_io_read_data_finish()");
+  if (rdi->need_transformations)
+    {
+      /* Scale the image */
+      if (io->cols != rdi->image->cols || io->rows != rdi->image->rows)
+        {
+	  DBG("Scaling image");
+	  uint flags = rdi->image->flags;
+	  if (!(rdi->need_transformations = ((io->flags ^ rdi->image->flags) & (IMAGE_NEW_FLAGS & ~IMAGE_PIXELS_ALIGNED))))
+	    flags = io->flags;
+	  struct image *img = image_new(io->context, io->cols, io->rows, flags, rdi->need_transformations ? NULL : io->pool);
+	  if (unlikely(!img))
+	    {
+	      image_destroy(rdi->image);
+	      return 0;
+	    }
+          if (unlikely(!image_scale(io->context, img, rdi->image)))
+            {
+              image_destroy(rdi->image);
+	      image_destroy(img);
+	      return 0;
+	    }
+	  image_destroy(rdi->image);
+	  rdi->image = img;
+	}
+
+      /* Convert pixel format */
+      if (io->flags != rdi->image->flags)
+        {
+	  struct image *img = image_new(io->context, io->cols, io->rows, io->flags, io->pool);
+	  if (unlikely(!img))
+	    {
+	      image_destroy(rdi->image);
+	      return 0;
+	    }
+	  struct image_conv_options opt = image_conv_defaults;
+	  opt.background = io->background_color;
+          if (unlikely(!image_conv(io->context, img, rdi->image, &opt)))
+            {
+              image_destroy(rdi->image);
+	      image_destroy(img);
+	      return 0;
+	    }
+	  image_destroy(rdi->image);
+	  rdi->image = img;
+	}
+    }
+
+  /* Success */
+  io->image = rdi->image;
+  return 1;
+}
+
+void
+image_io_read_data_break(struct image_io_read_data_internals *rdi, struct image_io *io UNUSED)
+{
+  DBG("image_io_read_data_break()");
+  if (rdi->image)
+    image_destroy(rdi->image);
+}
diff --git a/libucw/images/io-main.h b/libucw/images/io-main.h
new file mode 100644
index 0000000..a048b67
--- /dev/null
+++ b/libucw/images/io-main.h
@@ -0,0 +1,55 @@
+#ifndef _IMAGES_IO_MAIN_H
+#define _IMAGES_IO_MAIN_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_io_read_data_break ucw_image_io_read_data_break
+#define image_io_read_data_finish ucw_image_io_read_data_finish
+#define image_io_read_data_prepare ucw_image_io_read_data_prepare
+#define libjpeg_read_data ucw_libjpeg_read_data
+#define libjpeg_read_header ucw_libjpeg_read_header
+#define libjpeg_write ucw_libjpeg_write
+#define libmagick_cleanup ucw_libmagick_cleanup
+#define libmagick_init ucw_libmagick_init
+#define libmagick_read_data ucw_libmagick_read_data
+#define libmagick_read_header ucw_libmagick_read_header
+#define libmagick_write ucw_libmagick_write
+#define libpng_read_data ucw_libpng_read_data
+#define libpng_read_header ucw_libpng_read_header
+#define libpng_write ucw_libpng_write
+#define libungif_read_data ucw_libungif_read_data
+#define libungif_read_header ucw_libungif_read_header
+#endif
+
+static inline int libjpeg_init(struct image_io *io UNUSED) { return 1; }
+static inline void libjpeg_cleanup(struct image_io *io UNUSED) {}
+int libjpeg_read_header(struct image_io *io);
+int libjpeg_read_data(struct image_io *io);
+int libjpeg_write(struct image_io *io);
+
+static inline int libpng_init(struct image_io *io UNUSED) { return 1; }
+static inline void libpng_cleanup(struct image_io *io UNUSED) {}
+int libpng_read_header(struct image_io *io);
+int libpng_read_data(struct image_io *io);
+int libpng_write(struct image_io *io);
+
+static inline int libungif_init(struct image_io *io UNUSED) { return 1; }
+static inline void libungif_cleanup(struct image_io *io UNUSED) {}
+int libungif_read_header(struct image_io *io);
+int libungif_read_data(struct image_io *io);
+
+int libmagick_init(struct image_io *io);
+void libmagick_cleanup(struct image_io *io);
+int libmagick_read_header(struct image_io *io);
+int libmagick_read_data(struct image_io *io);
+int libmagick_write(struct image_io *io);
+
+struct image_io_read_data_internals {
+  struct image *image;
+  int need_transformations;
+};
+
+struct image *image_io_read_data_prepare(struct image_io_read_data_internals *rdi, struct image_io *io, uint cols, uint rows, uint flags);
+int image_io_read_data_finish(struct image_io_read_data_internals *rdi, struct image_io *io);
+void image_io_read_data_break(struct image_io_read_data_internals *rdi, struct image_io *io);
+
+#endif
diff --git a/libucw/images/libucw-images.pc b/libucw/images/libucw-images.pc
new file mode 100644
index 0000000..9cc39c0
--- /dev/null
+++ b/libucw/images/libucw-images.pc
@@ -0,0 +1,12 @@
+# pkg-config metadata for libucw-images
+
+libdir=@LIBDIR@
+incdir=.
+
+Name: libucw-images
+Description: UCW image library
+Version: @UCW_VERSION@
+Cflags: -I${incdir}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-images@UCW_ABI_SUFFIX@
+Libs.private: @LIBIMAGES_LIBS@
+Requires.private: @DEPS@
diff --git a/libucw/images/math.c b/libucw/images/math.c
new file mode 100644
index 0000000..0e88ca9
--- /dev/null
+++ b/libucw/images/math.c
@@ -0,0 +1,64 @@
+/*
+ *	Image Library -- Math routines
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <images/math.h>
+
+const u32 fast_div_tab[] = {
+          0, 4294967295U,2147483648U,1431655766, 1073741824,  858993460,  715827883,  613566757,
+  536870912,  477218589,  429496730,  390451573,  357913942,  330382100,  306783379,  286331154,
+  268435456,  252645136,  238609295,  226050911,  214748365,  204522253,  195225787,  186737709,
+  178956971,  171798692,  165191050,  159072863,  153391690,  148102321,  143165577,  138547333,
+  134217728,  130150525,  126322568,  122713352,  119304648,  116080198,  113025456,  110127367,
+  107374183,  104755300,  102261127,   99882961,   97612894,   95443718,   93368855,   91382283,
+   89478486,   87652394,   85899346,   84215046,   82595525,   81037119,   79536432,   78090315,
+   76695845,   75350304,   74051161,   72796056,   71582789,   70409300,   69273667,   68174085,
+   67108864,   66076420,   65075263,   64103990,   63161284,   62245903,   61356676,   60492498,
+   59652324,   58835169,   58040099,   57266231,   56512728,   55778797,   55063684,   54366675,
+   53687092,   53024288,   52377650,   51746594,   51130564,   50529028,   49941481,   49367441,
+   48806447,   48258060,   47721859,   47197443,   46684428,   46182445,   45691142,   45210183,
+   44739243,   44278014,   43826197,   43383509,   42949673,   42524429,   42107523,   41698712,
+   41297763,   40904451,   40518560,   40139882,   39768216,   39403370,   39045158,   38693400,
+   38347923,   38008561,   37675152,   37347542,   37025581,   36709123,   36398028,   36092163,
+   35791395,   35495598,   35204650,   34918434,   34636834,   34359739,   34087043,   33818641,
+   33554432,   33294321,   33038210,   32786010,   32537632,   32292988,   32051995,   31814573,
+   31580642,   31350127,   31122952,   30899046,   30678338,   30460761,   30246249,   30034737,
+   29826162,   29620465,   29417585,   29217465,   29020050,   28825284,   28633116,   28443493,
+   28256364,   28071682,   27889399,   27709467,   27531842,   27356480,   27183338,   27012373,
+   26843546,   26676816,   26512144,   26349493,   26188825,   26030105,   25873297,   25718368,
+   25565282,   25414008,   25264514,   25116768,   24970741,   24826401,   24683721,   24542671,
+   24403224,   24265352,   24129030,   23994231,   23860930,   23729102,   23598722,   23469767,
+   23342214,   23216040,   23091223,   22967740,   22845571,   22724695,   22605092,   22486740,
+   22369622,   22253717,   22139007,   22025474,   21913099,   21801865,   21691755,   21582751,
+   21474837,   21367997,   21262215,   21157475,   21053762,   20951060,   20849356,   20748635,
+   20648882,   20550083,   20452226,   20355296,   20259280,   20164166,   20069941,   19976593,
+   19884108,   19792477,   19701685,   19611723,   19522579,   19434242,   19346700,   19259944,
+   19173962,   19088744,   19004281,   18920561,   18837576,   18755316,   18673771,   18592933,
+   18512791,   18433337,   18354562,   18276457,   18199014,   18122225,   18046082,   17970575,
+   17895698,   17821442,   17747799,   17674763,   17602325,   17530479,   17459217,   17388532,
+   17318417,   17248865,   17179870,   17111424,   17043522,   16976156,   16909321,   16843010 };
+
+const byte fast_sqrt_tab[] = {
+    0,   16,   23,   28,   32,   36,   39,   43,   46,   48,   51,   53,   56,   58,   60,   62,
+   64,   66,   68,   70,   72,   74,   75,   77,   79,   80,   82,   83,   85,   86,   88,   89,
+   91,   92,   94,   95,   96,   98,   99,  100,  101,  103,  104,  105,  106,  108,  109,  110,
+  111,  112,  113,  115,  116,  117,  118,  119,  120,  121,  122,  123,  124,  125,  126,  127,
+  128,  129,  130,  131,  132,  133,  134,  135,  136,  137,  138,  139,  140,  141,  142,  143,
+  143,  144,  145,  146,  147,  148,  149,  150,  150,  151,  152,  153,  154,  155,  155,  156,
+  157,  158,  159,  159,  160,  161,  162,  163,  163,  164,  165,  166,  167,  167,  168,  169,
+  170,  170,  171,  172,  173,  173,  174,  175,  176,  176,  177,  178,  178,  179,  180,  181,
+  181,  182,  183,  183,  184,  185,  186,  186,  187,  188,  188,  189,  190,  190,  191,  192,
+  192,  193,  194,  194,  195,  196,  196,  197,  198,  198,  199,  199,  200,  201,  201,  202,
+  203,  203,  204,  205,  205,  206,  206,  207,  208,  208,  209,  210,  210,  211,  211,  212,
+  213,  213,  214,  214,  215,  216,  216,  217,  217,  218,  219,  219,  220,  220,  221,  221,
+  222,  223,  223,  224,  224,  225,  225,  226,  227,  227,  228,  228,  229,  229,  230,  230,
+  231,  232,  232,  233,  233,  234,  234,  235,  235,  236,  237,  237,  238,  238,  239,  239,
+  240,  240,  241,  241,  242,  242,  243,  243,  244,  245,  245,  246,  246,  247,  247,  248,
+  248,  249,  249,  250,  250,  251,  251,  252,  252,  253,  253,  254,  254,  255,  255,  255 };
+
diff --git a/libucw/images/math.h b/libucw/images/math.h
new file mode 100644
index 0000000..b322949
--- /dev/null
+++ b/libucw/images/math.h
@@ -0,0 +1,94 @@
+#ifndef _IMAGES_MATH_H
+#define _IMAGES_MATH_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define fast_div_tab ucw_fast_div_tab
+#define fast_sqrt_tab ucw_fast_sqrt_tab
+#endif
+
+extern const u32 fast_div_tab[];
+extern const byte fast_sqrt_tab[];
+
+static inline uint isqr(int x)
+{
+  return x * x;
+}
+
+static inline uint fast_div_u32_u8(uint x, uint y)
+{
+  return ((u64)(x) * fast_div_tab[y]) >> 32;
+}
+
+static inline uint fast_sqrt_u16(uint x)
+{
+  uint y;
+  if (x < (1 << 10) - 3)
+    y = fast_sqrt_tab[(x + 3) >> 2] >> 3;
+  else if (x < (1 << 14) - 28)
+    y = fast_sqrt_tab[(x + 28) >> 6] >> 1;
+  else
+    y = fast_sqrt_tab[x >> 8];
+  return (x < y * y) ? y - 1 : y;
+}
+
+static inline uint fast_sqrt_u32(uint x)
+{
+  uint y;
+  if (x < (1 << 16))
+    {
+      if (x < (1 << 10) - 3)
+  	y = fast_sqrt_tab[(x + 3) >> 2] >> 3;
+      else if (x < (1 << 14) - 28)
+	y = fast_sqrt_tab[(x + 28) >> 6] >> 1;
+      else
+        y = fast_sqrt_tab[x >> 8];
+    }
+  else
+    {
+      if (x < (1 << 24))
+        {
+	  if (x < (1 << 20))
+	    {
+              y = fast_sqrt_tab[x >> 12];
+              y = (fast_div_u32_u8(x, y) >> 3) + (y << 1);
+            }
+	  else
+	    {
+              y = fast_sqrt_tab[x >> 16];
+              y = (fast_div_u32_u8(x, y) >> 5) + (y << 3);
+            }
+        }
+      else
+        {
+          if (x < (1 << 28))
+	    {
+              if (x < (1 << 26))
+	        {
+                  y = fast_sqrt_tab[x >> 18];
+                  y = (fast_div_u32_u8(x, y) >> 6) + (y << 4);
+                }
+	      else
+	        {
+                  y = fast_sqrt_tab[x >> 20];
+                  y = (fast_div_u32_u8(x, y) >> 7) + (y << 5);
+                }
+            }
+	  else
+	    {
+              if (x < (1 << 30))
+	        {
+                  y = fast_sqrt_tab[x >> 22];
+                  y = (fast_div_u32_u8(x, y) >> 8) + (y << 6);
+                }
+	      else
+	        {
+                  y = fast_sqrt_tab[x >> 24];
+                  y = (fast_div_u32_u8(x, y) >> 9) + (y << 7);
+                }
+            }
+        }
+    }
+  return (x < y * y) ? y - 1 : y;
+}
+
+#endif
diff --git a/libucw/images/object.c b/libucw/images/object.c
new file mode 100644
index 0000000..ae7b021
--- /dev/null
+++ b/libucw/images/object.c
@@ -0,0 +1,110 @@
+/*
+ *	Image Library -- Image cards manipulations
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ */
+
+#undef LOCAL_DEBUG
+
+#include "sherlock/sherlock.h"
+#include <ucw/base224.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include "sherlock/object.h"
+#include <images/images.h>
+#include <images/object.h>
+#include <images/color.h>
+#include <images/signature.h>
+#include <stdio.h>
+#include <string.h>
+
+uint
+get_image_obj_info(struct image_obj_info *ioi, struct odes *o)
+{
+  byte *v = obj_find_aval(o, 'G');
+  if (!v)
+    {
+      DBG("Missing image info attribute");
+      return 0;
+    }
+  byte color_space[16], thumb_format[16];
+  UNUSED uint cnt = sscanf(v, "%d%d%s%d%d%d%s", &ioi->cols, &ioi->rows, color_space,
+      &ioi->colors, &ioi->thumb_cols, &ioi->thumb_rows, thumb_format);
+  ASSERT(cnt == 7);
+  ioi->thumb_format = (*thumb_format == 'p') ? IMAGE_FORMAT_PNG : IMAGE_FORMAT_JPEG;
+  DBG("Readed image info attribute: dim=%ux%u", ioi->cols, ioi->rows);
+  return 1;
+}
+
+uint
+get_image_obj_thumb(struct image_obj_info *ioi, struct odes *o, struct mempool *pool)
+{
+  struct oattr *a = obj_find_attr(o, 'N');
+  if (!a)
+    {
+      DBG("Missing image thumbnail attribute");
+      return 0;
+    }
+  uint count = 0;
+  uint max_len = 0;
+  for (struct oattr *b = a; b; b = b->same)
+    {
+      count++;
+      max_len += strlen(b->val);
+    }
+  byte buf[max_len + 1], *b = buf;
+  for (; a; a = a->same)
+    b += base224_decode(b, a->val, strlen(a->val));
+  ASSERT(b != buf);
+  ioi->thumb_data = mp_alloc(pool, ioi->thumb_size = b - buf);
+  memcpy(ioi->thumb_data, buf, ioi->thumb_size);
+  DBG("Readed thumbnail of size %u", ioi->thumb_size);
+  return 1;
+}
+
+struct image *
+read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct image_io *io, struct mempool *pool)
+{
+  struct fastbuf tmp_fb;
+  if (!fb)
+    fbbuf_init_read(fb = &tmp_fb, ioi->thumb_data, ioi->thumb_size, 0);
+  io->format = ioi->thumb_format;
+  io->fastbuf = fb;
+  if (!image_io_read_header(io))
+    goto error;
+  io->pool = pool;
+  io->flags = COLOR_SPACE_RGB | IMAGE_IO_USE_BACKGROUND;
+  if (!io->background_color.color_space)
+    io->background_color = color_white;
+  struct image *img;
+  if (!(img = image_io_read_data(io, 1)))
+    goto error;
+  DBG("Decompressed thumbnail: size=%ux%u", img->cols, img->rows);
+  return img;
+error:
+  DBG("Failed to decompress thumbnail: %s", io->thread->err_msg);
+  return NULL;
+}
+
+void
+put_image_obj_signature(struct odes *o, struct image_signature *sig)
+{
+  /* signatures should be short enough to in a single attribute */
+  uint size = image_signature_size(sig->len);
+  byte buf[BASE224_ENC_LENGTH(size) + 1];
+  buf[base224_encode(buf, (byte *)sig, size)] = 0;
+  obj_set_attr(o, 'H', buf);
+}
+
+uint
+get_image_obj_signature(struct image_signature *sig, struct odes *o)
+{
+  byte *a = obj_find_aval(o, 'H');
+  if (!a)
+    return 0;
+  UNUSED uint size = base224_decode((byte *)sig, a, strlen(a));
+  ASSERT(size == image_signature_size(sig->len));
+  return 1;
+}
diff --git a/libucw/images/object.h b/libucw/images/object.h
new file mode 100644
index 0000000..4f03166
--- /dev/null
+++ b/libucw/images/object.h
@@ -0,0 +1,35 @@
+#ifndef _IMAGES_OBJECT_H
+#define _IMAGES_OBJECT_H
+
+#include <images/images.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define get_image_obj_info ucw_get_image_obj_info
+#define get_image_obj_signature ucw_get_image_obj_signature
+#define get_image_obj_thumb ucw_get_image_obj_thumb
+#define put_image_obj_signature ucw_put_image_obj_signature
+#define read_image_obj_thumb ucw_read_image_obj_thumb
+#endif
+
+struct image_obj_info {
+  uint cols;
+  uint rows;
+  uint colors;
+  enum image_format thumb_format;
+  uint thumb_cols;
+  uint thumb_rows;
+  uint thumb_size;
+  byte *thumb_data;
+};
+
+struct odes;
+struct mempool;
+struct image_signature;
+
+uint get_image_obj_info(struct image_obj_info *ioi, struct odes *o);
+uint get_image_obj_thumb(struct image_obj_info *ioi, struct odes *o, struct mempool *pool);
+struct image *read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct image_io *io, struct mempool *pool);
+void put_image_obj_signature(struct odes *o, struct image_signature *sig);
+uint get_image_obj_signature(struct image_signature *sig, struct odes *o);
+
+#endif
diff --git a/libucw/images/scale-gen.h b/libucw/images/scale-gen.h
new file mode 100644
index 0000000..e6f1685
--- /dev/null
+++ b/libucw/images/scale-gen.h
@@ -0,0 +1,385 @@
+/*
+ *	Image Library -- Image scaling algorithms
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef IMAGE_SCALE_CHANNELS
+#  define IMAGE_SCALE_CHANNELS IMAGE_SCALE_PIXEL_SIZE
+#endif
+
+#undef IMAGE_COPY_PIXEL
+#if IMAGE_SCALE_PIXEL_SIZE == 1
+#define IMAGE_COPY_PIXEL(dest, src) do{ *(byte *)dest = *(byte *)src; }while(0)
+#elif IMAGE_SCALE_PIXEL_SIZE == 2
+#define IMAGE_COPY_PIXEL(dest, src) do{ *(u16 *)dest = *(u16 *)src; }while(0)
+#elif IMAGE_SCALE_PIXEL_SIZE == 3
+#define IMAGE_COPY_PIXEL(dest, src) do{ ((byte *)dest)[0] = ((byte *)src)[0]; ((byte *)dest)[1] = ((byte *)src)[1]; ((byte *)dest)[2] = ((byte *)src)[2]; }while(0)
+#elif IMAGE_SCALE_PIXEL_SIZE == 4
+#define IMAGE_COPY_PIXEL(dest, src) do{ *(u32 *)dest = *(u32 *)src; }while(0)
+#endif
+
+static void
+IMAGE_SCALE_PREFIX(nearest_xy)(struct image *dest, struct image *src)
+{
+  uint x_inc = (src->cols << 16) / dest->cols;
+  uint y_inc = (src->rows << 16) / dest->rows;
+  uint x_start = x_inc >> 1, x_pos;
+  uint y_pos = y_inc >> 1;
+  byte *row_start;
+# define IMAGE_WALK_PREFIX(x) walk_##x
+# define IMAGE_WALK_INLINE
+# define IMAGE_WALK_UNROLL 4
+# define IMAGE_WALK_IMAGE dest
+# define IMAGE_WALK_COL_STEP IMAGE_SCALE_PIXEL_SIZE
+# define IMAGE_WALK_DO_ROW_START do{ row_start = src->pixels + (y_pos >> 16) * src->row_size; y_pos += y_inc; x_pos = x_start; }while(0)
+# define IMAGE_WALK_DO_STEP do{ byte *pos = row_start + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE; x_pos += x_inc; IMAGE_COPY_PIXEL(walk_pos, pos); }while(0)
+# include <images/image-walk.h>
+}
+
+#if 0 /* Experiments with rearranging pixels for SSE... */
+static void
+IMAGE_SCALE_PREFIX(linear_x)(struct image *dest, struct image *src)
+{
+  /* Handle problematic special case */
+  byte *src_row = src->pixels;
+  byte *dest_row = dest->pixels;
+  if (src->cols == 1)
+    {
+      for (uint y_counter = dest->rows; y_counter--; )
+        {
+          // FIXME
+          ASSERT(0);
+	  src_row += src->row_size;
+	  dest_row += dest->row_size;
+	}
+      return;
+    }
+  /* Initialize the main loop */
+  uint x_inc = ((src->cols - 1) << 16) / (dest->cols - 1);
+# define COLS_AT_ONCE 256
+  byte pixel_buf[COLS_AT_ONCE * 2 * IMAGE_SCALE_PIXEL_SIZE]; /* Buffers should fit in cache */
+  u16 coef_buf[COLS_AT_ONCE * IMAGE_SCALE_PIXEL_SIZE];
+  /* Main loop */
+  for (uint y_counter = dest->rows; y_counter--; )
+    {
+      uint x_pos = 0;
+      byte *dest_pos = dest_row;
+      for (uint x_counter = dest->cols; --x_counter; )
+      for (uint x_counter = dest->cols; x_counter > COLS_AT_ONCE; x_counter -= COLS_AT_ONCE)
+        {
+	  byte *pixel_buf_pos = pixel_buf;
+	  u16 *coef_buf_pos = coef_buf;
+	  for (uint i = 0; i < COLS_AT_ONCE / 2; i++)
+	    {
+	      byte *src_pos = src_row + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE;
+	      uint ofs = x_pos & 0xffff;
+	      x_pos += x_inc;
+	      byte *src_pos_2 = src_row + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE;
+	      uint ofs_2 = x_pos & 0xffff;
+	      x_pos += x_inc;
+	      *coef_buf_pos++ = ofs;
+	      byte *pixel_buf_pos_2 = pixel_buf_pos + IMAGE_SCALE_PIXEL_SIZE;
+	      byte *pixel_buf_pos_3 = pixel_buf_pos + IMAGE_SCALE_PIXEL_SIZE * 2;
+	      byte *pixel_buf_pos_4 = pixel_buf_pos + IMAGE_SCALE_PIXEL_SIZE * 3;
+              IMAGE_COPY_PIXEL(pixel_buf_pos, src_pos);
+	      IMAGE_COPY_PIXEL(pixel_buf_pos_2, src_pos + IMAGE_SCALE_PIXEL_SIZE);
+              IMAGE_COPY_PIXEL(pixel_buf_pos_3, src_pos_2);
+	      IMAGE_COPY_PIXEL(pixel_buf_pos_4, src_pos_2 + IMAGE_SCALE_PIXEL_SIZE);
+	      pixel_buf_pos += 4 * IMAGE_SCALE_PIXEL_SIZE;
+	      *coef_buf_pos++ = ofs_2;
+	    }
+/*
+	  byte *src_pos = src_row + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE;
+	  uint ofs = x_pos & 0xffff;
+	  x_pos += x_inc;
+	  dest_pos[0] = LINEAR_INTERPOLATE(src_pos[0], src_pos[0 + IMAGE_SCALE_PIXEL_SIZE], ofs);
+#	  if IMAGE_SCALE_CHANNELS >= 2
+	  dest_pos[1] = LINEAR_INTERPOLATE(src_pos[1], src_pos[1 + IMAGE_SCALE_PIXEL_SIZE], ofs);
+#	  endif
+#	  if IMAGE_SCALE_CHANNELS >= 3
+	  dest_pos[2] = LINEAR_INTERPOLATE(src_pos[2], src_pos[2 + IMAGE_SCALE_PIXEL_SIZE], ofs);
+#	  endif
+#	  if IMAGE_SCALE_CHANNELS >= 4
+	  dest_pos[3] = LINEAR_INTERPOLATE(src_pos[3], src_pos[3 + IMAGE_SCALE_PIXEL_SIZE], ofs);
+#	  endif
+	  dest_pos += IMAGE_SCALE_PIXEL_SIZE;*/
+
+	}
+      /* Always copy the last column - handle "x_pos == dest->cols * 0x10000" overflow */
+      IMAGE_COPY_PIXEL(dest_pos, src_row + src->row_pixels_size - IMAGE_SCALE_PIXEL_SIZE);
+      /* Next step */
+      src_row += src->row_size;
+      dest_row += dest->row_size;
+    }
+#undef COLS_AT_ONCE
+}
+
+static void
+IMAGE_SCALE_PREFIX(bilinear_xy)(struct image *dest, struct image *src)
+{
+  uint x_inc = (((src->cols - 1) << 16) - 1) / (dest->cols);
+  uint y_inc = (((src->rows - 1) << 16) - 1) / (dest->rows);
+  uint y_pos = 0x10000;
+  byte *cache[2], buf1[dest->row_pixels_size + 16], buf2[dest->row_pixels_size + 16], *pbuf[2];
+  byte *dest_row = dest->pixels, *dest_pos;
+  uint cache_index = ~0U, cache_i = 0;
+  pbuf[0] = cache[0] = ALIGN_PTR((void *)buf1, 16);
+  pbuf[1] = cache[1] = ALIGN_PTR((void *)buf2, 16);
+#ifdef __SSE2__
+  __m128i zero = _mm_setzero_si128();
+#endif
+  for (uint row_counter = dest->rows; row_counter--; )
+    {
+      dest_pos = dest_row;
+      uint y_index = y_pos >> 16;
+      uint y_ofs = y_pos & 0xffff;
+      y_pos += y_inc;
+      uint x_pos = 0;
+      if (y_index > (uint)(cache_index + 1))
+	cache_index = y_index - 1;
+      while (y_index > cache_index)
+        {
+	  cache[0] = cache[1];
+	  cache[1] = pbuf[cache_i ^= 1];
+	  cache_index++;
+	  byte *src_row = src->pixels + cache_index * src->row_size;
+	  byte *cache_pos = cache[1];
+	  for (uint col_counter = dest->cols; --col_counter; )
+	    {
+	      byte *c1 = src_row + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE;
+	      byte *c2 = c1 + IMAGE_SCALE_PIXEL_SIZE;
+	      uint ofs = x_pos & 0xffff;
+	      cache_pos[0] = LINEAR_INTERPOLATE(c1[0], c2[0], ofs);
+#	      if IMAGE_SCALE_CHANNELS >= 2
+	      cache_pos[1] = LINEAR_INTERPOLATE(c1[1], c2[1], ofs);
+#	      endif
+#	      if IMAGE_SCALE_CHANNELS >= 3
+	      cache_pos[2] = LINEAR_INTERPOLATE(c1[2], c2[2], ofs);
+#	      endif
+#	      if IMAGE_SCALE_CHANNELS >= 4
+	      cache_pos[3] = LINEAR_INTERPOLATE(c1[3], c2[3], ofs);
+#	      endif
+	      cache_pos += IMAGE_SCALE_PIXEL_SIZE;
+	      x_pos += x_inc;
+	    }
+	  IMAGE_COPY_PIXEL(cache_pos, src_row + src->row_pixels_size - IMAGE_SCALE_PIXEL_SIZE);
+	}
+      uint i = 0;
+#ifdef __SSE2__
+      __m128i coef = _mm_set1_epi16(y_ofs >> 9);
+      for (; (int)i < (int)dest->row_pixels_size - 15; i += 16)
+        {
+	  __m128i a2 = _mm_loadu_si128((__m128i *)(cache[0] + i));
+	  __m128i a1 = _mm_unpacklo_epi8(a2, zero);
+	  a2 = _mm_unpackhi_epi8(a2, zero);
+	  __m128i b2 = _mm_loadu_si128((__m128i *)(cache[1] + i));
+	  __m128i b1 = _mm_unpacklo_epi8(b2, zero);
+	  b2 = _mm_unpackhi_epi8(b2, zero);
+	  b1 = _mm_sub_epi16(b1, a1);
+	  b2 = _mm_sub_epi16(b2, a2);
+	  a1 = _mm_slli_epi16(a1, 7);
+	  a2 = _mm_slli_epi16(a2, 7);
+	  b1 = _mm_mullo_epi16(b1, coef);
+	  b2 = _mm_mullo_epi16(b2, coef);
+	  a1 = _mm_add_epi16(a1, b1);
+	  a2 = _mm_add_epi16(a2, b2);
+	  a1 = _mm_srli_epi16(a1, 7);
+	  a2 = _mm_srli_epi16(a2, 7);
+	  a1 = _mm_packus_epi16(a1, a2);
+	  _mm_storeu_si128((__m128i *)(dest_pos + i), a1);
+	}
+#elif 1
+      for (; (int)i < (int)dest->row_pixels_size - 3; i += 4)
+        {
+	  dest_pos[i + 0] = LINEAR_INTERPOLATE(cache[0][i + 0], cache[1][i + 0], y_ofs);
+	  dest_pos[i + 1] = LINEAR_INTERPOLATE(cache[0][i + 1], cache[1][i + 1], y_ofs);
+	  dest_pos[i + 2] = LINEAR_INTERPOLATE(cache[0][i + 2], cache[1][i + 2], y_ofs);
+	  dest_pos[i + 3] = LINEAR_INTERPOLATE(cache[0][i + 3], cache[1][i + 3], y_ofs);
+	}
+#endif
+      for (; i < dest->row_pixels_size; i++)
+	dest_pos[i] = LINEAR_INTERPOLATE(cache[0][i], cache[1][i], y_ofs);
+      dest_row += dest->row_size;
+    }
+}
+#endif
+
+static void
+IMAGE_SCALE_PREFIX(downsample_xy)(struct image *dest, struct image *src)
+{
+  /* FIXME slow */
+  byte *rsrc = src->pixels, *psrc;
+  byte *rdest = dest->pixels, *pdest;
+  u64 x_inc = ((u64)dest->cols << 32) / src->cols, x_pos;
+  u64 y_inc = ((u64)dest->rows << 32) / src->rows, y_pos = 0;
+  uint x_inc_frac = (u64)0xffffffffff / x_inc;
+  uint y_inc_frac = (u64)0xffffffffff / y_inc;
+  uint final_mul = ((u64)(x_inc >> 16) * (y_inc >> 16)) >> 16;
+  uint buf_size = dest->cols * IMAGE_SCALE_CHANNELS;
+  u32 buf[buf_size], *pbuf;
+  buf_size *= sizeof(u32);
+  bzero(buf, buf_size);
+  for (uint rows_counter = src->rows; rows_counter--; )
+    {
+      pbuf = buf;
+      psrc = rsrc;
+      rsrc += src->row_size;
+      x_pos = 0;
+      y_pos += y_inc;
+      if (y_pos <= 0x100000000)
+        {
+          for (uint cols_counter = src->cols; cols_counter--; )
+            {
+	      x_pos += x_inc;
+	      if (x_pos <= 0x100000000)
+	        {
+	          pbuf[0] += psrc[0];
+#		  if IMAGE_SCALE_CHANNELS >= 2
+	          pbuf[1] += psrc[1];
+#                 endif
+#		  if IMAGE_SCALE_CHANNELS >= 3
+	          pbuf[2] += psrc[2];
+#                 endif
+#		  if IMAGE_SCALE_CHANNELS >= 4
+	          pbuf[3] += psrc[3];
+#                 endif
+	        }
+	      else
+	        {
+	          x_pos -= 0x100000000;
+	          uint mul2 = (uint)(x_pos >> 16) * x_inc_frac;
+	          uint mul1 = 0xffffff - mul2;
+	          pbuf[0] += (psrc[0] * mul1) >> 24;
+	          pbuf[0 + IMAGE_SCALE_CHANNELS] += (psrc[0] * mul2) >> 24;
+#		  if IMAGE_SCALE_CHANNELS >= 2
+	          pbuf[1] += (psrc[1] * mul1) >> 24;
+	          pbuf[1 + IMAGE_SCALE_CHANNELS] += (psrc[1] * mul2) >> 24;
+#                 endif
+#		  if IMAGE_SCALE_CHANNELS >= 3
+	          pbuf[2] += (psrc[2] * mul1) >> 24;
+	          pbuf[2 + IMAGE_SCALE_CHANNELS] += (psrc[2] * mul2) >> 24;
+#                 endif
+#		  if IMAGE_SCALE_CHANNELS >= 4
+	          pbuf[3] += (psrc[3] * mul1) >> 24;
+	          pbuf[3 + IMAGE_SCALE_CHANNELS] += (psrc[3] * mul2) >> 24;
+#                 endif
+	          pbuf += IMAGE_SCALE_CHANNELS;
+	        }
+	      psrc += IMAGE_SCALE_PIXEL_SIZE;
+	    }
+	}
+      else
+        {
+	  y_pos -= 0x100000000;
+          pdest = rdest;
+          rdest += dest->row_size;
+	  uint mul2 = (uint)(y_pos >> 16) * y_inc_frac;
+	  uint mul1 = 0xffffff - mul2;
+	  uint a0 = 0;
+#	  if IMAGE_SCALE_CHANNELS >= 2
+	  uint a1 = 0;
+#	  endif
+#	  if IMAGE_SCALE_CHANNELS >= 3
+	  uint a2 = 0;
+#	  endif
+#	  if IMAGE_SCALE_CHANNELS >= 4
+	  uint a3 = 0;
+#	  endif
+          for (uint cols_counter = src->cols; cols_counter--; )
+            {
+	      x_pos += x_inc;
+	      if (x_pos <= 0x100000000)
+	        {
+		  pbuf[0] += ((psrc[0] * mul1) >> 24);
+		  a0 += (psrc[0] * mul2) >> 24;
+#	          if IMAGE_SCALE_CHANNELS >= 2
+		  pbuf[1] += ((psrc[1] * mul1) >> 24);
+		  a1 += (psrc[1] * mul2) >> 24;
+#                 endif
+#	          if IMAGE_SCALE_CHANNELS >= 3
+		  pbuf[2] += ((psrc[2] * mul1) >> 24);
+		  a2 += (psrc[2] * mul2) >> 24;
+#                 endif
+#	          if IMAGE_SCALE_CHANNELS >= 4
+		  pbuf[3] += ((psrc[3] * mul1) >> 24);
+		  a3 += (psrc[3] * mul2) >> 24;
+#                 endif
+	        }
+	      else
+	        {
+	          x_pos -= 0x100000000;
+		  uint mul4 = (uint)(x_pos >> 16) * x_inc_frac;
+		  uint mul3 = 0xffffff - mul4;
+		  uint mul13 = ((u64)mul1 * mul3) >> 24;
+		  uint mul23 = ((u64)mul2 * mul3) >> 24;
+		  uint mul14 = ((u64)mul1 * mul4) >> 24;
+		  uint mul24 = ((u64)mul2 * mul4) >> 24;
+		  pdest[0] = ((((psrc[0] * mul13) >> 24) + pbuf[0]) * final_mul) >> 16;
+		  pbuf[0] = ((psrc[0] * mul23) >> 24) + a0;
+		  pbuf[0 + IMAGE_SCALE_CHANNELS] += ((psrc[0 + IMAGE_SCALE_PIXEL_SIZE] * mul14) >> 24);
+		  a0 = ((psrc[0 + IMAGE_SCALE_PIXEL_SIZE] * mul24) >> 24);
+#	          if IMAGE_SCALE_CHANNELS >= 2
+		  pdest[1] = ((((psrc[1] * mul13) >> 24) + pbuf[1]) * final_mul) >> 16;
+		  pbuf[1] = ((psrc[1] * mul23) >> 24) + a1;
+		  pbuf[1 + IMAGE_SCALE_CHANNELS] += ((psrc[1 + IMAGE_SCALE_PIXEL_SIZE] * mul14) >> 24);
+		  a1 = ((psrc[1 + IMAGE_SCALE_PIXEL_SIZE] * mul24) >> 24);
+#                 endif
+#	          if IMAGE_SCALE_CHANNELS >= 3
+		  pdest[2] = ((((psrc[2] * mul13) >> 24) + pbuf[2]) * final_mul) >> 16;
+		  pbuf[2] = ((psrc[2] * mul23) >> 24) + a2;
+		  pbuf[2 + IMAGE_SCALE_CHANNELS] += ((psrc[2 + IMAGE_SCALE_PIXEL_SIZE] * mul14) >> 24);
+		  a2 = ((psrc[2 + IMAGE_SCALE_PIXEL_SIZE] * mul24) >> 24);
+#                 endif
+#	          if IMAGE_SCALE_CHANNELS >= 4
+		  pdest[3] = ((((psrc[3] * mul13) >> 24) + pbuf[3]) * final_mul) >> 16;
+		  pbuf[3] = ((psrc[3] * mul23) >> 24) + a3;
+		  pbuf[3 + IMAGE_SCALE_CHANNELS] += ((psrc[3 + IMAGE_SCALE_PIXEL_SIZE] * mul14) >> 24);
+		  a3 = ((psrc[3 + IMAGE_SCALE_PIXEL_SIZE] * mul24) >> 24);
+#                 endif
+	          pbuf += IMAGE_SCALE_CHANNELS;
+		  pdest += IMAGE_SCALE_PIXEL_SIZE;
+	        }
+	      psrc += IMAGE_SCALE_PIXEL_SIZE;
+	    }
+	  pdest[0] = (pbuf[0] * final_mul) >> 16;
+	  pbuf[0] = a0;
+#         if IMAGE_SCALE_CHANNELS >= 2
+	  pdest[1] = (pbuf[1] * final_mul) >> 16;
+	  pbuf[1] = a1;
+#	  endif
+#         if IMAGE_SCALE_CHANNELS >= 3
+	  pdest[2] = (pbuf[2] * final_mul) >> 16;
+	  pbuf[2] = a2;
+#	  endif
+#         if IMAGE_SCALE_CHANNELS >= 4
+	  pdest[3] = (pbuf[3] * final_mul) >> 16;
+	  pbuf[3] = a3;
+#	  endif
+	}
+    }
+  pdest = rdest;
+  pbuf = buf;
+  for (uint cols_counter = dest->cols; cols_counter--; )
+    {
+      pdest[0] = (pbuf[0] * final_mul) >> 16;
+#     if IMAGE_SCALE_CHANNELS >= 2
+      pdest[1] = (pbuf[1] * final_mul) >> 16;
+#     endif
+#     if IMAGE_SCALE_CHANNELS >= 3
+      pdest[2] = (pbuf[2] * final_mul) >> 16;
+#     endif
+#     if IMAGE_SCALE_CHANNELS >= 4
+      pdest[3] = (pbuf[3] * final_mul) >> 16;
+#     endif
+      pbuf += IMAGE_SCALE_CHANNELS;
+      pdest += IMAGE_SCALE_PIXEL_SIZE;
+    }
+}
+
+#undef IMAGE_SCALE_PREFIX
+#undef IMAGE_SCALE_PIXEL_SIZE
+#undef IMAGE_SCALE_CHANNELS
diff --git a/libucw/images/scale.c b/libucw/images/scale.c
new file mode 100644
index 0000000..2695696
--- /dev/null
+++ b/libucw/images/scale.c
@@ -0,0 +1,278 @@
+/*
+ *	Image Library -- Image scaling algorithms
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/math.h>
+
+#include <string.h>
+
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
+
+#define LINEAR_INTERPOLATE(a, b, t) (((int)((a) << 16) + (int)(t) * ((int)(b) - (int)(a)) + 0x8000) >> 16)
+
+/* Generate optimized code for various pixel formats */
+
+#define IMAGE_SCALE_PREFIX(x) image_scale_1_##x
+#define IMAGE_SCALE_PIXEL_SIZE 1
+#include <images/scale-gen.h>
+
+#define IMAGE_SCALE_PREFIX(x) image_scale_2_##x
+#define IMAGE_SCALE_PIXEL_SIZE 2
+#include <images/scale-gen.h>
+
+#define IMAGE_SCALE_PREFIX(x) image_scale_3_##x
+#define IMAGE_SCALE_PIXEL_SIZE 3
+#include <images/scale-gen.h>
+
+#define IMAGE_SCALE_PREFIX(x) image_scale_4_##x
+#define IMAGE_SCALE_PIXEL_SIZE 4
+#include <images/scale-gen.h>
+
+/* Simple "nearest neighbour" algorithm */
+
+static void
+image_scale_nearest_xy(struct image *dest, struct image *src)
+{
+  switch (src->pixel_size)
+    {
+      case 1:
+	image_scale_1_nearest_xy(dest, src);
+	return;
+      case 2:
+	image_scale_2_nearest_xy(dest, src);
+	return;
+      case 3:
+	image_scale_3_nearest_xy(dest, src);
+	return;
+      case 4:
+	image_scale_4_nearest_xy(dest, src);
+	return;
+      default:
+	ASSERT(0);
+    }
+}
+
+static inline void
+image_scale_nearest_x(struct image *dest, struct image *src)
+{
+  image_scale_nearest_xy(dest, src);
+}
+
+static void
+image_scale_nearest_y(struct image *dest, struct image *src)
+{
+  uint y_inc = (src->rows << 16) / dest->rows;
+  uint y_pos = y_inc >> 1;
+  byte *dest_pos = dest->pixels;
+  for (uint row_counter = dest->rows; row_counter--; )
+    {
+      byte *src_pos = src->pixels + (y_pos >> 16) * src->row_size;
+      y_pos += y_inc;
+      memcpy(dest_pos, src_pos, dest->row_pixels_size);
+      dest_pos += dest->row_size;
+    }
+}
+
+/* Bilinear filter */
+
+UNUSED static void
+image_scale_linear_y(struct image *dest, struct image *src)
+{
+  byte *dest_row = dest->pixels;
+  /* Handle problematic special case */
+  if (src->rows == 1)
+    {
+      for (uint y_counter = dest->rows; y_counter--; dest_row += dest->row_size)
+        memcpy(dest_row, src->pixels, src->row_pixels_size);
+      return;
+    }
+  /* Initialize the main loop */
+  uint y_inc  = ((src->rows - 1) << 16) / (dest->rows - 1), y_pos = 0;
+#ifdef __SSE2__
+  __m128i zero = _mm_setzero_si128();
+#endif
+  /* Main loop */
+  for (uint y_counter = dest->rows; --y_counter; )
+    {
+      uint coef = y_pos & 0xffff;
+      byte *src_row_1 = src->pixels + (y_pos >> 16) * src->row_size;
+      byte *src_row_2 = src_row_1 + src->row_size;
+      uint i = 0;
+#ifdef __SSE2__
+      /* SSE2 */
+      __m128i sse_coef = _mm_set1_epi16(coef >> 9);
+      for (; (int)i < (int)dest->row_pixels_size - 15; i += 16)
+        {
+	  __m128i a2 = _mm_loadu_si128((__m128i *)(src_row_1 + i));
+	  __m128i a1 = _mm_unpacklo_epi8(a2, zero);
+	  a2 = _mm_unpackhi_epi8(a2, zero);
+	  __m128i b2 = _mm_loadu_si128((__m128i *)(src_row_2 + i));
+	  __m128i b1 = _mm_unpacklo_epi8(b2, zero);
+	  b2 = _mm_unpackhi_epi8(b2, zero);
+	  b1 = _mm_sub_epi16(b1, a1);
+	  b2 = _mm_sub_epi16(b2, a2);
+	  a1 = _mm_slli_epi16(a1, 7);
+	  a2 = _mm_slli_epi16(a2, 7);
+	  b1 = _mm_mullo_epi16(b1, sse_coef);
+	  b2 = _mm_mullo_epi16(b2, sse_coef);
+	  a1 = _mm_add_epi16(a1, b1);
+	  a2 = _mm_add_epi16(a2, b2);
+	  a1 = _mm_srli_epi16(a1, 7);
+	  a2 = _mm_srli_epi16(a2, 7);
+	  a1 = _mm_packus_epi16(a1, a2);
+	  _mm_storeu_si128((__m128i *)(dest_row + i), a1);
+	}
+#endif
+      /* Unrolled loop using general-purpose registers */
+      for (; (int)i < (int)dest->row_pixels_size - 3; i += 4)
+        {
+	  dest_row[i + 0] = LINEAR_INTERPOLATE(src_row_1[i + 0], src_row_2[i + 0], coef);
+	  dest_row[i + 1] = LINEAR_INTERPOLATE(src_row_1[i + 1], src_row_2[i + 1], coef);
+	  dest_row[i + 2] = LINEAR_INTERPOLATE(src_row_1[i + 2], src_row_2[i + 2], coef);
+	  dest_row[i + 3] = LINEAR_INTERPOLATE(src_row_1[i + 3], src_row_2[i + 3], coef);
+	}
+      /* Remaining columns */
+      for (; i < dest->row_pixels_size; i++)
+	dest_row[i] = LINEAR_INTERPOLATE(src_row_1[i], src_row_2[i], coef);
+      dest_row += dest->row_size;
+      y_pos += y_inc;
+    }
+  /* Always copy the last row - faster and also handle "y_pos == dest->rows * 0x10000" overflow */
+  memcpy(dest_row, src->pixels + src->image_size - src->row_size, src->row_pixels_size);
+}
+
+/* Box filter */
+
+static void
+image_scale_downsample_xy(struct image *dest, struct image *src)
+{
+  switch (src->pixel_size)
+    {
+      case 1:
+	image_scale_1_downsample_xy(dest, src);
+	return;
+      case 2:
+	image_scale_2_downsample_xy(dest, src);
+	return;
+      case 3:
+	image_scale_3_downsample_xy(dest, src);
+	return;
+      case 4:
+	image_scale_4_downsample_xy(dest, src);
+	return;
+      default:
+	ASSERT(0);
+    }
+}
+
+/* General routine
+ * FIXME: customizable; implement at least bilinear and bicubic filters */
+
+int
+image_scale(struct image_context *ctx, struct image *dest, struct image *src)
+{
+  if ((src->flags & IMAGE_PIXEL_FORMAT) != (dest->flags & IMAGE_PIXEL_FORMAT))
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_PIXEL_FORMAT, "Different pixel formats not supported.");
+      return 0;
+    }
+  if (dest->cols == src->cols)
+    {
+      if (dest->rows == src->rows)
+        {
+	  /* No scale, copy only */
+	  image_scale_nearest_y(dest, src);
+	  return 1;
+	}
+      else if (dest->rows < src->rows)
+        {
+	  /* Downscale vertically */
+	  image_scale_downsample_xy(dest, src);
+	  return 1;
+	}
+      else
+        {
+	  /* Upscale vertically */
+	  image_scale_nearest_y(dest, src);
+	  return 1;
+	}
+    }
+  else if (dest->rows == src->rows)
+    {
+      if (dest->cols < src->cols)
+        {
+          /* Downscale horizontally */
+          image_scale_downsample_xy(dest, src);
+          return 1;
+	}
+      else
+        {
+	  /* Upscale horizontally */
+	  image_scale_nearest_x(dest, src);
+	  return 1;
+	}
+    }
+  else
+    {
+      if (dest->cols <= src->cols && dest->rows <= src->rows)
+        {
+	  /* Downscale in both dimensions */
+          image_scale_downsample_xy(dest, src);
+	  return 1;
+	}
+      else
+        {
+	  image_scale_nearest_xy(dest, src);
+	  return 1;
+	}
+    }
+}
+
+void
+image_dimensions_fit_to_box(uint *cols, uint *rows, uint max_cols, uint max_rows, uint upsample)
+{
+  ASSERT(image_dimensions_valid(*cols, *rows));
+  ASSERT(image_dimensions_valid(max_cols, max_rows));
+  if (*cols <= max_cols && *rows <= max_rows)
+    {
+      if (!upsample)
+	return;
+      if (max_cols * *rows > max_rows * *cols)
+        {
+	  *cols = *cols * max_rows / *rows;
+	  *cols = MIN(*cols, max_cols);
+	  *rows = max_rows;
+	}
+      else
+        {
+	  *rows = *rows * max_cols / *cols;
+	  *rows = MIN(*rows, max_rows);
+	  *cols = max_cols;
+	}
+    }
+  else if (*cols <= max_cols)
+    goto down_cols;
+  else if (*rows <= max_rows || max_rows * *cols > max_cols * *rows)
+    goto down_rows;
+down_cols:
+  *cols = *cols * max_rows / *rows;
+  *cols = MAX(*cols, 1);
+  *rows = max_rows;
+  return;
+down_rows:
+  *rows = *rows * max_cols / *cols;
+  *rows = MAX(*rows, 1);
+  *cols = max_cols;
+}
diff --git a/libucw/images/sig-cmp-gen.h b/libucw/images/sig-cmp-gen.h
new file mode 100644
index 0000000..15d92da
--- /dev/null
+++ b/libucw/images/sig-cmp-gen.h
@@ -0,0 +1,389 @@
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define image_signatures_dist ucw_image_signatures_dist
+#define image_signatures_dist_explain ucw_image_signatures_dist_explain
+#endif
+
+#ifdef EXPLAIN
+#  define MSG(x...) do{ line += sprintf(line, x); }while(0)
+#  define LINE do{ line = buf; msg(line, param); }while(0)
+
+static void explain_signature(struct image_signature *sig, void (*msg)(byte *text, void *param), void *param)
+{
+  byte buf[1024], *line = buf;
+  MSG("signature: flags=0x%x df=%u dh=%u f=(%u", sig->flags, sig->df, sig->dh, sig->vec.f[0]);
+  for (uint i = 1; i < IMAGE_VEC_F; i++)
+    MSG(" %u", sig->vec.f[i]);
+  MSG(")");
+  LINE;
+  for (uint j = 0; j < sig->len; j++)
+    {
+      struct image_region *reg = sig->reg + j;
+      MSG("region %u: wa=%u wb=%u f=(%u", j, reg->wa, reg->wb, reg->f[0]);
+      for (uint i = 1; i < IMAGE_VEC_F; i++)
+	MSG(" %u", reg->f[i]);
+      MSG(") h=(%u", reg->h[0]);
+      for (uint i = 1; i < IMAGE_REG_H; i++)
+	MSG(" %u", reg->h[i]);
+      MSG(")");
+      LINE;
+    }
+}
+
+#else
+#  define MSG(x...) do{}while(0)
+#  define LINE do{}while(0)
+#endif
+
+#define MSGL(x...) do{ MSG(x); LINE; }while(0)
+
+#ifndef EXPLAIN
+static uint image_signatures_dist_integrated(struct image_signature *sig1, struct image_signature *sig2)
+#else
+static uint image_signatures_dist_integrated_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+  uint dist[IMAGE_REG_MAX * IMAGE_REG_MAX], p[IMAGE_REG_MAX], q[IMAGE_REG_MAX];
+  uint n, i, j, k, l, s, d;
+  struct image_region *reg1, *reg2;
+#ifdef EXPLAIN
+  byte buf[1024], *line = buf;
+  MSGL("Integrated matching");
+  explain_signature(sig1, msg, param);
+  explain_signature(sig2, msg, param);
+#endif
+
+  /* FIXME: do not mux textured and non-textured images (should be split in clusters tree) */
+  if ((sig1->flags ^ sig2->flags) & IMAGE_SIG_TEXTURED)
+    {
+      MSGL("Textured vs non-textured");
+      return ~0U;
+    }
+
+  /* Compute distance matrix */
+  n = 0;
+  MSGL("Distance matrix:");
+  /* ... for non-textured images */
+  if (!((sig1->flags | sig2->flags) & IMAGE_SIG_TEXTURED))
+    for (j = 0, reg2 = sig2->reg; j < sig2->len; j++, reg2++)
+      for (i = 0, reg1 = sig1->reg; i < sig1->len; i++, reg1++)
+        {
+	  uint dt = 0, ds = 0, dp = 0, d;
+	  for (uint i = 0; i < IMAGE_VEC_F; i++)
+	    dt += image_sig_cmp_features_weights[i] * isqr((int)reg1->f[i] - (int)reg2->f[i]);
+	  for (uint i = 0; i < 3; i++)
+	    ds += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
+	  for (uint i = 3; i < 5; i++)
+	    dp += image_sig_cmp_features_weights[IMAGE_VEC_F + i] * isqr((int)reg1->h[i] - (int)reg2->h[i]);
+#if 0
+	  int x1, y1, x2, y2;
+	  if (sig1->cols > sig1->rows)
+	    {
+	      x1 = reg1->h[3];
+	      y1 = ((int)reg1->h[4] - 64) * (int)sig1->rows / (int)sig1->cols + 64;
+	    }
+	  else
+	    {
+	      y1 = reg1->h[4];
+	      x1 = ((int)reg1->h[3] - 64) * (int)sig1->cols / (int)sig1->rows + 64;
+	    }
+	  if (sig2->cols > sig2->rows)
+	    {
+	      x2 = reg2->h[3];
+	      y2 = ((int)reg2->h[4] - 64) * (int)sig2->rows / (int)sig2->cols + 64;
+	    }
+	  else
+	    {
+	      y2 = reg2->h[4];
+	      x2 = ((int)reg2->h[3] - 64) * (int)sig2->cols / (int)sig2->rows + 64;
+	    }
+	  MSGL("%d %d %d %d", x1, y1, x2, y2);
+	  dp = image_sig_cmp_features_weights[IMAGE_VEC_F + 3] * isqr(x1 - x2) +
+	       image_sig_cmp_features_weights[IMAGE_VEC_F + 4] * isqr(y1 - y2);
+#endif
+#if 0
+	  d = dt * (4 + MIN(8, (ds >> 12))) * (4 + MIN(8, (dp >> 10))) + (ds >> 11) + (dp >> 10);
+	  MSG("[%u, %u] d=%u=(%u * %u * %u + %u + %u) dt=%u ds=%u dp=%u df=(%d", i, j, d,
+	      dt, 4 + MIN(8, (ds >> 12)), 4 + MIN(8, dp >> 10), ds >> 11, dp >> 10, dt, ds, dp, (int)reg1->f[0] - (int)reg2->f[0]);
+#endif
+#if 1
+	  d = dt;
+	  if (ds < 1000)
+	    d = d * 4;
+	  else if (ds < 4000)
+	    d = d * 6 + 8;
+	  else if (ds < 10000)
+	    d = d * 8 + 20;
+	  else if (ds < 50000)
+	    d = d * 10 + 50;
+	  else
+	    d = d * 12 + 100;
+	  if (dp < 1000)
+	    d = d * 2;
+	  else if (dp < 4000)
+	    d = d * 3 + 100;
+	  else if (dp < 10000)
+	    d = d * 4 + 800;
+	  else
+	    d = d * 5 + 3000;
+#endif
+	  dist[n++] = (d << 8) + i + (j << 4);
+	  MSG("[%u, %u] d=%u dt=%u ds=%u dp=%u df=(%d", i, j, d, dt, ds, dp, (int)reg1->f[0] - (int)reg2->f[0]);
+#ifdef EXPLAIN
+	  for (uint i = 1; i < IMAGE_VEC_F; i++)
+	    MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
+	  MSG(") dh=(%d", (int)reg1->h[0] - (int)reg2->h[0]);
+	  for (uint i = 1; i < IMAGE_REG_H; i++)
+	    MSG(" %d", (int)reg1->h[i] - (int)reg2->h[i]);
+	  MSGL(")");
+#endif
+        }
+  /* ... for textured images (ignore shape properties) */
+  else
+    for (j = 0, reg2 = sig2->reg; j < sig2->len; j++, reg2++)
+      for (i = 0, reg1 = sig1->reg; i < sig1->len; i++, reg1++)
+        {
+	  uint dt = 0;
+	  for (uint i = 0; i < IMAGE_VEC_F; i++)
+	    dt += image_sig_cmp_features_weights[i] * isqr((int)reg1->f[i] - (int)reg2->f[i]);
+	  dist[n++] = (dt << 12) + i + (j << 4);
+#ifdef EXPLAIN
+	  MSG("[%u, %u] dt=%u df=(%d", i, j, dt, (int)reg1->f[0] - (int)reg2->f[0]);
+	  for (uint i = 1; i < IMAGE_VEC_F; i++)
+	    MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
+	  MSGL(")");
+#endif
+        }
+
+  /* One or both signatures have no regions */
+  if (!n)
+    return ~0U;
+
+  /* Get percentages */
+  for (i = 0, reg1 = sig1->reg; i < sig1->len; i++, reg1++)
+    p[i] = reg1->wb;
+  for (i = 0, reg2 = sig2->reg; i < sig2->len; i++, reg2++)
+    q[i] = reg2->wb;
+
+  /* Sort entries in distance matrix */
+  image_signatures_dist_integrated_sort(dist, n);
+
+  /* Compute significance matrix and resulting distance */
+  uint sum = 0;
+  MSGL("Significance matrix:");
+  for (k = 0, l = 128; l; k++)
+    {
+      i = dist[k] & 15;
+      j = (dist[k] >> 4) & 15;
+      d = dist[k] >> 8;
+      if (p[i] <= q[j])
+        {
+	  s = p[i];
+	  q[j] -= p[i];
+	  p[i] = 0;
+	}
+      else
+        {
+	  s = q[j];
+	  p[i] -= q[j];
+	  q[j] = 0;
+	}
+      l -= s;
+      sum += s * d;
+#ifdef EXPLAIN
+      reg1 = sig1->reg + i;
+      reg2 = sig2->reg + j;
+      MSG("[%u, %u] s=%u d=%u df=(%d", i, j, s, d, (int)reg1->f[0] - (int)reg2->f[0]);
+      for (uint i = 1; i < IMAGE_VEC_F; i++)
+        MSG(" %d", (int)reg1->f[i] - (int)reg2->f[i]);
+      if (!((sig1->flags | sig2->flags) & IMAGE_SIG_TEXTURED))
+        {
+          MSG(") dh=(%d", (int)reg1->h[0] - (int)reg2->h[0]);
+          for (uint i = 1; i < IMAGE_REG_H; i++)
+            MSG(" %d", (int)reg1->h[i] - (int)reg2->h[i]);
+	}
+      MSGL(")");
+#endif
+    }
+
+  d = sum / 32;
+
+  uint a = sig1->cols * sig2->rows;
+  uint b = sig1->rows * sig2->cols;
+  if (a < 2 * b && b < 2 * a)
+    d = d * 2;
+  else if (a < 4 * b && b < 4 * a)
+    d = d * 3;
+  else
+    d = d * 5;
+
+  a = sig1->cols * sig1->rows;
+  b = sig2->cols * sig2->rows;
+
+  if ((a < 1000 && b > 5000) || (b < 1000 && a > 5000))
+    d = d * 2;
+  else if ((a < 5000 && b > 20000) || (b < 5000 && a > 20000))
+    d = d * 3 / 2;
+
+  return d;
+}
+
+#ifndef EXPLAIN
+static uint image_signatures_dist_fuzzy(struct image_signature *sig1, struct image_signature *sig2)
+#else
+static uint image_signatures_dist_fuzzy_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+#ifdef EXPLAIN
+  byte buf[1024], *line = buf;
+  MSGL("Fuzzy matching");
+  explain_signature(sig1, msg, param);
+  explain_signature(sig2, msg, param);
+#endif
+
+  /* FIXME: do not mux textured and non-textured images (should be split in clusters tree) */
+  if ((sig1->flags ^ sig2->flags) & IMAGE_SIG_TEXTURED)
+    {
+      MSGL("Textured vs non-textured");
+      return ~0U;
+    }
+
+  uint cnt1 = sig1->len;
+  uint cnt2 = sig2->len;
+  struct image_region *reg1 = sig1->reg;
+  struct image_region *reg2 = sig2->reg;
+  uint mf[IMAGE_REG_MAX][IMAGE_REG_MAX], mh[IMAGE_REG_MAX][IMAGE_REG_MAX];
+  uint lf[IMAGE_REG_MAX * 2], lh[IMAGE_REG_MAX * 2];
+  uint df = sig1->df + sig2->df, dh = sig1->dh + sig2->dh;
+
+  /* Compute distance matrix */
+  for (uint i = 0; i < cnt1; i++)
+    for (uint j = 0; j < cnt2; j++)
+      {
+	uint d = 0;
+	for (uint k = 0; k < IMAGE_VEC_F; k++)
+	  {
+	    int dif = reg1[i].f[k] - reg2[j].f[k];
+	    d += image_sig_cmp_features_weights[k] * dif * dif;
+	  }
+	mf[i][j] = d;
+	d = 0;
+	for (uint k = 0; k < IMAGE_REG_H; k++)
+	  {
+	    int dif = reg1[i].h[k] - reg2[j].h[k];
+	    d += image_sig_cmp_features_weights[k + IMAGE_VEC_F] * dif * dif;
+	  }
+	mh[i][j] = d;
+      }
+
+  uint lfs = 0, lhs = 0;
+  for (uint i = 0; i < cnt1; i++)
+    {
+      uint f = mf[i][0], h = mh[i][0];
+      for (uint j = 1; j < cnt2; j++)
+        {
+	  f = MIN(f, mf[i][j]);
+	  h = MIN(h, mh[i][j]);
+	}
+      lf[i] = (df * 0x10000) / (df + fast_sqrt_u32(f));
+      lh[i] = (dh * 0x10000) / (dh + fast_sqrt_u32(h));
+      lfs += lf[i] * (6 * reg1[i].wa + 2 * reg1[i].wb);
+      lhs += lh[i] * reg1[i].wa;
+    }
+  for (uint i = 0; i < cnt2; i++)
+    {
+      uint f = mf[0][i], h = mh[0][i];
+      for (uint j = 1; j < cnt1; j++)
+        {
+	  f = MIN(f, mf[j][i]);
+	  h = MIN(h, mh[j][i]);
+	}
+      lf[i + cnt1] = (df * 0x10000) / (df + fast_sqrt_u32(f));
+      lh[i + cnt1] = (dh * 0x10000) / (dh + fast_sqrt_u32(h));
+      lfs += lf[i] * (6 * reg2[i].wa + 2 * reg2[i].wb);
+      lhs += lh[i] * reg2[i].wa;
+    }
+
+  uint measure = lfs * 6 + lhs * 2 * 8;
+
+#ifdef EXPLAIN
+  /* Display similarity vectors */
+  MSG("Lf=(");
+  for (uint i = 0; i < cnt1 + cnt2; i++)
+    {
+      if (i)
+	MSG(" ");
+      if (i == cnt1)
+	MSG("~ ");
+      MSG("%.4f", (double)lf[i] / 0x10000);
+    }
+  MSGL(")");
+  MSG("Lh=(");
+  for (uint i = 0; i < cnt1 + cnt2; i++)
+    {
+      if (i)
+	MSG(" ");
+      if (i == cnt1)
+	MSG("~ ");
+      MSG("%.4f", (double)lh[i] / 0x10000);
+    }
+  MSGL(")");
+  MSGL("Lfm=%.4f", lfs / (double)(1 << (3 + 8 + 16)));
+  MSGL("Lhm=%.4f", lhs / (double)(1 << (8 + 16)));
+  MSGL("measure=%.4f", measure / (double)(1 << (3 + 3 + 8 + 16)));
+#endif
+
+  return (1 << (3 + 3 + 8 + 16)) - measure;
+}
+
+#ifndef EXPLAIN
+static uint image_signatures_dist_average(struct image_signature *sig1, struct image_signature *sig2)
+#else
+static uint image_signatures_dist_average_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+#ifdef EXPLAIN
+  byte buf[1024], *line = buf;
+  MSGL("Average matching");
+#endif
+
+  uint dist = 0;
+  for (uint i = 0; i < IMAGE_VEC_F; i++)
+    {
+      uint d = image_sig_cmp_features_weights[0] * isqr((int)sig1->vec.f[i] - (int)sig2->vec.f[i]);
+      MSGL("feature %u: d=%u (%u %u)", i, d, sig1->vec.f[i], sig2->vec.f[i]);
+      dist += d;
+    }
+
+  MSGL("dist=%u", dist);
+  return dist;
+}
+
+#ifndef EXPLAIN
+#define CALL(x) image_signatures_dist_##x(sig1, sig2)
+uint image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2)
+#else
+#define CALL(x) image_signatures_dist_##x##_explain(sig1, sig2, msg, param)
+uint image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param)
+#endif
+{
+  if (!sig1->len)
+    return CALL(average);
+  else
+    switch (image_sig_compare_method)
+      {
+        case 0:
+	  return CALL(integrated);
+	case 1:
+	  return CALL(fuzzy);
+	case 2:
+	  return CALL(average);
+	default:
+	  ASSERT(0);
+      }
+}
+#undef CALL
+
+#undef EXPLAIN
+#undef MSG
+#undef LINE
+#undef MSGL
diff --git a/libucw/images/sig-cmp.c b/libucw/images/sig-cmp.c
new file mode 100644
index 0000000..e7ed0df
--- /dev/null
+++ b/libucw/images/sig-cmp.c
@@ -0,0 +1,25 @@
+/*
+ *	Image Library -- Comparisions of image signatures
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <images/math.h>
+#include <images/images.h>
+#include <images/signature.h>
+
+#include <stdio.h>
+
+#define ASORT_PREFIX(x) image_signatures_dist_integrated_##x
+#define ASORT_KEY_TYPE uint
+#include <ucw/sorter/array-simple.h>
+
+#define EXPLAIN
+#include <images/sig-cmp-gen.h>
+#include <images/sig-cmp-gen.h>
diff --git a/libucw/images/sig-dump.c b/libucw/images/sig-dump.c
new file mode 100644
index 0000000..7163fa4
--- /dev/null
+++ b/libucw/images/sig-dump.c
@@ -0,0 +1,52 @@
+/*
+ *	Image Library -- Dumping of image signatures
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/signature.h>
+#include <stdio.h>
+
+byte *
+image_vector_dump(byte *buf, struct image_vector *vec)
+{
+  byte *p = buf;
+  *p++ = '(';
+  for (uint i = 0; i < IMAGE_VEC_F; i++)
+    {
+      if (i)
+	*p++ = ' ';
+      p += sprintf(p, "%u", vec->f[i]);
+    }
+  *p++ = ')';
+  *p = 0;
+  return buf;
+}
+
+byte *
+image_region_dump(byte *buf, struct image_region *reg)
+{
+  byte *p = buf;
+  p += sprintf(p, "(txt=");
+  for (uint i = 0; i < IMAGE_REG_F; i++)
+    {
+      if (i)
+	*p++ = ' ';
+      p += sprintf(p, "%u", reg->f[i]);
+    }
+  p += sprintf(p, " shp=");
+  for (uint i = 0; i < IMAGE_REG_H; i++)
+    {
+      if (i)
+	*p++ = ' ';
+      p += sprintf(p, "%u", reg->h[i]);
+    }
+  p += sprintf(p, " wa=%u wb=%u)", reg->wa, reg->wb);
+  *p = 0;
+  return buf;
+}
diff --git a/libucw/images/sig-init.c b/libucw/images/sig-init.c
new file mode 100644
index 0000000..37ee502
--- /dev/null
+++ b/libucw/images/sig-init.c
@@ -0,0 +1,324 @@
+/*
+ *	Image Library -- Computation of image signatures
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/conf.h>
+#include <images/images.h>
+#include <images/math.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/signature.h>
+
+#include <alloca.h>
+#include <math.h>
+
+int
+image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image)
+{
+  ASSERT((image->flags & IMAGE_PIXEL_FORMAT) == COLOR_SPACE_RGB);
+  data->image = image;
+  data->flags = 0;
+  data->cols = (image->cols + 3) >> 2;
+  data->rows = (image->rows + 3) >> 2;
+  data->full_cols = image->cols >> 2;
+  data->full_rows = image->rows >> 2;
+  data->blocks_count = data->cols * data->rows;
+  if (data->blocks_count >= 0x10000)
+    {
+      IMAGE_ERROR(ctx, IMAGE_ERROR_INVALID_DIMENSIONS, "Image too large for implemented signature algorithm.");
+      return 0;
+    }
+  data->blocks = xmalloc(data->blocks_count * sizeof(struct image_sig_block));
+  data->area = image->cols * image->rows;
+  DBG("Computing signature for image of %ux%u pixels (%ux%u blocks)",
+      image->cols, image->rows, data->cols, data->rows);
+  return 1;
+}
+
+void
+image_sig_preprocess(struct image_sig_data *data)
+{
+  struct image *image = data->image;
+  struct image_sig_block *block = data->blocks;
+  uint sum[IMAGE_VEC_F];
+  bzero(sum, sizeof(sum));
+
+  /* Every block of 4x4 pixels */
+  byte *row_start = image->pixels;
+  for (uint block_y = 0; block_y < data->rows; block_y++, row_start += image->row_size * 4)
+    {
+      byte *p = row_start;
+      for (uint block_x = 0; block_x < data->cols; block_x++, p += 12, block++)
+        {
+          int t[16], s[16], *tp = t;
+	  block->x = block_x;
+	  block->y = block_y;
+
+	  /* Convert pixels to Luv color space and compute average coefficients */
+	  uint l_sum = 0, u_sum = 0, v_sum = 0;
+	  byte *p2 = p;
+	  if (block_x < data->full_cols && block_y < data->full_rows)
+	    {
+	      for (uint y = 0; y < 4; y++, p2 += image->row_size - 12)
+	        for (uint x = 0; x < 4; x++, p2 += 3)
+	          {
+	            byte luv[3];
+	            srgb_to_luv_pixel(luv, p2);
+	            l_sum += *tp++ = luv[0] / 4;
+	            u_sum += luv[1];
+	            v_sum += luv[2];
+	          }
+	      block->area = 16;
+	      sum[0] += l_sum;
+	      sum[1] += u_sum;
+	      sum[2] += v_sum;
+	      block->v[0] = (l_sum >> 4);
+	      block->v[1] = (u_sum >> 4);
+	      block->v[2] = (v_sum >> 4);
+	    }
+	  /* Incomplete square near the edge */
+	  else
+	    {
+	      uint x, y;
+	      uint square_cols = (block_x < data->full_cols) ? 4 : image->cols & 3;
+	      uint square_rows = (block_y < data->full_rows) ? 4 : image->rows & 3;
+	      for (y = 0; y < square_rows; y++, p2 += image->row_size)
+	        {
+		  byte *p3 = p2;
+	          for (x = 0; x < square_cols; x++, p3 += 3)
+	            {
+	              byte luv[3];
+	              srgb_to_luv_pixel(luv, p3);
+	              l_sum += *tp++ = luv[0] / 4;
+	              u_sum += luv[1];
+	              v_sum += luv[2];
+		    }
+		  for (; x < 4; x++)
+		    {
+		      *tp = tp[-(int)square_cols];
+		      tp++;
+		    }
+	        }
+	      for (; y < 4; y++)
+	        for (x = 0; x < 4; x++)
+	          {
+	            *tp = tp[-(int)square_rows * 4];
+		    tp++;
+		  }
+	      block->area = square_cols * square_rows;
+	      uint inv = 0x10000 / block->area;
+	      sum[0] += l_sum;
+	      sum[1] += u_sum;
+	      sum[2] += v_sum;
+	      block->v[0] = (l_sum * inv) >> 16;
+	      block->v[1] = (u_sum * inv) >> 16;
+	      block->v[2] = (v_sum * inv) >> 16;
+	    }
+
+	  /* Apply Daubechies wavelet transformation */
+
+#         define DAUB_0	31651	/* (1 + sqrt 3) / (4 * sqrt 2) * 0x10000 */
+#         define DAUB_1	54822	/* (3 + sqrt 3) / (4 * sqrt 2) * 0x10000 */
+#         define DAUB_2	14689	/* (3 - sqrt 3) / (4 * sqrt 2) * 0x10000 */
+#         define DAUB_3	-8481	/* (1 - sqrt 3) / (4 * sqrt 2) * 0x10000 */
+
+	  /* ... to the rows */
+	  uint i;
+          for (i = 0; i < 16; i += 4)
+            {
+	      s[i + 0] = (DAUB_0 * t[i + 2] + DAUB_1 * t[i + 3] + DAUB_2 * t[i + 0] + DAUB_3 * t[i + 1]) / 0x10000;
+	      s[i + 1] = (DAUB_0 * t[i + 0] + DAUB_1 * t[i + 1] + DAUB_2 * t[i + 2] + DAUB_3 * t[i + 3]) / 0x10000;
+	      s[i + 2] = (DAUB_3 * t[i + 2] - DAUB_2 * t[i + 3] + DAUB_1 * t[i + 0] - DAUB_0 * t[i + 1]) / 0x10000;
+	      s[i + 3] = (DAUB_3 * t[i + 0] - DAUB_2 * t[i + 1] + DAUB_1 * t[i + 2] - DAUB_0 * t[i + 3]) / 0x10000;
+	    }
+
+	  /* ... and to the columns... skip LL band */
+	  for (i = 0; i < 2; i++)
+	    {
+	      t[i + 8] = (DAUB_3 * s[i + 8] - DAUB_2 * s[i +12] + DAUB_1 * s[i + 0] - DAUB_0 * s[i + 4]) / 0x10000;
+	      t[i +12] = (DAUB_3 * s[i + 0] - DAUB_2 * s[i + 4] + DAUB_1 * s[i + 8] - DAUB_0 * s[i +12]) / 0x10000;
+	    }
+	  for (; i < 4; i++)
+	    {
+	      t[i + 0] = (DAUB_0 * s[i + 8] + DAUB_1 * s[i +12] + DAUB_2 * s[i + 0] + DAUB_3 * s[i + 4]) / 0x10000;
+	      t[i + 4] = (DAUB_0 * s[i + 0] + DAUB_1 * s[i + 4] + DAUB_2 * s[i + 8] + DAUB_3 * s[i +12]) / 0x10000;
+	      t[i + 8] = (DAUB_3 * s[i + 8] - DAUB_2 * s[i +12] + DAUB_1 * s[i + 0] - DAUB_0 * s[i + 4]) / 0x10000;
+	      t[i +12] = (DAUB_3 * s[i + 0] - DAUB_2 * s[i + 4] + DAUB_1 * s[i + 8] - DAUB_0 * s[i +12]) / 0x10000;
+	    }
+
+	  /* Extract energies in LH, HL and HH bands */
+	  block->v[3] = fast_sqrt_u32(isqr(t[8]) + isqr(t[9]) + isqr(t[12]) + isqr(t[13]));
+	  block->v[4] = fast_sqrt_u32(isqr(t[2]) + isqr(t[3]) + isqr(t[6]) + isqr(t[7]));
+	  block->v[5] = fast_sqrt_u32(isqr(t[10]) + isqr(t[11]) + isqr(t[14]) + isqr(t[15]));
+	  sum[3] += block->v[3] * block->area;
+	  sum[4] += block->v[4] * block->area;
+	  sum[5] += block->v[5] * block->area;
+        }
+    }
+
+  /* Compute featrures average */
+  uint inv = 0xffffffffU / data->area;
+  for (uint i = 0; i < IMAGE_VEC_F; i++)
+    data->f[i] = ((u64)sum[i] * inv) >> 32;
+
+  if (image->cols < image_sig_min_width || image->rows < image_sig_min_height)
+    {
+      data->valid = 0;
+      data->regions_count = 0;
+    }
+  else
+    data->valid = 1;
+}
+
+void
+image_sig_finish(struct image_sig_data *data, struct image_signature *sig)
+{
+  for (uint i = 0; i < IMAGE_VEC_F; i++)
+    sig->vec.f[i] = data->f[i];
+  sig->len = data->regions_count;
+  sig->flags = data->flags;
+  if (!sig->len)
+    return;
+
+  /* For each region */
+  u64 w_total = 0;
+  uint w_border = MIN(data->cols, data->rows) * image_sig_border_size;
+  int w_mul = w_border ? image_sig_border_bonus * 256 / (int)w_border : 0;
+  for (uint i = 0; i < sig->len; i++)
+    {
+      struct image_sig_region *r = data->regions + i;
+      DBG("Processing region %u: count=%u", i, r->count);
+      ASSERT(r->count);
+
+      /* Copy texture properties */
+      sig->reg[i].f[0] = r->a[0];
+      sig->reg[i].f[1] = r->a[1];
+      sig->reg[i].f[2] = r->a[2];
+      sig->reg[i].f[3] = r->a[3];
+      sig->reg[i].f[4] = r->a[4];
+      sig->reg[i].f[5] = r->a[5];
+
+      /* Compute coordinates centroid and region weight */
+      u64 x_sum = 0, y_sum = 0, w_sum = 0;
+      for (struct image_sig_block *b = r->blocks; b; b = b->next)
+        {
+	  x_sum += b->x;
+	  y_sum += b->y;
+	  uint d = b->x;
+	  d = MIN(d, b->y);
+	  d = MIN(d, data->cols - b->x - 1);
+	  d = MIN(d, data->rows - b->y - 1);
+	  if (d >= w_border)
+	    w_sum += 128;
+	  else
+	    w_sum += 128 + (int)(w_border - d) * w_mul / 256;
+	}
+      w_total += w_sum;
+      r->w_sum = w_sum;
+      uint x_avg = x_sum / r->count;
+      uint y_avg = y_sum / r->count;
+      DBG("  centroid=(%u %u)", x_avg, y_avg);
+
+      /* Compute normalized inertia */
+      u64 sum1 = 0, sum2 = 0, sum3 = 0;
+      for (struct image_sig_block *b = r->blocks; b; b = b->next)
+        {
+	  uint inc2 = isqr(x_avg - b->x) + isqr(y_avg - b->y);
+	  uint inc1 = fast_sqrt_u32(inc2);
+	  sum1 += inc1;
+	  sum2 += inc2;
+	  sum3 += inc1 * inc2;
+	}
+      sig->reg[i].h[0] = CLAMP(image_sig_inertia_scale[0] * sum1 * ((3 * M_PI * M_PI) / 2) * pow(r->count, -1.5), 0, 255);
+      sig->reg[i].h[1] = CLAMP(image_sig_inertia_scale[1] * sum2 * ((4 * M_PI * M_PI * M_PI) / 2) / ((u64)r->count * r->count), 0, 255);
+      sig->reg[i].h[2] = CLAMP(image_sig_inertia_scale[2] * sum3 * ((5 * M_PI * M_PI * M_PI * M_PI) / 2) * pow(r->count, -2.5), 0, 255);
+      sig->reg[i].h[3] = (uint)x_avg * 127 / data->cols;
+      sig->reg[i].h[4] = (uint)y_avg * 127 / data->rows;
+    }
+
+  /* Compute average differences */
+  u64 df = 0, dh = 0;
+
+  if (sig->len < 2)
+    {
+      sig->df = 1;
+      sig->dh = 1;
+    }
+  else
+    {
+      uint cnt = 0;
+      for (uint i = 0; i < sig->len; i++)
+        for (uint j = i + 1; j < sig->len; j++)
+          {
+	    uint d = 0;
+	    for (uint k = 0; k < IMAGE_REG_F; k++)
+	      d += image_sig_cmp_features_weights[k] * isqr(sig->reg[i].f[k] - sig->reg[j].f[k]);
+	    df += fast_sqrt_u32(d);
+	    d = 0;
+	    for (uint k = 0; k < IMAGE_REG_H; k++)
+	      d += image_sig_cmp_features_weights[k + IMAGE_REG_F] * isqr(sig->reg[i].h[k] - sig->reg[j].h[k]);
+	    dh += fast_sqrt_u32(d);
+	    cnt++;
+          }
+      sig->df = CLAMP(df / cnt, 1, 0xffff);
+      sig->dh = CLAMP(dh / cnt, 1, 0xffff);
+    }
+  DBG("Average regions difs: df=%u dh=%u", sig->df, sig->dh);
+
+  /* Compute normalized weights */
+  uint wa = 128, wb = 128;
+  for (uint i = sig->len; --i > 0; )
+    {
+      struct image_sig_region *r = data->regions + i;
+      wa -= sig->reg[i].wa = CLAMP(r->count * 128 / data->blocks_count, 1, (int)(wa - i));
+      wb -= sig->reg[i].wb = CLAMP(r->w_sum * 128 / w_total, 1, (int)(wb - i));
+    }
+  sig->reg[0].wa = wa;
+  sig->reg[0].wb = wb;
+
+  /* Store image dimensions */
+  sig->cols = data->image->cols;
+  sig->rows = data->image->rows;
+
+  /* Dump regions features */
+#ifdef LOCAL_DEBUG
+  for (uint i = 0; i < sig->len; i++)
+    {
+      byte buf[IMAGE_REGION_DUMP_MAX];
+      image_region_dump(buf, sig->reg + i);
+      DBG("region %u: features=%s", i, buf);
+    }
+#endif
+}
+
+void
+image_sig_cleanup(struct image_sig_data *data)
+{
+  xfree(data->blocks);
+}
+
+int
+compute_image_signature(struct image_context *ctx, struct image_signature *sig, struct image *image)
+{
+  struct image_sig_data data;
+  if (!image_sig_init(ctx, &data, image))
+    return 0;
+  image_sig_preprocess(&data);
+  if (data.valid)
+    {
+      image_sig_segmentation(&data);
+      image_sig_detect_textured(&data);
+    }
+  image_sig_finish(&data, sig);
+  image_sig_cleanup(&data);
+  return 1;
+}
diff --git a/libucw/images/sig-seg.c b/libucw/images/sig-seg.c
new file mode 100644
index 0000000..b89cac9
--- /dev/null
+++ b/libucw/images/sig-seg.c
@@ -0,0 +1,348 @@
+/*
+ *	Image Library -- Image segmentation
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/heap.h>
+#include <images/images.h>
+#include <images/signature.h>
+#include <images/math.h>
+
+#include <string.h>
+
+#ifdef LOCAL_DEBUG
+static void
+dump_segmentation(struct image_sig_region *regions, uint regions_count)
+{
+  uint cols = 0, rows = 0;
+  for (uint i = 0; i < regions_count; i++)
+    for (struct image_sig_block *b = regions[i].blocks; b; b = b->next)
+      {
+	cols = MAX(cols, b->x + 1);
+	rows = MAX(rows, b->y + 1);
+      }
+  uint size = (cols + 1) * rows;
+  byte buf[size];
+  bzero(buf, size);
+  for (uint i = 0; i < regions_count; i++)
+    {
+      byte c = (i < 10) ? '0' + i : 'A' - 10 + i;
+      for (struct image_sig_block *b = regions[i].blocks; b; b = b->next)
+        buf[b->x + b->y * (cols + 1)] = c;
+    }
+  for (uint i = 0; i < rows; i++)
+    log(L_DEBUG, "%s", &buf[i * (cols + 1)]);
+}
+#endif
+
+/* Pre-quantization - recursively split groups of blocks with large error */
+
+static inline void
+prequant_init_region(struct image_sig_region *region)
+{
+  bzero(region, sizeof(*region));
+}
+
+static inline void
+prequant_add_block(struct image_sig_region *region, struct image_sig_block *block)
+{
+  block->next = region->blocks;
+  region->blocks = block;
+  region->count++;
+  for (uint i = 0; i < IMAGE_VEC_F; i++)
+    {
+      region->b[i] += block->v[i];
+      region->c[i] += isqr(block->v[i]);
+    }
+}
+
+static void
+prequant_finish_region(struct image_sig_region *region)
+{
+  if (region->count < 2)
+    {
+      region->e = 0;
+    }
+  else
+    {
+      u64 a = 0;
+      region->e = 0;
+      for (uint i = 0; i < IMAGE_VEC_F; i++)
+        {
+	  region->e += region->c[i];
+	  a += (u64)region->b[i] * region->b[i];
+	}
+      region->e -= a / region->count;
+      DBG("Finished region %u", (uint)region->e / region->count);
+    }
+}
+
+static inline uint
+prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b)
+{
+  return a->e > b->e;
+}
+
+#define ASORT_PREFIX(x) prequant_##x
+#define ASORT_KEY_TYPE uint
+#include <ucw/sorter/array-simple.h>
+
+static uint
+prequant(struct image_sig_block *blocks, uint blocks_count, struct image_sig_region *regions)
+{
+  DBG("Starting pre-quantization");
+
+  uint regions_count, heap_count, axis;
+  struct image_sig_block *blocks_end = blocks + blocks_count, *block, *block2;
+  struct image_sig_region *heap[IMAGE_REG_MAX + 1], *region, *region2;
+
+  /* Initialize single region with all blocks */
+  regions_count = heap_count = 1;
+  heap[1] = regions;
+  prequant_init_region(regions);
+  for (block = blocks; block != blocks_end; block++)
+    prequant_add_block(regions, block);
+  prequant_finish_region(regions);
+
+  /* Main cycle */
+  while (regions_count < IMAGE_REG_MAX &&
+      regions_count <= DARY_LEN(image_sig_prequant_thresholds) && heap_count)
+    {
+      region = heap[1];
+      DBG("Step... regions_count=%u heap_count=%u region->count=%u, region->e=%u",
+	  regions_count, heap_count, region->count, (uint)region->e);
+      if (region->count < 2 ||
+	  region->e < image_sig_prequant_thresholds[regions_count - 1] * blocks_count)
+        {
+	  HEAP_DELETE_MIN(struct image_sig_region *, heap, heap_count, prequant_heap_cmp, HEAP_SWAP);
+	  continue;
+	}
+
+      /* Select axis to split - the one with maximum average quadratic error */
+      axis = 0;
+      u64 cov = (u64)region->count * region->c[0] - (u64)region->b[0] * region->b[0];
+      for (uint i = 1; i < 6; i++)
+        {
+	  uint j = (u64)region->count * region->c[i] - (u64)region->b[i] * region->b[i];
+	  if (j > cov)
+	    {
+	      axis = i;
+	      cov = j;
+	    }
+	}
+      DBG("Splitting axis %u with average quadratic error %u", axis, (uint)(cov / (region->count * region->count)));
+
+      /* Sort values on the split axis */
+      uint val[256], cnt[256], cval;
+      if (region->count > 64)
+        {
+	  bzero(cnt, sizeof(cnt));
+	  for (block = region->blocks; block; block = block->next)
+	    cnt[block->v[axis]]++;
+	  cval = 0;
+	  for (uint i = 0; i < 256; i++)
+	    if (cnt[i])
+	      {
+		val[cval] = i;
+		cnt[cval] = cnt[i];
+		cval++;
+	      }
+	}
+      else
+        {
+          block = region->blocks;
+          for (uint i = 0; i < region->count; i++, block = block->next)
+	    val[i] = block->v[axis];
+	  prequant_sort(val, region->count);
+	  cval = 1;
+	  cnt[0] = 1;
+	  for (uint i = 1; i < region->count; i++)
+	    if (val[i] == val[cval - 1])
+	      cnt[cval - 1]++;
+	    else
+	      {
+		val[cval] = val[i];
+		cnt[cval] = 1;
+		cval++;
+	      }
+	}
+
+      /* Select split value - to minimize error */
+      uint b1 = val[0] * cnt[0];
+      uint c1 = isqr(val[0]) * cnt[0];
+      uint b2 = region->b[axis] - b1;
+      uint c2 = region->c[axis] - c1;
+      uint i = cnt[0], j = region->count - cnt[0];
+      u64 best_err = c1 - (u64)b1 * b1 / i + c2 - (u64)b2 * b2 / j;
+      uint split_val = val[0];
+      for (uint k = 1; k < cval - 1; k++)
+        {
+	  uint b0 = val[k] * cnt[k];
+	  uint c0 = isqr(val[k]) * cnt[k];
+	  b1 += b0;
+	  b2 -= b0;
+	  c1 += c0;
+	  c2 -= c0;
+	  i += cnt[k];
+	  j -= cnt[k];
+	  u64 err = (u64)c1 - (u64)b1 * b1 / i + (u64)c2 - (u64)b2 * b2 / j;
+	  if (err < best_err)
+	    {
+	      best_err = err;
+	      split_val = val[k];
+	    }
+	}
+      DBG("split_val=%u best_err=%llu b[axis]=%u c[axis]=%u", split_val, (long long)best_err, region->b[axis], region->c[axis]);
+
+      /* Split region */
+      block = region->blocks;
+      region2 = regions + regions_count++;
+      prequant_init_region(region);
+      prequant_init_region(region2);
+      while (block)
+        {
+	  block2 = block->next;
+	  if (block->v[axis] <= split_val)
+	    prequant_add_block(region, block);
+	  else
+	    prequant_add_block(region2, block);
+	  block = block2;
+	}
+      prequant_finish_region(region);
+      prequant_finish_region(region2);
+      HEAP_INCREASE(struct image_sig_region *, heap, heap_count, prequant_heap_cmp, HEAP_SWAP, 1, region);
+      HEAP_INSERT(struct image_sig_region *, heap, heap_count, prequant_heap_cmp, HEAP_SWAP, region2);
+    }
+
+  DBG("Pre-quantized to %u regions", regions_count);
+
+  return regions_count;
+}
+
+/* Post-quantization - run a few K-mean iterations to improve pre-quantized regions */
+
+static uint
+postquant(struct image_sig_block *blocks, uint blocks_count, struct image_sig_region *regions, uint regions_count)
+{
+  DBG("Starting post-quantization");
+
+  struct image_sig_block *blocks_end = blocks + blocks_count, *block;
+  struct image_sig_region *regions_end = regions + regions_count, *region;
+  uint error = 0, last_error;
+
+  /* Initialize regions and initial segmentation error */
+  for (region = regions; region != regions_end; )
+    {
+      uint inv = 0xffffffffU / region->count;
+      for (uint i = 0; i < IMAGE_VEC_F; i++)
+        {
+          region->a[i] = ((u64)region->b[i] * inv) >> 32;
+          error += region->c[i] - region->a[i] * region->b[i];
+        }
+      region++;
+    }
+
+  /* Convergation cycle */
+  for (uint step = 0; step < image_sig_postquant_max_steps; step++)
+    {
+      DBG("Step...");
+
+      /* Clear regions */
+      for (region = regions; region != regions_end; region++)
+        {
+	  region->blocks = NULL;
+	  region->count = 0;
+	  bzero(region->b, sizeof(region->b));
+	  bzero(region->c, sizeof(region->c));
+	}
+
+      /* Assign each block to its nearest pivot and accumulate region variables */
+      for (block = blocks; block != blocks_end; block++)
+        {
+	  struct image_sig_region *best_region = NULL;
+	  uint best_dist = ~0U;
+	  for (region = regions; region != regions_end; region++)
+	    {
+	      uint dist =
+		isqr(block->v[0] - region->a[0]) +
+		isqr(block->v[1] - region->a[1]) +
+		isqr(block->v[2] - region->a[2]) +
+		isqr(block->v[3] - region->a[3]) +
+		isqr(block->v[4] - region->a[4]) +
+		isqr(block->v[5] - region->a[5]);
+	      if (dist <= best_dist)
+	        {
+		  best_dist = dist;
+		  best_region = region;
+		}
+	    }
+	  region = best_region;
+	  region->count++;
+	  block->next = region->blocks;
+	  region->blocks = block;
+	  for (uint i = 0; i < IMAGE_VEC_F; i++)
+	    {
+	      region->b[i] += block->v[i];
+	      region->c[i] += isqr(block->v[i]);
+	    }
+	}
+
+      /* Finish regions, delete empty ones (should appear rarely), compute segmentation error */
+      last_error = error;
+      error = 0;
+      for (region = regions; region != regions_end; )
+	if (region->count)
+          {
+	    uint inv = 0xffffffffU / region->count;
+	    for (uint i = 0; i < IMAGE_VEC_F; i++)
+	      {
+	        region->a[i] = ((u64)region->b[i] * inv) >> 32;
+	        error += region->c[i] - region->a[i] * region->b[i];
+	      }
+	    region++;
+	  }
+        else
+	  {
+	    regions_end--;
+	    *region = *regions_end;
+	  }
+
+      DBG("last_error=%u error=%u", last_error, error);
+
+      /* Convergation criteria */
+      if (step >= image_sig_postquant_min_steps)
+        {
+	  if (error > last_error)
+	    break;
+	  u64 dif = last_error - error;
+	  if (dif * image_sig_postquant_threshold < (u64)last_error * 100)
+	    break;
+	}
+    }
+
+  DBG("Post-quantized to %u regions with average square error %u", regions_end - regions, error / blocks_count);
+
+  return regions_end - regions;
+}
+
+void
+image_sig_segmentation(struct image_sig_data *data)
+{
+  data->regions_count = prequant(data->blocks, data->blocks_count, data->regions);
+#ifdef LOCAL_DEBUG
+  dump_segmentation(data->regions, data->regions_count);
+#endif
+  data->regions_count = postquant(data->blocks, data->blocks_count, data->regions, data->regions_count);
+#ifdef LOCAL_DEBUG
+  dump_segmentation(data->regions, data->regions_count);
+#endif
+}
+
diff --git a/libucw/images/sig-txt.c b/libucw/images/sig-txt.c
new file mode 100644
index 0000000..c11e5eb
--- /dev/null
+++ b/libucw/images/sig-txt.c
@@ -0,0 +1,97 @@
+/*
+ *	Image Library -- Detection of textured images
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/signature.h>
+#include <images/math.h>
+
+#include <string.h>
+
+#define MAX_CELLS_COLS 4
+#define MAX_CELLS_ROWS 4
+
+void
+image_sig_detect_textured(struct image_sig_data *data)
+{
+  if (image_sig_textured_threshold <= 0)
+    {
+      DBG("Zero textured threshold.");
+      return;
+    }
+
+  uint cols = data->cols;
+  uint rows = data->rows;
+  uint cell_cols = MIN((cols + 1) / 2, MAX_CELLS_COLS);
+  uint cell_rows = MIN((rows + 1) / 2, MAX_CELLS_ROWS);
+  uint cell_x[MAX_CELLS_COLS + 1];
+  uint cell_y[MAX_CELLS_ROWS + 1];
+  uint i, j;
+  u32 cnt[IMAGE_REG_MAX];
+
+  if (cell_cols * cell_rows < 4)
+    {
+      DBG("Image is not textured.");
+      return;
+    }
+
+  DBG("Detecting textured image... cols=%u rows=%u cell_cols=%u cell_rows=%u", cols, rows, cell_cols, cell_rows);
+
+  /* Compute cells boundaries */
+  for (i = 1, j = 0; i < cell_cols; i++)
+    cell_x[i] = fast_div_u32_u8(j += cols, cell_cols);
+  cell_x[0] = 0;
+  cell_x[cell_cols] = cols;
+  for (i = 1, j = 0; i < cell_rows; i++)
+    cell_y[i] = fast_div_u32_u8(j += rows, cell_rows);
+  cell_y[0] = 0;
+  cell_y[cell_rows] = rows;
+
+  /* Preprocess blocks */
+  for (uint i = 0; i < data->regions_count; i++)
+    for (struct image_sig_block *block = data->regions[i].blocks; block; block = block->next)
+      block->region = i;
+
+  /* Process cells */
+  double e = 0;
+  for (uint j = 0; j < cell_rows; j++)
+    for (uint i = 0; i < cell_cols; i++)
+      {
+	uint cell_area = 0;
+        bzero(cnt, data->regions_count * sizeof(u32));
+	struct image_sig_block *b1 = data->blocks + cell_x[i] + cell_y[j] * cols, *b2;
+        for (uint y = cell_y[j]; y < cell_y[j + 1]; y++, b1 += cols)
+	  {
+	    b2 = b1;
+            for (uint x = cell_x[i]; x < cell_x[i + 1]; x++, b2++)
+	      {
+	        cnt[b2->region]++;
+		cell_area++;
+	      }
+	  }
+	for (uint k = 0; k < data->regions_count; k++)
+	  {
+	    int a = data->blocks_count * cnt[k] - cell_area * data->regions[k].count;
+	    e += (double)a * a / ((double)isqr(data->regions[k].count) * cell_area);
+	  }
+      }
+
+  DBG("Coefficient=%g", (double)e / (data->regions_count * data->blocks_count));
+
+  /* Threshold */
+  if (e < image_sig_textured_threshold * data->regions_count * data->blocks_count)
+    {
+      data->flags |= IMAGE_SIG_TEXTURED;
+      DBG("Image is textured.");
+    }
+  else
+    DBG("Image is not textured.");
+}
diff --git a/libucw/images/signature.h b/libucw/images/signature.h
new file mode 100644
index 0000000..34a6c9a
--- /dev/null
+++ b/libucw/images/signature.h
@@ -0,0 +1,155 @@
+#ifndef _IMAGES_SIGNATURE_H
+#define _IMAGES_SIGNATURE_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define compute_image_signature ucw_compute_image_signature
+#define image_region_dump ucw_image_region_dump
+#define image_sig_border_bonus ucw_image_sig_border_bonus
+#define image_sig_border_size ucw_image_sig_border_size
+#define image_sig_cleanup ucw_image_sig_cleanup
+#define image_sig_cmp_features_weights ucw_image_sig_cmp_features_weights
+#define image_sig_compare_method ucw_image_sig_compare_method
+#define image_sig_detect_textured ucw_image_sig_detect_textured
+#define image_sig_finish ucw_image_sig_finish
+#define image_sig_inertia_scale ucw_image_sig_inertia_scale
+#define image_sig_init ucw_image_sig_init
+#define image_sig_min_height ucw_image_sig_min_height
+#define image_sig_min_width ucw_image_sig_min_width
+#define image_sig_postquant_max_steps ucw_image_sig_postquant_max_steps
+#define image_sig_postquant_min_steps ucw_image_sig_postquant_min_steps
+#define image_sig_postquant_threshold ucw_image_sig_postquant_threshold
+#define image_sig_preprocess ucw_image_sig_preprocess
+#define image_sig_prequant_thresholds ucw_image_sig_prequant_thresholds
+#define image_sig_segmentation ucw_image_sig_segmentation
+#define image_sig_textured_threshold ucw_image_sig_textured_threshold
+#define image_signatures_dist ucw_image_signatures_dist
+#define image_signatures_dist_explain ucw_image_signatures_dist_explain
+#define image_vector_dump ucw_image_vector_dump
+#endif
+
+/* Configuration */
+extern uint image_sig_min_width, image_sig_min_height;
+extern uint *image_sig_prequant_thresholds;
+extern uint image_sig_postquant_min_steps, image_sig_postquant_max_steps, image_sig_postquant_threshold;
+extern double image_sig_border_size;
+extern int image_sig_border_bonus;
+extern double image_sig_inertia_scale[];
+extern double image_sig_textured_threshold;
+extern int image_sig_compare_method;
+extern uint image_sig_cmp_features_weights[];
+
+#define IMAGE_VEC_F	6
+#define IMAGE_REG_F	IMAGE_VEC_F
+#define IMAGE_REG_H	5
+#define IMAGE_REG_MAX	16
+
+/* K-dimensional feature vector (6 bytes) */
+struct image_vector {
+  byte f[IMAGE_VEC_F];		/* texture features */
+} PACKED;
+
+/* Features for image regions (16 bytes) */
+struct image_region {
+  byte f[IMAGE_VEC_F];		/* texture features - L, u, v, LH, HL, HH */
+  byte h[IMAGE_REG_H];		/* shape/pos features - I1, I2, I3, X, Y */
+  byte wa;			/* normalized area percentage */
+  byte wb;			/* normalized weight */
+};
+
+#define IMAGE_SIG_TEXTURED	0x1
+
+/* Image signature (usually 16 + len * 16 bytes) */
+struct image_signature {
+  byte len;			/* number of regions */
+  byte flags;			/* IMAGE_SIG_xxx */
+  u16 cols;			/* image width */
+  u16 rows;			/* image height */
+  u16 df;			/* average weighted f dist */
+  u16 dh;			/* average weighted h dist */
+  struct image_vector vec;	/* average features of all regions... simple signature */
+  struct image_region reg[IMAGE_REG_MAX];/* feature vector for every region */
+};
+
+struct image_cluster {
+  union {
+    struct {
+      s32 dot;			/* dot product of the splitting plane */
+      s8 vec[IMAGE_VEC_F];	/* normal vector of the splitting plane */
+    };
+    struct {
+      u64 pos;			/* cluster size in bytes */
+    };
+  };
+};
+
+static inline uint image_signature_size(uint len)
+{
+  return OFFSETOF(struct image_signature, reg) + len * sizeof(struct image_region);
+}
+
+/* sig-dump.c */
+
+#define IMAGE_VECTOR_DUMP_MAX (IMAGE_VEC_F * 16 + 1)
+#define IMAGE_REGION_DUMP_MAX ((IMAGE_REG_F + IMAGE_REG_H) * 16 + 100)
+
+byte *image_vector_dump(byte *buf, struct image_vector *vec);
+byte *image_region_dump(byte *buf, struct image_region *reg);
+
+struct image_sig_block {
+  struct image_sig_block *next;		/* linked list */
+  u32 x, y;				/* block position */
+  byte area;				/* block area in pixels (usually 16) */
+  byte region;				/* region index */
+  byte v[IMAGE_VEC_F];			/* feature vector */
+};
+
+struct image_sig_region {
+  struct image_sig_block *blocks;
+  u32 count;
+  u32 a[IMAGE_VEC_F];
+  u32 b[IMAGE_VEC_F];
+  u32 c[IMAGE_VEC_F];
+  u64 e;
+  u64 w_sum;
+};
+
+struct image_sig_data {
+  struct image *image;
+  struct image_sig_block *blocks;
+  struct image_sig_region regions[IMAGE_REG_MAX];
+  u32 cols;
+  u32 rows;
+  u32 full_cols;
+  u32 full_rows;
+  u32 flags;
+  u32 area;
+  u32 valid;
+  u32 blocks_count;
+  u32 regions_count;
+  u32 f[IMAGE_VEC_F];
+};
+
+/* sig-init.c */
+
+int compute_image_signature(struct image_context *ctx, struct image_signature *sig, struct image *image);
+
+int image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image);
+void image_sig_preprocess(struct image_sig_data *data);
+void image_sig_finish(struct image_sig_data *data, struct image_signature *sig);
+void image_sig_cleanup(struct image_sig_data *data);
+
+/* sig-seg.c */
+
+void image_sig_segmentation(struct image_sig_data *data);
+
+/* sig-txt.c */
+
+void image_sig_detect_textured(struct image_sig_data *data);
+
+/* sig-cmp.c */
+
+uint image_signatures_dist(struct image_signature *sig1, struct image_signature *sig2);
+uint image_signatures_dist_explain(struct image_signature *sig1, struct image_signature *sig2, void (*msg)(byte *text, void *param), void *param);
+
+#endif
+
diff --git a/libucw/images/ucw-color-tool.c b/libucw/images/ucw-color-tool.c
new file mode 100644
index 0000000..edc892f
--- /dev/null
+++ b/libucw/images/ucw-color-tool.c
@@ -0,0 +1,97 @@
+/*
+ *	Color spaces tool
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/color.h>
+
+#include <getopt.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+static void NONRET
+usage(void)
+{
+  fputs("\
+Usage: ucw-color-tool input-color-space output-color-space\n\
+", stderr);
+  exit(1);
+}
+
+static char *shortopts = "";
+static struct option longopts[] =
+{
+  { NULL,			0, 0, 0 }
+};
+
+static const struct color_space_info *
+parse_color_space(byte *s)
+{
+  if (!strcasecmp(s, "sRGB"))
+    return &color_srgb_info;
+  else if (!strcasecmp(s, "AdobeRGB") || !strcasecmp(s, "Adobe RGB"))
+    return &color_adobe_rgb_info;
+  else if (!strcasecmp(s, "CIERGB") || strcasecmp(s, "CIE RGB"))
+    return &color_cie_rgb_info;
+  else
+    die("Unknown color space");
+}
+
+static void
+print_matrix(double m[9])
+{
+  for (uint j = 0; j < 3; j++)
+    {
+      for (uint i = 0; i < 3; i++)
+	printf(" %12.8f", m[i + j * 3]);
+      printf("\n");
+    }
+}
+
+int
+main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  int opt;
+  while ((opt = getopt_long(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	default:
+	  usage();
+      }
+
+  if (argc == optind + 1)
+    {
+      const struct color_space_info *a = parse_color_space(argv[optind]);
+      double a_to_xyz[9], xyz_to_a[9];
+      color_compute_color_space_to_xyz_matrix(a_to_xyz, &a->chromacity);
+      color_invert_matrix(xyz_to_a, a_to_xyz);
+      printf("linear %s -> XYZ:\n", a->name);
+      print_matrix(a_to_xyz);
+      printf("XYZ -> linear %s:\n", a->name);
+      print_matrix(xyz_to_a);
+      printf("Simple gamma: %.8f\n", a->gamma.simple_gamma);
+      printf("Detailed gamma: g=%.8f o=%.8f t=%.8f s=%.8f\n", a->gamma.detailed_gamma, a->gamma.offset, a->gamma.transition, a->gamma.slope);
+    }
+  else if (argc == optind + 2)
+    {
+      const struct color_space_info *a = parse_color_space(argv[optind++]);
+      const struct color_space_info *b = parse_color_space(argv[optind]);
+      double a_to_b[9];
+      color_compute_color_spaces_conversion_matrix(a_to_b, &a->chromacity, &b->chromacity);
+      printf("linear %s -> linear %s:\n", a->name, b->name);
+      print_matrix(a_to_b);
+    }
+  else
+    usage();
+
+  return 0;
+}
diff --git a/libucw/images/ucw-image-dup-test.c b/libucw/images/ucw-image-dup-test.c
new file mode 100644
index 0000000..f38d1b2
--- /dev/null
+++ b/libucw/images/ucw-image-dup-test.c
@@ -0,0 +1,174 @@
+/*
+ *	Image duplicates testing
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+#include <images/images.h>
+#include <images/color.h>
+#include <images/duplicates.h>
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+
+static void NONRET
+usage(void)
+{
+  fputs("\
+Usage: ucw-image-dup-test [options] image1 image2 \n\
+\n\
+-q --quiet           no progress messages\n\
+-f --format-1        image1 format (jpeg, gif, png)\n\
+-F --format-2        image2 format\n\
+-g --background      background color (hexadecimal RRGGBB)\n\
+-t --transformations hexadecimal value of allowed transformtion (1=identity, FF=all)\n\
+", stderr);
+  exit(1);
+}
+
+static char *shortopts = "qf:F:g:t:" CF_SHORT_OPTS;
+static struct option longopts[] =
+{
+  CF_LONG_OPTS
+  { "quiet",		0, 0, 'q' },
+  { "format-1",		0, 0, 'f' },
+  { "format-2",		0, 0, 'F' },
+  { "background",	0, 0, 'g' },
+  { "transormations",	0, 0, 't' },
+  { NULL,		0, 0, 0 }
+};
+
+static uint verbose = 1;
+static byte *file_name_1;
+static byte *file_name_2;
+static enum image_format format_1;
+static enum image_format format_2;
+static struct color background_color;
+static uint transformations = IMAGE_DUP_TRANS_ALL;
+
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)
+
+int
+main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  int opt;
+  while ((opt = cf_getopt(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	case 'q':
+	  verbose = 0;
+	  break;
+	case 'f':
+	  if (!(format_1 = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 'F':
+	  if (!(format_2 = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 'g':
+	  {
+	    if (strlen(optarg) != 6)
+	      usage();
+	    errno = 0;
+	    char *end;
+	    long int v = strtol(optarg, &end, 16);
+	    if (errno || *end || v < 0)
+	      usage();
+	    color_make_rgb(&background_color, (v >> 16) & 255, (v >> 8) & 255, v & 255);
+	  }
+	  break;
+	case 't':
+	  {
+	    errno = 0;
+	    char *end;
+	    long int v = strtol(optarg, &end, 16);
+	    if (errno || *end || v < 0 || v > 0xff)
+	      usage();
+	    transformations = v;
+	  }
+	  break;
+	default:
+	  usage();
+      }
+
+  if (argc != optind + 2)
+    usage();
+  file_name_1 = argv[optind++];
+  file_name_2 = argv[optind];
+
+#define TRY(x) do{ if (!(x)) exit(1); }while(0)
+  MSG("Initializing image library");
+  struct image_context ctx;
+  struct image_dup_context idc;
+  struct image_io io;
+  image_context_init(&ctx);
+  image_dup_context_init(&ctx, &idc);
+
+  struct image *img1, *img2;
+
+  TRY(image_io_init(&ctx, &io));
+  MSG("Reading %s", file_name_1);
+  io.fastbuf = bopen(file_name_1, O_RDONLY, 1 << 18);
+  io.format = format_1 ? : image_file_name_to_format(file_name_1);
+  TRY(image_io_read_header(&io));
+  io.flags = COLOR_SPACE_RGB | IMAGE_IO_USE_BACKGROUND;
+  if (background_color.color_space)
+    io.background_color = background_color;
+  else if (!io.background_color.color_space)
+    io.background_color = color_black;
+  TRY(image_io_read_data(&io, 1));
+  bclose(io.fastbuf);
+  img1 = io.image;
+  MSG("Image size=%ux%u", img1->cols, img1->rows);
+
+  image_io_reset(&io);
+  MSG("Reading %s", file_name_2);
+  io.fastbuf = bopen(file_name_2, O_RDONLY, 1 << 18);
+  io.format = format_2 ? : image_file_name_to_format(file_name_2);
+  TRY(image_io_read_header(&io));
+  io.flags = COLOR_SPACE_RGB | IMAGE_IO_USE_BACKGROUND;
+  if (background_color.color_space)
+    io.background_color = background_color;
+  else if (!io.background_color.color_space)
+    io.background_color = color_black;
+  TRY(image_io_read_data(&io, 1));
+  bclose(io.fastbuf);
+  img2 = io.image;
+  image_io_cleanup(&io);
+  MSG("Image size=%ux%u", img2->cols, img2->rows);
+
+  struct image_dup *dup1, *dup2;
+  struct mempool *pool = mp_new(1 << 18);
+  MSG("Creating internal structures");
+  dup1 = mp_start(pool, image_dup_estimate_size(img1->cols, img1->rows, 1, idc.qtree_limit));
+  uint size = image_dup_new(&idc, img1, dup1, 1);
+  TRY(size);
+  mp_end(pool, (void *)dup1 + size);
+  dup2 = mp_start(pool, image_dup_estimate_size(img2->cols, img2->rows, 1, idc.qtree_limit));
+  size = image_dup_new(&idc, img2, dup2, 1);
+  TRY(size);
+  mp_end(pool, (void *)dup2 + size);
+
+  idc.flags = transformations | IMAGE_DUP_SCALE | IMAGE_DUP_WANT_ALL;
+  MSG("Similarity bitmap %02x", image_dup_compare(&idc, dup1, dup2));
+
+  mp_delete(pool);
+
+  image_destroy(img1);
+  image_destroy(img2);
+  image_dup_context_cleanup(&idc);
+  image_context_cleanup(&ctx);
+  MSG("Done.");
+  return 0;
+}
diff --git a/libucw/images/ucw-image-sim-test.c b/libucw/images/ucw-image-sim-test.c
new file mode 100644
index 0000000..2247db6
--- /dev/null
+++ b/libucw/images/ucw-image-sim-test.c
@@ -0,0 +1,320 @@
+/*
+ *	Image similarity testing
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <ucw/base64.h>
+#include <ucw/base224.h>
+#include <images/images.h>
+#include <images/color.h>
+#include <images/signature.h>
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+
+static void NONRET
+usage(void)
+{
+  fputs("\
+Usage: ucw-image-sim-test [options] image1 [image2] \n\
+\n\
+-q --quiet           no progress messages\n\
+-f --format-1        image1 format (jpeg, gif, png)\n\
+-F --format-2        image2 format\n\
+-g --background      background color (hexadecimal RRGGBB)\n\
+-r --segmentation-1  writes image1 segmentation to given file\n\
+-R --segmentation-2  writes image2 segmentation to given file\n\
+-6 --base64          display base64 encoded signature(s)\n\
+-2 --base224         display base224 encoded signature(s)\n\
+", stderr);
+  exit(1);
+}
+
+static char *shortopts = "qf:F:g:t:r:R:62" CF_SHORT_OPTS;
+static struct option longopts[] =
+{
+  CF_LONG_OPTS
+  { "quiet",		0, 0, 'q' },
+  { "format-1",		0, 0, 'f' },
+  { "format-2",		0, 0, 'F' },
+  { "background",	0, 0, 'g' },
+  { "segmentation-1",	0, 0, 'r' },
+  { "segmentation-2",	0, 0, 'R' },
+  { "base64",		0, 0, '6' },
+  { "base224",		0, 0, '2' },
+  { NULL,		0, 0, 0 }
+};
+
+static uint verbose = 1;
+static byte *file_name_1;
+static byte *file_name_2;
+static enum image_format format_1;
+static enum image_format format_2;
+static struct color background_color;
+static byte *segmentation_name_1;
+static byte *segmentation_name_2;
+static uint display_base64;
+static uint display_base224;
+
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)
+#define TRY(x) do{ if (!(x)) exit(1); }while(0)
+
+static void
+msg_str(byte *s, void *param UNUSED)
+{
+  MSG("%s", s);
+}
+
+static void
+dump_signature(struct image_signature *sig)
+{
+  byte buf[MAX(IMAGE_VECTOR_DUMP_MAX, IMAGE_REGION_DUMP_MAX)];
+  image_vector_dump(buf, &sig->vec);
+  MSG("vector: %s", buf);
+  for (uint i = 0; i < sig->len; i++)
+    {
+      image_region_dump(buf, sig->reg + i);
+      MSG("region %u: %s", i, buf);
+    }
+  uint sig_size = image_signature_size(sig->len);
+  if (display_base64)
+    {
+      byte buf[BASE64_ENC_LENGTH(sig_size) + 1];
+      uint enc_size = base64_encode(buf, (byte *)sig, sig_size);
+      buf[enc_size] = 0;
+      MSG("base64 encoded: %s", buf);
+    }
+  if (display_base224)
+    {
+      byte buf[BASE224_ENC_LENGTH(sig_size) + 1];
+      uint enc_size = base224_encode(buf, (byte *)sig, sig_size);
+      buf[enc_size] = 0;
+      MSG("base224 encoded: %s", buf);
+    }
+}
+
+static struct image_context ctx;
+static struct image_io io;
+
+static void
+write_segmentation(struct image_sig_data *data, byte *fn)
+{
+  MSG("Writing segmentation to %s", fn);
+
+  struct fastbuf *fb = bopen(fn, O_WRONLY | O_CREAT | O_TRUNC, 4096);
+  struct image *img;
+  TRY(img = image_new(&ctx, data->image->cols, data->image->rows, COLOR_SPACE_RGB, NULL));
+  image_clear(&ctx, img);
+
+  for (uint i = 0; i < data->regions_count; i++)
+    {
+      byte c[3];
+      double luv[3], xyz[3], srgb[3];
+      luv[0] = data->regions[i].a[0] * (4 / 2.55);
+      luv[1] = ((int)data->regions[i].a[1] - 128) * (4 / 2.55);
+      luv[2] = ((int)data->regions[i].a[2] - 128) * (4 / 2.55);
+      luv_to_xyz_exact(xyz, luv);
+      xyz_to_srgb_exact(srgb, xyz);
+      c[0] = CLAMP(srgb[0] * 255, 0, 255);
+      c[1] = CLAMP(srgb[1] * 255, 0, 255);
+      c[2] = CLAMP(srgb[2] * 255, 0, 255);
+      for (struct image_sig_block *block = data->regions[i].blocks; block; block = block->next)
+        {
+	  uint x1 = block->x * 4;
+	  uint y1 = block->y * 4;
+	  uint x2 = MIN(x1 + 4, img->cols);
+	  uint y2 = MIN(y1 + 4, img->rows);
+	  byte *p = img->pixels + x1 * 3 + y1 * img->row_size;
+	  for (uint y = y1; y < y2; y++, p += img->row_size)
+	    {
+	      byte *p2 = p;
+	      for (uint x = x1; x < x2; x++, p2 += 3)
+	        {
+	          p2[0] = c[0];
+	          p2[1] = c[1];
+	          p2[2] = c[2];
+	        }
+	    }
+        }
+    }
+
+  io.fastbuf = fb;
+  io.image = img;
+  io.format = image_file_name_to_format(fn);
+  TRY(image_io_write(&io));
+  image_io_reset(&io);
+
+  image_destroy(img);
+  bclose(fb);
+}
+
+int
+main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  int opt;
+  while ((opt = cf_getopt(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	case 'q':
+	  verbose = 0;
+	  break;
+	case 'f':
+	  if (!(format_1 = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 'F':
+	  if (!(format_2 = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 'g':
+	  {
+	    if (strlen(optarg) != 6)
+	      usage();
+	    errno = 0;
+	    char *end;
+	    long int v = strtol(optarg, &end, 16);
+	    if (errno || *end || v < 0)
+	      usage();
+	    color_make_rgb(&background_color, (v >> 16) & 255, (v >> 8) & 255, v & 255);
+	  }
+	  break;
+	case 'r':
+	  segmentation_name_1 = optarg;
+	  break;
+	case 'R':
+	  segmentation_name_2 = optarg;
+	  break;
+	case '6':
+	  display_base64++;
+	  break;
+	case '2':
+	  display_base224++;
+	  break;
+	default:
+	  usage();
+      }
+
+  if (argc != optind + 2 && argc != optind + 1)
+    usage();
+  file_name_1 = argv[optind++];
+  if (argc > optind)
+    file_name_2 = argv[optind++];
+
+  MSG("Initializing image library");
+  random_gen_seed();
+  srgb_to_luv_init();
+  image_context_init(&ctx);
+
+  struct image *img1, *img2;
+
+  TRY(image_io_init(&ctx, &io));
+
+  if (file_name_1)
+    {
+      MSG("Reading %s", file_name_1);
+      io.fastbuf = bopen(file_name_1, O_RDONLY, 1 << 18);
+      io.format = format_1 ? : image_file_name_to_format(file_name_1);
+      TRY(image_io_read_header(&io));
+      io.flags = COLOR_SPACE_RGB | IMAGE_IO_USE_BACKGROUND;
+      if (background_color.color_space)
+        io.background_color = background_color;
+      else if (!io.background_color.color_space)
+        io.background_color = color_black;
+      TRY(image_io_read_data(&io, 1));
+      bclose(io.fastbuf);
+      img1 = io.image;
+      MSG("Image size=%ux%u", img1->cols, img1->rows);
+      image_io_reset(&io);
+    }
+  else
+    img1 = NULL;
+
+  if (file_name_2)
+    {
+      MSG("Reading %s", file_name_2);
+      io.fastbuf = bopen(file_name_2, O_RDONLY, 1 << 18);
+      io.format = format_2 ? : image_file_name_to_format(file_name_2);
+      TRY(image_io_read_header(&io));
+      io.flags = COLOR_SPACE_RGB | IMAGE_IO_USE_BACKGROUND;
+      if (background_color.color_space)
+        io.background_color = background_color;
+      else if (!io.background_color.color_space)
+        io.background_color = color_black;
+      TRY(image_io_read_data(&io, 1));
+      bclose(io.fastbuf);
+      img2 = io.image;
+      MSG("Image size=%ux%u", img2->cols, img2->rows);
+      image_io_reset(&io);
+    }
+  else
+    img2 = NULL;
+
+  struct image_signature sig1, sig2;
+  MSG("Computing signatures");
+  if (img1)
+    {
+      struct image_sig_data data;
+      TRY(image_sig_init(&ctx, &data, img1));
+      image_sig_preprocess(&data);
+      if (data.valid)
+        {
+	  image_sig_segmentation(&data);
+	  image_sig_detect_textured(&data);
+	}
+      if (segmentation_name_1)
+	write_segmentation(&data, segmentation_name_1);
+      image_sig_finish(&data, &sig1);
+      image_sig_cleanup(&data);
+      dump_signature(&sig1);
+    }
+  if (img2)
+    {
+      struct image_sig_data data;
+      TRY(image_sig_init(&ctx, &data, img2));
+      image_sig_preprocess(&data);
+      if (data.valid)
+        {
+	  image_sig_segmentation(&data);
+	  image_sig_detect_textured(&data);
+	}
+      if (segmentation_name_2)
+	write_segmentation(&data, segmentation_name_2);
+      image_sig_finish(&data, &sig2);
+      image_sig_cleanup(&data);
+      dump_signature(&sig2);
+    }
+
+  if (img1 && img2)
+    {
+      uint dist;
+      if (verbose)
+        {
+          struct fastbuf *fb = bfdopen(0, 4096);
+          dist = image_signatures_dist_explain(&sig1, &sig2, msg_str, NULL);
+          bclose(fb);
+	}
+      else
+	dist = image_signatures_dist(&sig1, &sig2);
+      MSG("dist=%u", dist);
+    }
+
+  if (img1)
+    image_destroy(img1);
+  if (img2)
+    image_destroy(img2);
+
+  image_io_cleanup(&io);
+  image_context_cleanup(&ctx);
+  MSG("Done.");
+  return 0;
+}
diff --git a/libucw/images/ucw-image-tool.c b/libucw/images/ucw-image-tool.c
new file mode 100644
index 0000000..66928ac
--- /dev/null
+++ b/libucw/images/ucw-image-tool.c
@@ -0,0 +1,243 @@
+/*
+ *	Image Library -- Simple image manipulation utility
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/color.h>
+
+#include <getopt.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+
+static void NONRET
+usage(void)
+{
+  fputs("\
+Usage: ucw-image-tool [options] infile [outfile]\n\
+\n\
+-q --quiet               no progress messages\n\
+-f --input-format        input image format (jpeg, gif, png)\n\
+-F --output-format       output image format\n\
+-s --size                force output dimensions (100x200)\n\
+-b --fit-to-box          scale to fit the box (100x200)\n\
+-c --colorspace          force output colorspace (Grayscale, Grayscale+Alpha, RGB, RGB+Alpha, ...)\n\
+-Q --jpeg-quality        JPEG quality (1..100)\n\
+-g --background          background color (hexadecimal RRGGBB)\n\
+-G --default-background  background applied only if the image contains no background info (RRGGBB, default=FFFFFF)\n\
+-a --remove-alpha        remove alpha channel\n\
+-e --exif                reads Exif data\n"
+, stderr);
+  exit(1);
+}
+
+static char *shortopts = "qf:F:s:b:c:Q:g:G:ae";
+static struct option longopts[] =
+{
+  { "quiet",			0, 0, 'q' },
+  { "input-format",		0, 0, 'f' },
+  { "output-format",		0, 0, 'F' },
+  { "size",			0, 0, 's' },
+  { "fit-to-box",		0, 0, 'b' },
+  { "colorspace",		0, 0, 'c' },
+  { "jpeg-quality",		0, 0, 'Q' },
+  { "background",		0, 0, 'g' },
+  { "default-background",	0, 0, 'G' },
+  { "remove-alpha",		0, 0, 'a' },
+  { "exif",			0, 0, 'e' },
+  { NULL,			0, 0, 0 }
+};
+
+static uint verbose = 1;
+static byte *input_file_name;
+static enum image_format input_format;
+static byte *output_file_name;
+static enum image_format output_format;
+static uint cols;
+static uint rows;
+static uint fit_to_box;
+static uint channels_format;
+static uint jpeg_quality;
+static struct color background_color;
+static struct color default_background_color;
+static uint remove_alpha;
+static uint exif;
+
+static void
+parse_color(struct color *color, byte *s)
+{
+  if (strlen(s) != 6)
+    usage();
+  errno = 0;
+  char *end;
+  long int v = strtol(s, &end, 16);
+  if (errno || *end || v < 0)
+    usage();
+  color_make_rgb(color, (v >> 16) & 255, (v >> 8) & 255, v & 255);
+}
+
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)
+
+int
+main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  int opt;
+  default_background_color = color_white;
+  while ((opt = getopt_long(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	case 'q':
+	  verbose = 0;
+	  break;
+	case 'f':
+	  if (!(input_format = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 'F':
+	  if (!(output_format = image_extension_to_format(optarg)))
+	    usage();
+	  break;
+	case 's':
+	  {
+	    byte *r = strchr(optarg, 'x');
+	    if (!r)
+	      usage();
+	    *r++ = 0;
+	    if (!(cols = atoi(optarg)) || !(rows = atoi(r)))
+	      usage();
+	    fit_to_box = 0;
+	    break;
+	  }
+	case 'b':
+	  {
+	    byte *r = strchr(optarg, 'x');
+	    if (!r)
+	      usage();
+	    *r++ = 0;
+	    if (!(cols = atoi(optarg)) || !(rows = atoi(r)))
+	      usage();
+	    fit_to_box = 1;
+	    break;
+	  }
+	case 'c':
+	  if (!(channels_format = image_name_to_channels_format(optarg)))
+	    usage();
+	  break;
+	case 'Q':
+	  if (!(jpeg_quality = atoi(optarg)))
+	    usage();
+	  break;
+	case 'g':
+	  parse_color(&background_color, optarg);
+	  break;
+	case 'G':
+	  parse_color(&default_background_color, optarg);
+	  break;
+	case 'a':
+	  remove_alpha++;
+	  break;
+	case 'e':
+	  exif++;
+	  break;
+	default:
+	  usage();
+      }
+
+  if (argc != optind + 1 && argc != optind + 2)
+    usage();
+  input_file_name = argv[optind++];
+  if (argc > optind)
+    output_file_name = argv[optind];
+
+#define TRY(x) do{ if (!(x)) exit(1); }while(0)
+  MSG("Initializing image library");
+  struct image_context ctx;
+  struct image_io io;
+  image_context_init(&ctx);
+  ctx.tracing_level = ~0U;
+  if (!image_io_init(&ctx, &io))
+    die("Cannot initialize image I/O");
+
+  MSG("Reading %s", input_file_name);
+  byte cs_buf[IMAGE_CHANNELS_FORMAT_MAX_SIZE];
+  io.fastbuf = bopen(input_file_name, O_RDONLY, 1 << 18);
+  io.format = input_format ? : image_file_name_to_format(input_file_name);
+  if (exif)
+    io.flags |= IMAGE_IO_WANT_EXIF;
+  TRY(image_io_read_header(&io));
+  if (!output_file_name)
+    {
+      bclose(io.fastbuf);
+      printf("Format:      %s\n", image_format_to_extension(io.format) ? : (byte *)"?");
+      printf("Dimensions:  %dx%d\n", io.cols, io.rows);
+      printf("Colorspace:  %s\n", (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags, cs_buf));
+      printf("NumColors:   %u\n", io.number_of_colors);
+      if (io.background_color.color_space)
+        {
+	  byte rgb[3];
+	  TRY(color_put(&ctx, &io.background_color, rgb, COLOR_SPACE_RGB));
+          printf("Background:  %02x%02x%02x\n", rgb[0], rgb[1], rgb[2]);
+	}
+      if (io.exif_size)
+	printf("ExifSize:    %u\n", io.exif_size);
+    }
+  else
+    {
+      MSG("%s %dx%d %s", image_format_to_extension(io.format) ? : (byte *)"?", io.cols, io.rows,
+	  (io.flags & IMAGE_IO_HAS_PALETTE) ? (byte *)"Palette" : image_channels_format_to_name(io.flags, cs_buf));
+      if (cols)
+        if (fit_to_box)
+	  {
+            image_dimensions_fit_to_box(&io.cols, &io.rows, MIN(cols, 0xffff), MIN(rows, 0xffff), 0);
+	  }
+        else
+          {
+            io.cols = cols;
+            io.rows = rows;
+          }
+      if (background_color.color_space)
+	io.background_color = background_color;
+      else if (!io.background_color.color_space)
+	io.background_color = default_background_color;
+      if (remove_alpha)
+	io.flags &= ~IMAGE_ALPHA;
+      if (channels_format)
+        io.flags = io.flags & ~IMAGE_PIXEL_FORMAT | channels_format;
+      if (!(io.flags & IMAGE_ALPHA))
+        io.flags |= IMAGE_IO_USE_BACKGROUND;
+      if (jpeg_quality)
+	io.jpeg_quality = jpeg_quality;
+      uint output_fmt = output_format ? : image_file_name_to_format(output_file_name);
+      uint output_cs = io.flags & IMAGE_COLOR_SPACE;
+      if (output_fmt != IMAGE_FORMAT_JPEG &&
+	  output_cs != COLOR_SPACE_GRAYSCALE &&
+	  output_cs != COLOR_SPACE_RGB)
+        {
+	  MSG("Forcing RGB color space");
+	  io.flags = (io.flags & ~IMAGE_COLOR_SPACE) | COLOR_SPACE_RGB;
+	}
+      TRY(image_io_read_data(&io, 0));
+      bclose(io.fastbuf);
+      MSG("Writing %s", output_file_name);
+      io.fastbuf = bopen(output_file_name, O_WRONLY | O_CREAT | O_TRUNC, 1 << 18);
+      io.format = output_format ? : image_file_name_to_format(output_file_name);
+      MSG("%s %dx%d %s", image_format_to_extension(io.format) ? : (byte *)"?", io.cols, io.rows,
+	  image_channels_format_to_name(io.flags, cs_buf));
+      TRY(image_io_write(&io));
+      bclose(io.fastbuf);
+    }
+
+  image_io_cleanup(&io);
+  image_context_cleanup(&ctx);
+  MSG("Done.");
+  return 0;
+}
diff --git a/libucw/ksp.cfg b/libucw/ksp.cfg
new file mode 100644
index 0000000..a550c37
--- /dev/null
+++ b/libucw/ksp.cfg
@@ -0,0 +1,35 @@
+# Do we want shared or static libraries?
+UnSet("CONFIG_SHARED");
+
+# Include debugging code
+Set("CONFIG_DEBUG");
+
+# We want the public API
+Set("CONFIG_INSTALL_API");
+
+# Libucw extensions
+UnSet("CONFIG_UCW_PERL");
+UnSet("CONFIG_UCW_PERL_MODULES");
+UnSet("CONFIG_UCW_SHELL_UTILS");
+UnSet("CONFIG_UCW_UTILS");
+
+# Libucw-images settings
+UnSet("CONFIG_IMAGES");
+UnSet("CONFIG_IMAGES_LIBJPEG");
+UnSet("CONFIG_IMAGES_LIBPNG");
+UnSet("CONFIG_IMAGES_LIBUNGIF");
+UnSet("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Libucw-charset
+UnSet("CONFIG_CHARSET");
+UnSet("CONFIG_CHARSET_UTILS");
+
+# Libucw-xml
+UnSet("CONFIG_XML");
+
+# Libucw-json
+UnSet("CONFIG_JSON");
+
+# Return success
+1;
diff --git a/libucw/maint/HOWTO b/libucw/maint/HOWTO
new file mode 100644
index 0000000..f973275
--- /dev/null
+++ b/libucw/maint/HOWTO
@@ -0,0 +1,17 @@
+How to release libucw
+~~~~~~~~~~~~~~~~~~~~~
+
+- Run maint/abi-check-exports. No symbols should be listed except for _init
+  and friends. Otherwise, run maint/abi-map-symbols, update maint/libucw.abi
+  accordingly, and call maint/abi-rename symbols to fix headers.
+
+- Update version numbers and ABI suffix in ucw/default.cfg:
+      - If there were major changes, or changes which are not backward
+        compatible on source level, increase the major number.
+      - If new features were added, increase the minor number.
+      - Otherwise, increase only the third number.
+      - If anything in the ABI was changed, update UCW_ABI_SUFFIX.
+
+- git-tag vX.Y.Z && git push --tags
+
+- Run maint/release
diff --git a/libucw/maint/abi-check-exports b/libucw/maint/abi-check-exports
new file mode 100755
index 0000000..88818a1
--- /dev/null
+++ b/libucw/maint/abi-check-exports
@@ -0,0 +1,20 @@
+#!/usr/bin/perl
+# Check symbols exported by a library
+# (c) 2014 Martin Mares <mj@ucw.cz>
+
+use common::sense;
+
+my $lib = $ARGV[0] or die "Usage: $0 <library>\n";
+open my $f, '-|', 'nm', $lib or die;
+while (<$f>) {
+	chomp;
+	next if /^\s/;
+	my ($addr, $type, $sym) = split /\s+/;
+	if ($sym =~ m{^(ucw|ucwlib)_}) {
+		next
+	}
+	if ($type =~ m{[A-Z]}) {
+		print "$sym ($type)\n";
+	}
+}
+close $f or die;
diff --git a/libucw/maint/abi-map-symbols b/libucw/maint/abi-map-symbols
new file mode 100755
index 0000000..d3c2355
--- /dev/null
+++ b/libucw/maint/abi-map-symbols
@@ -0,0 +1,85 @@
+#!/usr/bin/perl
+# Search for symbols which might need renaming
+# (c) 2014 Martin Mares <mj@ucw.cz>
+
+use common::sense;
+
+sub symbol {
+	my ($sym) = @_;
+	return if $sym =~ m{^(ucw|ucwlib)_};
+	print "$sym\n";
+}
+
+sub parse {
+	my ($file) = @_;
+	print "# $file\n";
+	open my $f, '<', $file or die;
+	while (<$f>) {
+		chomp;
+		# Interpret special comments
+		m{// NOAPI} and next;
+		if (m{// API: (\w+)}) {
+			print "$1\n";
+			next;
+		}
+		# Find things which look like top-level declarations
+		s{//.*}{};
+		s{/\*.*}{};
+		/^\s/ and next;
+		/^$/ and next;
+		/^#/ and next;
+		/^{/ and next;
+		/}/ and next;
+		/^"/ and next;
+		/^-/ and next;		# Magic for ucw/getopt.h
+		/^\w+:/ and next;	# Labels in inline functions
+		/^typedef\s/ and next;
+		/^static\s/ and next;
+		/^(struct|union|enum)(\s+\w+)?(;|\s*{)/ and next;
+
+		# print "$_\n";
+
+		# Try to parse the declaration
+		s{\[[^\]]*\]}{}g;	# Delete array sizes
+		if (m{^extern [^,]*(\s+\**\w+(,\s+\**\w+)*);}) {
+			my $x = $1;
+			$x =~ s{[,*]}{}g;
+			symbol $_ for grep { !/^$/ } split /\s+/, $x;
+		} elsif (m{( |\*)(\w+)\(}) {
+			symbol($2);
+		} else {
+			print "??? $_\n";
+		}
+
+	}
+	close $f;
+}
+
+my %blacklist = map { $_ => 1 } qw(
+	ucw/binheap.h
+	ucw/char-map.h
+	ucw/ff-binary.h
+	ucw/gbuf.h
+	ucw/hashtable.h
+	ucw/kmp.h
+	ucw/kmp-search.h
+	ucw/redblack.h
+	ucw/str-match.h
+	ucw/strtonum.h
+	ucw/strtonum-gen.h
+	ucw/trie.h
+	charset/charconv-gen.h
+	charset/chartable.h
+	charset/U-cat.h
+	charset/U-ligatures.h
+	charset/U-lower.h
+	charset/U-unacc.h
+	charset/U-upper.h
+	images/image-walk.h
+	images/scale-gen.h
+);
+
+for my $f (<ucw/*.h>, <ucw/sorter/common.h>, <charset/*.h>, <images/*.h>, <ucw-xml/*.h>, <ucw-json/*.h>) {
+	next if $blacklist{$f};
+	parse($f);
+}
diff --git a/libucw/maint/abi-rename-symbols b/libucw/maint/abi-rename-symbols
new file mode 100755
index 0000000..acf0534
--- /dev/null
+++ b/libucw/maint/abi-rename-symbols
@@ -0,0 +1,69 @@
+#!/usr/bin/perl
+# Re-generate symbol renaming defines
+# (c) 2014 Martin Mares <mj@ucw.cz>
+
+use common::sense;
+
+my %renames = ();
+open my $f, '<', 'maint/libucw.abi' or die;
+my $current;
+while (<$f>) {
+	chomp;
+	if (/^#\s*(.*)/) {
+		$current = $1;
+	} else {
+		push @{$renames{$current}}, $_;
+	}
+}
+close $f;
+
+for my $g (sort keys %renames) {
+	my @symbols = sort @{$renames{$g}};
+	@symbols or next;
+
+	open my $in, '<', $g or die "Cannot open $g: $!\n";
+	open my $out, '>', "$g.new" or die;
+	my $mode = 0;
+	my $cmt = 0;
+	while (<$in>) {
+		if (!$mode) {
+			if (m{^/\*$} && !$cmt) {
+				$cmt = 1;
+			} elsif (m{^\s} ||
+			    m{^#include\s} ||
+			    m{^#define\s+_} ||
+			    m{^#ifndef\s+_} ||
+			    m{^\s*$}
+			   ) {
+				# Waiting for the right spot
+			} elsif (m{^#ifdef CONFIG_UCW_CLEAN_ABI$}) {
+				$mode = 2;
+				next;
+			} else {
+				$mode = 1;
+				print $out "#ifdef CONFIG_UCW_CLEAN_ABI\n";
+				for my $sym (@symbols) {
+					print $out "#define $sym ucw_$sym\n";
+				}
+				print $out "#endif\n\n";
+			}
+		} elsif ($mode == 2) {
+			if (m{^$}) {
+				$mode = 0;
+			}
+			next;
+		}
+		print $out "$_";
+	}
+	$mode or die;
+	close $out;
+	close $in;
+	system "cmp", "-s", $g, "$g.new";
+	if ($?) {
+		print "### $g: updated\n";
+		rename "$g.new", $g or die;
+	} else {
+		print "--- $g: not modified\n";
+		unlink "$g.new" or die;
+	}
+}
diff --git a/libucw/maint/libucw.abi b/libucw/maint/libucw.abi
new file mode 100644
index 0000000..3a68d41
--- /dev/null
+++ b/libucw/maint/libucw.abi
@@ -0,0 +1,911 @@
+# ucw/alloc.h
+# ucw/asio.h
+asio_init_queue
+asio_cleanup_queue
+asio_get
+asio_submit
+asio_wait
+asio_put
+asio_sync
+# ucw/base224.h
+base224_encode
+base224_decode
+# ucw/base64.h
+base64_encode
+base64_decode
+# ucw/bbuf.h
+bb_vprintf
+bb_printf
+bb_vprintf_at
+bb_printf_at
+# ucw/binheap-node.h
+# ucw/binsearch.h
+# ucw/bitarray.h
+bit_array_xrealloc
+bit_array_count_bits
+# ucw/bitops.h
+bit_fls
+ffs_table
+# ucw/bitsig.h
+bitsig_init
+bitsig_free
+bitsig_member
+bitsig_insert
+# ucw/chartype.h
+# ucw/clists.h
+# ucw/conf-internal.h
+cf_obtain_context
+cf_op_names
+cf_type_names
+cf_type_size
+cf_interpret_line
+cf_init_stack
+cf_done_stack
+cf_journal_swap
+cf_journal_delete
+cf_sections
+cf_find_subitem
+cf_commit_all
+cf_add_dirty
+cf_load_default
+# ucw/conf.h
+cf_new_context
+cf_delete_context
+cf_switch_context
+cf_load
+cf_reload
+cf_set
+cf_open_group
+cf_close_group
+cf_revert
+cf_get_pool
+cf_malloc
+cf_malloc_zero
+cf_strdup
+cf_printf
+cf_set_journalling
+cf_journal_block
+cf_journal_new_transaction
+cf_journal_commit_transaction
+cf_journal_rollback_transaction
+cf_declare_section
+cf_declare_rel_section
+cf_init_section
+cf_parse_int
+cf_parse_u64
+cf_parse_double
+cf_parse_ip
+cf_find_item
+cf_modify_item
+cf_dump_sections
+# ucw/config.h
+# ucw/crc-tables.h
+crc_tableil8_o32
+crc_tableil8_o40
+crc_tableil8_o48
+crc_tableil8_o56
+crc_tableil8_o64
+crc_tableil8_o72
+crc_tableil8_o80
+crc_tableil8_o88
+# ucw/crc.h
+crc32_init
+crc32_hash_buffer
+# ucw/daemon.h
+daemon_init
+daemon_run
+daemon_exit
+daemon_resolve_ugid
+daemon_switch_ugid
+daemon_control
+# ucw/eltpool.h
+ep_new
+ep_delete
+ep_total_size
+ep_alloc_slow
+# ucw/fastbuf.h
+fb_tie
+fbpar_cf
+fbpar_def
+bopen_file
+bopen_file_try
+bopen_tmp_file
+bopen_fd_name
+bfilesync
+bopen
+bopen_try
+bopen_tmp
+bfdopen
+bfdopen_shared
+temp_file_name
+open_tmp
+bfix_tmp_file
+bfdopen_internal
+bfmmopen_internal
+fbdir_cheat
+fbdir_open_fd_internal
+bclose_file_helper
+bopen_limited_fd
+fbmem_create
+fbmem_clone_read
+fbbuf_init_read
+fbbuf_init_write
+fbgrow_create
+fbgrow_create_mp
+fbgrow_reset
+fbgrow_rewind
+fbgrow_get_buf
+fbpool_init
+fbpool_start
+fbpool_end
+fbatomic_open
+fbatomic_internal_write
+fbnull_open
+fbnull_start
+fbnull_test
+fbmulti_create
+fbmulti_append
+fbmulti_remove
+bconfig
+bclose
+bthrow
+brefill
+bspout
+bflush
+bseek
+bsetpos
+brewind
+bfilesize
+bgetc_slow
+bpeekc_slow
+beof_slow
+bputc_slow
+bread_slow
+bwrite_slow
+bgets
+bgets0
+bgets_nodie
+bgets_bb
+bgets_mp
+bgets_stk_init
+bgets_stk_step
+bbcopy_slow
+bskip_slow
+bprintf
+vbprintf
+# ucw/fb-socket.h
+fbsock_create
+# ucw/ff-binary.h
+bgetw_slow
+bgetw_be_slow
+bgetw_le_slow
+bgetl_slow
+bgetl_be_slow
+bgetl_le_slow
+bgetq_slow
+bgetq_be_slow
+bgetq_le_slow
+bget5_slow
+bget5_be_slow
+bget5_le_slow
+bputw_slow
+bputw_be_slow
+bputw_le_slow
+bputl_slow
+bputl_be_slow
+bputl_le_slow
+bputq_slow
+bputq_be_slow
+bputq_le_slow
+bput5_slow
+bput5_be_slow
+bput5_le_slow
+# ucw/ff-unicode.h
+bget_utf8_slow
+bget_utf8_32_slow
+bput_utf8_slow
+bput_utf8_32_slow
+bget_utf16_be_slow
+bget_utf16_le_slow
+bput_utf16_be_slow
+bput_utf16_le_slow
+# ucw/ff-varint.h
+bget_varint_slow
+bput_varint_slow
+# ucw/fw-hex.h
+fb_wrap_hex_out
+fb_wrap_hex_in
+# ucw/gary.h
+gary_init
+gary_set_size
+gary_push_helper
+gary_fix
+gary_empty_hdr
+# ucw/getopt.h
+cf_def_file
+cf_env_file
+cf_getopt
+reset_getopt
+# ucw/hashfunc.h
+str_len_aligned
+hash_string_aligned
+hash_block_aligned
+str_len
+hash_string
+hash_block
+hash_string_nocase
+# ucw/heap.h
+# ucw/io.h
+mmap_file
+munmap_file
+careful_read
+careful_write
+sync_dir
+# ucw/ipaccess.h
+ipaccess_cf
+ipaccess_check
+ip_addrmask_type
+ip_addrmask_match
+# ucw/lib.h
+msg
+vmsg
+die
+vdie
+log_title
+log_pid
+log_die_hook
+log_init
+log_fork
+log_file
+assert_failed
+assert_failed_msg
+assert_failed_noinfo
+xmalloc
+xrealloc
+xfree
+xmalloc_zero
+xstrdup
+page_alloc
+page_alloc_zero
+page_free
+page_realloc
+big_alloc
+big_alloc_zero
+big_free
+random_u32
+random_max
+random_u64
+random_max_u64
+# ucw/lizard.h
+lizard_compress
+lizard_decompress
+lizard_alloc
+lizard_free
+lizard_decompress_safe
+adler32_update
+# ucw/log-internal.h
+log_pass_msg
+log_streams
+log_streams_after
+log_stream_default
+log_type_names
+# ucw/log.h
+log_register_type
+log_find_type
+log_type_name
+log_new_stream
+log_close_stream
+log_add_substream
+log_rm_substream
+log_set_format
+log_stream_by_flags
+log_set_default_stream
+log_close_all
+log_pass_filtered
+log_new_file
+log_new_fd
+log_switch_disable
+log_switch_enable
+log_switch
+log_drop_stderr
+log_new_syslog
+log_syslog_facility_exists
+log_new_configured
+log_configured
+log_check_configured
+# ucw/mainloop.h
+main_new
+main_delete
+main_destroy
+main_switch_context
+main_current
+main_init
+main_cleanup
+main_teardown
+main_loop
+main_step
+main_debug_context
+timer_add
+timer_add_rel
+timer_del
+main_get_time
+timer_debug
+hook_add
+hook_del
+hook_debug
+file_add
+file_chg
+file_del
+file_debug
+block_io_add
+block_io_del
+block_io_read
+block_io_write
+block_io_set_timeout
+rec_io_add
+rec_io_del
+rec_io_start_read
+rec_io_stop_read
+rec_io_set_timeout
+rec_io_write
+rec_io_parse_line
+process_add
+process_del
+process_fork
+process_debug
+signal_add
+signal_del
+signal_debug
+# ucw/md5.h
+md5_init
+md5_update
+md5_final
+md5_transform
+md5_hash_buffer
+# ucw/mempool.h
+mp_init
+mp_new
+mp_delete
+mp_flush
+mp_stats
+mp_total_size
+mp_shrink
+mp_alloc_internal
+mp_alloc
+mp_alloc_noalign
+mp_alloc_zero
+mp_start_internal
+mp_grow_internal
+mp_spread_internal
+mp_start
+mp_start_noalign
+mp_append_utf8_32
+mp_open
+mp_realloc
+mp_realloc_zero
+mp_push
+mp_restore
+mp_pop
+mp_strdup
+mp_memdup
+mp_multicat
+mp_strjoin
+mp_str_from_mem
+mp_printf
+mp_vprintf
+mp_printf_append
+mp_vprintf_append
+# ucw/opt-internal.h
+opt_precompute
+# ucw/opt.h
+opt_parse
+opt_failure
+opt_help
+opt_handle_help
+opt_handle_config
+opt_handle_set
+opt_handle_dumpconfig
+opt_conf_hook_internal
+cf_def_file
+cf_env_file
+# ucw/partmap.h
+partmap_open
+partmap_close
+partmap_size
+partmap_load
+# ucw/prime.h
+isprime
+nextprime
+next_table_prime
+prev_table_prime
+# ucw/process.h
+setproctitle_init
+setproctitle
+getproctitle
+format_exit_status
+run_command
+exec_command
+echo_command
+run_command_v
+exec_command_v
+echo_command_v
+# ucw/regex.h
+rx_compile
+rx_free
+rx_match
+rx_subst
+# ucw/resource.h
+rp_new
+rp_delete
+rp_detach
+rp_commit
+rp_dump
+res_alloc
+res_dump
+res_free
+res_detach
+res_add
+res_drop
+res_for_fd
+res_malloc
+res_malloc_zero
+res_realloc
+res_subpool
+res_mempool
+res_eltpool
+# ucw/semaphore.h
+# ucw/sha1.h
+sha1_init
+sha1_update
+sha1_final
+sha1_hash_buffer
+sha1_hmac
+sha1_hmac_init
+sha1_hmac_update
+sha1_hmac_final
+# ucw/sighandler.h
+handle_signal
+unhandle_signal
+set_signal_handler
+# ucw/signames.h
+sig_name_to_number
+sig_number_to_name
+# ucw/simple-lists.h
+simp_append
+simp2_append
+cf_string_list_config
+cf_2string_list_config
+# ucw/slists.h
+slist_prev
+slist_insert_before
+slist_remove
+# ucw/stkstring.h
+stk_array_len
+stk_array_join
+stk_printf_internal
+stk_vprintf_internal
+stk_hexdump_internal
+stk_fsize_internal
+# ucw/string.h
+str_format_flags
+str_count_char
+str_unesc
+str_sepsplit
+str_wordsplit
+str_match_pattern
+str_match_pattern_nocase
+mem_to_hex
+hex_to_mem
+str_has_prefix
+str_has_suffix
+str_hier_prefix
+str_hier_suffix
+# ucw/strtonum.h
+str_to_uintmax
+str_to_uint
+str_to_uns
+str_to_u32
+str_to_u64
+# ucw/table.h
+table_init
+table_cleanup
+table_start
+table_end
+table_col_str
+table_col_generic_format
+table_col_printf
+table_col_fbstart
+table_col_fbend
+table_end_row
+table_reset_row
+table_get_col_idx
+table_set_col_opt
+table_get_col_list
+table_set_col_order
+table_set_col_order_by_name
+table_col_is_printed
+table_set_formatter
+table_set_option_value
+table_set_option
+table_set_gary_options
+table_fmt_human_readable
+table_fmt_machine_readable
+table_fmt_blockline
+table_col_int
+table_col_uint
+table_col_double
+table_col_str
+table_col_intmax
+table_col_s64
+table_col_uintmax
+table_col_u64
+table_col_bool
+# ucw/tbf.h
+tbf_init
+tbf_limit
+# ucw/threads.h
+# ucw/time.h
+get_timestamp
+timestamp_type
+init_timer
+get_timer
+switch_timer
+# ucw/trans.h
+trans_init
+trans_cleanup
+trans_open
+trans_get_current
+trans_commit
+trans_rollback
+trans_fold
+trans_dump
+trans_get_pool
+trans_throw
+trans_vthrow
+trans_throw_exc
+trans_caught
+trans_current_exc
+# ucw/unaligned.h
+# ucw/unicode.h
+utf8_strlen
+utf8_strnlen
+# ucw/url.h
+url_deescape
+url_enescape
+url_enescape_friendly
+url_split
+url_normalize
+url_canonicalize
+url_pack
+url_canon_split_rel
+url_auto_canonicalize_rel
+url_identify_protocol
+url_has_repeated_component
+url_error
+url_proto_names
+# ucw/varint.h
+varint_put_big
+varint_get_big
+# ucw/wildmatch.h
+wp_compile
+wp_match
+wp_min_size
+# ucw/workqueue.h
+worker_pool_init
+worker_pool_cleanup
+raw_queue_init
+raw_queue_cleanup
+raw_queue_put
+raw_queue_get
+raw_queue_try_get
+work_queue_init
+work_queue_cleanup
+work_submit
+work_wait
+work_try_wait
+# ucw/xtypes.h
+xtype_parse_fmt
+xtype_format_fmt
+xt_str
+xt_int
+xt_s64
+xt_intmax
+xt_uint
+xt_u64
+xt_uintmax
+xt_bool
+xt_double
+xtype_unit_parser
+# ucw/xtypes-extra.h
+table_col_size
+table_col_timestamp
+xt_size
+xt_timestamp
+# ucw/sorter/common.h
+sorter_trace
+sorter_trace_array
+sorter_stream_bufsize
+sorter_debug
+sorter_min_radix_bits
+sorter_max_radix_bits
+sorter_add_radix_bits
+sorter_min_multiway_bits
+sorter_max_multiway_bits
+sorter_threads
+sorter_bufsize
+sorter_small_input
+sorter_thread_threshold
+sorter_thread_chunk
+sorter_radix_threshold
+sorter_fb_params
+sorter_small_fb_params
+sorter_run
+sorter_alloc
+sorter_prepare_buf
+sorter_alloc_buf
+sorter_free_buf
+sbuck_new
+sbuck_drop
+sbuck_have
+sbuck_has_file
+sbuck_size
+sbuck_read
+sbuck_write
+sbuck_swap_out
+asort_run
+asort_start_threads
+asort_stop_threads
+# charset/charconv.h
+conv_init
+conv_set_charset
+conv_in_to_ucs
+conv_ucs_to_out
+conv_x_to_ucs
+conv_ucs_to_x
+conv_x_count
+find_charset_by_name
+charset_name
+# charset/fb-charconv.h
+fb_wrap_charconv_in
+fb_wrap_charconv_out
+# charset/mp-charconv.h
+mp_strconv
+# charset/stk-charconv.h
+stk_strconv_init
+stk_strconv_step
+# charset/unicat.h
+_U_cat
+_U_upper
+_U_lower
+_U_unaccent
+Uexpand_lig
+# images/color.h
+color_space_channels
+color_space_name
+color_space_id_to_name
+color_space_name_to_id
+color_get
+color_put
+color_black
+color_white
+image_conv_defaults
+image_conv
+color_illuminant_d50
+color_illuminant_d65
+color_illuminant_e
+color_adobe_rgb_info
+color_apple_rgb_info
+color_cie_rgb_info
+color_color_match_rgb_info
+color_srgb_info
+color_compute_color_space_to_xyz_matrix
+color_compute_bradford_matrix
+color_compute_color_spaces_conversion_matrix
+color_invert_matrix
+srgb_to_xyz_exact
+xyz_to_srgb_exact
+xyz_to_luv_exact
+luv_to_xyz_exact
+rgb_to_cmyk_exact
+cmyk_to_rgb_exact
+srgb_to_luv_tab1
+srgb_to_luv_tab2
+srgb_to_luv_tab3
+srgb_to_luv_init
+srgb_to_luv_pixels
+srgb_to_luv_grid
+color_interpolation_table
+color_conv_init
+color_conv_pixels
+# images/duplicates.h
+image_dup_context_init
+image_dup_context_cleanup
+image_dup_estimate_size
+image_dup_new
+image_dup_compare
+# images/error.h
+image_trace
+# images/images.h
+image_context_init
+image_context_cleanup
+image_context_msg
+image_context_vmsg
+image_context_msg_default
+image_context_msg_silent
+image_max_dim
+image_max_bytes
+image_channels_format_to_name
+image_name_to_channels_format
+image_new
+image_clone
+image_destroy
+image_clear
+image_init_matrix
+image_init_subimage
+image_scale
+image_dimensions_fit_to_box
+image_io_init
+image_io_cleanup
+image_io_reset
+image_io_read_header
+image_io_read_data
+image_io_read
+image_io_write
+image_format_to_extension
+image_extension_to_format
+image_file_name_to_format
+# images/io-main.h
+libjpeg_read_header
+libjpeg_read_data
+libjpeg_write
+libpng_read_header
+libpng_read_data
+libpng_write
+libungif_read_header
+libungif_read_data
+libmagick_init
+libmagick_cleanup
+libmagick_read_header
+libmagick_read_data
+libmagick_write
+image_io_read_data_prepare
+image_io_read_data_finish
+image_io_read_data_break
+# images/math.h
+fast_div_tab
+fast_sqrt_tab
+# images/object.h
+get_image_obj_info
+get_image_obj_thumb
+read_image_obj_thumb
+put_image_obj_signature
+get_image_obj_signature
+# images/sig-cmp-gen.h
+image_signatures_dist
+image_signatures_dist_explain
+# images/signature.h
+image_sig_min_width
+image_sig_min_height
+image_sig_prequant_thresholds
+image_sig_postquant_min_steps
+image_sig_postquant_max_steps
+image_sig_postquant_threshold
+image_sig_border_size
+image_sig_border_bonus
+image_sig_inertia_scale
+image_sig_textured_threshold
+image_sig_compare_method
+image_sig_cmp_features_weights
+image_vector_dump
+image_region_dump
+compute_image_signature
+image_sig_init
+image_sig_preprocess
+image_sig_finish
+image_sig_cleanup
+image_sig_segmentation
+image_sig_detect_textured
+image_signatures_dist
+image_signatures_dist_explain
+# ucw-xml/dtd.h
+xml_dtd_find_notn
+xml_dtd_find_entity
+xml_dtd_find_elem
+xml_dtd_init
+xml_dtd_cleanup
+xml_dtd_finish
+xml_dtd_find_attr
+# ucw-xml/internals.h
+xml_throw
+xml_do_push
+xml_do_pop
+xml_push_dom
+xml_pop_dom
+xml_hash_new
+xml_spout_chars
+xml_fatal_nested
+xml_push_source
+xml_push_entity
+xml_refill
+xml_sources_cleanup
+xml_fatal_expected
+xml_fatal_expected_white
+xml_fatal_expected_quot
+xml_parse_white
+xml_parse_eq
+xml_parse_name
+xml_skip_name
+xml_parse_nmtoken
+xml_parse_system_literal
+xml_parse_pubid_literal
+xml_parse_char_ref
+xml_parse_pe_ref
+xml_parse_attr_value
+xml_skip_internal_subset
+xml_parse_notation_decl
+xml_parse_entity_decl
+xml_parse_element_decl
+xml_parse_attr_list_decl
+xml_push_comment
+xml_pop_comment
+xml_skip_comment
+xml_push_pi
+xml_pop_pi
+xml_skip_pi
+xml_validate_attr
+xml_ns_cleanup
+xml_ns_reset
+xml_ns_push_element
+xml_ns_pop_element
+# ucw-xml/xml.h
+xml_node_qname
+xml_attr_qname
+xml_attr_find
+xml_attr_find_ns
+xml_attr_value
+xml_attr_value_ns
+xml_normalize_white
+xml_merge_chars
+xml_merge_dom_chars
+xml_init
+xml_cleanup
+xml_reset
+xml_push_fastbuf
+xml_parse
+xml_next
+xml_next_state
+xml_skip_element
+xml_row
+xml_def_find_entity
+xml_def_resolve_entity
+xml_warn
+xml_error
+xml_fatal
+xml_ns_enable
+xml_ns_by_id
+xml_ns_by_name
+# ucw-json/json.h
+json_new
+json_delete
+json_reset
+json_push
+json_pop
+json_new_node
+json_new_number
+json_number_to_int
+json_number_to_uint
+json_number_to_s64
+json_number_to_u64
+json_new_array
+json_array_append
+json_new_object
+json_object_set
+json_object_get
+json_parse
+json_set_input
+json_next_token
+json_peek_token
+json_next_value
+json_write
+json_set_output
+json_write_value
diff --git a/libucw/maint/release b/libucw/maint/release
new file mode 100755
index 0000000..e245cbc
--- /dev/null
+++ b/libucw/maint/release
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+# A simple script for making releases of LibUCW
+# (c) 2012--2014 Martin Mares <mj@ucw.cz>
+
+use strict;
+use warnings;
+require "maint/release.pm";
+
+my $r = new UCW::Release("libucw");
+$r->{"test_compile"} = "./configure && make -j4";
+$r->{"archive_dir"} = $ENV{"HOME"} . "/archives/sw/libucw";
+push @{$r->{"uploads"}}, { "url" => "scp://ftp.ucw.cz/~ftp/pub/libucw/" };
+
+$r->ParseOptions;
+$r->GetVersionFromGit;
+$r->InitDist("maint/tmp");
+my $reldir = $r->GenPackage;
+$r->GenFile("README");
+$r->Test;
+$r->MakeArchive;
+$r->Upload;
+
+if ($r->{"do_upload"}) {
+	my $tdir = $r->{"TESTDIR"};
+	if (defined $tdir) {
+		print "Generating documentation\n";
+		`cd $tdir && make docs`;
+		die if $?;
+		print "Upload of documentation\n";
+		$r->Confirm;
+		`cd $tdir && maint/upload-doc`;
+		die if $@;
+	} else {
+		print "WARNING: With --notest, no documentation is published!\n";
+	}
+
+	print "Updating version at MJ's web\n";
+	$r->Confirm;
+	my $wv = $r->{"VERSION"};
+	`ssh jw "cd web && bin/release-prog libucw $wv"`;
+	die if $?;
+}
diff --git a/libucw/maint/release.pm b/libucw/maint/release.pm
new file mode 100644
index 0000000..9790671
--- /dev/null
+++ b/libucw/maint/release.pm
@@ -0,0 +1,368 @@
+#!/usr/bin/perl
+# A simple system for making software releases
+# (c) 2003--2012 Martin Mares <mj@ucw.cz>
+
+package UCW::Release;
+use strict;
+use warnings;
+use Getopt::Long;
+
+our $verbose = 0;
+
+sub new($$) {
+	my ($class,$basename) = @_;
+	my $s = {
+		"PACKAGE" => $basename,
+		"rules" => [
+			# p=preprocess, s=subst, -=discard
+			'(^|/)(CVS|\.arch-ids|{arch}|\.git|tmp)/' => '-',
+			'\.(lsm|spec)$' => 'ps',
+			'(^|/)README$' => 's'
+			],
+		"conditions" => {
+			# Symbols, which can serve as conditions for the preprocessor
+			},
+		"DATE" => `date '+%Y-%m-%d' | tr -d '\n'`,
+		"LSMDATE" => `date '+%y%m%d' | tr -d '\n'`,
+		"distfiles" => [
+			# Files to be uploaded
+			],
+		"uploads" => [
+			# Locations where we want to upload, e.g.:
+			#	{ "url" => "ftp://metalab.unc.edu/incoming/linux/",
+			#	  "filter" => '(\.tar\.gz|\.lsm)$', }
+			],
+		"test_compile" => "make",
+		# "archive_dir" => "/tmp/archives/$basename",
+		# Options
+		"do_test" => 1,
+		"do_patch" => 0,
+		"diff_against" => "",
+		"do_upload" => 1,
+		"do_sign" => 1,
+	};
+	bless $s;
+	return $s;
+}
+
+sub Confirm($) {
+	my ($s) = @_;
+	print "<confirm> "; <STDIN>;
+}
+
+sub GetVersionFromGit($) {
+	my ($s) = @_;
+	return if defined $s->{"VERSION"};
+	my $desc = `git describe --tags`; die "git describe failed\n" if $?;
+	chomp $desc;
+	my ($ver, $rest) = ($desc =~ /^v([0-9.]+)(.*)/) or die "Failed to understand output of git describe: $desc\n";
+	print "Detected version $ver from git description $desc\n";
+	if ($rest ne '') {
+		print "WARNING: We are several commits past release tag... ";
+		$s->Confirm;
+	}
+	$s->{"VERSION"} = $ver;
+	return $ver;
+}
+
+sub GetVersionFromFile($) {
+	my ($s,$file,$rx) = @_;
+	return if defined $s->{"VERSION"};
+	open F, $file or die "Unable to open $file for version autodetection";
+	while (<F>) {
+		chomp;
+		if (/$rx/) {
+			$s->{"VERSION"} = $1;
+			print "Detected version $1 from $file\n" if $verbose;
+			last;
+		}
+	}
+	close F;
+	if (!defined $s->{"VERSION"}) { die "Failed to auto-detect version"; }
+	return $s->{"VERSION"};
+}
+
+sub GetVersionsFromChangelog($) {
+	my ($s,$file,$rx) = @_;
+	return if defined $s->{"VERSION"};
+	open F, $file or die "Unable to open $file for version autodetection";
+	while (<F>) {
+		chomp;
+		if (/$rx/) {
+			if (!defined $s->{"VERSION"}) {
+				$s->{"VERSION"} = $1;
+				print "Detected version $1 from $file\n" if $verbose;
+			} elsif ($s->{"VERSION"} eq $1) {
+				# do nothing
+			} else {
+				$s->{"OLDVERSION"} = $1;
+				print "Detected previous version $1 from $file\n" if $verbose;
+				last;
+			}
+		}
+	}
+	close F;
+	if (!defined $s->{"VERSION"}) { die "Failed to auto-detect version"; }
+	return $s->{"VERSION"};
+}
+
+sub InitDist($) {
+	my ($s,$dd) = @_;
+	$s->{"DISTDIR"} = $dd;
+	print "Initializing dist directory $dd\n" if $verbose;
+	`rm -rf $dd`; die if $?;
+	`mkdir -p $dd`; die if $?;
+
+	if ($s->{"archive_dir"}) {
+		unshift @{$s->{"uploads"}}, { "url" => "file:" . $s->{"archive_dir"} };
+	}
+}
+
+sub ExpandVar($$) {
+	my ($s,$v) = @_;
+	if (defined $s->{$v}) {
+		return $s->{$v};
+	} else {
+		die "Reference to unknown variable $v";
+	}
+}
+
+sub TransformFile($$$) {
+	my ($s,$file,$action) = @_;
+
+	my $preprocess = ($action =~ /p/);
+	my $subst = ($action =~ /s/);
+	my $dest = "$file.dist";
+	open I, "<", $file or die "open($file): $?";
+	open O, ">", "$dest" or die "open($dest): $!";
+	my @ifs = ();	# stack of conditions, 1=satisfied
+	my $empty = 0;	# last line was empty
+	my $is_makefile = ($file =~ /(Makefile|.mk)$/);
+	while (<I>) {
+		if ($subst) {
+			s/@([0-9A-Za-z_]+)@/$s->ExpandVar($1)/ge;
+		}
+		if ($preprocess) {
+			if (/^#/ || $is_makefile) {
+				if (/^#?ifdef\s+(\w+)/) {
+					if (defined ${$s->{"conditions"}}{$1}) {
+						push @ifs, ${$s->{"conditions"}}{$1};
+						next;
+					}
+					push @ifs, 0;
+				} elsif (/^#ifndef\s+(\w+)/) {
+					if (defined ${$s->{"conditions"}}{$1}) {
+						push @ifs, -${$s->{"conditions"}}{$1};
+						next;
+					}
+					push @ifs, 0;
+				} elsif (/^#if\s+/) {
+					push @ifs, 0;
+				} elsif (/^#?endif/) {
+					my $x = pop @ifs;
+					defined $x or die "Improper nesting of conditionals";
+					$x && next;
+				} elsif (/^#?else/) {
+					my $x = pop @ifs;
+					defined $x or die "Improper nesting of conditionals";
+					push @ifs, -$x;
+					$x && next;
+				}
+			}
+			@ifs && $ifs[$#ifs] < 0 && next;
+			if (/^$/) {
+				$empty && next;
+				$empty = 1;
+			} else { $empty = 0; }
+		}
+		print O;
+	}
+	close O;
+	close I;
+	! -x $file or chmod(0755, "$dest") or die "chmod($dest): $!";
+	rename $dest, $file or "rename($dest,$file): $!";
+}
+
+sub GenPackage($) {
+	my ($s) = @_;
+	$s->{"PKG"} = $s->{"PACKAGE"} . "-" . $s->{"VERSION"};
+	my $dd = $s->{"DISTDIR"};
+	my $pkg = $s->{"PKG"};
+	my $dir = "$dd/$pkg";
+	print "Generating $dir\n";
+
+	system "git archive --format=tar --prefix=$dir/ HEAD | tar xf -";
+	die if $?;
+
+	my @files = `cd $dir && find . -type f`;
+	die if $?;
+
+	for my $f (@files) {
+		chomp $f;
+		$f =~ s/^\.\///;
+		my $action = "";
+		my @rules = @{$s->{"rules"}};
+		while (@rules) {
+			my $rule = shift @rules;
+			my $act = shift @rules;
+			if ($f =~ $rule) {
+				$action = $act;
+				last;
+			}
+		}
+		if ($action eq '') {
+		} elsif ($action =~ /-/) {
+			unlink "$dir/$f" or die "Cannot unlink $dir/$f: $!\n";
+			print "$f (unlinked)\n" if $verbose;
+		} else {
+			print "$f ($action)\n" if $verbose;
+			$s->TransformFile("$dir/$f", $action);
+		}
+	}
+
+	return $dir;
+}
+
+sub GenFile($$) {
+	my ($s,$f) = @_;
+	my $sf = $s->{"DISTDIR"} . "/" . $s->{"PKG"} . "/$f";
+	my $df = $s->{"DISTDIR"} . "/$f";
+	print "Generating $df\n";
+	`cp $sf $df`; die if $?;
+	push @{$s->{"distfiles"}}, $df;
+}
+
+sub SignFile($$) {
+	my ($s, $file) = @_;
+	$s->{'do_sign'} or return;
+	print "Signing $file\n";
+	system "gpg", "--armor", "--detach-sig", "$file";
+	die if $?;
+	rename "$file.asc", "$file.sign" or die "No signature produced!?\n";
+	push @{$s->{"distfiles"}}, "$file.sign";
+}
+
+sub MakeArchive($) {
+	my ($s) = @_;
+	my $dd = $s->{"DISTDIR"};
+	my $pkg = $s->{"PKG"};
+
+	print "Creating $dd/$pkg.tar\n";
+	my $tarvv = $verbose ? "vv" : "";
+	`cd $dd && tar c${tarvv}f $pkg.tar $pkg >&2`; die if $?;
+
+	print "Creating $dd/$pkg.tar.gz\n";
+	`gzip <$dd/$pkg.tar >$dd/$pkg.tar.gz`; die if $?;
+	push @{$s->{"distfiles"}}, "$dd/$pkg.tar.gz";
+
+	# print "Creating $dd/$pkg.tar.bz2\n";
+	# `bzip2 <$dd/$pkg.tar >$dd/$pkg.tar.bz2`; die if $?;
+	# push @{$s->{"distfiles"}}, "$dd/$pkg.tar.bz2";
+
+	$s->SignFile("$dd/$pkg.tar");
+}
+
+sub ParseOptions($) {
+	my ($s) = @_;
+	GetOptions(
+		"verbose!" => \$verbose,
+		"test!" => \$s->{"do_test"},
+		"patch!" => \$s->{"do_patch"},
+		"diff-against=s" => \$s->{"diff_against"},
+		"version=s" => \$s->{"VERSION"},
+		"upload!" => \$s->{"do_upload"},
+		"sign!" => \$s->{"do_sign"},
+	) || die "Syntax: release [--verbose] [--test] [--nopatch] [--version=<version>] [--diff-against=<version>] [--noupload] [--nosign]";
+}
+
+sub Test($) {
+	my ($s) = @_;
+	$s->{"do_test"} or return;
+	my $dd = $s->{"DISTDIR"};
+	my $pkg = $s->{"PKG"};
+	my $tdir = "$dd/$pkg.test";
+	$s->{"TESTDIR"} = $tdir;
+	`cp -a $dd/$pkg $tdir`; die if $?;
+	my $log = "$tdir.log";
+	print "Doing a test compilation\n";
+	my $make = $s->{"test_compile"};
+	`( cd $tdir && $make ) >$log 2>&1`;
+	die "There were errors. Please inspect $log" if $?;
+	`grep -q [Ww]arning $log`;
+	$? or print "There were warnings! Please inspect $log.\n";
+}
+
+sub MakePatch($) {
+	my ($s) = @_;
+	$s->{"do_patch"} or return;
+	my $dd = $s->{"DISTDIR"};
+	my $pkg1 = $s->{"PKG"};
+	my $oldver;
+	if ($s->{"diff_against"} ne "") {
+		$oldver = $s->{"diff_against"};
+	} elsif (defined $s->{"OLDVERSION"}) {
+		$oldver = $s->{"OLDVERSION"};
+	} else {
+		print "WARNING: No previous version known. No patch generated.\n";
+		return;
+	}
+	my $pkg0 = $s->{"PACKAGE"} . "-" . $oldver;
+
+	my $oldarch = $s->{"archivedir"} . "/" . $pkg0 . ".tar.gz";
+	-f $oldarch or die "MakePatch: $oldarch not found";
+	print "Unpacking $pkg0 from $oldarch\n";
+	`cd $dd && tar xzf $oldarch`; die if $?;
+
+	my $diff = $s->{"PACKAGE"} . "-" . $oldver . "-" . $s->{"VERSION"} . ".diff.gz";
+	print "Creating a patch from $pkg0 to $pkg1: $diff\n";
+	`cd $dd && diff -ruN $pkg0 $pkg1 | gzip >$diff`; die if $?;
+	push @{$s->{"distfiles"}}, "$dd/$diff";
+	$s->SignFile("$dd/$diff");
+}
+
+sub Upload($) {
+	my ($s) = @_;
+	$s->{"do_upload"} or return;
+	foreach my $u (@{$s->{"uploads"}}) {
+		my $url = $u->{"url"};
+		print "Upload to $url :\n";
+		my @files = ();
+		my $filter = $u->{"filter"} || ".*";
+		foreach my $f (@{$s->{"distfiles"}}) {
+			if ($f =~ $filter) {
+				print "\t$f\n";
+				push @files, $f;
+			}
+		}
+		$s->Confirm;
+		if ($url =~ m@^file:(.*)@) {
+			my $dir = $1;
+			$dir =~ s@^///@/@;
+			`cp @files $dir/`; die if $?;
+		} elsif ($url =~ m@^scp://([^/]+)(.*)@) {
+			$, = " ";
+			my $host = $1;
+			my $dir = $2;
+			$dir =~ s@^/~@~@;
+			$dir =~ s@^/\./@@;
+			my $cmd = "scp @files $host:$dir\n";
+			`$cmd`; die if $?;
+		} elsif ($url =~ m@ftp://([^/]+)(.*)@) {
+			my $host = $1;
+			my $dir = $2;
+			open FTP, "|ftp -v $host" or die;
+			print FTP "cd $dir\n";
+			foreach my $f (@files) {
+				(my $ff = $f) =~ s@.*\/([^/].*)@$1@;
+				print FTP "put $f $ff\n";
+			}
+			print FTP "bye\n";
+			close FTP;
+			die if $?;
+		} else {
+			die "Don't know how to handle this URL scheme";
+		}
+	}
+}
+
+1;
diff --git a/libucw/maint/upload-doc b/libucw/maint/upload-doc
new file mode 100755
index 0000000..6e1c0c0
--- /dev/null
+++ b/libucw/maint/upload-doc
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Build and upload LibUCW documentation and web pages
+# (c) 2012--2015 Martin Mares <mj@ucw.cz>
+
+set -e
+rm -rf maint/tmp/doc
+mkdir -p maint/tmp/doc
+make install-libucw-docs install-libucw-json-docs install-libucw-xml-docs PREFIX=. INSTALL_DOC_DIR=maint/tmp/doc
+rsync -avz --delete maint/tmp/doc/ jw:/var/www/libucw/doc/
+rsync -avz --no-times --no-perms --executability --omit-dir-times WWW/ jw:/var/www/libucw/ --exclude=doc --exclude='*.swp'
diff --git a/libucw/ucw-json/Makefile b/libucw/ucw-json/Makefile
new file mode 100644
index 0000000..ff8dcb3
--- /dev/null
+++ b/libucw/ucw-json/Makefile
@@ -0,0 +1,49 @@
+# Makefile for the UCW JSON library
+# (c) 2015 Martin Mares <mj@ucw.cz>
+
+DIRS+=ucw-json
+PROGS+=$(o)/ucw-json/json-test
+
+LIBJSON_MODS=json parse format
+LIBJSON_MOD_PATHS=$(addprefix $(o)/ucw-json/,$(LIBJSON_MODS))
+LIBJSON_INCLUDES=json.h
+LIBJSON_DEPS=$(LIBUCW)
+export LIBJSON_LIBS=-lm
+
+$(o)/ucw-json/libucw-json$(LV).a: $(addsuffix .o,$(LIBJSON_MOD_PATHS))
+$(o)/ucw-json/libucw-json$(LV).so: $(addsuffix .oo,$(LIBJSON_MOD_PATHS)) $(LIBJSON_DEPS)
+$(o)/ucw-json/libucw-json$(LV).so: SONAME_SUFFIX=.0
+$(o)/ucw-json/libucw-json$(LV).so: LIBS+=$(LIBJSON_LIBS)
+$(o)/ucw-json/libucw-json.pc: $(LIBJSON_DEPS)
+
+ifdef CONFIG_INSTALL_API
+$(o)/ucw-json/libucw-json.pc: $(addprefix $(o)/ucw-json/libucw-json$(LV),.a .so)
+endif
+
+TESTS+=$(o)/ucw-json/json-test.test
+$(o)/ucw-json/json-test: $(o)/ucw-json/json-test.o $(LIBJSON) $(LIBUCW)
+$(o)/ucw-json/json-test.test: $(o)/ucw-json/json-test
+
+API_LIBS+=libucw-json
+API_INCLUDES+=$(o)/ucw-json/.include-stamp
+$(o)/ucw-json/.include-stamp: $(addprefix $(s)/ucw-json/,$(LIBJSON_INCLUDES))
+$(o)/ucw-json/.include-stamp: IDST=ucw-json
+run/lib/pkgconfig/libucw-json.pc: $(o)/ucw-json/libucw-json.pc
+
+INSTALL_TARGETS+=install-libucw-json-lib
+install-libucw-json-lib:
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw-json$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-json$(LV).so.0.0
+	ln -sf libucw-json$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-json$(LV).so.0
+.PHONY: install-libucw-json-lib
+
+INSTALL_TARGETS+=install-libucw-json-api
+install-libucw-json-api:
+	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-json $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 run/lib/pkgconfig/libucw-json.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 $(addprefix run/include/ucw-json/,$(LIBJSON_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-json
+	ln -sf libucw-json$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-json$(LV).so
+	install -m 644 run/lib/libucw-json$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-json-api
+
+include $(s)/ucw-json/doc/Makefile
diff --git a/libucw/ucw-json/doc/Makefile b/libucw/ucw-json/doc/Makefile
new file mode 100644
index 0000000..0d7468e
--- /dev/null
+++ b/libucw/ucw-json/doc/Makefile
@@ -0,0 +1,20 @@
+# Makefile for the UCW-JSON documentation
+
+DIRS+=ucw-json/doc
+
+JSON_DOCS=json index
+JSON_DOCS_HTML=$(addprefix $(o)/ucw-json/doc/,$(addsuffix .html,$(JSON_DOCS)))
+
+DOCS+=$(JSON_DOCS_HTML)
+DOC_MODULES+=ucw-json
+$(JSON_DOCS_HTML): DOC_MODULE=ucw-json
+
+ifdef CONFIG_DOC
+INSTALL_TARGETS+=install-libucw-json-docs
+endif
+
+.PHONY: install-libucw-json-docs
+
+install-libucw-json-docs: $(JSON_DOCS_HTML)
+	install -d -m 755 $(DESTDIR)$(INSTALL_DOC_DIR)/ucw-json/
+	install -m 644 $^ $(DESTDIR)$(INSTALL_DOC_DIR)/ucw-json/
diff --git a/libucw/ucw-json/doc/index.txt b/libucw/ucw-json/doc/index.txt
new file mode 100644
index 0000000..de70808
--- /dev/null
+++ b/libucw/ucw-json/doc/index.txt
@@ -0,0 +1,15 @@
+The UCW-JSON library
+====================
+
+This library provides a light-weight JSON parser and generator built atop <<../ucw/index:,LibUCW>>.
+
+It follows the specification of JSON in RFC 7159.
+
+Modules
+-------
+- <<json:,JSON Parser and Generator>>
+
+Authors
+-------
+
+- Martin Mareš <mailto:mj\@ucw.cz[]>
diff --git a/libucw/ucw-json/doc/json.txt b/libucw/ucw-json/doc/json.txt
new file mode 100644
index 0000000..de4725e
--- /dev/null
+++ b/libucw/ucw-json/doc/json.txt
@@ -0,0 +1,7 @@
+JSON Parser and Generator
+=========================
+
+ucw-json/json.h
+---------------
+
+!!ucw-json/json.h
diff --git a/libucw/ucw-json/format.c b/libucw/ucw-json/format.c
new file mode 100644
index 0000000..227a26b
--- /dev/null
+++ b/libucw/ucw-json/format.c
@@ -0,0 +1,165 @@
+/*
+ *	UCW JSON Library -- Formatter
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/gary.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/unicode.h>
+#include <ucw-json/json.h>
+
+#include <float.h>
+#include <stdio.h>
+
+void json_set_output(struct json_context *js, struct fastbuf *fb)
+{
+  js->out_fb = fb;
+}
+
+static void write_string(struct json_context *js, const char *p)
+{
+  struct fastbuf *fb = js->out_fb;
+
+  bputc(fb, '"');
+  for (;;)
+    {
+      uint u;
+      p = utf8_32_get(p, &u);
+      if (!u)
+	break;
+      if (u == '"' || u == '\\')
+	{
+	  bputc(fb, '\\');
+	  bputc(fb, u);
+	}
+      else if (u < 0x20)
+	{
+	  // We avoid "\f" nor "\b" and use "\uXXXX" instead
+	  switch (u)
+	    {
+	    case 0x09: bputs(fb, "\\t"); break;
+	    case 0x0a: bputs(fb, "\\n"); break;
+	    case 0x0d: bputs(fb, "\\r"); break;
+	    default:
+	      bprintf(fb, "\\u%04x", u);
+	    }
+	}
+      else if (u >= 0x007f && (js->format_options & JSON_FORMAT_ESCAPE_NONASCII))
+	{
+	  if (u < 0x10000)
+	    bprintf(fb, "\\u%04x", u);
+	  else if (u < 0x110000)
+	    bprintf(fb, "\\u%04x\\u%04x", 0xd800 + ((u - 0x10000) >> 10), 0xdc00 + (u & 0x3ff));
+	  else
+	    bprintf(fb, "\\u%04x", UNI_REPLACEMENT);
+	}
+      else
+	bput_utf8_32(fb, u);
+    }
+  bputc(fb, '"');
+}
+
+static void write_number(struct fastbuf *fb, double val)
+{
+  bprintf(fb, "%.*g", DBL_DIG+1, val);
+}
+
+static bool want_indent_p(struct json_context *js)
+{
+  return (js->format_options & JSON_FORMAT_INDENT);
+}
+
+static void write_space(struct json_context *js)
+{
+  struct fastbuf *fb = js->out_fb;
+
+  if (want_indent_p(js))
+    {
+      bputc(fb, '\n');
+      for (uint i=0; i < js->out_indent; i++)
+	bputc(fb, '\t');
+    }
+  else
+    bputc(fb, ' ');
+}
+
+void json_write_value(struct json_context *js, struct json_node *n)
+{
+  struct fastbuf *fb = js->out_fb;
+
+  switch (n->type)
+    {
+    case JSON_NULL:
+      bputs(fb, "null");
+      break;
+    case JSON_BOOLEAN:
+      bputs(fb, (n->boolean ? "true" : "false"));
+      break;
+    case JSON_NUMBER:
+      write_number(fb, n->number);
+      break;
+    case JSON_STRING:
+      write_string(js, n->string);
+      break;
+    case JSON_ARRAY:
+      {
+	if (!GARY_SIZE(n->elements))
+	  bputs(fb, "[]");
+	else
+	  {
+	    bputc(fb, '[');
+	    js->out_indent++;
+	    for (size_t i=0; i < GARY_SIZE(n->elements); i++)
+	      {
+		if (i)
+		  bputc(fb, ',');
+		write_space(js);
+		json_write_value(js, n->elements[i]);
+	      }
+	    js->out_indent--;
+	    write_space(js);
+	    bputc(fb, ']');
+	  }
+	break;
+      }
+    case JSON_OBJECT:
+      {
+	if (!GARY_SIZE(n->pairs))
+	  bputs(fb, "{}");
+	else
+	  {
+	    bputc(fb, '{');
+	    js->out_indent++;
+	    for (size_t i=0; i < GARY_SIZE(n->pairs); i++)
+	      {
+		if (i)
+		  bputc(fb, ',');
+		write_space(js);
+		struct json_pair *p = &n->pairs[i];
+		write_string(js, p->key);
+		bputs(fb, ": ");
+		json_write_value(js, p->value);
+	      }
+	    js->out_indent--;
+	    write_space(js);
+	    bputc(fb, '}');
+	  }
+	break;
+      }
+    default:
+      ASSERT(0);
+    }
+}
+
+void json_write(struct json_context *js, struct fastbuf *fb, struct json_node *n)
+{
+  json_set_output(js, fb);
+  json_write_value(js, n);
+  bputc(fb, '\n');
+}
diff --git a/libucw/ucw-json/json-test.c b/libucw/ucw-json/json-test.c
new file mode 100644
index 0000000..5d4c287
--- /dev/null
+++ b/libucw/ucw-json/json-test.c
@@ -0,0 +1,123 @@
+/*
+ *	UCW JSON Library -- Tests
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/fw-hex.h>
+#include <ucw/opt.h>
+#include <ucw/trans.h>
+#include <ucw-json/json.h>
+
+static int opt_read;
+static int opt_write;
+static int opt_escape;
+static int opt_indent;
+static int opt_read_hex;
+static int opt_write_hex;
+static int opt_stream;
+
+static struct opt_section options = {
+  OPT_ITEMS {
+    OPT_HELP("Test program for UCW JSON library."),
+    OPT_HELP("Usage: json-test [options]"),
+    OPT_HELP(""),
+    OPT_HELP("Options:"),
+    OPT_HELP_OPTION,
+    OPT_BOOL('r', "read", opt_read, 0, "\tRead JSON from standard input"),
+    OPT_BOOL('R', "read-hex", opt_read_hex, 0, "\tRead JSON, interpreting <XY> as hex escapes"),
+    OPT_BOOL('w', "write", opt_write, 0, "\tWrite JSON to standard output"),
+    OPT_BOOL('W', "write-hex", opt_write_hex, 0, "\tWrite JSON, print non-ASCII as hex escapes"),
+    OPT_BOOL('e', "escape", opt_escape, 0, "\tEscape non-ASCII characters in strings"),
+    OPT_BOOL('i', "indent", opt_indent, 0, "\tIndent output"),
+    OPT_BOOL('s', "stream", opt_stream, 0, "\tTest of streaming mode"),
+    OPT_END
+  }
+};
+
+static struct json_node *do_parse(struct json_context *js, struct fastbuf *fb)
+{
+  struct json_node *n;
+  TRANS_TRY
+    {
+      n = json_parse(js, fb);
+    }
+  TRANS_CATCH(x)
+    {
+      fprintf(stderr, "ERROR: %s\n", x->msg);
+      exit(1);
+    }
+  TRANS_END;
+  return n;
+}
+
+static void test_stream(struct json_context *js)
+{
+  struct fastbuf *in = bfdopen_shared(0, 65536);
+  struct fastbuf *out = bfdopen_shared(1, 65536);
+  json_set_input(js, in);
+  json_set_output(js, out);
+
+  for (;;)
+    {
+      json_push(js);
+      struct json_node *n = json_next_value(js);
+      if (!n)
+	break;
+      json_write_value(js, n);
+      bputc(out, '\n');
+      json_pop(js);
+    }
+
+  bclose(out);
+  bclose(in);
+}
+
+int main(int argc UNUSED, char **argv)
+{
+  opt_parse(&options, argv+1);
+
+  struct json_context *js = json_new();
+  struct json_node *n = NULL;
+
+  if (opt_escape)
+    js->format_options |= JSON_FORMAT_ESCAPE_NONASCII;
+  if (opt_indent)
+    js->format_options |= JSON_FORMAT_INDENT;
+
+  if (opt_stream)
+    {
+      test_stream(js);
+      json_delete(js);
+      return 0;
+    }
+
+  if (opt_read || opt_read_hex)
+    {
+      struct fastbuf *fb = bfdopen_shared(0, 65536);
+      if (opt_read_hex)
+	fb = fb_wrap_hex_in(fb);
+      n = do_parse(js, fb);
+      bclose(fb);
+    }
+
+  if (!n)
+    n = json_new_number(js, 42);
+
+  if (opt_write || opt_write_hex)
+    {
+      struct fastbuf *fb = bfdopen_shared(1, 65536);
+      if (opt_write_hex)
+	fb = fb_wrap_hex_out(fb);
+      json_write(js, fb, n);
+      bclose(fb);
+    }
+
+  json_delete(js);
+  return 0;
+}
diff --git a/libucw/ucw-json/json-test.t b/libucw/ucw-json/json-test.t
new file mode 100644
index 0000000..db747e7
--- /dev/null
+++ b/libucw/ucw-json/json-test.t
@@ -0,0 +1,394 @@
+# Tests for the JSON library
+# (c) 2015 Martin Mares <mj@ucw.cz>
+
+### Literals ###
+
+Name:	Null
+Run:	../obj/ucw-json/json-test -rw
+In:	null
+Out:	null
+
+Name:	True
+In:	true
+Out:	true
+
+Name:	False
+In:	false
+Out:	false
+
+Name:	Invalid literal 1
+In:	lomikel
+Exit:	1
+Err:	ERROR: Invalid literal name at line 1:8
+
+Name:	Invalid literal 2
+In:	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+Exit:	1
+Err:	ERROR: Invalid literal name at line 1:101
+
+### Numbers ###
+
+Name:	Plain number
+In:	42
+Out:	42
+
+Name:	Negative number
+In:	-42
+Out:	-42
+
+Name:	Zero number
+In:	0
+Out:	0
+
+# The largest number guaranteed to be precise by RFC 7159
+Name:	Large number
+In:	9007199254740991
+Out:	9007199254740991
+
+Name:	Fractional number 1
+In:	12345.54321
+Out:	12345.54321
+
+Name:	Fractional number 2
+In:	0.333333333
+Out:	0.333333333
+
+Name:	Number in scientific notation 1
+In:	3.14159e20
+Out:	3.14159e+20
+
+Name:	Number in scientific notation 2
+In:	3.14159e+20
+Out:	3.14159e+20
+
+Name:	Number in scientific notation 3
+In:	3.14159e-20
+Out:	3.14159e-20
+
+Name:	No leading zero allowed
+In:	01234
+Exit:	1
+Err:	ERROR: Malformed number: leading zero at line 1:2
+
+Name:	Bare sign is not a number
+In:	-
+Exit:	1
+Err:	ERROR: Malformed number: just minus at line 1:2
+
+Name:	No leading decimal point allowed
+In:	.1234
+Exit:	1
+Err:	ERROR: Numbers must start with a digit at line 1:1
+
+Name:	Digits after decimal point required
+In:	1234.
+Exit:	1
+Err:	ERROR: Malformed number: no digits after decimal point at line 1:6
+
+Name:	Exponent part must be non-empty 1
+In:	1e
+Exit:	1
+Err:	ERROR: Malformed number: empty exponent at line 1:3
+
+Name:	Exponent part must be non-empty 2
+In:	1e+
+Exit:	1
+Err:	ERROR: Malformed number: empty exponent at line 1:4
+
+Name:	Number out of range
+In:	1e3000000
+Exit:	1:
+Err:	ERROR: Number out of range at line 1:10
+
+### Strings ###
+
+Name:	Plain string
+In:	"foo"
+Out:	"foo"
+
+Name:	Empty string
+In:	""
+Out:	""
+
+Name:	UTF-8 string
+In:	"šelmi�ka"
+Out:	"šelmi�ka"
+
+Name:	Unterminated string
+In:	"infinity
+Exit:	1
+Err:	ERROR: Unterminated string at line 1:10
+
+Name:	Multi-line string
+In:	"infi
+	nity"
+Exit:	1
+Err:	ERROR: Unterminated string at line 1:6
+
+# Some characters are written as \uXXXX on output, which is correct
+Name:	Escaped characters
+In:	"\"\\\/\b\f\n\r\t"
+Out:	"\"\\/\u0008\u000c\n\r\t"
+
+Name:	Improper escaped characters
+In:	"\a"
+Exit:	1
+Err:	ERROR: Invalid backslash sequence in string at line 1:3
+
+Name:	Unicode escapes
+In:	"\u0041\u010d\u010D\u0001"
+Out:	"A��\u0001"
+
+Name:	Improper Unicode escapes 1
+In:	"\u"
+Exit:	1
+Err:	ERROR: Invalid Unicode escape sequence at line 1:4
+
+Name:	Improper Unicode escapes 2
+In:	"\u
+Exit:	1
+Err:	ERROR: Invalid Unicode escape sequence at line 1:4
+
+Name:	Improper Unicode escapes 3
+In:	"\uABCZ"
+Exit:	1
+Err:	ERROR: Invalid Unicode escape sequence at line 1:7
+
+### Unicode magic ###
+
+# TAB is forbidden
+Name:	Control characters 1
+Run:	../obj/ucw-json/json-test -RW
+In:	"<09>"
+Exit:	1
+Err:	ERROR: Invalid control character in string at line 1:2
+
+# Surprisingly, DEL is not
+Name:	Control characters 2
+In:	"<7f>"
+Out:	"<7f>"<0a>
+
+# U+31234
+Name:	UTF-8 outside BMP
+In:	"<f0><b1><88><b4>"
+Out:	"<f0><b1><88><b4>"<0a>
+
+Name:	Private use characters in BMP
+In:	"<ef><80><80>"
+Exit:	1
+Err:	ERROR: Invalid private-use character in string at line 1:2
+
+Name:	UTF-8 outside BMP
+In:	"<f0><b1><88><b4>"
+Out:	"<f0><b1><88><b4>"<0a>
+
+Name:	Private use characters outside BMP
+In:	"<f3><b0><80><80>"
+Exit:	1
+Err:	ERROR: Invalid private-use character in string at line 1:2
+
+# U+FF0000
+Name:	UTF-8 outside UCS
+In:	"<f8><bf><b0><80><80>"
+Exit:	1
+Err:	ERROR: Invalid non-Unicode character in string at line 1:2
+
+# U+D800
+Name:	UTF-8 surrogate 1
+In:	"<ed><a0><80>"
+Exit:	1
+Err:	ERROR: Invalid surrogate character in string at line 1:2
+
+# U+DC00
+Name:	UTF-8 surrogate 2
+In:	"<ed><b0><80>"
+Exit:	1
+Err:	ERROR: Invalid surrogate character in string at line 1:2
+
+# Denormalized U+07FF
+Name:	UTF-8 denormalized
+In:	"<c1><bf>"
+Exit:	1
+Err:	ERROR: Malformed UTF-8 character at line 1:1
+
+# U+FEFF
+Name:	UTF-8 BOM
+In:	<ef><bb><bf>
+Exit:	1
+Err:	ERROR: Misplaced byte-order mark, complain in Redmond at line 1:1
+
+Name:	Escaped NUL
+In:	"\u0000"
+Exit:	1
+Err:	ERROR: Zero bytes in strings are not supported at line 1:7
+
+Name:	Escaped surrogate
+In:	"\udaff\udcba"
+Out:	"<f3><8f><b2><ba>"<0a>
+
+Name:	Escaped surrogate malformation 1
+In:	"\udaff"
+Exit:	1
+Err:	ERROR: Escaped high surrogate codepoint must be followed by a low surrogate codepoint at line 1:8
+
+Name:	Escaped surrogate malformation 2
+In:	"\udcff"
+Exit:	1
+Err:	ERROR: Invalid escaped surrogate codepoint at line 1:7
+
+Name:	Escaped low private-use character
+In:	"\uedac"
+Exit:	1
+Err:	ERROR: Invalid escaped private-use character at line 1:7
+
+Name:	Escaped high private-use character
+In:	"\udbff\udc00"
+Exit:	1
+Err:	ERROR: Invalid escaped private-use character at line 1:13
+
+# Switch back to normal mode
+Name:	Invalid ASCII character
+Run:	../obj/ucw-json/json-test -rw
+In:	@
+Exit:	1
+Err:	ERROR: Invalid character at line 1:1
+
+### Arrays ###
+
+Name:	Empty array
+In:	[]
+Out:	[]
+
+Name:	One-element array
+In:	[1]
+Out:	[ 1 ]
+
+Name:	Two-element array
+In:	[1,2]
+Out:	[ 1, 2 ]
+
+Name:	Nested arrays
+In:	[[1,2],["a","b"]]
+Out:	[ [ 1, 2 ], [ "a", "b" ] ]
+
+Name:	Multi-line array
+In:	[
+	"a",    null,false
+	,false
+	]
+Out:	[ "a", null, false, false ]
+
+Name:	Unterminated array 1
+In:	[1,2
+Exit:	1
+Err:	ERROR: Comma or right bracket expected at line 2:0
+
+Name:	Unterminated array 2
+In:	[1,2,
+Exit:	1
+Err:	ERROR: Unterminated array at line 2:0
+
+Name:	Extra comma not allowed
+In:	[1,2,]
+Exit:	1
+Err:	ERROR: Misplaced end of array at line 1:6
+
+Name:	Solitary comma not allowed
+In:	,
+Exit:	1
+Err:	ERROR: Misplaced comma at line 1:1
+
+Name:	Deeply nested array
+In:	[[[[[[[[[[]]]]]]]]]]
+Out:	[ [ [ [ [ [ [ [ [ [] ] ] ] ] ] ] ] ] ]
+
+Name:	Deeply unclosed array
+In:	[[[[[[[[[[]
+Exit:	1
+Err:	ERROR: Comma or right bracket expected at line 2:0
+
+Name:	Missing comma
+In:	[1 2]
+Exit:	1
+Err:	ERROR: Comma or right bracket expected at line 1:5
+
+### Objects ###
+
+Name:	Empty object
+In:	{}
+Out:	{}
+
+Name:	One-entry object
+In:	{"a":"b"}
+Out:	{ "a": "b" }
+
+Name:	Two-entry object
+In:	{"a":1,"b":2}
+Out:	{ "a": 1, "b": 2 }
+
+Name:	Nested objects
+In:	{
+		"a": [1,2],
+		"b": { "x": true, "y": false }
+	}
+Out:	{ "a": [ 1, 2 ], "b": { "x": true, "y": false } }
+
+Name:	Unterminated object 1
+In:	{
+Exit:	1
+Err:	ERROR: Unterminated object at line 2:0
+
+Name:	Unterminated object 2
+In:	{ "a"
+Exit:	1
+Err:	ERROR: Colon expected at line 2:0
+
+Name:	Unterminated object 3
+In:	{ "a":
+Exit:	1
+Err:	ERROR: Unterminated object at line 2:0
+
+Name:	Unterminated object 4
+In:	{ "a":1,
+Exit:	1
+Err:	ERROR: Unterminated object at line 2:0
+
+Name:	Extra comma not allowed in objects
+In:	{ "a":1, }
+Exit:	1
+Err:	ERROR: Misplaced end of object at line 1:10
+
+Name:	Non-string key
+In:	{1:2}
+Exit:	1
+Err:	ERROR: Object key must be a string at line 1:3
+
+Name:	Repeated key
+In:	{"a":1, "a":2}
+Exit:	1
+Err:	ERROR: Key already set at line 1:14
+
+Name:	Missing object comma
+In:	{"a":1 "b":2}
+Exit:	1
+Err:	ERROR: Comma expected at line 1:10
+
+### Top-level problems ###
+
+Name:	Empty input
+Exit:	1
+Err:	ERROR: Empty input at line 1:0
+
+Name:	Multiple values
+In:	1 2
+Exit:	1
+Err:	ERROR: Only one top-level value allowed at line 1:4
+
+### Streaming interface ###
+
+Name:	Streaming
+Run:	../obj/ucw-json/json-test -s
+In:	123 [true, false] "Rincewind"
+Out:	123
+	[ true, false ]
+	"Rincewind"
diff --git a/libucw/ucw-json/json.c b/libucw/ucw-json/json.c
new file mode 100644
index 0000000..780478d
--- /dev/null
+++ b/libucw/ucw-json/json.c
@@ -0,0 +1,141 @@
+/*
+ *	UCW JSON Library -- Data Representation
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/gary.h>
+#include <ucw/mempool.h>
+#include <ucw-json/json.h>
+
+#include <limits.h>
+#include <math.h>
+#include <stdint.h>
+
+static void json_init(struct json_context *js)
+{
+  mp_save(js->pool, &js->init_state);
+  js->trivial_token = json_new_node(js, JSON_INVALID);
+}
+
+struct json_context *json_new(void)
+{
+  struct mempool *mp = mp_new(4096);
+  struct json_context *js = mp_alloc_zero(mp, sizeof(*js));
+  js->pool = mp;
+  json_init(js);
+  return js;
+}
+
+void json_delete(struct json_context *js)
+{
+  mp_delete(js->pool);
+}
+
+void json_reset(struct json_context *js)
+{
+  struct mempool *mp = js->pool;
+  mp_restore(mp, &js->init_state);
+  bzero(js, sizeof(*js));
+  js->pool = mp;
+  json_init(js);
+}
+
+void json_push(struct json_context *js)
+{
+  ASSERT(!js->next_token);
+  mp_push(js->pool);
+}
+
+void json_pop(struct json_context *js)
+{
+  ASSERT(!js->next_token);
+  mp_pop(js->pool);
+}
+
+struct json_node *json_new_node(struct json_context *js, enum json_node_type type)
+{
+  struct json_node *n = mp_alloc_fast(js->pool, sizeof(*n));
+  n->type = type;
+  return n;
+}
+
+struct json_node *json_new_number(struct json_context *js, double value)
+{
+  ASSERT(isfinite(value));
+  struct json_node *n = json_new_node(js, JSON_NUMBER);
+  n->number = value;
+  return n;
+}
+
+#define JSON_NUM_TO(_type, _min, _max)					\
+  bool json_number_to_##_type(struct json_node *num, _type *dest)	\
+  {									\
+    if (num->type == JSON_NUMBER &&					\
+        num->number >= _min && num->number <= _max)			\
+      {									\
+        *dest = num->number;						\
+        return 1;							\
+      }									\
+    return 0;								\
+  }
+
+JSON_NUM_TO(int, INT_MIN, INT_MAX)
+JSON_NUM_TO(uint, 0, UINT_MAX)
+JSON_NUM_TO(s64, INT64_MIN, INT64_MAX)
+JSON_NUM_TO(u64, 0, UINT64_MAX)
+
+struct json_node *json_new_array(struct json_context *js)
+{
+  struct json_node *n = json_new_node(js, JSON_ARRAY);
+  GARY_INIT_SPACE_ALLOC(n->elements, 4, mp_get_allocator(js->pool));
+  return n;
+}
+
+void json_array_append(struct json_node *array, struct json_node *elt)
+{
+  ASSERT(array->type == JSON_ARRAY);
+  *GARY_PUSH(array->elements) = elt;
+}
+
+struct json_node *json_new_object(struct json_context *js)
+{
+  struct json_node *n = json_new_node(js, JSON_OBJECT);
+  GARY_INIT_SPACE_ALLOC(n->pairs, 4, mp_get_allocator(js->pool));
+  return n;
+}
+
+void json_object_set(struct json_node *n, const char *key, struct json_node *value)
+{
+  for (size_t i=0; i < GARY_SIZE(n->pairs); i++)
+    if (!strcmp(n->pairs[i].key, key))
+      {
+	if (value)
+	  n->pairs[i].value = value;
+	else
+	  {
+	    n->pairs[i] = n->pairs[GARY_SIZE(n->pairs) - 1];
+	    GARY_POP(n->pairs);
+	  }
+	return;
+      }
+
+  if (value)
+    {
+      struct json_pair *p = GARY_PUSH(n->pairs);
+      p->key = key;
+      p->value = value;
+    }
+}
+
+struct json_node *json_object_get(struct json_node *n, const char *key)
+{
+  for (size_t i=0; i < GARY_SIZE(n->pairs); i++)
+    if (!strcmp(n->pairs[i].key, key))
+      return n->pairs[i].value;
+  return NULL;
+}
diff --git a/libucw/ucw-json/json.h b/libucw/ucw-json/json.h
new file mode 100644
index 0000000..369598b
--- /dev/null
+++ b/libucw/ucw-json/json.h
@@ -0,0 +1,319 @@
+/*
+ *	UCW JSON Library
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_JSON_JSON_H
+#define _UCW_JSON_JSON_H
+
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define json_array_append ucw_json_array_append
+#define json_delete ucw_json_delete
+#define json_new ucw_json_new
+#define json_new_array ucw_json_new_array
+#define json_new_node ucw_json_new_node
+#define json_new_number ucw_json_new_number
+#define json_new_object ucw_json_new_object
+#define json_next_token ucw_json_next_token
+#define json_next_value ucw_json_next_value
+#define json_number_to_int ucw_json_number_to_int
+#define json_number_to_s64 ucw_json_number_to_s64
+#define json_number_to_u64 ucw_json_number_to_u64
+#define json_number_to_uint ucw_json_number_to_uint
+#define json_object_get ucw_json_object_get
+#define json_object_set ucw_json_object_set
+#define json_parse ucw_json_parse
+#define json_peek_token ucw_json_peek_token
+#define json_pop ucw_json_pop
+#define json_push ucw_json_push
+#define json_reset ucw_json_reset
+#define json_set_input ucw_json_set_input
+#define json_set_output ucw_json_set_output
+#define json_write ucw_json_write
+#define json_write_value ucw_json_write_value
+#endif
+
+/***
+ * === JSON library context
+ *
+ * The context structure remembers the whole state of the JSON
+ * library. All JSON values are allocated from a memory pool associated
+ * with the context. By default, their lifetime is the same as that
+ * of the context.
+ *
+ * Alternatively, you can mark the current state of the context
+ * with json_push() and return to the marked state later using
+ * json_pop(). All JSON values created between these two operations
+ * are released afterwards. See json_push() for details.
+ ***/
+
+/**
+ * The context is represented a pointer to this structure.
+ * The fields marked with [*] are publicly accessible, the rest is private.
+ **/
+struct json_context {
+  // Memory management
+  struct mempool *pool;
+  struct mempool_state init_state;
+
+  // Parser context
+  struct fastbuf *in_fb;
+  uint in_line;				// [*] Current line number
+  uint in_column;			// [*] Current column number
+  bool in_eof;				//     End of file was encountered
+  struct json_node *next_token;
+  struct json_node *trivial_token;
+  int next_char;
+
+  // Formatter context
+  struct fastbuf *out_fb;
+  uint out_indent;
+  uint format_options;			// [*] Formatting options (a combination of JSON_FORMAT_xxx)
+};
+
+/** Creates a new JSON context. **/
+struct json_context *json_new(void);
+
+/** Deletes a JSON context, deallocating all memory associated with it. **/
+void json_delete(struct json_context *js);
+
+/**
+ * Recycles a JSON context. All state is reset, allocated objects are freed.
+ * This is equivalent to mp_delete() followed by mp_new(), but it is faster
+ * and the address of the context is preserved.
+ **/
+void json_reset(struct json_context *js);
+
+/**
+ * Push the current state of the context onto state stack.
+ *
+ * Between json_push() and the associated json_pop(), only newly
+ * created JSON values can be modified. Older values can be only
+ * inspected, never modified. In particular, new values cannot be
+ * inserted to old arrays nor objects.
+ *
+ * If you are using json_peek_token(), the saved tokens cannot
+ * be carried over push/pop boundary.
+ **/
+void json_push(struct json_context *js);
+
+/**
+ * Create a copy of a string in JSON memory.
+ *
+ * For example, this is useful when you want to use a string of unknown
+ * lifetime as a key in json_object_set().
+ **/
+static inline const char *json_strdup(struct json_context *js, const char *str)
+{
+  return mp_strdup(js->pool, str);
+}
+
+/**
+ * Pop state of the context off state stack. All JSON values created
+ * since the state was saved by json_push() are released.
+ **/
+void json_pop(struct json_context *js);
+
+/***
+ * === JSON values
+ *
+ * Each JSON value is represented by <<struct json_node,struct json_node>>,
+ * which is either an elementary value (null, boolean, number, string),
+ * or a container (array, object) pointing to other values.
+ *
+ * A value can belong to multiple containers simultaneously, so in general,
+ * the relationships between values need not form a tree, but a directed
+ * acyclic graph.
+ *
+ * You are allowed to read contents of nodes directly, but construction
+ * and modification of nodes must be always performed using the appropriate
+ * library functions.
+ ***/
+
+/** Node types **/
+enum json_node_type {
+  JSON_INVALID,
+  JSON_NULL,
+  JSON_BOOLEAN,
+  JSON_NUMBER,
+  JSON_STRING,
+  JSON_ARRAY,
+  JSON_OBJECT,
+  // These are not real nodes, but raw tokens.
+  // They are not present in the tree of values, but you may see them
+  // if you call json_next_token() and friends.
+  JSON_BEGIN_ARRAY,
+  JSON_END_ARRAY,
+  JSON_BEGIN_OBJECT,
+  JSON_END_OBJECT,
+  JSON_NAME_SEP,
+  JSON_VALUE_SEP,
+  JSON_EOF,
+};
+
+/** Each value is represented by a single node. **/
+struct json_node {
+  enum json_node_type type;
+  union {				// Data specific to individual value types
+    bool boolean;
+    double number;
+    const char *string;
+    struct json_node **elements;	// Arrays: Growing array of values
+    struct json_pair *pairs;		// Objects: Growing array of pairs
+  };
+};
+
+/** Attributes of objects are stored as (key, value) pairs of this format. **/
+struct json_pair {
+  const char *key;
+  struct json_node *value;
+  // FIXME: Hash table
+};
+
+// Used internally
+struct json_node *json_new_node(struct json_context *js, enum json_node_type type);
+
+/** Creates a new null value. **/
+static inline struct json_node *json_new_null(struct json_context *js UNUSED)
+{
+  static const struct json_node static_null = { .type = JSON_NULL };
+  return (struct json_node *) &static_null;
+}
+
+/** Creates a new boolean value. **/
+static inline struct json_node *json_new_bool(struct json_context *js UNUSED, bool value)
+{
+  static const struct json_node static_bool[2] = {
+    [0] = { .type = JSON_BOOLEAN, { .boolean = 0 } },
+    [1] = { .type = JSON_BOOLEAN, { .boolean = 1 } },
+  };
+  return (struct json_node *) &static_bool[value];
+}
+
+/** Creates a new numeric value. The @value must be a finite number. **/
+struct json_node *json_new_number(struct json_context *js, double value);
+
+/**
+ * Convert a numeric value to an `int`. Returns false if the value
+ * is not numeric or if it is too large for an int.
+ **/
+bool json_number_to_int(struct json_node *num, int *dest);
+
+/** Same as above, but for `uint`. **/
+bool json_number_to_uint(struct json_node *num, uint *dest);
+
+/** Same as above, but for `s64`. **/
+bool json_number_to_s64(struct json_node *num, s64 *dest);
+
+/** Same as above, but for `u64`. **/
+bool json_number_to_u64(struct json_node *num, u64 *dest);
+
+/**
+ * Creates a new string value. The @value is kept only as a reference.
+ *
+ * String values can contain an arbitrary UTF-8 string with no null
+ * characters. However, it is not recommended to use UTF-8 values outside
+ * the range of UniCode codepoints (0 to 0x10ffff).
+ **/
+static inline struct json_node *json_new_string_ref(struct json_context *js, const char *value)
+{
+  struct json_node *n = json_new_node(js, JSON_STRING);
+  n->string = value;
+  return n;
+}
+
+/** Creates a new string value, making a private copy of @value. **/
+static inline struct json_node *json_new_string(struct json_context *js, const char *value)
+{
+  return json_new_string_ref(js, mp_strdup(js->pool, value));
+}
+
+/** Creates a new array value with no elements. **/
+struct json_node *json_new_array(struct json_context *js);
+
+/** Appends a new element to the given array. **/
+void json_array_append(struct json_node *array, struct json_node *elt);
+
+/** Creates a new object value with no attributes. **/
+struct json_node *json_new_object(struct json_context *js);
+
+/**
+ * Adds a new (@key, @value) pair to the given object. If @key is already
+ * present, the pair is replaced. If @value is NULL, no new pair is created
+ * and a pre-existing pair is deleted.
+ *
+ * The @key is referenced by the object, you must not free it during
+ * the lifetime of the object. When in doubt, use json_strdup().
+ **/
+void json_object_set(struct json_node *n, const char *key, struct json_node *value);
+
+/** Returns the value associated with @key, or NULL if no such value exists. **/
+struct json_node *json_object_get(struct json_node *n, const char *key);
+
+/***
+ * === Parser
+ *
+ * The simplest way to parse a complete JSON file is to call json_parse(),
+ * which returns a value tree representing the contents of the file.
+ *
+ * Alternatively, you can read the input token by token: call json_set_input()
+ * and then repeat json_next_token(). If you are parsing huge JSON files,
+ * you probably want to do json_push() first, then scan and process some
+ * tokens, and then json_pop().
+ *
+ * All parsing functions throw LibUCW exceptions of class `ucw.json.parse`
+ * upon errors. If you want to catch them, call the parser inside
+ * a transaction.
+ ***/
+
+/** Parses a JSON file from the given fastbuf stream. **/
+struct json_node *json_parse(struct json_context *js, struct fastbuf *fb);
+
+/** Selects the given fastbuf stream as parser input. **/
+void json_set_input(struct json_context *js, struct fastbuf *in);
+
+/** Reads the next token from the input. **/
+struct json_node *json_next_token(struct json_context *js);
+
+/** Reads the next token, but keeps it in the input. **/
+struct json_node *json_peek_token(struct json_context *js);
+
+/** Reads the next JSON value, including nested values. **/
+struct json_node *json_next_value(struct json_context *js);
+
+/***
+ * === Writer
+ *
+ * JSON files can be produced by simply calling json_write().
+ *
+ * If you want to generate the output on the fly (for example if it is huge),
+ * call json_set_output() and then iterate json_write_value().
+ *
+ * By default, we produce a single-line compact representation,
+ * but you can choose differently by setting the appropriate
+ * `format_options` in the `json_context`.
+ ***/
+
+/** Writes a JSON file to the given fastbuf stream, containing the JSON value @n. **/
+void json_write(struct json_context *js, struct fastbuf *fb, struct json_node *n);
+
+/** Selects the given fastbuf stream as output. **/
+void json_set_output(struct json_context *js, struct fastbuf *fb);
+
+/** Writes a single JSON value to the output stream. **/
+void json_write_value(struct json_context *js, struct json_node *n);
+
+/** Formatting options. The `format_options` field in the context is a bitwise OR of these flags. **/
+enum json_format_option {
+  JSON_FORMAT_ESCAPE_NONASCII = 1,	// Produce pure ASCII output by escaping all Unicode characters in strings
+  JSON_FORMAT_INDENT = 2,		// Produce pretty indented output
+};
+
+#endif
diff --git a/libucw/ucw-json/libucw-json.pc b/libucw/ucw-json/libucw-json.pc
new file mode 100644
index 0000000..fb4e105
--- /dev/null
+++ b/libucw/ucw-json/libucw-json.pc
@@ -0,0 +1,12 @@
+# pkg-config metadata for libucw-json
+
+libdir=@LIBDIR@
+incdir=.
+
+Name: libucw-json
+Description: JSON parser for LibUCW project
+Version: @UCW_VERSION@
+Cflags: -I${incdir}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-json@UCW_ABI_SUFFIX@
+Libs.private: @LIBJSON_LIBS@
+Requires.private: @DEPS@
diff --git a/libucw/ucw-json/parse.c b/libucw/ucw-json/parse.c
new file mode 100644
index 0000000..df99ea4
--- /dev/null
+++ b/libucw/ucw-json/parse.c
@@ -0,0 +1,452 @@
+/*
+ *	UCW JSON Library -- Parser
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/trans.h>
+#include <ucw/unicode.h>
+#include <ucw-json/json.h>
+
+#include <errno.h>
+#include <stdlib.h>
+
+void json_set_input(struct json_context *js, struct fastbuf *in)
+{
+  js->in_fb = in;
+  js->in_line = 1;
+  js->in_column = 0;
+  js->next_char = -1;
+  js->next_token = NULL;
+  js->in_eof = 0;
+}
+
+static void NONRET json_parse_error(struct json_context *js, const char *msg)
+{
+  trans_throw("ucw.json.parse", js, "%s at line %u:%u", msg, js->in_line, js->in_column);
+}
+
+static int json_get_char(struct json_context *js)
+{
+  int c = bget_utf8_32_repl(js->in_fb, -2);
+  if (unlikely(c < 0))
+    {
+      if (c == -2)
+	json_parse_error(js, "Malformed UTF-8 character");
+      js->in_eof = 1;
+      return c;
+    }
+  js->in_column++;
+  return c;
+}
+
+static void json_unget_char(struct json_context *js, int c)
+{
+  js->next_char = c;
+}
+
+static struct json_node *json_triv_token(struct json_context *js, enum json_node_type type)
+{
+  js->trivial_token->type = type;
+  return js->trivial_token;
+}
+
+static struct json_node *json_parse_number(struct json_context *js, int c)
+{
+  mp_push(js->pool);
+  char *p = mp_start_noalign(js->pool, 0);
+
+  // Optional minus
+  if (c == '-')
+    {
+      p = mp_append_char(js->pool, p, c);
+      c = json_get_char(js);
+      if (!(c >= '0' && c <= '9'))
+	json_parse_error(js, "Malformed number: just minus");
+    }
+
+  // Integer part
+  if (c == '0')
+    {
+      // Leading zeroes are forbidden by RFC 7159
+      p = mp_append_char(js->pool, p, c);
+      c = json_get_char(js);
+      if (c >= '0' && c <= '9')
+	json_parse_error(js, "Malformed number: leading zero");
+    }
+  else
+    {
+      while (c >= '0' && c <= '9')
+	{
+	  p = mp_append_char(js->pool, p, c);
+	  c = json_get_char(js);
+	}
+    }
+
+  // Fractional part
+  if (c == '.')
+    {
+      p = mp_append_char(js->pool, p, c);
+      c = json_get_char(js);
+      if (!(c >= '0' && c <= '9'))
+	json_parse_error(js, "Malformed number: no digits after decimal point");
+      while (c >= '0' && c <= '9')
+	{
+	  p = mp_append_char(js->pool, p, c);
+	  c = json_get_char(js);
+	}
+    }
+
+  // Exponent
+  if (c == 'e' || c == 'E')
+    {
+      p = mp_append_char(js->pool, p, c);
+      c = json_get_char(js);
+      if (c == '+' || c == '-')
+	{
+	  p = mp_append_char(js->pool, p, c);
+	  c = json_get_char(js);
+	}
+      if (!(c >= '0' && c <= '9'))
+	json_parse_error(js, "Malformed number: empty exponent");
+      while (c >= '0' && c <= '9')
+	{
+	  p = mp_append_char(js->pool, p, c);
+	  c = json_get_char(js);
+	}
+    }
+
+  json_unget_char(js, c);
+
+  p = mp_end_string(js->pool, p);
+  errno = 0;
+  double val = strtod(p, NULL);
+  if (errno == ERANGE)
+    json_parse_error(js, "Number out of range");
+  mp_pop(js->pool);
+
+  return json_new_number(js, val);
+}
+
+static struct json_node *json_parse_name(struct json_context *js, int c)
+{
+  char name[16];
+  uint i = 0;
+
+  while (c >= 'a' && c <= 'z')
+    {
+      if (i < sizeof(name) - 1)
+	name[i++] = c;
+      c = json_get_char(js);
+    }
+  if (i >= sizeof(name) - 1)
+    json_parse_error(js, "Invalid literal name");
+  name[i] = 0;
+  json_unget_char(js, c);
+
+  struct json_node *n;
+  if (!strcmp(name, "null"))
+    n = json_new_null(js);
+  else if (!strcmp(name, "false"))
+    n = json_new_bool(js, 0);
+  else if (!strcmp(name, "true"))
+    n = json_new_bool(js, 1);
+  else
+    json_parse_error(js, "Invalid literal name");
+
+  return n;
+}
+
+static uint json_parse_hex4(struct json_context *js)
+{
+  uint x = 0;
+  for (int i=0; i<4; i++)
+    {
+      x = x << 4;
+      int c = json_get_char(js);
+      if (c >= '0' && c <= '9')
+	x += c - '0';
+      else if (c >= 'a' && c <= 'f')
+	x += c - 'a' + 10;
+      else if (c >= 'A' && c <= 'F')
+	x += c - 'A' + 10;
+      else
+	json_parse_error(js, "Invalid Unicode escape sequence");
+    }
+  return x;
+}
+
+static struct json_node *json_parse_string(struct json_context *js, int c)
+{
+  char *p = mp_start_noalign(js->pool, 0);
+
+  c = json_get_char(js);
+  while (c != '"')
+    {
+      if (unlikely(c < 0x20))
+	{
+	  if (c < 0 || c == 0x0d || c == 0x0a)
+	    json_parse_error(js, "Unterminated string");
+	  else
+	    json_parse_error(js, "Invalid control character in string");
+	}
+      if (unlikely(c >= 0xd800 && c < 0xf900))
+	{
+	  if (c < 0xe000)
+	    json_parse_error(js, "Invalid surrogate character in string");
+	  else
+	    json_parse_error(js, "Invalid private-use character in string");
+	}
+      if (unlikely(c >= 0xf0000))
+	{
+	  if (c > 0x10ffff)
+	    json_parse_error(js, "Invalid non-Unicode character in string");
+	  else
+	    json_parse_error(js, "Invalid private-use character in string");
+	}
+      if (c == '\\')
+	{
+	  c = json_get_char(js);
+	  switch (c)
+	    {
+	    case '"':
+	    case '\\':
+	    case '/':
+	      break;
+	    case 'b':
+	      c = 0x08;
+	      break;
+	    case 'f':
+	      c = 0x0c;
+	      break;
+	    case 'n':
+	      c = 0x0a;
+	      break;
+	    case 'r':
+	      c = 0x0d;
+	      break;
+	    case 't':
+	      c = 0x09;
+	      break;
+	    case 'u':
+	      {
+		uint x = json_parse_hex4(js);
+		if (!x)
+		  json_parse_error(js, "Zero bytes in strings are not supported");
+		if (x >= 0xd800 && x < 0xf900)
+		  {
+		    if (x < 0xdc00)
+		      {
+			// High surrogate: low surrogate must follow
+			uint y = 0;
+			if (json_get_char(js) == '\\' && json_get_char(js) == 'u')
+			  y = json_parse_hex4(js);
+			if (!(y >= 0xdc00 && y < 0xe000))
+			  json_parse_error(js, "Escaped high surrogate codepoint must be followed by a low surrogate codepoint");
+			c = 0x10000 + ((x & 0x03ff) << 10) | (y & 0x03ff);
+			if (c > 0xf0000)
+			  json_parse_error(js, "Invalid escaped private-use character");
+		      }
+		    else if (x < 0xe000)
+		      {
+			// Low surrogate
+			json_parse_error(js, "Invalid escaped surrogate codepoint");
+		      }
+		    else
+		      json_parse_error(js, "Invalid escaped private-use character");
+		  }
+		else
+		  c = x;
+		break;
+	      }
+	    default:
+	      json_parse_error(js, "Invalid backslash sequence in string");
+	    }
+	}
+      p = mp_append_utf8_32(js->pool, p, c);
+      c = json_get_char(js);
+    }
+
+  p = mp_end_string(js->pool, p);
+  return json_new_string_ref(js, p);
+}
+
+static struct json_node *json_read_token(struct json_context *js)
+{
+  if (unlikely(js->in_eof))
+    return json_triv_token(js, JSON_EOF);
+
+  int c = js->next_char;
+  if (c >= 0)
+    js->next_char = -1;
+  else
+    c = json_get_char(js);
+
+  while (c == 0x20 || c == 0x09 || c == 0x0a || c == 0x0d)
+    {
+      if (c == 0x0a)
+	{
+	  js->in_line++;
+	  js->in_column = 0;
+	}
+      c = json_get_char(js);
+    }
+  if (c < 0)
+    return json_triv_token(js, JSON_EOF);
+
+  if (c >= '0' && c <= '9' || c == '-')
+    return json_parse_number(js, c);
+
+  if (c >= 'a' && c <= 'z')
+    return json_parse_name(js, c);
+
+  if (c == '"')
+    return json_parse_string(js, c);
+
+  switch (c)
+    {
+    case '[':
+      return json_triv_token(js, JSON_BEGIN_ARRAY);
+    case ']':
+      return json_triv_token(js, JSON_END_ARRAY);
+    case '{':
+      return json_triv_token(js, JSON_BEGIN_OBJECT);
+    case '}':
+      return json_triv_token(js, JSON_END_OBJECT);
+    case ':':
+      return json_triv_token(js, JSON_NAME_SEP);
+    case ',':
+      return json_triv_token(js, JSON_VALUE_SEP);
+    case '.':
+      json_parse_error(js, "Numbers must start with a digit");
+    case 0xfeff:
+      json_parse_error(js, "Misplaced byte-order mark, complain in Redmond");
+    default:
+      json_parse_error(js, "Invalid character");
+    }
+}
+
+struct json_node *json_peek_token(struct json_context *js)
+{
+  if (!js->next_token)
+    js->next_token = json_read_token(js);
+  return js->next_token;
+}
+
+struct json_node *json_next_token(struct json_context *js)
+{
+  struct json_node *t = js->next_token;
+  if (t)
+    {
+      js->next_token = NULL;
+      return t;
+    }
+  return json_read_token(js);
+}
+
+struct json_node *json_next_value(struct json_context *js)
+{
+  struct json_node *t = json_next_token(js);
+
+  switch (t->type)
+    {
+    case JSON_EOF:
+      return NULL;
+
+    // Elementary values
+    case JSON_NULL:
+    case JSON_BOOLEAN:
+    case JSON_NUMBER:
+    case JSON_STRING:
+      return t;
+
+    // Array
+    case JSON_BEGIN_ARRAY:
+      {
+	struct json_node *a = json_new_array(js);
+	if (json_peek_token(js)->type == JSON_END_ARRAY)
+	  json_next_token(js);
+	else for (;;)
+	  {
+	    struct json_node *v = json_next_value(js);
+	    if (!v)
+	      json_parse_error(js, "Unterminated array");
+	    json_array_append(a, v);
+
+	    t = json_next_token(js);
+	    if (t->type == JSON_END_ARRAY)
+	      break;
+	    if (t->type != JSON_VALUE_SEP)
+	      json_parse_error(js, "Comma or right bracket expected");
+	  }
+	return a;
+      }
+
+    // Object
+    case JSON_BEGIN_OBJECT:
+      {
+	struct json_node *o = json_new_object(js);
+	if (json_peek_token(js)->type == JSON_END_OBJECT)
+	  json_next_token(js);
+	else for (;;)
+	  {
+	    struct json_node *k = json_next_value(js);
+	    if (!k)
+	      json_parse_error(js, "Unterminated object");
+	    if (k->type != JSON_STRING)
+	      json_parse_error(js, "Object key must be a string");
+
+	    t = json_next_token(js);
+	    if (t->type != JSON_NAME_SEP)
+	      json_parse_error(js, "Colon expected");
+
+	    struct json_node *v = json_next_value(js);
+	    if (!v)
+	      json_parse_error(js, "Unterminated object");
+	    if (json_object_get(o, k->string))		// FIXME: Optimize
+	      json_parse_error(js, "Key already set");
+	    json_object_set(o, k->string, v);
+
+	    t = json_next_token(js);
+	    if (t->type == JSON_END_OBJECT)
+	      break;
+	    if (t->type != JSON_VALUE_SEP)
+	      json_parse_error(js, "Comma expected");
+	  }
+	return o;
+      }
+
+    // Misplaced characters
+    case JSON_END_ARRAY:
+      json_parse_error(js, "Misplaced end of array");
+    case JSON_END_OBJECT:
+      json_parse_error(js, "Misplaced end of object");
+    case JSON_NAME_SEP:
+      json_parse_error(js, "Misplaced colon");
+    case JSON_VALUE_SEP:
+      json_parse_error(js, "Misplaced comma");
+    default:
+      ASSERT(0);
+    }
+}
+
+struct json_node *json_parse(struct json_context *js, struct fastbuf *fb)
+{
+  json_set_input(js, fb);
+
+  struct json_node *n = json_next_value(js);
+  if (!n)
+    json_parse_error(js, "Empty input");
+
+  struct json_node *t = json_next_token(js);
+  if (t->type != JSON_EOF)
+    json_parse_error(js, "Only one top-level value allowed");
+
+  return n;
+}
diff --git a/libucw/ucw-xml/Makefile b/libucw/ucw-xml/Makefile
new file mode 100644
index 0000000..9f339b2
--- /dev/null
+++ b/libucw/ucw-xml/Makefile
@@ -0,0 +1,54 @@
+# Makefile for the XML parser
+# (c) 2007 Pavel Charvat <pchar@ucw.cz>
+
+DIRS+=ucw-xml
+PROGS+=$(o)/ucw-xml/xml-test
+
+LIBXML_MODS=common source parse dtd ns
+LIBXML_MOD_PATHS=$(addprefix $(o)/ucw-xml/,$(LIBXML_MODS))
+LIBXML_INCLUDES=xml.h dtd.h
+LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET)
+
+$(o)/ucw-xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS))
+$(o)/ucw-xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS)
+$(o)/ucw-xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0
+$(o)/ucw-xml/libucw-xml.pc: $(LIBXML_DEPS)
+
+ifdef CONFIG_INSTALL_API
+$(o)/ucw-xml/libucw-xml.pc: $(addprefix $(o)/ucw-xml/libucw-xml$(LV),.a .so)
+endif
+
+$(addsuffix .o,$(LIBXML_MOD_PATHS)): $(o)/ucw-xml/unicat.h
+$(addsuffix .oo,$(LIBXML_MOD_PATHS)): $(o)/ucw-xml/unicat.h
+$(o)/ucw-xml/unicat.h: $(s)/ucw-xml/unicat.pl
+	$(M)GEN $(addprefix $(o)/ucw-xml/unicat,.h .c)
+	$(Q)$< $(addprefix $(o)/ucw-xml/unicat,.h .c)
+	$(Q)touch $@
+
+TESTS+=$(o)/ucw-xml/xml-test.test
+$(o)/ucw-xml/xml-test: $(o)/ucw-xml/xml-test.o $(LIBXML) $(LIBCHARSET) $(LIBUCW)
+$(o)/ucw-xml/xml-test.test: $(o)/ucw-xml/xml-test
+
+API_LIBS+=libucw-xml
+API_INCLUDES+=$(o)/ucw-xml/.include-stamp
+$(o)/ucw-xml/.include-stamp: $(addprefix $(s)/ucw-xml/,$(LIBXML_INCLUDES))
+$(o)/ucw-xml/.include-stamp: IDST=ucw-xml
+run/lib/pkgconfig/libucw-xml.pc: $(o)/ucw-xml/libucw-xml.pc
+
+INSTALL_TARGETS+=install-libucw-xml-lib
+install-libucw-xml-lib:
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw-xml$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0.0
+	ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so.0
+.PHONY: install-libucw-xml-lib
+
+INSTALL_TARGETS+=install-libucw-xml-api
+install-libucw-xml-api:
+	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 $(addprefix run/include/ucw-xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw-xml
+	ln -sf libucw-xml$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so
+	install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-xml-api
+
+include $(s)/ucw-xml/doc/Makefile
diff --git a/libucw/ucw-xml/TODO b/libucw/ucw-xml/TODO
new file mode 100644
index 0000000..b8dbc29
--- /dev/null
+++ b/libucw/ucw-xml/TODO
@@ -0,0 +1,15 @@
+Non-normative / not-implemented:
+-- introduce numeric error codes
+-- cycle detection in internal entities (and possibly external?)
+-- conditional sections in DTD
+-- validation of elements (regular expressions, non-cdata)
+-- validation of attributes (unfinished)
+-- notations
+-- URI normalization
+-- support for xml:space
+-- support for xml:lang
+-- full support for standalone documents
+-- Unicode normalization
+
+Optimizations:
+-- detect definitions of trivial entities
diff --git a/libucw/ucw-xml/common.c b/libucw/ucw-xml/common.c
new file mode 100644
index 0000000..8c23ce2
--- /dev/null
+++ b/libucw/ucw-xml/common.c
@@ -0,0 +1,135 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+#include <ucw-xml/internals.h>
+#include <ucw/stkstring.h>
+#include <ucw/ff-unicode.h>
+
+#include <setjmp.h>
+
+/*** Error handling ***/
+
+void NONRET
+xml_throw(struct xml_context *ctx)
+{
+  ASSERT(ctx->err_code && ctx->throw_buf);
+  longjmp(*(jmp_buf *)ctx->throw_buf, ctx->err_code);
+}
+
+void
+xml_warn(struct xml_context *ctx, const char *format, ...)
+{
+  if (ctx->h_warn)
+    {
+      va_list args;
+      va_start(args, format);
+      ctx->err_msg = stk_vprintf(format, args);
+      ctx->err_code = XML_ERR_WARN;
+      va_end(args);
+      ctx->h_warn(ctx);
+      ctx->err_msg = NULL;
+      ctx->err_code = XML_ERR_OK;
+    }
+}
+
+void
+xml_error(struct xml_context *ctx, const char *format, ...)
+{
+  if (ctx->h_error)
+    {
+      va_list args;
+      va_start(args, format);
+      ctx->err_msg = stk_vprintf(format, args);
+      ctx->err_code = XML_ERR_ERROR;
+      va_end(args);
+      ctx->h_error(ctx);
+      ctx->err_msg = NULL;
+      ctx->err_code = XML_ERR_OK;
+    }
+}
+
+void NONRET
+xml_fatal(struct xml_context *ctx, const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  ctx->err_msg = mp_vprintf(ctx->stack, format, args);
+  ctx->err_code = XML_ERR_FATAL;
+  ctx->state = XML_STATE_EOF;
+  va_end(args);
+  if (ctx->h_fatal)
+    ctx->h_fatal(ctx);
+  xml_throw(ctx);
+}
+
+/*** Memory management ***/
+
+void *
+xml_hash_new(struct mempool *pool, uint size)
+{
+  void *tab = mp_alloc_zero(pool, size + XML_HASH_HDR_SIZE);
+  *(void **)tab = pool;
+  return tab + XML_HASH_HDR_SIZE;
+}
+
+/*** Initialization ***/
+
+static struct xml_context xml_defaults = {
+  .flags = XML_SRC_EOF | XML_REPORT_ALL,
+  .state = XML_STATE_START,
+  .h_resolve_entity = xml_def_resolve_entity,
+  .chars = {
+    .name = "<xml_chars>",
+    .spout = xml_spout_chars,
+    .can_overwrite_buffer = 1,
+  },
+};
+
+void
+xml_init(struct xml_context *ctx)
+{
+  *ctx = xml_defaults;
+  ctx->pool = mp_new(65536);
+  ctx->stack = mp_new(65536);
+  TRACE(ctx, "init");
+}
+
+void
+xml_cleanup(struct xml_context *ctx)
+{
+  TRACE(ctx, "cleanup");
+  xml_dtd_cleanup(ctx);
+  xml_sources_cleanup(ctx);
+  xml_ns_cleanup(ctx);
+  mp_delete(ctx->pool);
+  mp_delete(ctx->stack);
+}
+
+void
+xml_reset(struct xml_context *ctx)
+{
+  TRACE(ctx, "reset");
+  struct mempool *pool = ctx->pool, *stack = ctx->stack, *ns_pool = ctx->ns_pool;
+  const char **ns_by_id = ctx->ns_by_id;
+  xml_dtd_cleanup(ctx);
+  xml_sources_cleanup(ctx);
+  mp_flush(pool);
+  mp_flush(stack);
+  *ctx = xml_defaults;
+  ctx->pool = pool;
+  ctx->stack = stack;
+  ctx->ns_pool = ns_pool;
+  ctx->ns_by_id = ns_by_id;
+  xml_ns_reset(ctx);
+}
diff --git a/libucw/ucw-xml/doc/Makefile b/libucw/ucw-xml/doc/Makefile
new file mode 100644
index 0000000..2ae21aa
--- /dev/null
+++ b/libucw/ucw-xml/doc/Makefile
@@ -0,0 +1,20 @@
+# Makefile for the UCW-XML documentation
+
+DIRS+=ucw-xml/doc
+
+XML_DOCS=xml index
+XML_DOCS_HTML=$(addprefix $(o)/ucw-xml/doc/,$(addsuffix .html,$(XML_DOCS)))
+
+DOCS+=$(XML_DOCS_HTML)
+DOC_MODULES+=ucw-xml
+$(XML_DOCS_HTML): DOC_MODULE=ucw-xml
+
+ifdef CONFIG_DOC
+INSTALL_TARGETS+=install-libucw-xml-docs
+endif
+
+.PHONY: install-libucw-xml-docs
+
+install-libucw-xml-docs: $(XML_DOCS_HTML)
+	install -d -m 755 $(DESTDIR)$(INSTALL_DOC_DIR)/ucw-xml/
+	install -m 644 $^ $(DESTDIR)$(INSTALL_DOC_DIR)/ucw-xml/
diff --git a/libucw/ucw-xml/doc/index.txt b/libucw/ucw-xml/doc/index.txt
new file mode 100644
index 0000000..a3c8efb
--- /dev/null
+++ b/libucw/ucw-xml/doc/index.txt
@@ -0,0 +1,34 @@
+The UCW-XML library
+===================
+
+This library provides a light-weight XML parser built atop <<../ucw/index:,LibUCW>>.
+It is primarily intended for efficient parsing of huge data sets, where other
+parsers are too slow and cumbersome.
+
+Its features include:
+
+* High speed and low memory consumption, mainly thanks to efficient LibUCW
+  primitives like fastbufs and mempools.
+* Multiple interfaces:
+** SAX-like: callback functions called on various parser events
+** Pull: for each call of the parser, it returns the next node
+** DOM-like: returns a data structure describing the whole tree of nodes
+** Any combination of the above: For example, when given a database with millions
+   of records, you can pull on the top level and ask for DOM of each record
+   separately.
+* Support of namespaces.
+* Complies with W3C recommendations on XML 1.0, XML 1.1, and Namespaces in XML 1.0
+  as a non-validating parser, but does not aim to support all frills of other
+  XML-related standards.
+* Partial support for DTD-driven parsing: basic checks of document structure,
+  filling in default values, expanding user-defined entities.
+
+Modules
+-------
+- <<xml:,XML Parser>>
+
+Authors
+-------
+
+- Pavel Charvát <mailto:pchar\@ucw.cz[]> (main author)
+- Martin Mareš <mailto:mj\@ucw.cz[]> (minor hacking and support for namespaces)
diff --git a/libucw/ucw-xml/doc/xml.txt b/libucw/ucw-xml/doc/xml.txt
new file mode 100644
index 0000000..07852d3
--- /dev/null
+++ b/libucw/ucw-xml/doc/xml.txt
@@ -0,0 +1,12 @@
+XML Parser
+==========
+
+ucw-xml/xml.h
+-------------
+
+To parse a document, create a parser context (<<struct_xml_context,struct xml_context>>),
+initialize it with <<xml_init()>>, fill in requested parsing mode, pointers to hooks, and
+other parameters. Then call <<xml_parse()>> or <<xml_next()>> as you need. At the end, dispose
+of the context by <<xml_cleanup()>> or recycle it by <<xml_reset()>>.
+
+!!ucw-xml/xml.h
diff --git a/libucw/ucw-xml/dtd.c b/libucw/ucw-xml/dtd.c
new file mode 100644
index 0000000..62badba
--- /dev/null
+++ b/libucw/ucw-xml/dtd.c
@@ -0,0 +1,1003 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+#include <ucw-xml/internals.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/unicode.h>
+
+/* Notations */
+
+#define HASH_PREFIX(x) xml_dtd_notns_##x
+#define HASH_NODE struct xml_dtd_notn
+#define HASH_KEY_STRING name
+#define HASH_ZERO_FILL
+#define HASH_TABLE_DYNAMIC
+#define HASH_WANT_LOOKUP
+#define HASH_WANT_FIND
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+struct xml_dtd_notn *
+xml_dtd_find_notn(struct xml_context *ctx, char *name)
+{
+  struct xml_dtd *dtd = ctx->dtd;
+  struct xml_dtd_notn *notn = xml_dtd_notns_find(dtd->tab_notns, name);
+  return !notn ? NULL : (notn->flags & XML_DTD_NOTN_DECLARED) ? notn : NULL;
+}
+
+/* General entities */
+
+#define HASH_PREFIX(x) xml_dtd_ents_##x
+#define HASH_NODE struct xml_dtd_entity
+#define HASH_KEY_STRING name
+#define HASH_ZERO_FILL
+#define HASH_TABLE_DYNAMIC
+#define HASH_WANT_FIND
+#define HASH_WANT_LOOKUP
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+static struct xml_dtd_entity *
+xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text)
+{
+  struct xml_dtd *dtd = ctx->dtd;
+  struct xml_dtd_entity *ent = xml_dtd_ents_lookup(dtd->tab_ents, name);
+  if (ent->flags & XML_DTD_ENTITY_DECLARED)
+    {
+      xml_warn(ctx, "Entity &%s; already declared", name);
+      return NULL;
+    }
+  slist_add_tail(&dtd->ents, &ent->n);
+  ent->flags = XML_DTD_ENTITY_DECLARED | XML_DTD_ENTITY_TRIVIAL;
+  ent->text = text;
+  return ent;
+}
+
+static void
+xml_dtd_declare_default_entities(struct xml_context *ctx)
+{
+  xml_dtd_declare_trivial_entity(ctx, "lt", "<");
+  xml_dtd_declare_trivial_entity(ctx, "gt", ">");
+  xml_dtd_declare_trivial_entity(ctx, "amp", "&");
+  xml_dtd_declare_trivial_entity(ctx, "apos", "'");
+  xml_dtd_declare_trivial_entity(ctx, "quot", "\"");
+}
+
+struct xml_dtd_entity *
+xml_def_find_entity(struct xml_context *ctx UNUSED, char *name)
+{
+#define ENT(n, t) ent_##n = { .name = #n, .text = t, .flags = XML_DTD_ENTITY_DECLARED | XML_DTD_ENTITY_TRIVIAL }
+  static struct xml_dtd_entity ENT(lt, "<"), ENT(gt, ">"), ENT(amp, "&"), ENT(apos, "'"), ENT(quot, "\"");
+#undef ENT
+  switch (name[0])
+    {
+      case 'l':
+	if (!strcmp(name, "lt"))
+	  return &ent_lt;
+	break;
+      case 'g':
+	if (!strcmp(name, "gt"))
+	  return &ent_gt;
+	break;
+      case 'a':
+	if (!strcmp(name, "amp"))
+	  return &ent_amp;
+	if (!strcmp(name, "apos"))
+	  return &ent_apos;
+	break;
+      case 'q':
+	if (!strcmp(name, "quot"))
+	  return &ent_quot;
+	break;
+    }
+  return NULL;
+}
+
+struct xml_dtd_entity *
+xml_dtd_find_entity(struct xml_context *ctx, char *name)
+{
+  struct xml_dtd *dtd = ctx->dtd;
+  if (ctx->h_find_entity)
+    return ctx->h_find_entity(ctx, name);
+  else if (dtd)
+    {
+      struct xml_dtd_entity *ent = xml_dtd_ents_find(dtd->tab_ents, name);
+      return !ent ? NULL : (ent->flags & XML_DTD_ENTITY_DECLARED) ? ent : NULL;
+    }
+  else
+    return xml_def_find_entity(ctx, name);
+}
+
+/* Parameter entities */
+
+static struct xml_dtd_entity *
+xml_dtd_find_pentity(struct xml_context *ctx, char *name)
+{
+  struct xml_dtd *dtd = ctx->dtd;
+  struct xml_dtd_entity *ent = xml_dtd_ents_find(dtd->tab_pents, name);
+  return !ent ? NULL : (ent->flags & XML_DTD_ENTITY_DECLARED) ? ent : NULL;
+}
+
+/* Elements */
+
+struct xml_dtd_elems_table;
+
+static void
+xml_dtd_elems_init_data(struct xml_dtd_elems_table *tab UNUSED, struct xml_dtd_elem *e)
+{
+  slist_init(&e->attrs);
+}
+
+#define HASH_PREFIX(x) xml_dtd_elems_##x
+#define HASH_NODE struct xml_dtd_elem
+#define HASH_KEY_STRING name
+#define HASH_TABLE_DYNAMIC
+#define HASH_ZERO_FILL
+#define HASH_WANT_FIND
+#define HASH_WANT_LOOKUP
+#define HASH_GIVE_ALLOC
+#define HASH_GIVE_INIT_DATA
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+struct xml_dtd_elem *
+xml_dtd_find_elem(struct xml_context *ctx, char *name)
+{
+  return ctx->dtd ? xml_dtd_elems_find(ctx->dtd->tab_elems, name) : NULL;
+}
+
+/* Element sons */
+
+struct xml_dtd_enodes_table;
+
+static inline uint
+xml_dtd_enodes_hash(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_elem_node *parent, struct xml_dtd_elem *elem)
+{
+  return hash_pointer(parent) ^ hash_pointer(elem);
+}
+
+static inline int
+xml_dtd_enodes_eq(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_elem_node *parent1, struct xml_dtd_elem *elem1, struct xml_dtd_elem_node *parent2, struct xml_dtd_elem *elem2)
+{
+  return (parent1 == parent2) && (elem1 == elem2);
+}
+
+static inline void
+xml_dtd_enodes_init_key(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_elem_node *node, struct xml_dtd_elem_node *parent, struct xml_dtd_elem *elem)
+{
+  node->parent = parent;
+  node->elem = elem;
+}
+
+#define HASH_PREFIX(x) xml_dtd_enodes_##x
+#define HASH_NODE struct xml_dtd_elem_node
+#define HASH_KEY_COMPLEX(x) x parent, x elem
+#define HASH_KEY_DECL struct xml_dtd_elem_node *parent, struct xml_dtd_elem *elem
+#define HASH_GIVE_HASHFN
+#define HASH_GIVE_EQ
+#define HASH_GIVE_INIT_KEY
+#define HASH_TABLE_DYNAMIC
+#define HASH_ZERO_FILL
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+/* Element attributes */
+
+struct xml_dtd_attrs_table;
+
+static inline uint
+xml_dtd_attrs_hash(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_elem *elem, char *name)
+{
+  return hash_pointer(elem) ^ hash_string(name);
+}
+
+static inline int
+xml_dtd_attrs_eq(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_elem *elem1, char *name1, struct xml_dtd_elem *elem2, char *name2)
+{
+  return (elem1 == elem2) && !strcmp(name1, name2);
+}
+
+static void
+xml_dtd_attrs_init_key(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_attr *attr, struct xml_dtd_elem *elem, char *name)
+{
+  attr->elem = elem;
+  attr->name = name;
+  slist_add_tail(&elem->attrs, &attr->n);
+}
+
+#define HASH_PREFIX(x) xml_dtd_attrs_##x
+#define HASH_NODE struct xml_dtd_attr
+#define HASH_ZERO_FILL
+#define HASH_TABLE_DYNAMIC
+#define HASH_KEY_COMPLEX(x) x elem, x name
+#define HASH_KEY_DECL struct xml_dtd_elem *elem, char *name
+#define HASH_GIVE_HASHFN
+#define HASH_GIVE_EQ
+#define HASH_GIVE_INIT_KEY
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+struct xml_dtd_attr *
+xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name)
+{
+  return ctx->dtd ? xml_dtd_attrs_find(ctx->dtd->tab_attrs, elem, name) : NULL;
+}
+
+/* Enumerated attribute values */
+
+struct xml_dtd_evals_table;
+
+static inline uint
+xml_dtd_evals_hash(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_attr *attr, char *val)
+{
+  return hash_pointer(attr) ^ hash_string(val);
+}
+
+static inline int
+xml_dtd_evals_eq(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_attr *attr1, char *val1, struct xml_dtd_attr *attr2, char *val2)
+{
+  return (attr1 == attr2) && !strcmp(val1, val2);
+}
+
+static inline void
+xml_dtd_evals_init_key(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_eval *eval, struct xml_dtd_attr *attr, char *val)
+{
+  eval->attr = attr;
+  eval->val = val;
+}
+
+#define HASH_PREFIX(x) xml_dtd_evals_##x
+#define HASH_NODE struct xml_dtd_eval
+#define HASH_TABLE_DYNAMIC
+#define HASH_KEY_COMPLEX(x) x attr, x val
+#define HASH_KEY_DECL struct xml_dtd_attr *attr, char *val
+#define HASH_GIVE_HASHFN
+#define HASH_GIVE_EQ
+#define HASH_GIVE_INIT_KEY
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+/* Enumerated attribute notations */
+
+struct xml_dtd_enotns_table;
+
+static inline uint
+xml_dtd_enotns_hash(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_attr *attr, struct xml_dtd_notn *notn)
+{
+  return hash_pointer(attr) ^ hash_pointer(notn);
+}
+
+static inline int
+xml_dtd_enotns_eq(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_attr *attr1, struct xml_dtd_notn *notn1, struct xml_dtd_attr *attr2, struct xml_dtd_notn *notn2)
+{
+  return (attr1 == attr2) && (notn1 == notn2);
+}
+
+static void
+xml_dtd_enotns_init_key(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_enotn *enotn, struct xml_dtd_attr *attr, struct xml_dtd_notn *notn)
+{
+  enotn->attr = attr;
+  enotn->notn = notn;
+}
+
+#define HASH_PREFIX(x) xml_dtd_enotns_##x
+#define HASH_NODE struct xml_dtd_enotn
+#define HASH_TABLE_DYNAMIC
+#define HASH_KEY_COMPLEX(x) x attr, x notn
+#define HASH_KEY_DECL struct xml_dtd_attr *attr, struct xml_dtd_notn *notn
+#define HASH_GIVE_HASHFN
+#define HASH_GIVE_EQ
+#define HASH_GIVE_INIT_KEY
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_GIVE_ALLOC
+#define HASH_TABLE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+/* DTD initialization/cleanup */
+
+void
+xml_dtd_init(struct xml_context *ctx)
+{
+  if (ctx->dtd)
+    return;
+  struct mempool *pool = mp_new(4096);
+  struct xml_dtd *dtd = ctx->dtd = mp_alloc_zero(pool, sizeof(*ctx->dtd));
+  dtd->pool = pool;
+  xml_dtd_ents_init(dtd->tab_ents = xml_hash_new(pool, sizeof(struct xml_dtd_ents_table)));
+  xml_dtd_ents_init(dtd->tab_pents = xml_hash_new(pool, sizeof(struct xml_dtd_ents_table)));
+  xml_dtd_notns_init(dtd->tab_notns = xml_hash_new(pool, sizeof(struct xml_dtd_notns_table)));
+  xml_dtd_elems_init(dtd->tab_elems = xml_hash_new(pool, sizeof(struct xml_dtd_elems_table)));
+  xml_dtd_enodes_init(dtd->tab_enodes = xml_hash_new(pool, sizeof(struct xml_dtd_enodes_table)));
+  xml_dtd_attrs_init(dtd->tab_attrs = xml_hash_new(pool, sizeof(struct xml_dtd_attrs_table)));
+  xml_dtd_evals_init(dtd->tab_evals = xml_hash_new(pool, sizeof(struct xml_dtd_evals_table)));
+  xml_dtd_enotns_init(dtd->tab_enotns = xml_hash_new(pool, sizeof(struct xml_dtd_enotns_table)));
+  xml_dtd_declare_default_entities(ctx);
+}
+
+void
+xml_dtd_cleanup(struct xml_context *ctx)
+{
+  if (!ctx->dtd)
+    return;
+  mp_delete(ctx->dtd->pool);
+  ctx->dtd = NULL;
+}
+
+void
+xml_dtd_finish(struct xml_context *ctx)
+{
+  if (!ctx->dtd)
+    return;
+  // FIXME: validity checks
+}
+
+/*** Parsing functions ***/
+
+/* References to parameter entities */
+
+void
+xml_parse_pe_ref(struct xml_context *ctx)
+{
+  /* PEReference ::= '%' Name ';'
+   * Already parsed: '%' */
+  struct mempool_state state;
+  mp_save(ctx->stack, &state);
+  char *name = xml_parse_name(ctx, ctx->stack);
+  xml_parse_char(ctx, ';');
+  struct xml_dtd_entity *ent = xml_dtd_find_pentity(ctx, name);
+  if (!ent)
+    xml_error(ctx, "Unknown entity %%%s;", name);
+  else
+    {
+      TRACE(ctx, "Pushed entity %%%s;", name);
+      mp_restore(ctx->stack, &state);
+      xml_dec(ctx);
+      xml_push_entity(ctx, ent);
+      return;
+    }
+  mp_restore(ctx->stack, &state);
+  xml_dec(ctx);
+}
+
+static uint
+xml_parse_dtd_pe(struct xml_context *ctx, uint entity_decl)
+{
+  /* Already parsed: '%' */
+  do
+    {
+      xml_inc(ctx);
+      if (!~entity_decl && (xml_peek_cat(ctx) & XML_CHAR_WHITE))
+        {
+	  xml_dec(ctx);
+	  return ~0U;
+	}
+      xml_parse_pe_ref(ctx);
+      while (xml_peek_cat(ctx) & XML_CHAR_WHITE)
+	xml_skip_char(ctx);
+    }
+  while (xml_get_char(ctx) == '%');
+  xml_unget_char(ctx);
+  return 1;
+}
+
+static uint
+xml_parse_dtd_white(struct xml_context *ctx, uint mandatory)
+{
+  /* Whitespace or parameter entity,
+   * mandatory==~0U has a special maening of the whitespace before the '%' character in an parameter entity declaration */
+  uint cnt = 0;
+  while (xml_peek_cat(ctx) & XML_CHAR_WHITE)
+    {
+      xml_skip_char(ctx);
+      cnt = 1;
+    }
+  if (xml_peek_char(ctx) == '%')
+    {
+      xml_skip_char(ctx);
+      return xml_parse_dtd_pe(ctx, mandatory);
+    }
+  else if (unlikely(mandatory && !cnt))
+    xml_fatal_expected_white(ctx);
+  return cnt;
+}
+
+static void
+xml_dtd_parse_external_id(struct xml_context *ctx, char **system_id, char **public_id, uint allow_public)
+{
+  struct xml_dtd *dtd = ctx->dtd;
+  uint c = xml_peek_char(ctx);
+  if (c == 'S')
+    {
+      xml_parse_seq(ctx, "SYSTEM");
+      xml_parse_dtd_white(ctx, 1);
+      *public_id = NULL;
+      *system_id = xml_parse_system_literal(ctx, dtd->pool);
+    }
+  else if (c == 'P')
+    {
+      xml_parse_seq(ctx, "PUBLIC");
+      xml_parse_dtd_white(ctx, 1);
+      *system_id = NULL;
+      *public_id = xml_parse_pubid_literal(ctx, dtd->pool);
+      if (xml_parse_dtd_white(ctx, !allow_public))
+	if ((c = xml_peek_char(ctx)) == '\'' || c == '"' || !allow_public)
+	  *system_id = xml_parse_system_literal(ctx, dtd->pool);
+    }
+  else
+    xml_fatal(ctx, "Expected an external ID");
+}
+
+/* DTD: <!NOTATION ...> */
+
+void
+xml_parse_notation_decl(struct xml_context *ctx)
+{
+  /* NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID) S? '>'
+   * Already parsed: '<!NOTATION' */
+  TRACE(ctx, "parse_notation_decl");
+  struct xml_dtd *dtd = ctx->dtd;
+  xml_parse_dtd_white(ctx, 1);
+
+  struct xml_dtd_notn *notn = xml_dtd_notns_lookup(dtd->tab_notns, xml_parse_name(ctx, dtd->pool));
+  xml_parse_dtd_white(ctx, 1);
+  char *system_id, *public_id;
+  xml_dtd_parse_external_id(ctx, &system_id, &public_id, 1);
+  xml_parse_dtd_white(ctx, 0);
+  xml_parse_char(ctx, '>');
+
+  if (notn->flags & XML_DTD_NOTN_DECLARED)
+    xml_warn(ctx, "Notation %s already declared", notn->name);
+  else
+    {
+      notn->flags = XML_DTD_NOTN_DECLARED;
+      notn->system_id = system_id;
+      notn->public_id = public_id;
+      slist_add_tail(&dtd->notns, &notn->n);
+    }
+  xml_dec(ctx);
+}
+
+/* DTD: <!ENTITY ...> */
+
+void
+xml_parse_entity_decl(struct xml_context *ctx)
+{
+  /* Already parsed: '<!ENTITY' */
+  TRACE(ctx, "parse_entity_decl");
+  struct xml_dtd *dtd = ctx->dtd;
+  uint flags = ~xml_parse_dtd_white(ctx, ~0U) ? 0 : XML_DTD_ENTITY_PARAMETER;
+  if (flags)
+    xml_parse_dtd_white(ctx, 1);
+  struct xml_dtd_entity *ent = xml_dtd_ents_lookup(flags ? dtd->tab_pents : dtd->tab_ents, xml_parse_name(ctx, dtd->pool));
+  xml_parse_dtd_white(ctx, 1);
+  slist *list = flags ? &dtd->pents : &dtd->ents;
+  if (ent->flags & XML_DTD_ENTITY_DECLARED)
+    {
+       xml_fatal(ctx, "Entity &%s; already declared, skipping not implemented", ent->name);
+       // FIXME: should be only warning
+    }
+  uint c, sep = xml_get_char(ctx);
+  if (sep == '\'' || sep == '"')
+    {
+      /* Internal entity:
+       * EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | "'" ([^%&'] | PEReference | Reference)* "'" */
+      char *p = mp_start_noalign(dtd->pool, 1);
+      while (1)
+        {
+	  if ((c = xml_get_char(ctx)) == sep)
+	    break;
+	  if (c == '%')
+	    {
+	      // FIXME
+	      ASSERT(0);
+	      //xml_parse_parameter_ref(ctx);
+	      continue;
+	    }
+	  if (c == '&')
+	    {
+	      xml_inc(ctx);
+	      if (xml_peek_char(ctx) != '#')
+	        {
+	          /* Bypass references to general entities */
+	          struct mempool_state state;
+	          mp_save(ctx->stack, &state);
+	          char *n = xml_parse_name(ctx, ctx->stack);
+	          xml_parse_char(ctx, ';');
+		  xml_dec(ctx);
+		  uint l = strlen(n);
+		  p = mp_spread(dtd->pool, p, 3 + l);
+		  *p++ = '&';
+		  memcpy(p, n, l);
+		  p += l;
+		  *p++ = ';';;
+		  mp_restore(ctx->stack, &state);
+		  continue;
+	        }
+	      else
+	        {
+		  xml_skip_char(ctx);
+	          c = xml_parse_char_ref(ctx);
+		}
+	    }
+	  p = mp_spread(dtd->pool, p, 5);
+	  p = utf8_32_put(p, c);
+	}
+      *p = 0;
+      ent->len = p - (char *)mp_ptr(dtd->pool);
+      ent->text = mp_end(dtd->pool, p + 1);
+      slist_add_tail(list, &ent->n);
+      ent->flags = flags | XML_DTD_ENTITY_DECLARED;
+    }
+  else
+    {
+      /* External entity */
+      struct xml_dtd_notn *notn = NULL;
+      char *system_id, *public_id;
+      xml_unget_char(ctx);
+      xml_dtd_parse_external_id(ctx, &system_id, &public_id, 0);
+      if (xml_parse_dtd_white(ctx, 0) && flags && xml_peek_char(ctx) != '>')
+        {
+	  /* General external unparsed entity */
+	  flags |= XML_DTD_ENTITY_UNPARSED;
+	  xml_parse_seq(ctx, "NDATA");
+	  xml_parse_dtd_white(ctx, 1);
+	  notn = xml_dtd_notns_lookup(dtd->tab_notns, xml_parse_name(ctx, dtd->pool));
+	}
+      slist_add_tail(list, &ent->n);
+      ent->flags = flags | XML_DTD_ENTITY_DECLARED | XML_DTD_ENTITY_EXTERNAL;
+      ent->system_id = system_id;
+      ent->public_id = public_id;
+      ent->notn = notn;
+    }
+  xml_parse_dtd_white(ctx, 0);
+  xml_parse_char(ctx, '>');
+  xml_dec(ctx);
+}
+
+/* DTD: <!ELEMENT ...> */
+
+void
+xml_parse_element_decl(struct xml_context *ctx)
+{
+  /* Elementdecl ::= '<!ELEMENT' S  Name  S  contentspec  S? '>'
+   * Already parsed: '<!ELEMENT' */
+  struct xml_dtd *dtd = ctx->dtd;
+  xml_parse_dtd_white(ctx, 1);
+  char *name = xml_parse_name(ctx, dtd->pool);
+  xml_parse_dtd_white(ctx, 1);
+  struct xml_dtd_elem *elem = xml_dtd_elems_lookup(dtd->tab_elems, name);
+  if (elem->flags & XML_DTD_ELEM_DECLARED)
+    xml_fatal(ctx, "Element <%s> already declared", name);
+
+  /* contentspec ::= 'EMPTY' | 'ANY' | Mixed | children */
+  uint c = xml_peek_char(ctx);
+  if (c == 'E')
+    {
+      xml_parse_seq(ctx, "EMPTY");
+      elem->type = XML_DTD_ELEM_EMPTY;
+    }
+  else if (c == 'A')
+    {
+      xml_parse_seq(ctx, "ANY");
+      elem->type = XML_DTD_ELEM_ANY;
+    }
+  else if (c == '(')
+    {
+      xml_skip_char(ctx);
+      xml_inc(ctx);
+      xml_parse_dtd_white(ctx, 0);
+      struct xml_dtd_elem_node *parent = elem->node = mp_alloc_zero(dtd->pool, sizeof(*parent));
+      if (xml_peek_char(ctx) == '#')
+        {
+	  /* Mixed ::= '(' S? '#PCDATA' (S? '|' S? Name)* S? ')*' | '(' S? '#PCDATA' S? ')' */
+	  xml_skip_char(ctx);
+	  xml_parse_seq(ctx, "PCDATA");
+	  elem->type = XML_DTD_ELEM_MIXED;
+          parent->type = XML_DTD_ELEM_PCDATA;
+	  while (1)
+	    {
+	      xml_parse_dtd_white(ctx, 0);
+	      if ((c = xml_get_char(ctx)) == ')')
+		break;
+	      else if (c != '|')
+		xml_fatal_expected(ctx, ')');
+	      xml_parse_dtd_white(ctx, 0);
+	      struct xml_dtd_elem *son_elem = xml_dtd_elems_lookup(dtd->tab_elems, xml_parse_name(ctx, dtd->pool));
+	      if (xml_dtd_enodes_find(dtd->tab_enodes, parent, son_elem))
+		xml_error(ctx, "Duplicate content '%s'", son_elem->name);
+	      else
+	        {
+		  struct xml_dtd_elem_node *son = xml_dtd_enodes_new(dtd->tab_enodes, parent, son_elem);
+		  slist_add_tail(&parent->sons, &son->n);
+		}
+	    }
+	  xml_dec(ctx);
+	  if (xml_peek_char(ctx) == '*')
+	    {
+	      xml_skip_char(ctx);
+	      parent->occur = XML_DTD_ELEM_OCCUR_MULT;
+	    }
+	  else if (!slist_head(&parent->sons))
+	    parent->occur = XML_DTD_ELEM_OCCUR_ONCE;
+	  else
+	    xml_fatal_expected(ctx, '*');
+	}
+      else
+        {
+	  /* children ::= (choice | seq) ('?' | '*' | '+')?
+	   * cp ::= (Name | choice | seq) ('?' | '*' | '+')?
+	   * choice ::= '(' S? cp ( S? '|' S? cp )+ S? ')'
+	   * seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' */
+
+	  elem->type = XML_DTD_ELEM_CHILDREN;
+	  parent->type = XML_DTD_ELEM_PCDATA;
+	  uint c;
+	  goto first;
+
+	  while (1)
+	    {
+	      /* After name */
+	      xml_parse_dtd_white(ctx, 0);
+	      if ((c = xml_get_char(ctx)) ==  ')')
+	        {
+		  xml_dec(ctx);
+		  if (parent->type == XML_DTD_ELEM_PCDATA)
+		    parent->type = XML_DTD_ELEM_SEQ;
+		  if ((c = xml_get_char(ctx)) == '?')
+		    parent->occur = XML_DTD_ELEM_OCCUR_OPT;
+		  else if (c == '*')
+		    parent->occur = XML_DTD_ELEM_OCCUR_MULT;
+		  else if (c == '+')
+		    parent->occur = XML_DTD_ELEM_OCCUR_PLUS;
+		  else
+		    {
+		      xml_unget_char(ctx);
+		      parent->occur = XML_DTD_ELEM_OCCUR_ONCE;
+		    }
+		  if (!parent->parent)
+		    break;
+		  parent = parent->parent;
+		  continue;
+		}
+	      else if (c == '|')
+	        {
+		  if (parent->type == XML_DTD_ELEM_PCDATA)
+		    parent->type = XML_DTD_ELEM_OR;
+		  else if (parent->type != XML_DTD_ELEM_OR)
+		    xml_fatal(ctx, "Mixed operators in the list of element children");
+		}
+	      else if (c == ',')
+	        {
+		  if (parent->type == XML_DTD_ELEM_PCDATA)
+		    parent->type = XML_DTD_ELEM_SEQ;
+		  else if (parent->type != XML_DTD_ELEM_SEQ)
+		    xml_fatal(ctx, "Mixed operators in the list of element children");
+		}
+	      else if (c == '(')
+	        {
+		  xml_inc(ctx);
+		  struct xml_dtd_elem_node *son = mp_alloc_zero(dtd->pool, sizeof(*son));
+		  son->parent = parent;
+		  slist_add_tail(&parent->sons, &son->n);
+		  parent = son->parent;
+		  son->type = XML_DTD_ELEM_MIXED;
+		}
+	      else
+	        xml_unget_char(ctx);
+
+	      /* Before name */
+	      xml_parse_dtd_white(ctx, 0);
+first:;
+	      struct xml_dtd_elem *son_elem = xml_dtd_elems_lookup(dtd->tab_elems, xml_parse_name(ctx, dtd->pool));
+	      // FIXME: duplicates, occurance
+	      //struct xml_dtd_elem_node *son = xml_dtd_enodes_new(dtd->tab_enodes, parent, son_elem);
+	      struct xml_dtd_elem_node *son = mp_alloc_zero(dtd->pool, sizeof(*son));
+	      son->parent = parent;
+	      son->elem = son_elem;
+	      slist_add_tail(&parent->sons, &son->n);
+	    }
+	}
+    }
+  else
+    xml_fatal(ctx, "Expected element content specification");
+
+  xml_parse_dtd_white(ctx, 0);
+  xml_parse_char(ctx, '>');
+  xml_dec(ctx);
+}
+
+void
+xml_parse_attr_list_decl(struct xml_context *ctx)
+{
+  /* AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>'
+   * AttDef ::= S Name S AttType S DefaultDecl
+   * Already parsed: '<!ATTLIST' */
+  struct xml_dtd *dtd = ctx->dtd;
+  xml_parse_dtd_white(ctx, 1);
+  struct xml_dtd_elem *elem = xml_dtd_elems_lookup(ctx->dtd->tab_elems, xml_parse_name(ctx, dtd->pool));
+
+  while (xml_parse_dtd_white(ctx, 0) && xml_peek_char(ctx) != '>')
+    {
+      char *name = xml_parse_name(ctx, dtd->pool);
+      struct xml_dtd_attr *attr = xml_dtd_attrs_find(dtd->tab_attrs, elem, name);
+      uint ignored = 0;
+      if (attr)
+        {
+	  xml_warn(ctx, "Duplicate attribute definition");
+	  ignored++;
+	}
+      else
+	attr = xml_dtd_attrs_new(ctx->dtd->tab_attrs, elem, name);
+      xml_parse_dtd_white(ctx, 1);
+      if (xml_peek_char(ctx) == '(')
+        {
+	  xml_skip_char(ctx); // FIXME: xml_inc/dec ?
+	  if (!ignored)
+	    attr->type = XML_ATTR_ENUM;
+	  do
+	    {
+	      xml_parse_dtd_white(ctx, 0);
+	      char *value = xml_parse_nmtoken(ctx, dtd->pool);
+	      if (!ignored)
+		if (xml_dtd_evals_find(ctx->dtd->tab_evals, attr, value))
+		  xml_error(ctx, "Duplicate enumeration value");
+	        else
+		  xml_dtd_evals_new(ctx->dtd->tab_evals, attr, value);
+	      xml_parse_dtd_white(ctx, 0);
+	    }
+	  while (xml_get_char(ctx) == '|');
+	  xml_unget_char(ctx);
+	  xml_parse_char(ctx, ')');
+	}
+      else
+        {
+	  char *type = xml_parse_name(ctx, dtd->pool);
+	  enum xml_dtd_attr_type t = XML_ATTR_CDATA;
+	  if (!strcmp(type, "CDATA"))
+	    t = XML_ATTR_CDATA;
+	  else if (!strcmp(type, "ID"))
+	    t = XML_ATTR_ID;
+	  else if (!strcmp(type, "IDREF"))
+	    t = XML_ATTR_IDREF;
+	  else if (!strcmp(type, "IDREFS"))
+	    t = XML_ATTR_IDREFS;
+	  else if (!strcmp(type, "ENTITY"))
+	    t = XML_ATTR_ENTITY;
+	  else if (!strcmp(type, "ENTITIES"))
+	    t = XML_ATTR_ENTITIES;
+	  else if (!strcmp(type, "NMTOKEN"))
+	    t = XML_ATTR_NMTOKEN;
+	  else if (!strcmp(type, "NMTOKENS"))
+	    t = XML_ATTR_NMTOKENS;
+	  else if (!strcmp(type, "NOTATION"))
+	    {
+	      if (elem->type == XML_DTD_ELEM_EMPTY)
+		xml_fatal(ctx, "Empty element must not have notation attribute");
+	      // FIXME: An element type MUST NOT have more than one NOTATION attribute specified.
+	      t = XML_ATTR_NOTATION;
+	      xml_parse_dtd_white(ctx, 1);
+	      xml_parse_char(ctx, '(');
+	      do
+	        {
+		  xml_parse_dtd_white(ctx, 0);
+		  struct xml_dtd_notn *n = xml_dtd_notns_lookup(ctx->dtd->tab_notns, xml_parse_name(ctx, dtd->pool));
+		  if (!ignored)
+		    if (xml_dtd_enotns_find(ctx->dtd->tab_enotns, attr, n))
+		      xml_error(ctx, "Duplicate enumerated notation");
+		    else
+		      xml_dtd_enotns_new(ctx->dtd->tab_enotns, attr, n);
+		  xml_parse_dtd_white(ctx, 0);
+		}
+	      while (xml_get_char(ctx) == '|');
+	      xml_unget_char(ctx);
+	      xml_parse_char(ctx, ')');
+	    }
+	  else
+	    xml_fatal(ctx, "Unknown attribute type");
+	  if (!ignored)
+	    attr->type = t;
+	}
+      xml_parse_dtd_white(ctx, 1);
+      enum xml_dtd_attr_default def = XML_ATTR_NONE;
+      if (xml_get_char(ctx) == '#')
+	switch (xml_peek_char(ctx))
+          {
+	    case 'R':
+	      xml_parse_seq(ctx, "REQUIRED");
+	      def = XML_ATTR_REQUIRED;
+	      break;
+	    case 'I':
+	      xml_parse_seq(ctx, "IMPLIED");
+	      def = XML_ATTR_IMPLIED;
+	      break;
+	    case 'F':
+	      xml_parse_seq(ctx, "FIXED");
+	      def = XML_ATTR_FIXED;
+	      xml_parse_dtd_white(ctx, 1);
+	      break;
+	    default:
+	      xml_fatal(ctx, "Expected a modifier for default attribute value");
+	  }
+      else
+	xml_unget_char(ctx);
+      if (def != XML_ATTR_REQUIRED && def != XML_ATTR_IMPLIED)
+        {
+	  char *v = xml_parse_attr_value(ctx, attr);
+	  if (!ignored)
+	    attr->default_value = v;
+	}
+      if (!ignored)
+	attr->default_mode = def;
+    }
+  xml_skip_char(ctx);
+  xml_dec(ctx);
+}
+
+void
+xml_skip_internal_subset(struct xml_context *ctx)
+{
+  TRACE(ctx, "skip_internal_subset");
+  /* AlreadyParsed: '[' */
+  uint c;
+  while ((c = xml_get_char(ctx)) != ']')
+    {
+      if (c != '<')
+	continue;
+      if ((c = xml_get_char(ctx)) == '?')
+        {
+          xml_inc(ctx);
+	  xml_skip_pi(ctx);
+	}
+      else if (c != '!')
+	xml_dec(ctx);
+      else if (xml_get_char(ctx) == '-')
+        {
+	  xml_inc(ctx);
+	  xml_skip_comment(ctx);
+	}
+      else
+	while ((c = xml_get_char(ctx)) != '>')
+	  if (c == '\'' || c == '"')
+	    while (xml_get_char(ctx) != c);
+    }
+  xml_dec(ctx);
+}
+
+/*** Validation of attribute values ***/
+
+static uint
+xml_check_tokens(char *value, uint first_cat, uint next_cat, uint seq)
+{
+  char *p = value;
+  uint u;
+  while (1)
+    {
+      p = utf8_32_get(p, &u);
+      if (!(xml_char_cat(u) & first_cat))
+        return 0;
+      while (*p & ~0x20)
+        {
+	  p = utf8_32_get(p, &u);
+	  if (!(xml_char_cat(u) & next_cat))
+	    return 0;
+	}
+      if (!*p)
+	return 1;
+      if (!seq)
+	return 0;
+      p++;
+    }
+}
+
+static uint
+xml_is_name(struct xml_context *ctx, char *value)
+{
+  /* Name ::= NameStartChar (NameChar)* */
+  return xml_check_tokens(value, ctx->cat_sname, ctx->cat_name, 0);
+}
+
+static uint
+xml_is_names(struct xml_context *ctx, char *value)
+{
+  /* Names ::= Name (#x20 Name)* */
+  return xml_check_tokens(value, ctx->cat_sname, ctx->cat_name, 1);
+}
+
+static uint
+xml_is_nmtoken(struct xml_context *ctx, char *value)
+{
+  /* Nmtoken ::= (NameChar)+ */
+  return xml_check_tokens(value, ctx->cat_name, ctx->cat_name, 0);
+}
+
+static uint
+xml_is_nmtokens(struct xml_context *ctx, char *value)
+{
+  /* Nmtokens ::= Nmtoken (#x20 Nmtoken)* */
+  return xml_check_tokens(value, ctx->cat_name, ctx->cat_name, 1);
+}
+
+static void
+xml_err_attr_format(struct xml_context *ctx, struct xml_dtd_attr *dtd, char *type)
+{
+  xml_error(ctx, "Attribute %s in <%s> does not match the production of %s", dtd->name, dtd->elem->name, type);
+}
+
+void
+xml_validate_attr(struct xml_context *ctx, struct xml_dtd_attr *dtd, char *value)
+{
+  if (dtd->type == XML_ATTR_CDATA)
+    return;
+  xml_normalize_white(ctx, value);
+  switch (dtd->type)
+    {
+      case XML_ATTR_ID:
+	if (!xml_is_name(ctx, value))
+	  xml_err_attr_format(ctx, dtd, "NAME");
+	//FIXME: add to a hash table
+	break;
+      case XML_ATTR_IDREF:
+	if (!xml_is_name(ctx, value))
+	  xml_err_attr_format(ctx, dtd, "NAME");
+	// FIXME: find in hash table (beware forward references)
+	break;
+      case XML_ATTR_IDREFS:
+	if (!xml_is_names(ctx, value))
+	  xml_err_attr_format(ctx, dtd, "NAMES");
+	// FIXME: find
+	break;
+      case XML_ATTR_ENTITY:
+	// FIXME
+	break;
+      case XML_ATTR_ENTITIES:
+	// FIXME
+	break;
+      case XML_ATTR_NMTOKEN:
+	if (!xml_is_nmtoken(ctx, value))
+	  xml_err_attr_format(ctx, dtd, "NMTOKEN");
+	break;
+      case XML_ATTR_NMTOKENS:
+	if (!xml_is_nmtokens(ctx, value))
+	  xml_err_attr_format(ctx, dtd, "NMTOKENS");
+	break;
+      case XML_ATTR_ENUM:
+	if (!xml_dtd_evals_find(ctx->dtd->tab_evals, dtd, value))
+	  xml_error(ctx, "Attribute %s in <%s> contains an undefined enumeration value", dtd->name, dtd->elem->name);
+	break;
+      case XML_ATTR_NOTATION:
+	if (!xml_dtd_find_notn(ctx, value))
+	  xml_error(ctx, "Attribute %s in <%s> contains an undefined notation", dtd->name, dtd->elem->name);
+	break;
+    }
+}
diff --git a/libucw/ucw-xml/dtd.h b/libucw/ucw-xml/dtd.h
new file mode 100644
index 0000000..c3e07f6
--- /dev/null
+++ b/libucw/ucw-xml/dtd.h
@@ -0,0 +1,178 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_XML_DTD_H
+#define _UCW_XML_DTD_H
+
+#include <ucw-xml/xml.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define xml_dtd_cleanup ucw_xml_dtd_cleanup
+#define xml_dtd_find_attr ucw_xml_dtd_find_attr
+#define xml_dtd_find_elem ucw_xml_dtd_find_elem
+#define xml_dtd_find_entity ucw_xml_dtd_find_entity
+#define xml_dtd_find_notn ucw_xml_dtd_find_notn
+#define xml_dtd_finish ucw_xml_dtd_finish
+#define xml_dtd_init ucw_xml_dtd_init
+#endif
+
+struct xml_dtd {
+  struct mempool *pool;			/* Memory pool where to allocate DTD */
+  slist ents;				/* Link list of general entities */
+  slist pents;				/* Link list of parameter entities */
+  slist notns;				/* Link list of notations */
+  slist elems;				/* Link list of elements */
+  void *tab_ents;			/* Hash table of general entities */
+  void *tab_pents;			/* Hash table of parameter entities */
+  void *tab_notns;			/* Hash table of notations */
+  void *tab_elems;			/* Hash table of elements */
+  void *tab_enodes;			/* Hash table of element sons */
+  void *tab_attrs;			/* Hash table of element attributes */
+  void *tab_evals;			/* Hash table of enumerated attribute values */
+  void *tab_enotns;			/* hash table of enumerated attribute notations */
+};
+
+/* Notations */
+
+enum xml_dtd_notn_flags {
+  XML_DTD_NOTN_DECLARED = 0x1,		/* The notation has been declared (internal usage) */
+};
+
+struct xml_dtd_notn {
+  snode n;				/* Node in xml_dtd.notns */
+  uint flags;				/* XML_DTD_NOTN_x */
+  char *name;				/* Notation name */
+  char *system_id;			/* External ID */
+  char *public_id;
+  void *user;				/* User-defined */
+};
+
+struct xml_dtd_notn *xml_dtd_find_notn(struct xml_context *ctx, char *name);
+
+/* Entities */
+
+enum xml_dtd_entity_flags {
+  XML_DTD_ENTITY_DECLARED = 0x1,	/* The entity has been declared (internal usage) */
+  XML_DTD_ENTITY_VISITED = 0x2,		/* Cycle detection (internal usage) */
+  XML_DTD_ENTITY_PARAMETER = 0x4,	/* Parameter entity, general otherwise */
+  XML_DTD_ENTITY_EXTERNAL = 0x8,	/* External entity, internal otherwise */
+  XML_DTD_ENTITY_UNPARSED = 0x10,	/* Unparsed entity, parsed otherwise */
+  XML_DTD_ENTITY_TRIVIAL = 0x20,	/* Replacement text is a sequence of characters and character references */
+};
+
+struct xml_dtd_entity {
+  snode n;				/* Node in xml_dtd.[gp]ents */
+  uint flags;				/* XML_DTD_ENT_x */
+  char *name;				/* Entity name */
+  char *text;				/* Replacement text / expanded replacement text (XML_DTD_ENT_TRIVIAL) */
+  uint len;				/* Text length */
+  char *system_id;			/* External ID */
+  char *public_id;
+  struct xml_dtd_notn *notn;		/* Notation (XML_DTD_ENT_UNPARSED only) */
+  void *user;				/* User-defined */
+};
+
+struct xml_dtd_entity *xml_dtd_find_entity(struct xml_context *ctx, char *name);
+
+/* Elements */
+
+enum xml_dtd_elem_flags {
+  XML_DTD_ELEM_DECLARED = 0x1,		/* The element has been declared (internal usage) */
+};
+
+enum xml_dtd_elem_type {
+  XML_DTD_ELEM_EMPTY,
+  XML_DTD_ELEM_ANY,
+  XML_DTD_ELEM_MIXED,
+  XML_DTD_ELEM_CHILDREN,
+};
+
+struct xml_dtd_elem {
+  snode n;
+  uint flags;
+  uint type;
+  char *name;
+  struct xml_dtd_elem_node *node;
+  slist attrs;
+  void *user;				/* User-defined */
+};
+
+struct xml_dtd_elem_node {
+  snode n;
+  struct xml_dtd_elem_node *parent;
+  struct xml_dtd_elem *elem;
+  slist sons;
+  uint type;
+  uint occur;
+  void *user;				/* User-defined */
+};
+
+enum xml_dtd_elem_node_type {
+  XML_DTD_ELEM_PCDATA,
+  XML_DTD_ELEM_SEQ,
+  XML_DTD_ELEM_OR,
+};
+
+enum xml_dtd_elem_node_occur {
+  XML_DTD_ELEM_OCCUR_ONCE,
+  XML_DTD_ELEM_OCCUR_OPT,
+  XML_DTD_ELEM_OCCUR_MULT,
+  XML_DTD_ELEM_OCCUR_PLUS,
+};
+
+struct xml_dtd_elem *xml_dtd_find_elem(struct xml_context *ctx, char *name);
+
+/* Attributes */
+
+enum xml_dtd_attr_default {
+  XML_ATTR_NONE,
+  XML_ATTR_REQUIRED,
+  XML_ATTR_IMPLIED,
+  XML_ATTR_FIXED,
+};
+
+enum xml_dtd_attr_type {
+  XML_ATTR_CDATA,
+  XML_ATTR_ID,
+  XML_ATTR_IDREF,
+  XML_ATTR_IDREFS,
+  XML_ATTR_ENTITY,
+  XML_ATTR_ENTITIES,
+  XML_ATTR_NMTOKEN,
+  XML_ATTR_NMTOKENS,
+  XML_ATTR_ENUM,
+  XML_ATTR_NOTATION,
+};
+
+struct xml_dtd_attr {
+  snode n;
+  char *name;				/* Attribute name */
+  struct xml_dtd_elem *elem;		/* Owner element */
+  uint type;				/* See enum xml_dtd_attr_type */
+  uint default_mode;			/* See enum xml_dtd_attr_default */
+  char *default_value;			/* The default value defined in DTD (or NULL) */
+};
+
+struct xml_dtd_eval {
+  struct xml_dtd_attr *attr;
+  char *val;
+};
+
+struct xml_dtd_enotn {
+  struct xml_dtd_attr *attr;
+  struct xml_dtd_notn *notn;
+};
+
+void xml_dtd_init(struct xml_context *ctx);
+void xml_dtd_cleanup(struct xml_context *ctx);
+void xml_dtd_finish(struct xml_context *ctx);
+
+struct xml_dtd_attr *xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name);
+
+#endif
diff --git a/libucw/ucw-xml/internals.h b/libucw/ucw-xml/internals.h
new file mode 100644
index 0000000..0e9dc2d
--- /dev/null
+++ b/libucw/ucw-xml/internals.h
@@ -0,0 +1,275 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_XML_INTERNALS_H
+#define _UCW_XML_INTERNALS_H
+
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define xml_do_pop ucw_xml_do_pop
+#define xml_do_push ucw_xml_do_push
+#define xml_fatal_expected ucw_xml_fatal_expected
+#define xml_fatal_expected_quot ucw_xml_fatal_expected_quot
+#define xml_fatal_expected_white ucw_xml_fatal_expected_white
+#define xml_fatal_nested ucw_xml_fatal_nested
+#define xml_hash_new ucw_xml_hash_new
+#define xml_ns_cleanup ucw_xml_ns_cleanup
+#define xml_ns_pop_element ucw_xml_ns_pop_element
+#define xml_ns_push_element ucw_xml_ns_push_element
+#define xml_ns_reset ucw_xml_ns_reset
+#define xml_parse_attr_list_decl ucw_xml_parse_attr_list_decl
+#define xml_parse_attr_value ucw_xml_parse_attr_value
+#define xml_parse_char_ref ucw_xml_parse_char_ref
+#define xml_parse_element_decl ucw_xml_parse_element_decl
+#define xml_parse_entity_decl ucw_xml_parse_entity_decl
+#define xml_parse_eq ucw_xml_parse_eq
+#define xml_parse_name ucw_xml_parse_name
+#define xml_parse_nmtoken ucw_xml_parse_nmtoken
+#define xml_parse_notation_decl ucw_xml_parse_notation_decl
+#define xml_parse_pe_ref ucw_xml_parse_pe_ref
+#define xml_parse_pubid_literal ucw_xml_parse_pubid_literal
+#define xml_parse_system_literal ucw_xml_parse_system_literal
+#define xml_parse_white ucw_xml_parse_white
+#define xml_pop_comment ucw_xml_pop_comment
+#define xml_pop_dom ucw_xml_pop_dom
+#define xml_pop_pi ucw_xml_pop_pi
+#define xml_push_comment ucw_xml_push_comment
+#define xml_push_dom ucw_xml_push_dom
+#define xml_push_entity ucw_xml_push_entity
+#define xml_push_pi ucw_xml_push_pi
+#define xml_push_source ucw_xml_push_source
+#define xml_refill ucw_xml_refill
+#define xml_skip_comment ucw_xml_skip_comment
+#define xml_skip_internal_subset ucw_xml_skip_internal_subset
+#define xml_skip_name ucw_xml_skip_name
+#define xml_skip_pi ucw_xml_skip_pi
+#define xml_sources_cleanup ucw_xml_sources_cleanup
+#define xml_spout_chars ucw_xml_spout_chars
+#define xml_throw ucw_xml_throw
+#define xml_validate_attr ucw_xml_validate_attr
+#endif
+
+/*** Debugging ***/
+
+#ifdef LOCAL_DEBUG
+#define TRACE(c, f, p...) do { DBG("XML %u: " f, xml_row(c), ##p); } while(0)
+#else
+#define TRACE(c, f, p...) do {} while(0)
+#endif
+
+/*** Error handling ***/
+
+void NONRET xml_throw(struct xml_context *ctx);
+
+/*** Memory management ***/
+
+struct xml_stack {
+  struct xml_stack *next;
+  struct mempool_state state;
+  uint flags;
+};
+
+void *xml_do_push(struct xml_context *ctx, uint size);
+void xml_do_pop(struct xml_context *ctx, struct xml_stack *s);
+
+static inline void xml_push(struct xml_context *ctx)
+{
+  TRACE(ctx, "push");
+  xml_do_push(ctx, sizeof(struct xml_stack));
+}
+
+static inline void xml_pop(struct xml_context *ctx)
+{
+  TRACE(ctx, "pop");
+  ASSERT(ctx->stack_list);
+  xml_do_pop(ctx, ctx->stack_list);
+}
+
+struct xml_dom_stack {
+  struct xml_stack stack;
+  struct mempool_state state;
+};
+
+struct xml_node *xml_push_dom(struct xml_context *ctx, struct mempool_state *state);
+void xml_pop_dom(struct xml_context *ctx, uint free);
+
+#define XML_HASH_HDR_SIZE ALIGN_TO(sizeof(void *), CPU_STRUCT_ALIGN)
+#define XML_HASH_GIVE_ALLOC struct HASH_PREFIX(table); \
+  static inline void *HASH_PREFIX(alloc)(struct HASH_PREFIX(table) *t, uint size) \
+  { return mp_alloc(*(void **)((void *)t - XML_HASH_HDR_SIZE), size); } \
+  static inline void HASH_PREFIX(free)(struct HASH_PREFIX(table) *t UNUSED, void *p UNUSED) {}
+
+void *xml_hash_new(struct mempool *pool, uint size);
+
+void xml_spout_chars(struct fastbuf *fb);
+
+/*** Reading of document/external entities ***/
+
+void NONRET xml_fatal_nested(struct xml_context *ctx);
+
+static inline void xml_inc(struct xml_context *ctx)
+{
+  /* Called after the first character of a block */
+  TRACE(ctx, "inc");
+  ctx->depth++;
+}
+
+static inline void xml_dec(struct xml_context *ctx)
+{
+  /* Called after the last character of a block */
+  TRACE(ctx, "dec");
+  if (unlikely(!ctx->depth--))
+    xml_fatal_nested(ctx);
+}
+
+#include "obj/ucw-xml/unicat.h"
+
+static inline uint xml_char_cat(uint c)
+{
+  if (c < 0x10000)
+    return 1U << ucw_xml_char_tab1[(c & 0xff) + ucw_xml_char_tab2[c >> 8]];
+  else if (likely(c < 0x110000))
+    return 1U << ucw_xml_char_tab3[c >> 16];
+  else
+    return 1;
+}
+
+static inline uint xml_ascii_cat(uint c)
+{
+  return ucw_xml_char_tab1[c];
+}
+
+struct xml_source *xml_push_source(struct xml_context *ctx);
+void xml_push_entity(struct xml_context *ctx, struct xml_dtd_entity *ent);
+
+void xml_refill(struct xml_context *ctx);
+
+static inline uint xml_peek_char(struct xml_context *ctx)
+{
+  if (ctx->bptr == ctx->bstop)
+    xml_refill(ctx);
+  return ctx->bptr[0];
+}
+
+static inline uint xml_peek_cat(struct xml_context *ctx)
+{
+  if (ctx->bptr == ctx->bstop)
+    xml_refill(ctx);
+  return ctx->bptr[1];
+}
+
+static inline uint xml_get_char(struct xml_context *ctx)
+{
+  uint c = xml_peek_char(ctx);
+  ctx->bptr += 2;
+  return c;
+}
+
+static inline uint xml_get_cat(struct xml_context *ctx)
+{
+  uint c = xml_peek_cat(ctx);
+  ctx->bptr += 2;
+  return c;
+}
+
+static inline uint xml_last_char(struct xml_context *ctx)
+{
+  return ctx->bptr[-2];
+}
+
+static inline uint xml_last_cat(struct xml_context *ctx)
+{
+  return ctx->bptr[-1];
+}
+
+static inline uint xml_skip_char(struct xml_context *ctx)
+{
+  uint c = ctx->bptr[0];
+  ctx->bptr += 2;
+  return c;
+}
+
+static inline uint xml_unget_char(struct xml_context *ctx)
+{
+  return *(ctx->bptr -= 2);
+}
+
+void xml_sources_cleanup(struct xml_context *ctx);
+
+/*** Parsing ***/
+
+void NONRET xml_fatal_expected(struct xml_context *ctx, uint c);
+void NONRET xml_fatal_expected_white(struct xml_context *ctx);
+void NONRET xml_fatal_expected_quot(struct xml_context *ctx);
+
+uint xml_parse_white(struct xml_context *ctx, uint mandatory);
+
+static inline void xml_parse_char(struct xml_context *ctx, uint c)
+{
+  /* Consumes a given Unicode character */
+  if (unlikely(c != xml_get_char(ctx)))
+    xml_fatal_expected(ctx, c);
+}
+
+static inline void xml_parse_seq(struct xml_context *ctx, const char *seq)
+{
+  /* Consumes a given sequence of ASCII characters */
+  while (*seq)
+    xml_parse_char(ctx, *seq++);
+}
+
+void xml_parse_eq(struct xml_context *ctx);
+
+static inline uint xml_parse_quote(struct xml_context *ctx)
+{
+  /* "'" | '"' */
+  uint c = xml_get_char(ctx);
+  if (unlikely(c != '\'' && c != '\"'))
+    xml_fatal_expected_quot(ctx);
+  return c;
+}
+
+char *xml_parse_name(struct xml_context *ctx, struct mempool *pool);
+void xml_skip_name(struct xml_context *ctx);
+char *xml_parse_nmtoken(struct xml_context *ctx, struct mempool *pool);
+
+char *xml_parse_system_literal(struct xml_context *ctx, struct mempool *pool);
+char *xml_parse_pubid_literal(struct xml_context *ctx, struct mempool *pool);
+
+uint xml_parse_char_ref(struct xml_context *ctx);
+void xml_parse_pe_ref(struct xml_context *ctx);
+
+char *xml_parse_attr_value(struct xml_context *ctx, struct xml_dtd_attr *attr);
+
+void xml_skip_internal_subset(struct xml_context *ctx);
+void xml_parse_notation_decl(struct xml_context *ctx);
+void xml_parse_entity_decl(struct xml_context *ctx);
+void xml_parse_element_decl(struct xml_context *ctx);
+void xml_parse_attr_list_decl(struct xml_context *ctx);
+
+void xml_push_comment(struct xml_context *ctx);
+void xml_pop_comment(struct xml_context *ctx);
+void xml_skip_comment(struct xml_context *ctx);
+
+void xml_push_pi(struct xml_context *ctx);
+void xml_pop_pi(struct xml_context *ctx);
+void xml_skip_pi(struct xml_context *ctx);
+
+void xml_validate_attr(struct xml_context *ctx, struct xml_dtd_attr *dtd, char *value);
+
+/*** Namespaces ***/
+
+void xml_ns_cleanup(struct xml_context *ctx);
+void xml_ns_reset(struct xml_context *ctx);
+void xml_ns_push_element(struct xml_context *ctx);
+void xml_ns_pop_element(struct xml_context *ctx);
+
+#endif
diff --git a/libucw/ucw-xml/libucw-xml.pc b/libucw/ucw-xml/libucw-xml.pc
new file mode 100644
index 0000000..5c02e99
--- /dev/null
+++ b/libucw/ucw-xml/libucw-xml.pc
@@ -0,0 +1,11 @@
+# pkg-config metadata for libucw-xml
+
+libdir=@LIBDIR@
+incdir=.
+
+Name: libucw-xml
+Description: XML parser for LibUCW project
+Version: @UCW_VERSION@
+Cflags: -I${incdir}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-xml@UCW_ABI_SUFFIX@
+Requires.private: @DEPS@
diff --git a/libucw/ucw-xml/ns.c b/libucw/ucw-xml/ns.c
new file mode 100644
index 0000000..18412dd
--- /dev/null
+++ b/libucw/ucw-xml/ns.c
@@ -0,0 +1,248 @@
+/*
+ *	UCW Library -- A simple XML parser -- Namespaces
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/gary.h>
+#include <ucw/string.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/internals.h>
+
+/*
+ *  This is an implementation of XML namespaces according to
+ *  http://www.w3.org/TR/REC-xml-names/.
+ *
+ *  Currently, we assume that the document does not contain a plethora
+ *  of namespaces and prefixes. So we keep them in memory until the
+ *  document ends.
+ */
+
+struct ns_hash_entry {
+  uint ns;
+  char name[1];
+};
+
+#define HASH_NODE struct ns_hash_entry
+#define HASH_PREFIX(x) ns_hash_##x
+#define HASH_KEY_ENDSTRING name
+#define HASH_WANT_FIND
+#define HASH_WANT_LOOKUP
+#define HASH_TABLE_DYNAMIC
+#define HASH_TABLE_ALLOC
+#define HASH_LOOKUP_DETECT_NEW
+#define HASH_GIVE_ALLOC
+XML_HASH_GIVE_ALLOC
+#include <ucw/hashtable.h>
+
+struct xml_ns_prefix {
+  struct xml_ns_prefix *prev;
+  struct xml_node *e;			/* Which element defined this prefix */
+  struct ns_hash_entry *he;		/* NULL if changing default NS */
+  uint prev_ns;				/* Previous NS ID assigned to this prefix */
+};
+
+static bool
+ns_enabled(struct xml_context *ctx)
+{
+  return (ctx->flags & XML_NAMESPACES);
+}
+
+void
+xml_ns_enable(struct xml_context *ctx)
+{
+  if (ns_enabled(ctx))
+    return;
+
+  TRACE(ctx, "NS: Enabling");
+  ASSERT(!ctx->depth);
+  ctx->flags |= XML_NAMESPACES;
+  if (!ctx->ns_pool)
+    {
+      // CAVEAT: xml_reset() must handle everything we allocate here
+      TRACE(ctx, "NS: Allocating data structures");
+      ctx->ns_pool = mp_new(4096);
+      GARY_INIT(ctx->ns_by_id, 16);
+    }
+
+  ctx->ns_by_name = xml_hash_new(ctx->ns_pool, sizeof(struct ns_hash_table));
+  ns_hash_init(ctx->ns_by_name);
+
+  ctx->ns_by_prefix = xml_hash_new(ctx->ns_pool, sizeof(struct ns_hash_table));
+  ns_hash_init(ctx->ns_by_prefix);
+
+  /* Intern well-known namespaces */
+  GARY_RESIZE(ctx->ns_by_id, 0);
+  uint none_ns = xml_ns_by_name(ctx, "");
+  uint xmlns_ns = xml_ns_by_name(ctx, "http://www.w3.org/2000/xmlns/");
+  uint xml_ns = xml_ns_by_name(ctx, "http://www.w3.org/XML/1998/namespace");
+  ASSERT(none_ns == XML_NS_NONE && xmlns_ns == XML_NS_XMLNS && xml_ns == XML_NS_XML);
+
+  /* Intern standard prefixes */
+  int new_xmlns, new_xml;
+  ns_hash_lookup(ctx->ns_by_prefix, "xmlns", &new_xmlns)->ns = xmlns_ns;
+  ns_hash_lookup(ctx->ns_by_prefix, "xml", &new_xml)->ns = xml_ns;
+  ASSERT(new_xmlns && new_xml);
+}
+
+void
+xml_ns_cleanup(struct xml_context *ctx)
+{
+  if (!ctx->ns_pool)
+    return;
+
+  TRACE(ctx, "NS: Cleanup");
+  GARY_FREE(ctx->ns_by_id);
+  mp_delete(ctx->ns_pool);
+}
+
+void
+xml_ns_reset(struct xml_context *ctx)
+{
+  if (!ns_enabled(ctx))
+    return;
+
+  TRACE(ctx, "NS: Reset");
+  GARY_RESIZE(ctx->ns_by_id, 0);
+  mp_flush(ctx->ns_pool);
+}
+
+const char *
+xml_ns_by_id(struct xml_context *ctx, uint ns)
+{
+  if (!ns)		// This should work even if namespaces are disabled
+    return "";
+  ASSERT(ns_enabled(ctx) && ns < GARY_SIZE(ctx->ns_by_id));
+  return ctx->ns_by_id[ns];
+}
+
+uint
+xml_ns_by_name(struct xml_context *ctx, const char *name)
+{
+  ASSERT(ns_enabled(ctx));
+  int new_p;
+  struct ns_hash_entry *he = ns_hash_lookup(ctx->ns_by_name, (char *) name, &new_p);
+  if (new_p)
+    {
+      he->ns = GARY_SIZE(ctx->ns_by_id);
+      ASSERT(he->ns < ~0U);
+      *GARY_PUSH(ctx->ns_by_id) = he->name;
+      TRACE(ctx, "NS: New namespace <%s> with ID %u", he->name, he->ns);
+    }
+  return he->ns;
+}
+
+static struct xml_ns_prefix *
+ns_push_prefix(struct xml_context *ctx)
+{
+  struct xml_ns_prefix *px = mp_alloc(ctx->stack, sizeof(*px));
+  px->prev = ctx->ns_prefix_stack;
+  ctx->ns_prefix_stack = px;
+  px->e = ctx->node;
+  return px;
+}
+
+static uint
+ns_resolve(struct xml_context *ctx, char **namep, uint default_ns)
+{
+  char *name = *namep;
+  char *colon = strchr(name, ':');
+  if (colon)
+    {
+      *colon = 0;
+      struct ns_hash_entry *he = ns_hash_find(ctx->ns_by_prefix, name);
+      *colon = ':';
+      if (he && he->ns)
+	{
+	  *namep = colon + 1;
+	  return he->ns;
+	}
+      else
+	{
+	  xml_error(ctx, "Unknown namespace prefix for %s", name);
+	  return 0;
+	}
+    }
+  else
+    return default_ns;
+}
+
+void xml_ns_push_element(struct xml_context *ctx)
+{
+  struct xml_node *e = ctx->node;
+  if (!ns_enabled(ctx))
+    {
+      e->ns = 0;
+      return;
+    }
+
+  /* Scan attributes for prefix definitions */
+  XML_ATTR_FOR_EACH(a, e)
+    if (str_has_prefix(a->name, "xmlns"))
+      {
+	uint ns = xml_ns_by_name(ctx, a->val);
+	if (a->name[5] == ':')
+	  {
+	    if (!ns)
+	      xml_error(ctx, "Namespace prefixes must not be undeclared");
+	    else if (a->name[6])
+	      {
+		/* New NS prefix */
+		int new_p;
+		struct ns_hash_entry *he = ns_hash_lookup(ctx->ns_by_prefix, a->name + 6, &new_p);
+		if (new_p)
+		  he->ns = 0;
+		struct xml_ns_prefix *px = ns_push_prefix(ctx);
+		px->he = he;
+		px->prev_ns = he->ns;
+		he->ns = ns;
+		TRACE(ctx, "NS: New prefix <%s> -> ID %u", he->name, he->ns);
+	      }
+	    else
+	      xml_error(ctx, "Invalid namespace prefix");
+	  }
+	else if (!a->name[5])
+	  {
+	    /* New default NS */
+	    struct xml_ns_prefix *px = ns_push_prefix(ctx);
+	    px->he = NULL;
+	    px->prev_ns = ctx->ns_default;
+	    ctx->ns_default = ns;
+	    TRACE(ctx, "New default NS -> ID %u", ns);
+	  }
+      }
+
+  /* Resolve namespaces */
+  e->ns = ns_resolve(ctx, &e->name, ctx->ns_default);
+  XML_ATTR_FOR_EACH(a, e)
+    a->ns = ns_resolve(ctx, &a->name, 0);
+}
+
+void xml_ns_pop_element(struct xml_context *ctx)
+{
+  if (!ns_enabled(ctx))
+    return;
+
+  struct xml_ns_prefix *px;
+  while ((px = ctx->ns_prefix_stack) && px->e == ctx->node)
+    {
+      struct ns_hash_entry *he = px->he;
+      if (he)
+	{
+	  TRACE(ctx, "NS: Restoring prefix <%s> -> ID %u", he->name, px->prev_ns);
+	  he->ns = px->prev_ns;
+	}
+      else
+	{
+	  TRACE(ctx, "NS: Restoring default NS -> ID %u", px->prev_ns);
+	  ctx->ns_default = px->prev_ns;
+	}
+      ctx->ns_prefix_stack = px->prev;
+    }
+}
diff --git a/libucw/ucw-xml/parse.c b/libucw/ucw-xml/parse.c
new file mode 100644
index 0000000..532095d
--- /dev/null
+++ b/libucw/ucw-xml/parse.c
@@ -0,0 +1,1405 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+#include <ucw-xml/internals.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/unicode.h>
+#include <ucw/chartype.h>
+#include <ucw/hashfunc.h>
+
+#include <setjmp.h>
+
+/*** Basic parsing ***/
+
+void NONRET
+xml_fatal_expected(struct xml_context *ctx, uint c)
+{
+  if (c >= 32 && c < 127)
+    xml_fatal(ctx, "Expected '%c'", c);
+  else
+    xml_fatal(ctx, "Expected U+%04x", c);
+}
+
+void NONRET
+xml_fatal_expected_white(struct xml_context *ctx)
+{
+  xml_fatal(ctx, "Expected a white space");
+}
+
+void NONRET
+xml_fatal_expected_quot(struct xml_context *ctx)
+{
+  xml_fatal(ctx, "Expected a quotation mark");
+}
+
+void
+xml_parse_eq(struct xml_context *ctx)
+{
+  /* Eq ::= S? '=' S? */
+  xml_parse_white(ctx, 0);
+  xml_parse_char(ctx, '=');
+  xml_parse_white(ctx, 0);
+}
+
+/*** Memory management ***/
+
+void *xml_do_push(struct xml_context *ctx, uint size)
+{
+  /* Saves ctx->stack and ctx->flags state */
+  struct mempool_state state;
+  mp_save(ctx->stack, &state);
+  struct xml_stack *s = mp_alloc(ctx->stack, size);
+  s->state = state;
+  s->flags = ctx->flags;
+  s->next = ctx->stack_list;
+  ctx->stack_list = s;
+  return s;
+}
+
+void xml_do_pop(struct xml_context *ctx, struct xml_stack *s)
+{
+  /* Restore ctx->stack and ctx->flags state */
+  ctx->stack_list = s->next;
+  ctx->flags = s->flags;
+  mp_restore(ctx->stack, &s->state);
+}
+
+struct xml_node *xml_push_dom(struct xml_context *ctx, struct mempool_state *state)
+{
+  /* Create a new DOM node */
+  TRACE(ctx, "push_dom");
+  struct xml_dom_stack *s = xml_do_push(ctx, sizeof(*s));
+  if (state)
+    s->state = *state;
+  else
+    mp_save(ctx->pool, &s->state);
+  struct xml_node *n = mp_alloc(ctx->pool, sizeof(*n));
+  n->user = NULL;
+  if (n->parent = ctx->node)
+    clist_add_tail(&n->parent->sons, &n->n);
+  return ctx->node = n;
+}
+
+void xml_pop_dom(struct xml_context *ctx, uint free)
+{
+  /* Leave DOM subtree */
+  TRACE(ctx, "pop_dom");
+  ASSERT(ctx->node);
+  struct xml_node *p = ctx->node->parent;
+  struct xml_dom_stack *s = (void *)ctx->stack_list;
+  if (free)
+    {
+      /* See xml_pop_element() for cleanup of attribute hash table */
+      if (p)
+        clist_remove(&ctx->node->n);
+      mp_restore(ctx->pool, &s->state);
+    }
+  ctx->node = p;
+  xml_do_pop(ctx, &s->stack);
+}
+
+/*** Basics ***/
+
+uint xml_parse_white(struct xml_context *ctx, uint mandatory)
+{
+  /* mandatory=1 -> S ::= (#x20 | #x9 | #xD | #xA)+
+   * mandatory=0 -> S? */
+  uint cnt = 0;
+  while (xml_peek_cat(ctx) & XML_CHAR_WHITE)
+    {
+      xml_skip_char(ctx);
+      cnt++;
+    }
+  if (unlikely(mandatory && !cnt))
+    xml_fatal_expected_white(ctx);
+  return cnt;
+}
+
+/*** Names and nmtokens ***/
+
+static char *
+xml_parse_string(struct xml_context *ctx, struct mempool *pool, uint first_cat, uint next_cat, char *err)
+{
+  char *p = mp_start_noalign(pool, 2);
+  *p++ = '<';		/* We always prepend a '<', so we can seek backwards in the string */
+  if (unlikely(!(xml_peek_cat(ctx) & first_cat)))
+    xml_fatal(ctx, "%s", err);
+  do
+    {
+      p = mp_spread(pool, p, 5);
+      p = utf8_32_put(p, xml_skip_char(ctx));
+    }
+  while (xml_peek_cat(ctx) & next_cat);
+  *p++ = 0;
+  return mp_end(pool, p) + 1;
+}
+
+static void
+xml_skip_string(struct xml_context *ctx, uint first_cat, uint next_cat, char *err)
+{
+  if (unlikely(!(xml_get_cat(ctx) & first_cat)))
+    xml_fatal(ctx, "%s", err);
+  while (xml_peek_cat(ctx) & next_cat)
+    xml_skip_char(ctx);
+}
+
+char *
+xml_parse_name(struct xml_context *ctx, struct mempool *pool)
+{
+  /* Name ::= NameStartChar (NameChar)* */
+  return xml_parse_string(ctx, pool, ctx->cat_sname, ctx->cat_name, "Expected a name");
+}
+
+void
+xml_skip_name(struct xml_context *ctx)
+{
+  xml_skip_string(ctx, ctx->cat_sname, ctx->cat_name, "Expected a name");
+}
+
+char *
+xml_parse_nmtoken(struct xml_context *ctx, struct mempool *pool)
+{
+  /* Nmtoken ::= (NameChar)+ */
+  return xml_parse_string(ctx, pool, ctx->cat_name, ctx->cat_name, "Expected a nmtoken");
+}
+
+/*** Simple literals ***/
+
+char *
+xml_parse_system_literal(struct xml_context *ctx, struct mempool *pool)
+{
+  /* SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'") */
+  char *p = mp_start_noalign(pool, 1);
+  uint q = xml_parse_quote(ctx), c;
+  while ((c = xml_get_char(ctx)) != q)
+    {
+      p = mp_spread(pool, p, 5);
+      p = utf8_32_put(p, c);
+    }
+  *p++ = 0;
+  return mp_end(pool, p);
+}
+
+char *
+xml_parse_pubid_literal(struct xml_context *ctx, struct mempool *pool)
+{
+  /* PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'" */
+  char *p = mp_start_noalign(pool, 1);
+  uint q = xml_parse_quote(ctx), c;
+  while ((c = xml_get_char(ctx)) != q)
+    {
+      if (unlikely(!(xml_last_cat(ctx) & XML_CHAR_PUBID)))
+	xml_fatal(ctx, "Expected a pubid character");
+      p = mp_spread(pool, p, 2);
+      *p++ = c;
+    }
+  *p++ = 0;
+  return mp_end(pool, p);
+}
+
+/*** Comments ***/
+
+void
+xml_push_comment(struct xml_context *ctx)
+{
+  TRACE(ctx, "push_comment");
+  /* Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
+   * Already parsed: '<!-' */
+  xml_parse_char(ctx, '-');
+  struct xml_node *n = xml_push_dom(ctx, NULL);
+  n->type = XML_NODE_COMMENT;
+  char *p = mp_start_noalign(ctx->pool, 6);
+  while (1)
+    {
+      if (xml_get_char(ctx) == '-')
+	if (xml_get_char(ctx) == '-')
+	  break;
+	else
+	  *p++ = '-';
+      p = utf8_32_put(p, xml_last_char(ctx));
+      p = mp_spread(ctx->pool, p, 6);
+    }
+  xml_parse_char(ctx, '>');
+  *p = 0;
+  n->len = p - (char *)mp_ptr(ctx->pool);
+  n->text = mp_end(ctx->pool, p + 1);
+  if ((ctx->flags & XML_REPORT_COMMENTS) && ctx->h_comment)
+    ctx->h_comment(ctx);
+}
+
+void
+xml_pop_comment(struct xml_context *ctx)
+{
+  xml_pop_dom(ctx, !(ctx->flags & XML_ALLOC_COMMENTS));
+  xml_dec(ctx);
+  TRACE(ctx, "pop_comment");
+}
+
+void
+xml_skip_comment(struct xml_context *ctx)
+{
+  TRACE(ctx, "skip_comment");
+  xml_parse_char(ctx, '-');
+  while (xml_get_char(ctx) != '-' || xml_get_char(ctx) != '-');
+  xml_parse_char(ctx, '>');
+  xml_dec(ctx);
+}
+
+/*** Processing instructions ***/
+
+void
+xml_push_pi(struct xml_context *ctx)
+{
+  TRACE(ctx, "push_pi");
+  /* Parses a PI to ctx->value and ctx->name:
+   *   PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>'
+   *   PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))
+   * Already parsed: '<?' */
+  struct xml_node *n = xml_push_dom(ctx, NULL);
+  n->type = XML_NODE_PI;
+  n->name = xml_parse_name(ctx, ctx->pool);
+  if (unlikely(!strcasecmp(n->name, "xml")))
+    xml_error(ctx, "Reserved PI target");
+  char *p = mp_start_noalign(ctx->pool, 5);
+  if (!xml_parse_white(ctx, 0))
+    xml_parse_seq(ctx, "?>");
+  else
+    while (1)
+      {
+	if (xml_get_char(ctx) == '?')
+	  if (xml_peek_char(ctx) == '>')
+	    {
+	      xml_skip_char(ctx);
+	      break;
+	    }
+	  else
+	    *p++ = '?';
+	else
+	  p = utf8_32_put(p, xml_last_char(ctx));
+	p = mp_spread(ctx->pool, p, 5);
+      }
+  *p = 0;
+  n->len = p - (char *)mp_ptr(ctx->pool);
+  n->text = mp_end(ctx->pool, p + 1);
+  if ((ctx->flags & XML_REPORT_PIS) && ctx->h_pi)
+    ctx->h_pi(ctx);
+}
+
+void
+xml_pop_pi(struct xml_context *ctx)
+{
+  xml_pop_dom(ctx, !(ctx->flags & XML_ALLOC_PIS));
+  xml_dec(ctx);
+  TRACE(ctx, "pop_pi");
+}
+
+void
+xml_skip_pi(struct xml_context *ctx)
+{
+  TRACE(ctx, "skip_pi");
+  if (ctx->flags & XML_VALIDATING)
+    {
+      struct mempool_state state;
+      mp_save(ctx->stack, &state);
+      if (unlikely(!strcasecmp(xml_parse_name(ctx, ctx->stack), "xml")))
+	xml_error(ctx, "Reserved PI target");
+      mp_restore(ctx->stack, &state);
+      if (!xml_parse_white(ctx, 0))
+        {
+	  xml_parse_seq(ctx, "?>");
+	  xml_dec(ctx);
+	  return;
+	}
+    }
+  while (1)
+    if (xml_get_char(ctx) == '?')
+      if (xml_peek_char(ctx) == '>')
+	break;
+  xml_skip_char(ctx);
+  xml_dec(ctx);
+}
+
+/*** Character references ***/
+
+uint
+xml_parse_char_ref(struct xml_context *ctx)
+{
+  TRACE(ctx, "parse_char_ref");
+  /* CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'
+   * Already parsed: '&#' */
+  uint v = 0;
+  if (xml_get_char(ctx) == 'x')
+    {
+      if (!(xml_get_cat(ctx) & XML_CHAR_XDIGIT))
+        {
+	  xml_error(ctx, "Expected a hexadecimal value of character reference");
+	  goto recover;
+	}
+      do
+        {
+	  v = (v << 4) + Cxvalue(xml_last_char(ctx));
+	}
+      while (v < 0x110000 && (xml_get_cat(ctx) & XML_CHAR_XDIGIT));
+    }
+  else
+    {
+      if (!(xml_last_cat(ctx) & XML_CHAR_DIGIT))
+        {
+	  xml_error(ctx, "Expected a numeric value of character reference");
+	  goto recover;
+	}
+      do
+        {
+	  v = v * 10 + xml_last_char(ctx) - '0';
+	}
+      while (v < 0x110000 && (xml_get_cat(ctx) & XML_CHAR_DIGIT));
+    }
+  uint cat = xml_char_cat(v);
+  if (!(cat & ctx->cat_unrestricted))
+    {
+      xml_error(ctx, "Character reference out of range");
+      goto recover;
+    }
+  if (xml_last_char(ctx) == ';')
+    {
+      xml_dec(ctx);
+      return v;
+    }
+  xml_error(ctx, "Expected ';'");
+recover:
+  while (xml_last_char(ctx) != ';')
+    xml_get_char(ctx);
+  xml_dec(ctx);
+  return UNI_REPLACEMENT;
+}
+
+/*** References to general entities ***/
+
+static void
+xml_parse_ref(struct xml_context *ctx)
+{
+  /* Reference ::= EntityRef | CharRef
+   * EntityRef ::= '&' Name ';'
+   * Already parsed: '&' */
+  struct fastbuf *out = &ctx->chars;
+  if (xml_peek_char(ctx) == '#')
+    {
+      xml_skip_char(ctx);
+      bput_utf8_32(out, xml_parse_char_ref(ctx));
+    }
+  else
+    {
+      TRACE(ctx, "parse_ge_ref");
+      struct mempool_state state;
+      mp_save(ctx->stack, &state);
+      char *name = xml_parse_name(ctx, ctx->stack);
+      xml_parse_char(ctx, ';');
+      struct xml_dtd_entity *ent = xml_dtd_find_entity(ctx, name);
+      if (!ent)
+        {
+	  xml_error(ctx, "Unknown entity &%s;", name);
+	  bputc(out, '&');
+	  bputs(out, name);
+	  bputc(out, ';');
+	}
+      else if (ent->flags & XML_DTD_ENTITY_TRIVIAL)
+        {
+	  TRACE(ctx, "Trivial entity &%s;", name);
+	  bputs(out, ent->text);
+	}
+      else
+        {
+	  TRACE(ctx, "Pushed entity &%s;", name);
+	  mp_restore(ctx->stack, &state);
+          xml_dec(ctx);
+	  xml_push_entity(ctx, ent);
+	  return;
+	}
+      mp_restore(ctx->stack, &state);
+      xml_dec(ctx);
+    }
+}
+
+/*** Character data ***/
+
+void
+xml_spout_chars(struct fastbuf *fb)
+{
+  if (fb->bptr < fb->bufend)
+    return;
+  struct xml_context *ctx = SKIP_BACK(struct xml_context, chars, fb);
+  struct mempool *pool = ctx->pool;
+  if (fb->bufend != fb->buffer)
+    {
+      TRACE(ctx, "growing chars");
+      uint len = fb->bufend - fb->buffer;
+      uint reported = fb->bstop - fb->buffer;
+      fb->buffer = mp_expand(pool);
+      fb->bufend = fb->buffer + mp_avail(pool);
+      fb->bptr = fb->buffer + len;
+      fb->bstop = fb->buffer + reported;
+    }
+  else
+    {
+      TRACE(ctx, "starting chars");
+      mp_save(pool, &ctx->chars_state);
+      fb->bptr = fb->buffer = fb->bstop = mp_start_noalign(pool, 2);
+      fb->bufend = fb->buffer + mp_avail(pool) - 1;
+    }
+}
+
+static uint
+xml_end_chars(struct xml_context *ctx, char **out)
+{
+  struct fastbuf *fb = &ctx->chars;
+  uint len = fb->bptr - fb->buffer;
+  if (len)
+    {
+      TRACE(ctx, "ending chars");
+      *fb->bptr = 0;
+      *out = mp_end(ctx->pool, fb->bptr + 1);
+      fb->bufend = fb->bstop = fb->bptr = fb->buffer;
+    }
+  return len;
+}
+
+static uint
+xml_report_chars(struct xml_context *ctx, char **out)
+{
+  struct fastbuf *fb = &ctx->chars;
+  uint len = fb->bptr - fb->buffer;
+  if (len)
+    {
+      *fb->bptr = 0;
+      *out = fb->bstop;
+      fb->bstop = fb->bptr;
+    }
+  return len;
+}
+
+static uint
+xml_flush_chars(struct xml_context *ctx)
+{
+  char *text, *rtext;
+  uint len = xml_end_chars(ctx, &text), rlen;
+  if (len)
+    {
+      if (ctx->flags & XML_NO_CHARS)
+        {
+          if ((ctx->flags & XML_REPORT_CHARS) && ctx->h_ignorable)
+            ctx->h_ignorable(ctx, text, len);
+	  mp_restore(ctx->pool, &ctx->chars_state);
+	  return 0;
+	}
+      if ((ctx->flags & XML_REPORT_CHARS) && ctx->h_block && (rlen = xml_report_chars(ctx, &rtext)))
+	ctx->h_block(ctx, rtext, rlen);
+      if (!(ctx->flags & XML_ALLOC_CHARS) && !(ctx->flags & XML_REPORT_CHARS))
+        {
+	  mp_restore(ctx->pool, &ctx->chars_state);
+	  return 0;
+	}
+      struct xml_node *n = xml_push_dom(ctx, &ctx->chars_state);
+      n->type = XML_NODE_CHARS;
+      n->text = text;
+      n->len = len;
+      if ((ctx->flags & XML_REPORT_CHARS) && ctx->h_chars)
+        ctx->h_chars(ctx);
+    }
+  return len;
+}
+
+static void
+xml_pop_chars(struct xml_context *ctx)
+{
+  xml_pop_dom(ctx, !(ctx->flags & XML_ALLOC_CHARS));
+  TRACE(ctx, "pop_chars");
+}
+
+static void
+xml_append_chars(struct xml_context *ctx)
+{
+  TRACE(ctx, "append_chars");
+  struct fastbuf *out = &ctx->chars;
+  if (ctx->flags & XML_NO_CHARS)
+    while (xml_get_char(ctx) != '<')
+      if (xml_last_cat(ctx) & XML_CHAR_WHITE)
+	bput_utf8_32(out, xml_last_char(ctx));
+      else
+        {
+	  xml_error(ctx, "This element must not contain character data");
+	  while (xml_get_char(ctx) != '<');
+	  break;
+	}
+  else
+    while (xml_get_char(ctx) != '<')
+      if (xml_last_char(ctx) == '&')
+        {
+	  xml_inc(ctx);
+          xml_parse_ref(ctx);
+        }
+      else
+        bput_utf8_32(out, xml_last_char(ctx));
+  xml_unget_char(ctx);
+}
+
+/*** CDATA sections ***/
+
+static void
+xml_skip_cdata(struct xml_context *ctx)
+{
+  TRACE(ctx, "skip_cdata");
+  xml_parse_seq(ctx, "CDATA[");
+  while (xml_get_char(ctx) != ']' || xml_get_char(ctx) != ']' || xml_get_char(ctx) != '>');
+  xml_dec(ctx);
+}
+
+static void
+xml_append_cdata(struct xml_context *ctx)
+{
+  /* CDSect :== '<![CDATA[' (Char* - (Char* ']]>' Char*)) ']]>'
+   * Already parsed: '<![' */
+  TRACE(ctx, "append_cdata");
+  if (ctx->flags & XML_NO_CHARS)
+    {
+      xml_error(ctx, "This element must not contain CDATA");
+      xml_skip_cdata(ctx);
+      return;
+    }
+  xml_parse_seq(ctx, "CDATA[");
+  struct fastbuf *out = &ctx->chars;
+  uint rlen;
+  char *rtext;
+  if ((ctx->flags & XML_REPORT_CHARS) && ctx->h_block && (rlen = xml_report_chars(ctx, &rtext)))
+    ctx->h_block(ctx, rtext, rlen);
+  while (1)
+    {
+      if (xml_get_char(ctx) == ']')
+        {
+          if (xml_get_char(ctx) == ']')
+	    if (xml_get_char(ctx) == '>')
+	      break;
+	    else
+	      bputc(out, ']');
+	  bputc(out, ']');
+	}
+      bput_utf8_32(out, xml_last_char(ctx));
+    }
+  if ((ctx->flags & XML_REPORT_CHARS) && ctx->h_cdata && (rlen = xml_report_chars(ctx, &rtext)))
+    ctx->h_cdata(ctx, rtext, rlen);
+  xml_dec(ctx);
+}
+
+/*** Attribute values ***/
+
+char *
+xml_parse_attr_value(struct xml_context *ctx, struct xml_dtd_attr *attr UNUSED)
+{
+  TRACE(ctx, "parse_attr_value");
+  /* AttValue ::= '"' ([^<&"] | Reference)* '"'	| "'" ([^<&'] | Reference)* "'" */
+  /* FIXME: -- check value constrains / normalize leading/trailing WS and repeated WS */
+  struct mempool_state state;
+  uint quote = xml_parse_quote(ctx);
+  mp_save(ctx->stack, &state);
+  struct fastbuf *out = &ctx->chars;
+  struct xml_source *src = ctx->src;
+  while (1)
+    {
+      uint c = xml_get_char(ctx);
+      if (c == '&')
+        {
+	  xml_inc(ctx);
+	  xml_parse_ref(ctx);
+	}
+      else if (c == quote && src == ctx->src)
+	break;
+      else if (c == '<')
+	xml_error(ctx, "Attribute value must not contain '<'");
+      else if (xml_last_cat(ctx) & XML_CHAR_WHITE)
+	bputc(out, ' ');
+      else
+	bput_utf8_32(out, c);
+    }
+  mp_restore(ctx->stack, &state);
+  char *text;
+  return xml_end_chars(ctx, &text) ? text : "";
+}
+
+uint
+xml_normalize_white(struct xml_context *ctx UNUSED, char *text)
+{
+  char *s = text, *d = text;
+  while (*s == 0x20)
+    s++;
+  while (1)
+    {
+      while (*s & ~0x20)
+	*d++ = *s++;
+      if (!*s)
+	break;
+      while (*++s == 0x20);
+      *d++ = 0x20;
+    }
+  if (d != text && d[-1] == 0x20)
+    d--;
+  *d = 0;
+  return d - text;
+}
+
+/*** Attributes ***/
+
+static void
+xml_raw_add_attr(struct xml_context *ctx, struct xml_node *e, char *name, char *value)
+{
+  struct xml_attr *a = mp_alloc(ctx->pool, sizeof(*a));
+  a->elem = e;
+  a->ns = 0;		/* Namespaces will be resolved later */
+  a->name = name;
+  a->val = value;
+  a->dtd = NULL;
+  a->user = NULL;
+  /* a->hash will be calculated later */
+  slist_add_tail(&e->attrs, &a->n);
+}
+
+static inline uint
+xml_attr_hash(uint ns, char *name)
+{
+  return hash_string(name) ^ hash_u32(ns);
+}
+
+static void
+xml_parse_attr(struct xml_context *ctx)
+{
+  TRACE(ctx, "parse_attr");
+  /* Attribute ::= Name Eq AttValue */
+  struct xml_node *e = ctx->node;
+  char *n = xml_parse_name(ctx, ctx->pool);
+  xml_parse_eq(ctx);
+  char *v = xml_parse_attr_value(ctx, NULL);
+  xml_raw_add_attr(ctx, e, n, v);
+}
+
+static void
+xml_process_attr(struct xml_context *ctx, struct xml_attr *a)
+{
+  struct xml_node *e = a->elem;
+  a->hash = xml_attr_hash(a->ns, a->name);
+
+  XML_ATTR_FOR_EACH(a2, e)
+    {
+      if (a2 == a)
+	break;
+      if (a2->hash == a->hash && a2->ns == a->ns && !strcmp(a2->name, a->name))
+	xml_error(ctx, "Attribute %s is not unique in element <%s>", xml_attr_qname(ctx, a), xml_node_qname(ctx, e));
+    }
+}
+
+struct xml_attr *
+xml_attr_find(struct xml_context *ctx, struct xml_node *node, char *name)
+{
+  return xml_attr_find_ns(ctx, node, 0, name);
+}
+
+struct xml_attr *
+xml_attr_find_ns(struct xml_context *ctx UNUSED, struct xml_node *node, uint ns, char *name)
+{
+  ASSERT(node->type == XML_NODE_ELEM);
+  uint hash = xml_attr_hash(ns, name);
+  XML_ATTR_FOR_EACH(a, node)
+    if (a->hash == hash && a->ns == ns && !strcmp(a->name, name))
+      return a;
+  return NULL;
+}
+
+char *
+xml_attr_value_ns(struct xml_context *ctx, struct xml_node *node, uint ns, char *name)
+{
+  struct xml_attr *attr = xml_attr_find_ns(ctx, node, ns, name);
+  if (attr)
+    return attr->val;
+  if (!node->dtd)
+    return NULL;
+  if (ns)			/* So far, our DTD support is not namespace-aware */
+    return NULL;
+  struct xml_dtd_attr *dtd = xml_dtd_find_attr(ctx, node->dtd, name);
+  return dtd ? dtd->default_value : NULL;
+}
+
+char *
+xml_attr_value(struct xml_context *ctx, struct xml_node *node, char *name)
+{
+  return xml_attr_value_ns(ctx, node, 0, name);
+}
+
+char *
+xml_attr_qname(struct xml_context *ctx UNUSED, struct xml_attr *attr)
+{
+  char *n = attr->name;
+  while (n[-1] != '<')
+    n--;
+  return n;
+}
+
+/*** Elements ***/
+
+static uint
+xml_validate_element(struct xml_dtd_elem_node *root, struct xml_dtd_elem *elem)
+{
+  if (root->elem)
+    return elem == root->elem;
+  else
+    SLIST_FOR_EACH(struct xml_dtd_elem_node *, son, root->sons)
+      if (xml_validate_element(son, elem))
+	return 1;
+  return 0;
+}
+
+static void
+xml_push_element(struct xml_context *ctx)
+{
+  TRACE(ctx, "push_element");
+  /* EmptyElemTag | STag
+   * EmptyElemTag ::= '<' Name (S  Attribute)* S? '/>'
+   * STag ::= '<' Name (S  Attribute)* S? '>'
+   * Already parsed: '<' */
+  struct xml_node *e = xml_push_dom(ctx, NULL);
+  clist_init(&e->sons);
+  e->type = XML_NODE_ELEM;
+  e->name = xml_parse_name(ctx, ctx->pool);
+  slist_init(&e->attrs);
+
+  if (!e->parent)
+    {
+      ctx->dom = e;
+      if (ctx->doctype && strcmp(e->name, ctx->doctype))
+	xml_error(ctx, "The root element <%s> does not match the document type <%s>", e->name, ctx->doctype);
+    }
+
+  if (!ctx->dtd)
+    e->dtd = NULL;
+  else if (!(e->dtd = xml_dtd_find_elem(ctx, e->name)))
+    xml_error(ctx, "Undefined element <%s>", e->name);
+  else
+    {
+      struct xml_dtd_elem *dtd = e->dtd, *parent_dtd = e->parent ? e->parent->dtd : NULL;
+      if (dtd->type == XML_DTD_ELEM_MIXED)
+        ctx->flags &= ~XML_NO_CHARS;
+      else
+	ctx->flags |= XML_NO_CHARS;
+      if (parent_dtd)
+        if (parent_dtd->type == XML_DTD_ELEM_EMPTY)
+	  xml_error(ctx, "Empty element must not contain children");
+        else if (parent_dtd->type != XML_DTD_ELEM_ANY)
+	  {
+	    // FIXME: validate regular expressions
+	    if (!xml_validate_element(parent_dtd->node, dtd))
+	      xml_error(ctx, "Unexpected element <%s>", e->name);
+	  }
+    }
+
+  /* Parse attributes */
+  while (1)
+    {
+      uint white = xml_parse_white(ctx, 0);
+      uint c = xml_get_char(ctx);
+      if (c == '/')
+        {
+	  xml_parse_char(ctx, '>');
+	  ctx->flags |= XML_EMPTY_ELEM_TAG;
+	  break;
+	}
+      else if (c == '>')
+	break;
+      else if (!white)
+	xml_fatal_expected_white(ctx);
+      xml_unget_char(ctx);
+      xml_parse_attr(ctx);
+    }
+
+  /* Resolve namespaces */
+  xml_ns_push_element(ctx);
+
+  /* Once we have namespaces, hash attribute names */
+  XML_ATTR_FOR_EACH(a, e)
+    xml_process_attr(ctx, a);
+
+  /* FIXME: DTD logic is not namespace-aware */
+  if (e->dtd)
+    {
+      XML_ATTR_FOR_EACH(a, e)
+	{
+	  if (!(a->dtd = xml_dtd_find_attr(ctx, e->dtd, a->name)))
+	    xml_error(ctx, "Undefined attribute %s in element <%s>", a->name, e->name);
+	  else
+	    xml_validate_attr(ctx, a->dtd, a->val);
+	}
+      SLIST_FOR_EACH(struct xml_dtd_attr *, a, e->dtd->attrs)
+	{
+	  if (a->default_mode == XML_ATTR_REQUIRED)
+	    {
+	      if (!xml_attr_find(ctx, e, a->name))
+		xml_error(ctx, "Missing required attribute %s in element <%s>", a->name, e->name);
+	    }
+	  else if (a->default_mode != XML_ATTR_IMPLIED && ctx->flags & XML_ALLOC_DEFAULT_ATTRS)
+	    {
+	      if (!xml_attr_find(ctx, e, a->name))
+		xml_raw_add_attr(ctx, e, a->name, a->default_value);
+	    }
+	}
+    }
+
+  if ((ctx->flags & XML_REPORT_TAGS) && ctx->h_stag)
+    ctx->h_stag(ctx);
+}
+
+static void
+xml_pop_element(struct xml_context *ctx)
+{
+  TRACE(ctx, "pop_element");
+  if ((ctx->flags & XML_REPORT_TAGS) && ctx->h_etag)
+    ctx->h_etag(ctx);
+
+  xml_ns_pop_element(ctx);
+
+  struct xml_node *e = ctx->node;
+  uint free = !(ctx->flags & XML_ALLOC_TAGS);
+  if (free)
+    {
+      if (!e->parent)
+	ctx->dom = NULL;
+#if 0
+      /*
+       *  With the current data structures, freeing of attributes is not necessary,
+       *  but it might be if we switch to a global hash table of large elements.
+       */
+      SLIST_FOR_EACH(struct xml_attr *, a, e->attrs)
+	xml_attrs_remove(ctx->tab_attrs, a);
+      struct xml_node *n;
+      while (n = clist_head(&e->sons))
+        {
+	  if (n->type == XML_NODE_ELEM)
+	    {
+	      SLIST_FOR_EACH(struct xml_attr *, a, n->attrs)
+		xml_attrs_remove(ctx->tab_attrs, a);
+	      clist_insert_list_after(&n->sons, &n->n);
+	    }
+	  clist_remove(&n->n);
+	}
+#endif
+    }
+
+  xml_pop_dom(ctx, free);
+  xml_dec(ctx);
+}
+
+static void
+xml_parse_etag(struct xml_context *ctx)
+{
+ /* ETag ::= '</' Name S? '>'
+  * Already parsed: '<' */
+  struct xml_node *e = ctx->node;
+  ASSERT(e);
+  char *n = xml_node_qname(ctx, e);
+  while (*n)
+    {
+      uint c;
+      n = utf8_32_get(n, &c);
+      if (xml_get_char(ctx) != c)
+	goto recover;
+    }
+  xml_parse_white(ctx, 0);
+  if (xml_get_char(ctx) != '>')
+    {
+recover:
+      xml_error(ctx, "Invalid ETag, expected </%s>", xml_node_qname(ctx, e));
+      while (xml_get_char(ctx) != '>');
+    }
+  xml_dec(ctx);
+}
+
+char *
+xml_node_qname(struct xml_context *ctx UNUSED, struct xml_node *node)
+{
+  ASSERT(node->type == XML_NODE_ELEM);
+  char *n = node->name;
+  while (n[-1] != '<')
+    n--;
+  return n;
+}
+
+/*** Document type declaration ***/
+
+static void
+xml_parse_doctype_decl(struct xml_context *ctx)
+{
+  TRACE(ctx, "parse_doctype_decl");
+  /* doctypedecl ::= '<!DOCTYPE' S  Name (S  ExternalID)? S? ('[' intSubset ']' S?)? '>'
+   * Already parsed: '<!'
+   * Terminated before '[' or '>' */
+  if (ctx->doctype)
+    xml_fatal(ctx, "Multiple document types not allowed");
+  xml_parse_seq(ctx, "DOCTYPE");
+  xml_parse_white(ctx, 1);
+  ctx->doctype = xml_parse_name(ctx, ctx->pool);
+  TRACE(ctx, "doctype=%s", ctx->doctype);
+  uint c;
+  if (xml_parse_white(ctx, 0) && ((c = xml_peek_char(ctx)) == 'S' || c == 'P'))
+    {
+      if (c == 'S')
+        {
+	  xml_parse_seq(ctx, "SYSTEM");
+	  xml_parse_white(ctx, 1);
+	  ctx->system_id = xml_parse_system_literal(ctx, ctx->pool);
+	}
+      else
+        {
+	  xml_parse_seq(ctx, "PUBLIC");
+	  xml_parse_white(ctx, 1);
+	  ctx->public_id = xml_parse_pubid_literal(ctx, ctx->pool);
+	  xml_parse_white(ctx, 1);
+	  ctx->system_id = xml_parse_system_literal(ctx, ctx->pool);
+	}
+      xml_parse_white(ctx, 0);
+      ctx->flags |= XML_HAS_EXTERNAL_SUBSET;
+    }
+  if (xml_peek_char(ctx) == '[')
+    {
+      ctx->flags |= XML_HAS_INTERNAL_SUBSET;
+      xml_skip_char(ctx);
+      xml_inc(ctx);
+    }
+  if (ctx->h_doctype_decl)
+    ctx->h_doctype_decl(ctx);
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/* DTD: Internal subset */
+
+static void
+xml_parse_subset(struct xml_context *ctx, uint external)
+{
+  // FIXME:
+  // -- comments/pi have no parent
+  // -- conditional sections in external subset
+  // -- check corectness of parameter entities
+
+  /* '[' intSubset ']'
+   * intSubset :== (markupdecl | DeclSep)
+   * Already parsed: '['
+   *
+   * extSubsetDecl ::= ( markupdecl | conditionalSect | DeclSep)*
+   */
+  while (1)
+    {
+      xml_parse_white(ctx, 0);
+      uint c = xml_get_char(ctx);
+      xml_inc(ctx);
+      if (c == '<')
+	if ((c = xml_get_char(ctx)) == '!')
+	  switch (c = xml_get_char(ctx))
+	    {
+	      case '-':
+		xml_push_comment(ctx);
+		xml_pop_comment(ctx);
+		break;
+	      case 'N':
+		xml_parse_seq(ctx, "OTATION");
+		xml_parse_notation_decl(ctx);
+		break;
+	      case 'E':
+		if ((c = xml_get_char(ctx)) == 'N')
+		  {
+		    xml_parse_seq(ctx, "TITY");
+		    xml_parse_entity_decl(ctx);
+		  }
+		else if (c == 'L')
+		  {
+		    xml_parse_seq(ctx, "EMENT");
+		    xml_parse_element_decl(ctx);
+		  }
+		else
+		  goto invalid_markup;
+		break;
+	      case 'A':
+		xml_parse_seq(ctx, "TTLIST");
+		xml_parse_attr_list_decl(ctx);
+		break;
+	      default:
+		goto invalid_markup;
+	    }
+        else if (c == '?')
+	  {
+	    xml_push_pi(ctx);
+	    xml_pop_pi(ctx);
+	  }
+        else
+	  goto invalid_markup;
+      else if (c == '%')
+	xml_parse_pe_ref(ctx);
+      else if (c == ']' && !external)
+        {
+	  break;
+	}
+      else if (c == '>' && external)
+        {
+	  break;
+	}
+      else
+	goto invalid_markup;
+    }
+  xml_dec(ctx);
+  return;
+invalid_markup: ;
+  xml_fatal(ctx, "Invalid markup in the %s subset", external ? "external" : "internal");
+}
+
+/*** The State Machine ***/
+
+uint
+xml_next(struct xml_context *ctx)
+{
+  /* A nasty state machine */
+
+#define PULL(x) do { if (ctx->pull & XML_PULL_##x) return ctx->state = XML_STATE_##x; /* fall-thru */ case XML_STATE_##x: ; } while (0)
+#define PULL_STATE(x, s) do { if (ctx->pull & XML_PULL_##x) return ctx->state = XML_STATE_##s, XML_STATE_##x; /* fall-thru */ case XML_STATE_##s: ; } while (0)
+
+  TRACE(ctx, "xml_next (state=%u)", ctx->state);
+  jmp_buf throw_buf;
+  ctx->throw_buf = &throw_buf;
+  if (setjmp(throw_buf))
+    {
+error:
+      if (ctx->err_code == XML_ERR_EOF && ctx->h_fatal)
+	ctx->h_fatal(ctx);
+      TRACE(ctx, "raised fatal error");
+      return ctx->state = XML_STATE_EOF;
+    }
+  uint c;
+  switch (ctx->state)
+    {
+      case XML_STATE_START:
+	TRACE(ctx, "entering prolog");
+	ctx->flags |= XML_SRC_DOCUMENT | XML_SRC_EXPECTED_DECL;
+	if (ctx->h_document_start)
+	  ctx->h_document_start(ctx);
+	/* XMLDecl */
+	xml_refill(ctx);
+	if (ctx->h_xml_decl)
+	  ctx->h_xml_decl(ctx);
+	PULL(XML_DECL);
+
+	/* Misc* (doctypedecl Misc*)? */
+        while (1)
+	  {
+	    xml_parse_white(ctx, 0);
+	    xml_parse_char(ctx, '<');
+	    xml_inc(ctx);
+	    if ((c = xml_get_char(ctx)) == '?')
+	      /* Processing intruction */
+	      if (!(ctx->flags & XML_REPORT_PIS))
+	        xml_skip_pi(ctx);
+	      else
+	        {
+		  xml_push_pi(ctx);
+		  PULL_STATE(PI, PROLOG_PI);
+		  xml_pop_pi(ctx);
+	        }
+	    else if (c != '!')
+	      {
+		/* Found the root tag */
+		xml_unget_char(ctx);
+		goto first_tag;
+	      }
+	    else if (xml_get_char(ctx) == '-')
+	      if (!(ctx->flags & XML_REPORT_COMMENTS))
+		xml_skip_comment(ctx);
+	      else
+	        {
+		  xml_push_comment(ctx);
+		  PULL_STATE(COMMENT, PROLOG_COMMENT);
+		  xml_pop_comment(ctx);
+		}
+	    else
+	      {
+		/* DocTypeDecl */
+		xml_unget_char(ctx);
+		xml_parse_doctype_decl(ctx);
+		PULL(DOCTYPE_DECL);
+		if (ctx->flags & XML_HAS_DTD)
+		  if (ctx->flags & XML_PARSE_DTD)
+		    {
+		      xml_dtd_init(ctx);
+		      if (ctx->h_dtd_start)
+		        ctx->h_dtd_start(ctx);
+		      if (ctx->flags & XML_HAS_INTERNAL_SUBSET)
+		        {
+		          xml_parse_subset(ctx, 0);
+			  xml_dec(ctx);
+			}
+		      if (ctx->flags & XML_HAS_EXTERNAL_SUBSET)
+		        {
+		          struct xml_dtd_entity ent = {
+			    .system_id = ctx->system_id,
+			    .public_id = ctx->public_id,
+			  };
+			  xml_parse_white(ctx, 0);
+			  xml_parse_char(ctx, '>');
+			  xml_unget_char(ctx);
+			  ASSERT(ctx->h_resolve_entity);
+			  ctx->h_resolve_entity(ctx, &ent);
+			  ctx->flags |= XML_SRC_EXPECTED_DECL;
+			  xml_parse_subset(ctx, 1);
+			  xml_unget_char(ctx);;
+			}
+		      if (ctx->h_dtd_end)
+		        ctx->h_dtd_end(ctx);
+		    }
+		  else if (ctx->flags & XML_HAS_INTERNAL_SUBSET)
+		    xml_skip_internal_subset(ctx);
+		xml_parse_white(ctx, 0);
+		xml_parse_char(ctx, '>');
+		xml_dec(ctx);
+	      }
+	  }
+
+      case XML_STATE_CHARS:
+
+	while (1)
+	  {
+	    if (xml_peek_char(ctx) != '<')
+	      {
+		/* CharData */
+	        xml_append_chars(ctx);
+		continue;
+	      }
+	    else
+	      xml_skip_char(ctx);
+	    xml_inc(ctx);
+first_tag:
+
+	    if ((c = xml_get_char(ctx)) == '?')
+	      {
+		/* PI */
+	        if (!(ctx->flags & (XML_REPORT_PIS | XML_ALLOC_PIS)))
+	          xml_skip_pi(ctx);
+	        else
+		  {
+		    if (xml_flush_chars(ctx))
+		      {
+			PULL_STATE(CHARS, CHARS_BEFORE_PI);
+			xml_pop_chars(ctx);
+		      }
+		    xml_push_pi(ctx);
+		    PULL(PI);
+		    xml_pop_pi(ctx);
+		  }
+	      }
+
+	    else if (c == '!')
+	      if ((c = xml_get_char(ctx)) == '-')
+	        {
+		  /* Comment */
+		  if (!(ctx->flags & (XML_REPORT_COMMENTS | XML_ALLOC_COMMENTS)))
+		    xml_skip_comment(ctx);
+		  else
+		    {
+		      if (xml_flush_chars(ctx))
+		        {
+			  PULL_STATE(CHARS, CHARS_BEFORE_COMMENT);
+			  xml_pop_chars(ctx);
+			}
+		      xml_push_comment(ctx);
+		      PULL(COMMENT);
+		      xml_pop_comment(ctx);
+		    }
+		}
+	      else if (c == '[')
+	        {
+		  /* CDATA */
+		  xml_append_cdata(ctx);
+		}
+	      else
+		xml_fatal(ctx, "Unexpected character after '<!'");
+
+	    else if (c != '/')
+	      {
+		/* STag | EmptyElemTag */
+		xml_unget_char(ctx);
+		if (xml_flush_chars(ctx))
+		  {
+		    PULL_STATE(CHARS, CHARS_BEFORE_STAG);
+		    xml_pop_chars(ctx);
+		  }
+
+		xml_push_element(ctx);
+		PULL(STAG);
+		if (ctx->flags & XML_EMPTY_ELEM_TAG)
+		  goto pop_element;
+	      }
+
+	    else
+	      {
+		/* ETag */
+		if (xml_flush_chars(ctx))
+		  {
+		    PULL_STATE(CHARS, CHARS_BEFORE_ETAG);
+		    xml_pop_chars(ctx);
+		  }
+
+		xml_parse_etag(ctx);
+pop_element:
+		PULL(ETAG);
+		xml_pop_element(ctx);
+		if (!ctx->node)
+		  goto epilog;
+	      }
+	  }
+
+epilog:
+	/* Misc* */
+        TRACE(ctx, "entering epilog");
+	while (1)
+	  {
+	    /* Epilog whitespace is the only place, where a valid document can reach EOF */
+	    if (setjmp(throw_buf))
+	      if (ctx->err_code == XML_ERR_EOF)
+	        {
+		  TRACE(ctx, "reached EOF");
+		  ctx->state = XML_STATE_EOF;
+		  if (ctx->h_document_end)
+		    ctx->h_document_end(ctx);
+      case XML_STATE_EOF:
+		  ctx->err_code = 0;
+		  ctx->err_msg = NULL;
+		  return XML_STATE_EOF;
+		}
+	      else
+		goto error;
+	    xml_parse_white(ctx, 0);
+	    if (setjmp(throw_buf))
+	      goto error;
+
+	    /* Misc */
+	    xml_parse_char(ctx, '<');
+	    xml_inc(ctx);
+	    if ((c = xml_get_char(ctx)) == '?')
+	      /* Processing instruction */
+	      if (!(ctx->flags & XML_REPORT_PIS))
+	        xml_skip_pi(ctx);
+	      else
+	        {
+		  xml_push_pi(ctx);
+		  PULL_STATE(PI, EPILOG_PI);
+		  xml_pop_pi(ctx);
+	        }
+	    else if (c == '!')
+	      {
+		xml_parse_char(ctx, '-');
+	        /* Comment */
+	        if (!(ctx->flags & XML_REPORT_COMMENTS))
+		  xml_skip_comment(ctx);
+	        else
+	          {
+		    xml_push_comment(ctx);
+		    PULL_STATE(COMMENT, EPILOG_COMMENT);
+		    xml_pop_comment(ctx);
+		  }
+	      }
+	    else
+	      xml_fatal(ctx, "Syntax error in the epilog");
+	  }
+
+    }
+  ASSERT(0);
+}
+
+uint
+xml_next_state(struct xml_context *ctx, uint pull)
+{
+  uint saved = ctx->pull;
+  ctx->pull = pull;
+  uint res = xml_next(ctx);
+  ctx->pull = saved;
+  return res;
+}
+
+uint
+xml_skip_element(struct xml_context *ctx)
+{
+  ASSERT(ctx->state == XML_STATE_STAG);
+  struct xml_node *node = ctx->node;
+  uint saved = ctx->pull, res;
+  ctx->pull = XML_PULL_ETAG;
+  while ((res = xml_next(ctx)) && ctx->node != node);
+  ctx->pull = saved;
+  return res;
+}
+
+uint
+xml_parse(struct xml_context *ctx)
+{
+  /* This cycle should run only once unless the user overrides the value of ctx->pull in a SAX handler */
+  do
+    {
+      ctx->pull = 0;
+    }
+  while (xml_next(ctx));
+  return ctx->err_code;
+}
+
+char *
+xml_merge_chars(struct xml_context *ctx UNUSED, struct xml_node *node, struct mempool *pool)
+{
+  ASSERT(node->type == XML_NODE_ELEM);
+  char *p = mp_start_noalign(pool, 1);
+  XML_NODE_FOR_EACH(son, node)
+    if (son->type == XML_NODE_CHARS)
+      {
+	p = mp_spread(pool, p, son->len + 1);
+	memcpy(p, son->text, son->len);
+	p += son->len;
+      }
+  *p++ = 0;
+  return mp_end(pool, p);
+}
+
+static char *
+xml_append_dom_chars(char *p, struct mempool *pool, struct xml_node *node)
+{
+  XML_NODE_FOR_EACH(son, node)
+    if (son->type == XML_NODE_CHARS)
+      {
+	p = mp_spread(pool, p, son->len + 1);
+	memcpy(p, son->text, son->len);
+	p += son->len;
+      }
+    else if (son->type == XML_NODE_ELEM)
+      p = xml_append_dom_chars(p, pool, son);
+  return p;
+}
+
+char *
+xml_merge_dom_chars(struct xml_context *ctx UNUSED, struct xml_node *node, struct mempool *pool)
+{
+  ASSERT(node->type == XML_NODE_ELEM);
+  char *p = mp_start_noalign(pool, 1);
+  p = xml_append_dom_chars(p, pool, node);
+  *p++ = 0;
+  return mp_end(pool, p);
+}
diff --git a/libucw/ucw-xml/source.c b/libucw/ucw-xml/source.c
new file mode 100644
index 0000000..5396c50
--- /dev/null
+++ b/libucw/ucw-xml/source.c
@@ -0,0 +1,486 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+#include <ucw-xml/internals.h>
+#include <ucw/unicode.h>
+#include <ucw/ff-unicode.h>
+#include <charset/charconv.h>
+#include <charset/fb-charconv.h>
+
+/*** Character categorization ***/
+
+#include "obj/ucw-xml/unicat.c"
+
+static void
+xml_init_cats(struct xml_context *ctx)
+{
+  if (!(ctx->flags & XML_VERSION_1_1))
+    {
+      ctx->cat_chars = XML_CHAR_VALID_1_0;
+      ctx->cat_unrestricted = XML_CHAR_VALID_1_0;
+      ctx->cat_new_line = XML_CHAR_NEW_LINE_1_0;
+      ctx->cat_name = XML_CHAR_NAME_1_0;
+      ctx->cat_sname = XML_CHAR_SNAME_1_0;
+    }
+  else
+    {
+      ctx->cat_chars = XML_CHAR_VALID_1_1;
+      ctx->cat_unrestricted = XML_CHAR_UNRESTRICTED_1_1;
+      ctx->cat_new_line = XML_CHAR_NEW_LINE_1_1;
+      ctx->cat_name = XML_CHAR_NAME_1_1;
+      ctx->cat_sname = XML_CHAR_SNAME_1_1;
+    }
+}
+
+/*** Reading of document/external entities ***/
+
+static void NONRET
+xml_eof(struct xml_context *ctx)
+{
+  ctx->err_msg = "Unexpected EOF";
+  ctx->err_code = XML_ERR_EOF;
+  xml_throw(ctx);
+}
+
+void NONRET
+xml_fatal_nested(struct xml_context *ctx)
+{
+  xml_fatal(ctx, "Entity is not nested correctly");
+}
+
+static inline void
+xml_add_char(u32 **bstop, uint c)
+{
+  *(*bstop)++ = c;
+  *(*bstop)++ = xml_char_cat(c);
+}
+
+struct xml_source *
+xml_push_source(struct xml_context *ctx)
+{
+  xml_push(ctx);
+  struct xml_source *src = ctx->src;
+  if (src)
+    {
+      src->bptr = ctx->bptr;
+      src->bstop = ctx->bstop;
+    }
+  src = mp_alloc_zero(ctx->stack, sizeof(*src));
+  src->next = ctx->src;
+  src->saved_depth = ctx->depth;
+  ctx->src = src;
+  ctx->flags &= ~(XML_SRC_EOF | XML_SRC_EXPECTED_DECL | XML_SRC_DOCUMENT);
+  ctx->bstop = ctx->bptr = src->buf;
+  ctx->depth = 0;
+  return src;
+}
+
+struct xml_source *
+xml_push_fastbuf(struct xml_context *ctx, struct fastbuf *fb)
+{
+  struct xml_source *src = xml_push_source(ctx);
+  src->fb = fb;
+  return src;
+}
+
+static void
+xml_close_source(struct xml_source *src)
+{
+  bclose(src->fb);
+  if (src->wrapped_fb)
+    bclose(src->wrapped_fb);
+}
+
+static void
+xml_pop_source(struct xml_context *ctx)
+{
+  TRACE(ctx, "pop_source");
+  if (unlikely(ctx->depth != 0))
+    xml_fatal(ctx, "Unexpected end of entity");
+  struct xml_source *src = ctx->src;
+  if (!src)
+    xml_fatal(ctx, "Undefined source");
+  xml_close_source(src);
+  ctx->depth = src->saved_depth;
+  ctx->src = src = src->next;
+  if (src)
+    {
+      ctx->bptr = src->bptr;
+      ctx->bstop = src->bstop;
+    }
+  xml_pop(ctx);
+  if (unlikely(!src))
+    xml_eof(ctx);
+}
+
+void
+xml_sources_cleanup(struct xml_context *ctx)
+{
+  struct xml_source *s;
+  while (s = ctx->src)
+    {
+      ctx->src = s->next;
+      xml_close_source(s);
+    }
+}
+
+static void xml_refill_utf8(struct xml_context *ctx);
+
+void
+xml_def_resolve_entity(struct xml_context *ctx, struct xml_dtd_entity *ent UNUSED)
+{
+  xml_error(ctx, "References to external entities are not supported");
+}
+
+void
+xml_push_entity(struct xml_context *ctx, struct xml_dtd_entity *ent)
+{
+  TRACE(ctx, "xml_push_entity");
+  struct xml_source *src;
+  if (ent->flags & XML_DTD_ENTITY_EXTERNAL)
+    {
+      ASSERT(ctx->h_resolve_entity);
+      ctx->h_resolve_entity(ctx, ent);
+      ctx->flags |= XML_SRC_EXPECTED_DECL;
+      src = ctx->src;
+    }
+  else
+    {
+      src = xml_push_source(ctx);
+      fbbuf_init_read(src->fb = &src->wrap_fb, ent->text, strlen(ent->text), 0);
+    }
+  src->refill = xml_refill_utf8;
+  src->refill_cat1 = ctx->cat_unrestricted & ~ctx->cat_new_line;
+  src->refill_cat2 = ctx->cat_new_line;
+}
+
+static uint
+xml_error_restricted(struct xml_context *ctx, uint c)
+{
+  if (c == ~1U)
+    xml_error(ctx, "Corrupted encoding");
+  else
+    xml_error(ctx, "Restricted char U+%04X", c);
+  return UNI_REPLACEMENT;
+}
+
+static void xml_parse_decl(struct xml_context *ctx);
+
+#define REFILL(ctx, func, params...)							\
+  struct xml_source *src = ctx->src;							\
+  struct fastbuf *fb = src->fb;								\
+  if (ctx->bptr == ctx->bstop)								\
+    ctx->bptr = ctx->bstop = src->buf;							\
+  uint c, t1 = src->refill_cat1, t2 = src->refill_cat2, row = src->row;			\
+  u32 *bend = src->buf + ARRAY_SIZE(src->buf), *bstop = ctx->bstop,			\
+      *last_0xd = src->pending_0xd ? bstop : NULL;					\
+  do											\
+    {											\
+      c = func(fb, ##params);								\
+      uint t = xml_char_cat(c);								\
+      if (t & t1)									\
+        /* Typical branch */								\
+	*bstop++ = c, *bstop++ = t;							\
+      else if (t & t2)									\
+        {										\
+	  /* New line */								\
+	  /* XML 1.0: 0xA | 0xD | 0xD 0xA */						\
+	  /* XML 1.1: 0xA | 0xD | 0xD 0xA | 0x85 | 0xD 0x85 | 0x2028 */			\
+	  if (c == 0xd)									\
+	    last_0xd = bstop + 2;							\
+	  else if (c != 0x2028 && last_0xd == bstop)					\
+	    {										\
+	      last_0xd = NULL;								\
+	      continue;									\
+	    }										\
+	  xml_add_char(&bstop, 0xa), row++;						\
+	}										\
+      else if (c == '>')								\
+        {										\
+	  /* Used only in XML/TextDecl to switch the encoding */			\
+	  *bstop++ = c, *bstop++ = t;							\
+	  break;									\
+	}										\
+      else if (~c)									\
+        /* Restricted character */							\
+        xml_add_char(&bstop, xml_error_restricted(ctx, c));				\
+      else										\
+        {										\
+	  /* EOF */									\
+          ctx->flags |= XML_SRC_EOF;							\
+          break;									\
+	}										\
+    }											\
+  while (bstop < bend);									\
+  src->pending_0xd = (last_0xd == bstop);						\
+  ctx->bstop = bstop;									\
+  src->row = row;
+
+static void
+xml_refill_utf8(struct xml_context *ctx)
+{
+  REFILL(ctx, bget_utf8_repl, ~1U);
+}
+
+static void
+xml_refill_utf16_le(struct xml_context *ctx)
+{
+  REFILL(ctx, bget_utf16_le_repl, ~1U);
+}
+
+static void
+xml_refill_utf16_be(struct xml_context *ctx)
+{
+  REFILL(ctx, bget_utf16_be_repl, ~1U);
+}
+
+#undef REFILL
+
+void
+xml_refill(struct xml_context *ctx)
+{
+  do
+    {
+      if (ctx->flags & XML_SRC_EOF)
+	xml_pop_source(ctx);
+      else if (ctx->flags & XML_SRC_EXPECTED_DECL)
+	xml_parse_decl(ctx);
+      else
+        {
+	  ctx->src->refill(ctx);
+	  TRACE(ctx, "refilled %u characters", (uint)((ctx->bstop - ctx->bptr) / 2));
+	}
+    }
+  while (ctx->bptr == ctx->bstop);
+}
+
+static uint
+xml_source_row(struct xml_context *ctx, struct xml_source *src)
+{
+  uint row = src->row;
+  for (u32 *p = ctx->bstop; p != ctx->bptr; p -= 2)
+    if (p[-1] & src->refill_cat2)
+      row--;
+  return row + 1;
+}
+
+uint
+xml_row(struct xml_context *ctx)
+{
+  return ctx->src ? xml_source_row(ctx, ctx->src) : 0;
+}
+
+/* Document/external entity header */
+
+static char *
+xml_parse_encoding_name(struct xml_context *ctx)
+{
+  /* EncName ::= '"' [A-Za-z] ([A-Za-z0-9._] | '-')* '"' | "'" [A-Za-z] ([A-Za-z0-9._] | '-')* "'" */
+  char *p = mp_start_noalign(ctx->pool, 1);
+  uint q = xml_parse_quote(ctx);
+  if (unlikely(!(xml_get_cat(ctx) & XML_CHAR_ENC_SNAME)))
+    xml_fatal(ctx, "Invalid character in the encoding name");
+  while (1)
+    {
+      p = mp_spread(ctx->pool, p, 2);
+      *p++ = xml_last_char(ctx);
+      if (xml_get_char(ctx) == q)
+	break;
+      if (unlikely(!(xml_last_cat(ctx) & XML_CHAR_ENC_NAME)))
+	xml_fatal(ctx, "Invalid character in the encoding name");
+    }
+  *p++ = 0;
+  return mp_end(ctx->pool, p);
+}
+
+static void
+xml_init_charconv(struct xml_context *ctx, int cs)
+{
+  // XXX: with a direct access to libucw-charset tables could be faster
+  struct xml_source *src = ctx->src;
+  TRACE(ctx, "wrapping charset %s", charset_name(cs));
+  src->wrapped_fb = src->fb;
+  src->fb = fb_wrap_charconv_in(src->fb, cs, CONV_CHARSET_UTF8);
+}
+
+static void
+xml_parse_decl(struct xml_context *ctx)
+{
+  TRACE(ctx, "xml_parse_decl");
+  struct xml_source *src = ctx->src;
+  ctx->flags &= ~XML_SRC_EXPECTED_DECL;
+  uint doc = ctx->flags & XML_SRC_DOCUMENT;
+
+  /* Setup valid Unicode ranges and force the reader to abort refill() after each '>', where we can switch encoding or XML version */
+  if (doc)
+    xml_init_cats(ctx);
+  src->refill_cat1 = ctx->cat_unrestricted & ~ctx->cat_new_line & ~XML_CHAR_GT;
+  src->refill_cat2 = ctx->cat_new_line;
+
+  /* Initialize the supplied charset (if any) or try to guess it */
+  char *expected_encoding = src->expected_encoding;
+  src->refill = xml_refill_utf8;
+  int bom = bpeekc(src->fb);
+  if (bom < 0)
+    ctx->flags |= XML_SRC_EOF;
+  if (!src->fb_encoding)
+    {
+      if (bom == 0xfe)
+	src->refill = xml_refill_utf16_be;
+      else if (bom == 0xff)
+	src->refill = xml_refill_utf16_le;
+    }
+  else
+    {
+      int cs = find_charset_by_name(src->fb_encoding);
+      if (cs == CONV_CHARSET_UTF8)
+        {}
+      else if (cs >= 0)
+        {
+	  xml_init_charconv(ctx, cs);
+	  bom = 0;
+	}
+      else if (strcasecmp(src->fb_encoding, "UTF-16"))
+        {
+	  src->refill = xml_refill_utf16_be;
+	  if (bom == 0xff)
+	    src->refill = xml_refill_utf16_le;
+	}
+      else if (strcasecmp(src->fb_encoding, "UTF-16BE"))
+	src->refill = xml_refill_utf16_be;
+      else if (strcasecmp(src->fb_encoding, "UTF-16LE"))
+	src->refill = xml_refill_utf16_le;
+      else
+        {
+	  xml_error(ctx, "Unknown encoding '%s'", src->fb_encoding);
+	  expected_encoding = NULL;
+	}
+    }
+  uint utf16 = src->refill == xml_refill_utf16_le || src->refill == xml_refill_utf16_be;
+  if (utf16)
+    src->fb_encoding = (src->refill == xml_refill_utf16_be) ? "UTF-16BE" : "UTF-16LE";
+  if (!expected_encoding)
+    expected_encoding = src->fb_encoding;
+  if (bom > 0 && xml_peek_char(ctx) == 0xfeff)
+    xml_skip_char(ctx);
+  else if (utf16)
+    xml_error(ctx, "Missing or corrupted BOM");
+  TRACE(ctx, "Initial encoding=%s", src->fb_encoding ? : "?");
+
+  /* Look ahead for presence of XMLDecl or optional TextDecl */
+  if (!(ctx->flags & XML_SRC_EOF) && ctx->bstop != src->buf + ARRAY_SIZE(src->buf))
+    xml_refill(ctx);
+  u32 *bptr = ctx->bptr;
+  uint have_decl = (12 <= ctx->bstop - ctx->bptr && (bptr[11] & XML_CHAR_WHITE) &&
+    bptr[0] == '<' && bptr[2] == '?' && (bptr[4] & 0xdf) == 'X' && (bptr[6] & 0xdf) == 'M' && (bptr[8] & 0xdf) == 'L');
+  if (!have_decl)
+    {
+      if (doc)
+        xml_fatal(ctx, "Missing or corrupted XML header");
+      else if (expected_encoding && strcasecmp(src->expected_encoding, "UTF-8") && !utf16)
+	xml_error(ctx, "Missing or corrupted entity header");
+      goto exit;
+    }
+  ctx->bptr = bptr + 12;
+  xml_parse_white(ctx, 0);
+
+  /* Parse version string (mandatory in XMLDecl, optional in TextDecl) */
+  if (xml_peek_char(ctx) == 'v')
+    {
+      xml_parse_seq(ctx, "version");
+      xml_parse_eq(ctx);
+      char *version = xml_parse_pubid_literal(ctx, ctx->pool);
+      TRACE(ctx, "version=%s", version);
+      uint v = 0;
+      if (!strcmp(version, "1.1"))
+	v = XML_VERSION_1_1;
+      else if (strcmp(version, "1.0"))
+        {
+	  xml_error(ctx, "Unknown XML version string '%s'", version);
+	  version = "1.0";
+	}
+      if (doc)
+        {
+	  ctx->version_str = version;
+	  ctx->flags |= v;
+	}
+      else if (v > (ctx->flags & XML_VERSION_1_1))
+        xml_error(ctx, "XML 1.1 external entity included from XML 1.0 document");
+      if (!xml_parse_white(ctx, !doc))
+        goto end;
+    }
+  else if (doc)
+    {
+      xml_error(ctx, "Expected XML version");
+      ctx->version_str = "1.0";
+    }
+
+  /* Parse encoding string (optional in XMLDecl, mandatory in TextDecl) */
+  if (xml_peek_char(ctx) == 'e')
+    {
+      xml_parse_seq(ctx, "encoding");
+      xml_parse_eq(ctx);
+      src->decl_encoding = xml_parse_encoding_name(ctx);
+      TRACE(ctx, "encoding=%s", src->decl_encoding);
+      if (!xml_parse_white(ctx, 0))
+	goto end;
+    }
+  else if (!doc)
+    xml_error(ctx, "Expected XML encoding");
+
+  /* Parse whether the document is standalone (optional in XMLDecl) */
+  if (doc && xml_peek_char(ctx) == 's')
+    {
+      xml_parse_seq(ctx, "standalone");
+      xml_parse_eq(ctx);
+      uint c = xml_parse_quote(ctx);
+      if (ctx->standalone = (xml_peek_char(ctx) == 'y'))
+	xml_parse_seq(ctx, "yes");
+      else
+        xml_parse_seq(ctx, "no");
+      xml_parse_char(ctx, c);
+      TRACE(ctx, "standalone=%d", ctx->standalone);
+      xml_parse_white(ctx, 0);
+    }
+end:
+  xml_parse_seq(ctx, "?>");
+
+  /* Switch to the final encoding */
+  if (src->decl_encoding)
+    {
+      int cs = find_charset_by_name(src->decl_encoding);
+      if (cs < 0 && !expected_encoding)
+	xml_error(ctx, "Unknown encoding '%s'", src->decl_encoding);
+      else if (!src->fb_encoding && cs >= 0 && cs != CONV_CHARSET_UTF8)
+        {
+	  xml_init_charconv(ctx, cs);
+	  src->fb_encoding = src->decl_encoding;
+	}
+      else if (expected_encoding && strcasecmp(src->decl_encoding, expected_encoding) && (!utf16 ||
+	!(!strcasecmp(src->decl_encoding, "UTF-16") ||
+	 (!strcasecmp(src->decl_encoding, "UTF-16BE") && strcasecmp(expected_encoding, "UTF-16LE")) ||
+	 (!strcasecmp(src->decl_encoding, "UTF-16LE") && strcasecmp(expected_encoding, "UTF-16BE")))))
+	xml_error(ctx, "The header contains encoding '%s' instead of expected '%s'", src->decl_encoding, expected_encoding);
+    }
+  if (!src->fb_encoding)
+    src->fb_encoding = "UTF-8";
+  TRACE(ctx, "Final encoding=%s", src->fb_encoding);
+
+exit:
+  /* Update valid Unicode ranges */
+  if (doc)
+    xml_init_cats(ctx);
+  src->refill_cat1 = ctx->cat_unrestricted & ~ctx->cat_new_line;
+  src->refill_cat2 = ctx->cat_new_line;
+}
diff --git a/libucw/ucw-xml/unicat.pl b/libucw/ucw-xml/unicat.pl
new file mode 100755
index 0000000..c1bc442
--- /dev/null
+++ b/libucw/ucw-xml/unicat.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/perl
+#
+#	UCW Library -- Character map for the XML parser
+#
+#	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+#
+#	This software may be freely distributed and used according to the terms
+#	of the GNU Lesser General Public License.
+#
+
+my @cat = ();
+my @lcat = ();
+my %ids = ();
+my %cls = ();
+for (my $i = 0; $i < 0x10000; $i++) { $cat[$i] = 0; }
+for (my $i = 0; $i < 0x11; $i++) { $lcat[$i] = 0; }
+
+my @white = (0x9, 0xA, 0xD, 0x20);
+my @base_char_1_0 = (
+  [0x0041,0x005A], [0x0061,0x007A], [0x00C0,0x00D6], [0x00D8,0x00F6], [0x00F8,0x00FF], [0x0100,0x0131],
+  [0x0134,0x013E], [0x0141,0x0148], [0x014A,0x017E], [0x0180,0x01C3], [0x01CD,0x01F0], [0x01F4,0x01F5],
+  [0x01FA,0x0217], [0x0250,0x02A8], [0x02BB,0x02C1], 0x0386, [0x0388,0x038A], 0x038C, [0x038E,0x03A1],
+  [0x03A3,0x03CE], [0x03D0,0x03D6], 0x03DA, 0x03DC, 0x03DE, 0x03E0, [0x03E2,0x03F3], [0x0401,0x040C],
+  [0x040E,0x044F], [0x0451,0x045C], [0x045E,0x0481], [0x0490,0x04C4], [0x04C7,0x04C8], [0x04CB,0x04CC],
+  [0x04D0,0x04EB], [0x04EE,0x04F5], [0x04F8,0x04F9], [0x0531,0x0556], 0x0559, [0x0561,0x0586], [0x05D0,0x05EA],
+  [0x05F0,0x05F2], [0x0621,0x063A], [0x0641,0x064A], [0x0671,0x06B7], [0x06BA,0x06BE], [0x06C0,0x06CE],
+  [0x06D0,0x06D3], 0x06D5, [0x06E5,0x06E6], [0x0905,0x0939], 0x093D, [0x0958,0x0961], [0x0985,0x098C],
+  [0x098F,0x0990], [0x0993,0x09A8], [0x09AA,0x09B0], 0x09B2, [0x09B6,0x09B9], [0x09DC,0x09DD], [0x09DF,0x09E1],
+  [0x09F0,0x09F1], [0x0A05,0x0A0A], [0x0A0F,0x0A10], [0x0A13,0x0A28], [0x0A2A,0x0A30], [0x0A32,0x0A33],
+  [0x0A35,0x0A36], [0x0A38,0x0A39], [0x0A59,0x0A5C], 0x0A5E, [0x0A72,0x0A74], [0x0A85,0x0A8B], 0x0A8D,
+  [0x0A8F,0x0A91], [0x0A93,0x0AA8], [0x0AAA,0x0AB0], [0x0AB2,0x0AB3], [0x0AB5,0x0AB9], 0x0ABD, 0x0AE0,
+  [0x0B05,0x0B0C], [0x0B0F,0x0B10], [0x0B13,0x0B28], [0x0B2A,0x0B30], [0x0B32,0x0B33], [0x0B36,0x0B39],
+  0x0B3D, [0x0B5C,0x0B5D], [0x0B5F,0x0B61], [0x0B85,0x0B8A], [0x0B8E,0x0B90], [0x0B92,0x0B95], [0x0B99,0x0B9A],
+  0x0B9C, [0x0B9E,0x0B9F], [0x0BA3,0x0BA4], [0x0BA8,0x0BAA], [0x0BAE,0x0BB5], [0x0BB7,0x0BB9], [0x0C05,0x0C0C],
+  [0x0C0E,0x0C10], [0x0C12,0x0C28], [0x0C2A,0x0C33], [0x0C35,0x0C39], [0x0C60,0x0C61], [0x0C85,0x0C8C],
+  [0x0C8E,0x0C90], [0x0C92,0x0CA8], [0x0CAA,0x0CB3], [0x0CB5,0x0CB9], 0x0CDE, [0x0CE0,0x0CE1], [0x0D05,0x0D0C],
+  [0x0D0E,0x0D10], [0x0D12,0x0D28], [0x0D2A,0x0D39], [0x0D60,0x0D61], [0x0E01,0x0E2E], 0x0E30, [0x0E32,0x0E33],
+  [0x0E40,0x0E45], [0x0E81,0x0E82], 0x0E84, [0x0E87,0x0E88], 0x0E8A, 0x0E8D, [0x0E94,0x0E97], [0x0E99,0x0E9F],
+  [0x0EA1,0x0EA3], 0x0EA5, 0x0EA7, [0x0EAA,0x0EAB], [0x0EAD,0x0EAE], 0x0EB0, [0x0EB2,0x0EB3], 0x0EBD,
+  [0x0EC0,0x0EC4], [0x0F40,0x0F47], [0x0F49,0x0F69], [0x10A0,0x10C5], [0x10D0,0x10F6], 0x1100, [0x1102,0x1103],
+  [0x1105,0x1107], 0x1109, [0x110B,0x110C], [0x110E,0x1112], 0x113C, 0x113E, 0x1140, 0x114C, 0x114E, 0x1150,
+  [0x1154,0x1155], 0x1159, [0x115F,0x1161], 0x1163, 0x1165, 0x1167, 0x1169, [0x116D,0x116E], [0x1172,0x1173],
+  0x1175, 0x119E, 0x11A8, 0x11AB, [0x11AE,0x11AF], [0x11B7,0x11B8], 0x11BA, [0x11BC,0x11C2], 0x11EB, 0x11F0,
+  0x11F9, [0x1E00,0x1E9B], [0x1EA0,0x1EF9], [0x1F00,0x1F15], [0x1F18,0x1F1D], [0x1F20,0x1F45], [0x1F48,0x1F4D],
+  [0x1F50,0x1F57], 0x1F59, 0x1F5B, 0x1F5D, [0x1F5F,0x1F7D], [0x1F80,0x1FB4], [0x1FB6,0x1FBC], 0x1FBE,
+  [0x1FC2,0x1FC4], [0x1FC6,0x1FCC], [0x1FD0,0x1FD3], [0x1FD6,0x1FDB], [0x1FE0,0x1FEC], [0x1FF2,0x1FF4],
+  [0x1FF6,0x1FFC], 0x2126, [0x212A,0x212B], 0x212E, [0x2180,0x2182], [0x3041,0x3094], [0x30A1,0x30FA],
+  [0x3105,0x312C], [0xAC00,0xD7A3]);
+my @ideographic_1_0 = ([0x4E00,0x9FA5], 0x3007, [0x3021,0x3029]);
+my @combining_char_1_0 = (
+  [0x0300,0x0345], [0x0360,0x0361], [0x0483,0x0486], [0x0591,0x05A1], [0x05A3,0x05B9], [0x05BB,0x05BD],
+  0x05BF, [0x05C1,0x05C2], 0x05C4, [0x064B,0x0652], 0x0670, [0x06D6,0x06DC], [0x06DD,0x06DF], [0x06E0,0x06E4],
+  [0x06E7,0x06E8], [0x06EA,0x06ED], [0x0901,0x0903], 0x093C, [0x093E,0x094C], 0x094D, [0x0951,0x0954],
+  [0x0962,0x0963], [0x0981,0x0983], 0x09BC, 0x09BE, 0x09BF, [0x09C0,0x09C4], [0x09C7,0x09C8], [0x09CB,0x09CD],
+  0x09D7, [0x09E2,0x09E3], 0x0A02, 0x0A3C, 0x0A3E, 0x0A3F, [0x0A40,0x0A42], [0x0A47,0x0A48], [0x0A4B,0x0A4D],
+  [0x0A70,0x0A71], [0x0A81,0x0A83], 0x0ABC, [0x0ABE,0x0AC5], [0x0AC7,0x0AC9], [0x0ACB,0x0ACD], [0x0B01,0x0B03],
+  0x0B3C, [0x0B3E,0x0B43], [0x0B47,0x0B48], [0x0B4B,0x0B4D], [0x0B56,0x0B57], [0x0B82,0x0B83], [0x0BBE,0x0BC2],
+  [0x0BC6,0x0BC8], [0x0BCA,0x0BCD], 0x0BD7, [0x0C01,0x0C03], [0x0C3E,0x0C44], [0x0C46,0x0C48], [0x0C4A,0x0C4D],
+  [0x0C55,0x0C56], [0x0C82,0x0C83], [0x0CBE,0x0CC4], [0x0CC6,0x0CC8], [0x0CCA,0x0CCD], [0x0CD5,0x0CD6],
+  [0x0D02,0x0D03], [0x0D3E,0x0D43], [0x0D46,0x0D48], [0x0D4A,0x0D4D], 0x0D57, 0x0E31, [0x0E34,0x0E3A],
+  [0x0E47,0x0E4E], 0x0EB1, [0x0EB4,0x0EB9], [0x0EBB,0x0EBC], [0x0EC8,0x0ECD], [0x0F18,0x0F19], 0x0F35,
+  0x0F37, 0x0F39, 0x0F3E, 0x0F3F, [0x0F71,0x0F84], [0x0F86,0x0F8B], [0x0F90,0x0F95], 0x0F97, [0x0F99,0x0FAD],
+  [0x0FB1,0x0FB7], 0x0FB9, [0x20D0,0x20DC], 0x20E1, [0x302A,0x302F], 0x3099, 0x309A);
+my @digit_1_0 = (
+  [0x0030,0x0039], [0x0660,0x0669], [0x06F0,0x06F9], [0x0966,0x096F], [0x09E6,0x09EF], [0x0A66,0x0A6F],
+  [0x0AE6,0x0AEF], [0x0B66,0x0B6F], [0x0BE7,0x0BEF], [0x0C66,0x0C6F], [0x0CE6,0x0CEF], [0x0D66,0x0D6F],
+  [0x0E50,0x0E59], [0x0ED0,0x0ED9], [0x0F20,0x0F29]);
+my @extender_1_0 = (
+  0x00B7, 0x02D0, 0x02D1, 0x0387, 0x0640, 0x0E46, 0x0EC6, 0x3005, [0x3031,0x3035], [0x309D,0x309E], [0x30FC,0x30FE]);
+my @sname_1_1 = (
+  "[:A-Z_a-z]", [0xC0,0xD6], [0xD8,0xF6], [0xF8,0x2FF], [0x370,0x37D], [0x37F,0x1FFF],
+  [0x200C,0x200D], [0x2070,0x218F], [0x2C00,0x2FEF], [0x3001,0xD7FF], [0xF900,0xFDCF], [0xFDF0,0xFFFD], [0x10000,0xEFFFF]);
+
+set("WHITE", @white);
+set("NEW_LINE_1_0", 0xA, 0xD);
+set("NEW_LINE_1_1", 0xA, 0xD, 0x85, 0x2028);
+set("DIGIT", "[0-9]");
+set("XDIGIT", "[0-9a-fA-F]");
+set("VALID_1_0", @white, [0x20,0xD7FF], [0xE000,0xFFFD], [0x10000,0x10FFFF]);
+set("VALID_1_1", [0x1,0xD7FF], [0xE000,0xFFFD], [0x10000,0x10FFFF]);
+set("UNRESTRICTED_1_1", @white, [0x20,0x7E], 0x85, [0xA0,0xD7FF], [0xE000,0xFFFD], [0x10000,0x10FFFF]);
+set("PUBID", 0x20, 0xD, 0xA, "[-a-zA-Z0-9'()+,./:=?:!*#@\$_%]");
+set("ENC_SNAME", "[a-zA-Z]");
+set("ENC_NAME", "[-a-zA-Z0-9._]");
+set("SNAME_1_0", "[_:]", @base_char_1_0, @ideographic_1_0);
+set("NAME_1_0", "[-_:.]", @base_char_1_0, @ideographic_1_0, @combining_char_1_0, @digit_1_0, @extender_1_0);
+set("SNAME_1_1", @sname_1_1);
+set("NAME_1_1", @sname_1_1, "[-.0-9]", 0xB7, [0x0300,0x036F], [0x203F,0x2040]);
+set("GT", "[>]");
+
+($ARGV[0] eq "" || $ARGV[1] eq "") && die("Invalid usage");
+find_cls();
+open(H, ">", $ARGV[0]) or die("Cannot create $ARGV[0]");
+open(C, ">", $ARGV[1]) or die("Cannot create $ARGV[1]");
+gen_enum();
+gen_tabs();
+close(H);
+close(C);
+
+sub set {
+  my $id = shift;
+  $ids{$id} = scalar keys(%ids) if !defined($ids{$id});
+  my $mask = 1 << $ids{$id};
+  foreach my $i (@_) {
+    if (ref($i) eq "ARRAY") {
+      my $j = $i->[0];
+      for (; $j <= $i->[1] && $j < 0x10000; $j++) { $cat[$j] |= $mask; }
+      for (; $j <= $i->[1]; $j += 0x10000) { $lcat[$j >> 16] |= $mask; }
+    }
+    elsif ($i =~ /^\[/) { for (my $j=0; $j < 128; $j++) { if (chr($j) =~ /$i/) { $cat[$j] |= $mask; } } }
+    else { $cat[$i] |= $mask; }
+  }
+}
+
+sub find_cls {
+  foreach (my $i=0; $i<@cat; $i++) { $cls{$cat[$i]} = scalar keys(%cls) if !defined($cls{$cat[$i]}); }
+  foreach (my $i=0; $i<@lcat; $i++) { $cls{$lcat[$i]} = scalar keys(%cls) if !defined($cls{$lcat[$i]}); }
+}
+
+sub gen_enum {
+  print H "enum xml_char_type {\n";
+  foreach my $id (sort keys %ids) {
+    my $mask = 0;
+    foreach my $i (keys %cls) {
+      $mask |= 1 << $cls{$i} if $cls{$i} && ($i & (1 << $ids{$id}));
+    }
+    printf H "  XML_CHAR_%-20s = 0x%08x,\n", $id, $mask;
+  }
+  print H "};\n\n";
+}
+
+sub gen_tabs {
+  my @tab = ();
+  my %hash = ();
+
+  print H "extern const byte ucw_xml_char_tab1[];\n";
+  print H "extern const uint ucw_xml_char_tab2[];\n";
+  print H "extern const byte ucw_xml_char_tab3[];\n";
+
+  print C "const uint ucw_xml_char_tab2[] = {\n  ";
+  for (my $t=0; $t<256; $t++) {
+    my $i = $t * 256;
+    my @x = ();
+    for (my $j=0; $j<256; $j += 32) {
+      push @x, join(",", map($cls{$_}, @cat[$i+$j..$i+$j+31]));
+    }
+    my $sub = "  " . join(",\n  ", @x);
+    if (!defined($hash{$sub})) {
+      $hash{$sub} = 256 * scalar @tab;
+      push @tab, $sub;
+    }
+    printf C "0x%x", $hash{$sub};
+    print C ((~$t & 15) ? "," : ($t < 255) ? ",\n  " : "\n};\n\n");
+  }
+
+  print C "const byte ucw_xml_char_tab1[] = {\n";
+  print C join(",\n\n", @tab);
+  print C "\n};\n\n";
+
+  my @l = ();
+  for (my $i=0; $i<0x11; $i++) {
+    push @l, sprintf("%d", $cls{$lcat[$i]});
+  }
+  print C "const byte ucw_xml_char_tab3[] = {" . join(",", @l) . "};\n";
+}
diff --git a/libucw/ucw-xml/xml-test.c b/libucw/ucw-xml/xml-test.c
new file mode 100644
index 0000000..7b7fcd1
--- /dev/null
+++ b/libucw/ucw-xml/xml-test.c
@@ -0,0 +1,394 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw-xml/xml.h>
+#include <ucw-xml/dtd.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <ucw/gary.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+enum {
+  WANT_FIRST = 0x100,
+  WANT_HIDE_ERRORS,
+  WANT_IGNORE_COMMENTS,
+  WANT_IGNORE_PIS,
+  WANT_REPORT_BLOCKS,
+  WANT_REPORT_IGNORABLE,
+  WANT_FILE_ENTITIES,
+  WANT_QNAMES,
+};
+
+static char *shortopts = "spdtn" CF_SHORT_OPTS;
+static struct option longopts[] = {
+  CF_LONG_OPTS
+  { "sax",		0, 0, 's' },
+  { "pull",		0, 0, 'p' },
+  { "dom",		0, 0, 't' },
+  { "dtd",		0, 0, 'd' },
+  { "namespaces",	0, 0, 'n' },
+  { "hide-errors",	0, 0, WANT_HIDE_ERRORS },
+  { "ignore-comments",	0, 0, WANT_IGNORE_COMMENTS },
+  { "ignore-pis",	0, 0, WANT_IGNORE_PIS },
+  { "report-blocks",	0, 0, WANT_REPORT_BLOCKS },
+  { "report-ignorable",	0, 0, WANT_REPORT_IGNORABLE },
+  { "file-entities",	0, 0, WANT_FILE_ENTITIES },
+  { "qnames",		0, 0, WANT_QNAMES },
+  { NULL,		0, 0, 0 }
+};
+
+static void NONRET
+usage(void)
+{
+  fputs("\
+Usage: xml-test [options] < input.xml\n\
+\n\
+Options:\n"
+CF_USAGE
+"\
+-p, --pull              Test PULL interface\n\
+-s, --sax               Test SAX interface\n\
+-t, --dom               Test DOM interface\n\
+-d, --dtd               Enable parsing of DTD\n\
+-n, --namespaces	Resolve namespaces\n\
+    --hide-errors       Hide warnings and error messages\n\
+    --ignore-comments   Ignore comments\n\
+    --ignore-pis        Ignore processing instructions\n\
+    --report-blocks	Report blocks or characters and CDATA sections\n\
+    --report-ignorable  Report ignorable whitespace\n\
+    --file-entities     Resolve file external entities (not fully normative)\n\
+    --qnames		Display qualified names including namespace prefixes\n\
+\n", stderr);
+  exit(1);
+}
+
+static uint want_sax;
+static uint want_pull;
+static uint want_dom;
+static uint want_ns;
+static uint want_parse_dtd;
+static uint want_hide_errors;
+static uint want_ignore_comments;
+static uint want_ignore_pis;
+static uint want_report_blocks;
+static uint want_report_ignorable;
+static uint want_file_entities;
+static uint want_qnames;
+
+static struct fastbuf *out;
+
+static char *
+node_type(struct xml_node *node)
+{
+  switch (node->type)
+    {
+      case XML_NODE_ELEM: return "element";
+      case XML_NODE_COMMENT: return "comment";
+      case XML_NODE_PI: return "pi";
+      case XML_NODE_CHARS: return "chars";
+      default: return "unknown";
+    }
+}
+
+static void
+show_node(struct xml_context *ctx, struct xml_node *node)
+{
+  switch (node->type)
+    {
+      case XML_NODE_ELEM:
+	if (want_ns)
+	  bprintf(out, " (ns%u)<%s>", node->ns, (want_qnames ? xml_node_qname(ctx, node) : node->name));
+	else
+	  bprintf(out, " <%s>", node->name);
+        XML_ATTR_FOR_EACH(a, node)
+	  if (want_ns)
+	    bprintf(out, " (ns%u)%s='%s'", a->ns, (want_qnames ? xml_attr_qname(ctx, a) : a->name), a->val);
+	  else
+	    bprintf(out, " %s='%s'", a->name, a->val);
+	bputc(out, '\n');
+	break;
+      case XML_NODE_COMMENT:
+	bprintf(out, " text='%s'\n", node->text);
+	break;
+      case XML_NODE_PI:
+	bprintf(out, " target=%s text='%s'\n", node->name, node->text);
+	break;
+      case XML_NODE_CHARS:
+	bprintf(out, " text='%s'\n", node->text);
+	break;
+      default:
+        bputc(out, '\n');
+    }
+}
+
+static void
+show_tree(struct xml_context *ctx, struct xml_node *node, uint level)
+{
+  if (!node)
+    return;
+  bputs(out, "DOM:  ");
+  for (uint i = 0; i < level; i++)
+    bputs(out, "    ");
+  bputs(out, node_type(node));
+  show_node(ctx, node);
+  if (node->type == XML_NODE_ELEM)
+    XML_NODE_FOR_EACH(son, node)
+      show_tree(ctx, son, level + 1);
+}
+
+static void
+h_error(struct xml_context *ctx)
+{
+  bprintf(out, "SAX:  %s at %u: %s\n", (ctx->err_code < XML_ERR_ERROR) ? "warn" : "error", xml_row(ctx), ctx->err_msg);
+}
+
+static void
+h_document_start(struct xml_context *ctx UNUSED)
+{
+  bputs(out, "SAX:  document_start\n");
+}
+
+static void
+h_document_end(struct xml_context *ctx UNUSED)
+{
+  bputs(out, "SAX:  document_end\n");
+}
+
+static void
+h_xml_decl(struct xml_context *ctx)
+{
+  bprintf(out, "SAX:  xml_decl version=%s standalone=%d fb_encoding=%s\n", ctx->version_str, ctx->standalone, ctx->src->fb_encoding);
+}
+
+static void
+h_doctype_decl(struct xml_context *ctx)
+{
+  bprintf(out, "SAX:  doctype_decl type=%s public='%s' system='%s' extsub=%d intsub=%d\n",
+    ctx->doctype, ctx->public_id ? : "", ctx->system_id ? : "",
+    !!(ctx->flags & XML_HAS_EXTERNAL_SUBSET), !!(ctx->flags & XML_HAS_INTERNAL_SUBSET));
+}
+
+static void
+h_comment(struct xml_context *ctx)
+{
+  bputs(out, "SAX:  comment");
+  show_node(ctx, ctx->node);
+}
+
+static void
+h_pi(struct xml_context *ctx)
+{
+  bputs(out, "SAX:  pi");
+  show_node(ctx, ctx->node);
+}
+
+static void
+h_stag(struct xml_context *ctx)
+{
+  bputs(out, "SAX:  stag");
+  show_node(ctx, ctx->node);
+}
+
+static void
+h_etag(struct xml_context *ctx)
+{
+  bprintf(out, "SAX:  etag </%s>\n", ctx->node->name);
+}
+
+static void
+h_chars(struct xml_context *ctx)
+{
+  bputs(out, "SAX:  chars");
+  show_node(ctx, ctx->node);
+}
+
+static void
+h_block(struct xml_context *ctx UNUSED, char *text, uint len UNUSED)
+{
+  bprintf(out, "SAX:  block text='%s'\n", text);
+}
+
+static void
+h_cdata(struct xml_context *ctx UNUSED, char *text, uint len UNUSED)
+{
+  bprintf(out, "SAX:  cdata text='%s'\n", text);
+}
+
+static void
+h_ignorable(struct xml_context *ctx UNUSED, char *text, uint len UNUSED)
+{
+  bprintf(out, "SAX:  ignorable text='%s'\n", text);
+}
+
+static void
+h_dtd_start(struct xml_context *ctx UNUSED)
+{
+  bputs(out, "SAX:  dtd_start\n");
+}
+
+static void
+h_dtd_end(struct xml_context *ctx UNUSED)
+{
+  bputs(out, "SAX:  dtd_end\n");
+}
+
+static void
+h_resolve_entity(struct xml_context *ctx, struct xml_dtd_entity *e)
+{
+  xml_push_fastbuf(ctx, bopen(e->system_id, O_RDONLY, 4096));
+}
+
+int
+main(int argc, char **argv)
+{
+  int opt;
+  cf_def_file = NULL;
+  log_init(argv[0]);
+  while ((opt = cf_getopt(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	case 's':
+	  want_sax++;
+	  break;
+	case 'p':
+	  want_pull++;
+	  break;
+	case 't':
+	  want_dom++;
+	  break;
+	case 'd':
+	  want_parse_dtd++;
+	  break;
+	case 'n':
+	  want_ns++;
+	  break;
+	case WANT_HIDE_ERRORS:
+	  want_hide_errors++;
+	  break;
+	case WANT_IGNORE_COMMENTS:
+	  want_ignore_comments++;
+	  break;
+	case WANT_IGNORE_PIS:
+	  want_ignore_pis++;
+	  break;
+	case WANT_REPORT_BLOCKS:
+	  want_report_blocks++;
+	  break;
+	case WANT_REPORT_IGNORABLE:
+	  want_report_ignorable++;
+	  break;
+	case WANT_FILE_ENTITIES:
+	  want_file_entities++;
+	  break;
+	case WANT_QNAMES:
+	  want_qnames++;
+	  break;
+	default:
+	  usage();
+      }
+  if (optind != argc)
+    usage();
+
+  out = bfdopen_shared(1, 4096);
+  struct xml_context ctx;
+  xml_init(&ctx);
+  if (!want_hide_errors)
+    ctx.h_warn = ctx.h_error = ctx.h_fatal = h_error;
+  if (want_sax)
+    {
+      ctx.h_document_start = h_document_start;
+      ctx.h_document_end = h_document_end;
+      ctx.h_xml_decl = h_xml_decl;
+      ctx.h_doctype_decl = h_doctype_decl;
+      ctx.h_comment = h_comment;
+      ctx.h_pi = h_pi;
+      ctx.h_stag = h_stag;
+      ctx.h_etag = h_etag;
+      ctx.h_chars = h_chars;
+      if (want_report_blocks)
+        {
+          ctx.h_block = h_block;
+          ctx.h_cdata = h_cdata;
+	}
+      if (want_report_ignorable)
+        ctx.h_ignorable = h_ignorable;
+      ctx.h_dtd_start = h_dtd_start;
+      ctx.h_dtd_end = h_dtd_end;
+    }
+  if (want_dom)
+    ctx.flags |= XML_ALLOC_ALL;
+  if (want_parse_dtd)
+    ctx.flags |= XML_PARSE_DTD;
+  if (want_ignore_comments)
+    ctx.flags &= ~(XML_REPORT_COMMENTS | XML_ALLOC_COMMENTS);
+  if (want_ignore_pis)
+    ctx.flags &= ~(XML_REPORT_PIS | XML_ALLOC_PIS);
+  if (want_file_entities)
+    ctx.h_resolve_entity = h_resolve_entity;
+  if (want_ns)
+    xml_ns_enable(&ctx);
+  xml_push_fastbuf(&ctx, bfdopen_shared(0, 4096));
+  bputs(out, "PULL: start\n");
+  if (want_pull)
+    {
+      ctx.pull = XML_PULL_CHARS | XML_PULL_STAG | XML_PULL_ETAG | XML_PULL_COMMENT | XML_PULL_PI;
+      uint state;
+      while (state = xml_next(&ctx))
+	switch (state)
+	  {
+	    case XML_STATE_CHARS:
+	      bputs(out, "PULL: chars");
+	      show_node(&ctx, ctx.node);
+	      break;
+	    case XML_STATE_STAG:
+	      bputs(out, "PULL: stag");
+	      show_node(&ctx, ctx.node);
+	      break;
+	    case XML_STATE_ETAG:
+	      bprintf(out, "PULL: etag </%s>\n", ctx.node->name);
+	      break;
+	    case XML_STATE_COMMENT:
+	      bputs(out, "PULL: comment");
+	      show_node(&ctx, ctx.node);
+	      break;
+	    case XML_STATE_PI:
+	      bputs(out, "PULL: pi");
+	      show_node(&ctx, ctx.node);
+	      break;
+	    default:
+	      bputs(out, "PULL: unknown\n");
+	      break;
+	  }
+    }
+  else
+    xml_parse(&ctx);
+  if (ctx.err_code)
+    bprintf(out, "PULL: fatal error at %u: %s\n", xml_row(&ctx), ctx.err_msg);
+  else
+    {
+      bputs(out, "PULL: eof\n");
+      if (want_dom)
+	show_tree(&ctx, ctx.dom, 0);
+    }
+
+  if (want_ns)
+    {
+      bputs(out, "Known namespaces:\n");
+      for (uns i=0; i < GARY_SIZE(ctx.ns_by_id); i++)
+	bprintf(out, "%u\t%s\n", i, ctx.ns_by_id[i]);
+    }
+
+  xml_cleanup(&ctx);
+  bclose(out);
+  return 0;
+}
diff --git a/libucw/ucw-xml/xml-test.t b/libucw/ucw-xml/xml-test.t
new file mode 100644
index 0000000..d48fd40
--- /dev/null
+++ b/libucw/ucw-xml/xml-test.t
@@ -0,0 +1,58 @@
+# Tests for the XML parser
+# (c) 2008 Pavel Charvat <pchar@ucw.cz>
+
+Run:	../obj/ucw-xml/xml-test
+In:	<?xml version="1.0"?>
+	<html></html>
+Out:	PULL: start
+	PULL: eof
+
+Run:	../obj/ucw-xml/xml-test -s
+In:	<?xml version="1.0" encoding="ISO-8859-1"?>
+	<html><a a1="val1" a2="val2">text1&amp;amp;&lt;</a>text2</html>
+Out:	PULL: start
+	SAX:  document_start
+	SAX:  xml_decl version=1.0 standalone=0 fb_encoding=ISO-8859-1
+	SAX:  stag <html>
+	SAX:  stag <a> a1='val1' a2='val2'
+	SAX:  chars text='text1&amp;<'
+	SAX:  etag </a>
+	SAX:  chars text='text2'
+	SAX:  etag </html>
+	SAX:  document_end
+	PULL: eof
+
+Run:	../obj/ucw-xml/xml-test -sptd
+In:	<?xml version="1.0"?>
+	<!DOCTYPE root [
+	<!ELEMENT root (#PCDATA|a)*>
+	<!ENTITY % pe1 "<!ENTITY e1 'text'>">
+	%pe1;
+	<!ENTITY e2 '&lt;&e1;&gt;'>
+	<!ELEMENT a (#PCDATA)*>
+	]>
+	<root>&e1;<a>&e2;</a></root>
+Out:	PULL: start
+	SAX:  document_start
+	SAX:  xml_decl version=1.0 standalone=0 fb_encoding=UTF-8
+	SAX:  doctype_decl type=root public='' system='' extsub=0 intsub=1
+	SAX:  dtd_start
+	SAX:  dtd_end
+	SAX:  stag <root>
+	PULL: stag <root>
+	SAX:  chars text='text'
+	PULL: chars text='text'
+	SAX:  stag <a>
+	PULL: stag <a>
+	SAX:  chars text='<text>'
+	PULL: chars text='<text>'
+	PULL: etag </a>
+	SAX:  etag </a>
+	PULL: etag </root>
+	SAX:  etag </root>
+	SAX:  document_end
+	PULL: eof
+	DOM:  element <root>
+	DOM:      chars text='text'
+	DOM:      element <a>
+	DOM:          chars text='<text>'
diff --git a/libucw/ucw-xml/xml.h b/libucw/ucw-xml/xml.h
new file mode 100644
index 0000000..1712607
--- /dev/null
+++ b/libucw/ucw-xml/xml.h
@@ -0,0 +1,404 @@
+/*
+ *	UCW Library -- A simple XML parser
+ *
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_XML_XML_H
+#define _UCW_XML_XML_H
+
+#include <ucw/clists.h>
+#include <ucw/slists.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define xml_attr_find ucw_xml_attr_find
+#define xml_attr_find_ns ucw_xml_attr_find_ns
+#define xml_attr_qname ucw_xml_attr_qname
+#define xml_attr_value ucw_xml_attr_value
+#define xml_attr_value_ns ucw_xml_attr_value_ns
+#define xml_cleanup ucw_xml_cleanup
+#define xml_def_find_entity ucw_xml_def_find_entity
+#define xml_def_resolve_entity ucw_xml_def_resolve_entity
+#define xml_error ucw_xml_error
+#define xml_fatal ucw_xml_fatal
+#define xml_init ucw_xml_init
+#define xml_merge_chars ucw_xml_merge_chars
+#define xml_merge_dom_chars ucw_xml_merge_dom_chars
+#define xml_next ucw_xml_next
+#define xml_next_state ucw_xml_next_state
+#define xml_node_qname ucw_xml_node_qname
+#define xml_normalize_white ucw_xml_normalize_white
+#define xml_ns_by_id ucw_xml_ns_by_id
+#define xml_ns_by_name ucw_xml_ns_by_name
+#define xml_ns_enable ucw_xml_ns_enable
+#define xml_parse ucw_xml_parse
+#define xml_push_fastbuf ucw_xml_push_fastbuf
+#define xml_reset ucw_xml_reset
+#define xml_row ucw_xml_row
+#define xml_skip_element ucw_xml_skip_element
+#define xml_warn ucw_xml_warn
+#endif
+
+/***
+ * === Constants
+ ***/
+
+struct xml_context;
+struct xml_dtd_entity;
+
+/** Error code reported by the parser. So far, only the basic error classes are recognized. **/
+enum xml_error {
+  XML_ERR_OK = 0,
+  XML_ERR_WARN = 1000,					/* Warning */
+  XML_ERR_ERROR = 2000,					/* Recoverable error */
+  XML_ERR_FATAL = 3000,					/* Unrecoverable error */
+  XML_ERR_EOF,
+};
+
+/** Parser state. A pull parser returns one of these to indicate the type of the current node. **/
+enum xml_state {
+  XML_STATE_EOF,					/* EOF or a fatal error */
+  XML_STATE_START,					/* Initial state */
+  XML_STATE_XML_DECL,					/* XML_PULL_XML_DECL */
+  XML_STATE_DOCTYPE_DECL,				/* XML_PULL_DOCTYPE_DECL */
+  XML_STATE_CHARS,					/* XML_PULL_CHARS */
+  XML_STATE_STAG,					/* XML_PULL_STAG */
+  XML_STATE_ETAG,					/* XML_PULL_ETAG */
+  XML_STATE_COMMENT,					/* XML_PULL_COMMENT */
+  XML_STATE_PI,						/* XML_PULL_PI */
+
+  /* Internal states */
+  XML_STATE_CHARS_BEFORE_STAG,
+  XML_STATE_CHARS_BEFORE_ETAG,
+  XML_STATE_CHARS_BEFORE_CDATA,
+  XML_STATE_CHARS_BEFORE_COMMENT,
+  XML_STATE_CHARS_BEFORE_PI,
+  XML_STATE_PROLOG_COMMENT,
+  XML_STATE_PROLOG_PI,
+  XML_STATE_EPILOG_COMMENT,
+  XML_STATE_EPILOG_PI,
+};
+
+/** Pull requests: a bit mask of node types you want to return. The other nodes are silently skipped. **/
+enum xml_pull {
+  XML_PULL_XML_DECL =			0x00000001,	/* Stop after the XML declaration */
+  XML_PULL_DOCTYPE_DECL =		0x00000002,	/* Stop in the doctype declaration (before optional internal subset) */
+  XML_PULL_CHARS =			0x00000004,
+  XML_PULL_STAG =			0x00000008,
+  XML_PULL_ETAG =			0x00000010,
+  XML_PULL_COMMENT =			0x00000020,
+  XML_PULL_PI =				0x00000040,
+  XML_PULL_ALL =			0xffffffff,
+};
+
+/** Parser mode flags. **/
+enum xml_flags {
+  /* Enable reporting of various events via SAX and/or PULL interface */
+  XML_REPORT_COMMENTS =			0x00000001,	/* Report comments */
+  XML_REPORT_PIS =			0x00000002,	/* Report processing instructions */
+  XML_REPORT_CHARS =			0x00000004,	/* Report characters */
+  XML_REPORT_TAGS =			0x00000008,	/* Report element starts/ends */
+  XML_REPORT_MISC = XML_REPORT_COMMENTS | XML_REPORT_PIS,
+  XML_REPORT_ALL = XML_REPORT_MISC | XML_REPORT_CHARS | XML_REPORT_TAGS,
+
+  /* Enable construction of DOM for these types */
+  XML_ALLOC_COMMENTS =			0x00000010,	/* Create comment nodes */
+  XML_ALLOC_PIS =			0x00000020,	/* Create processing instruction nodes */
+  XML_ALLOC_CHARS =			0x00000040,	/* Create character nodes */
+  XML_ALLOC_TAGS =			0x00000080,	/* Create element nodes */
+  XML_ALLOC_MISC = XML_ALLOC_COMMENTS | XML_ALLOC_PIS,
+  XML_ALLOC_ALL = XML_ALLOC_MISC | XML_ALLOC_CHARS | XML_ALLOC_TAGS,
+
+  /* Other parameters */
+  XML_VALIDATING =			0x00000100,	/* Validate everything (not fully implemented!) */
+  XML_PARSE_DTD =			0x00000200,	/* Enable parsing of DTD */
+  XML_NO_CHARS =			0x00000400,	/* The current element must not contain character data (filled automaticaly if using DTD) */
+  XML_ALLOC_DEFAULT_ATTRS =		0x00000800,	/* Allocate default attribute values so they can be found by XML_ATTR_FOR_EACH */
+  XML_NAMESPACES =			0x00001000,	/* Parse namespaces, use xml_ns_enable() to set this */
+
+  /* Internals, do not change! */
+  XML_EMPTY_ELEM_TAG =			0x00010000,	/* The current element match EmptyElemTag */
+  XML_VERSION_1_1 =			0x00020000,	/* XML version is 1.1, otherwise 1.0 */
+  XML_HAS_EXTERNAL_SUBSET =		0x00040000,	/* The document contains a reference to external DTD subset */
+  XML_HAS_INTERNAL_SUBSET =		0x00080000,	/* The document contains an internal subset */
+  XML_HAS_DTD =	XML_HAS_EXTERNAL_SUBSET | XML_HAS_INTERNAL_SUBSET,
+  XML_SRC_EOF =				0x00100000,	/* EOF reached */
+  XML_SRC_EXPECTED_DECL =		0x00200000,	/* Just before optional or required XMLDecl/TextDecl */
+  XML_SRC_DOCUMENT =			0x00400000,	/* The document entity */
+  XML_SRC_EXTERNAL =			0x00800000,	/* An external entity */
+};
+
+/***
+ * === Internal representation of DOM
+ *
+ * All DOM nodes are allocated within temporary memory pools and they are not
+ * guaranteed to survive when the parser leaves the element. Upon <<xml_cleanup()>>,
+ * all remaining nodes are always freed.
+ ***/
+
+/** Node types **/
+enum xml_node_type {
+  XML_NODE_ELEM,			/* Element */
+  XML_NODE_COMMENT,			/* Comment */
+  XML_NODE_CHARS,			/* Character data */
+  XML_NODE_PI,				/* Processing instruction */
+};
+
+/** Iterate over all children of a node. **/
+#define XML_NODE_FOR_EACH(var, node) CLIST_FOR_EACH(struct xml_node *, var, (node)->sons)
+
+/** Iterate over all attributes of a node. **/
+#define XML_ATTR_FOR_EACH(var, node) SLIST_FOR_EACH(struct xml_attr *, var, (node)->attrs)
+
+/** A single DOM node. **/
+struct xml_node {
+  cnode n;						/* Node for list of parent's sons */
+  uint type;						/* XML_NODE_x */
+  struct xml_node *parent;				/* Parent node */
+  /*
+   *  If namespaces are enabled, node->name points to the local part of the name
+   *  and node->ns is the resolved namespace ID.
+   *
+   *  However, the namespace prefix is kept in memory just before the local part,
+   *  so you can use xml_node_qname() to find out the full qualified name.
+   *  The same applies to attributes, but the function is xml_attr_qname().
+   */
+  char *name;						/* Element name / PI target */
+  clist sons;						/* Children nodes */
+  union {
+    struct {
+      char *text;					/* PI text / Comment / CDATA */
+      uint len;						/* Text length in bytes */
+    };
+    struct {
+      uint ns;						/* Namespace ID */
+      struct xml_dtd_elem *dtd;				/* Element DTD */
+      slist attrs;					/* Link list of element attributes */
+    };
+  };
+  void *user;						/* User-defined (initialized to NULL) */
+};
+
+/** A single attribute. **/
+struct xml_attr {
+  snode n;						/* Node for elem->attrs */
+  uint hash;						/* Internal hash of ns + name */
+  struct xml_node *elem;				/* Parent element */
+  struct xml_dtd_attr *dtd;				/* Attribute DTD */
+  uint ns;						/* Namespace ID */
+  char *name;						/* Attribute name without NS prefix */
+  char *val;						/* Attribute value */
+  void *user;						/* User-defined (initialized to NULL) */
+};
+
+#define XML_BUF_SIZE 32                                 /* At least 8 -- hardcoded */
+
+struct xml_source {
+  struct xml_source *next;				/* Link list of pending fastbufs (xml_context.sources) */
+  struct fastbuf *fb;					/* Source fastbuf */
+  struct fastbuf *wrapped_fb;				/* Original wrapped fastbuf (needed for cleanup) */
+  struct fastbuf wrap_fb;				/* Fbmem wrapper */
+  u32 buf[2 * XML_BUF_SIZE];				/* Read buffer with Unicode values and categories */
+  u32 *bptr, *bstop;					/* Current state of the buffer */
+  uint row;						/* File position */
+  char *expected_encoding;				/* Initial encoding before any transformation has been made (expected in XMLDecl/TextDecl) */
+  char *fb_encoding;					/* Encoding of the source fastbuf */
+  char *decl_encoding;					/* Encoding read from the XMLDecl/TextDecl */
+  uint refill_cat1;					/* Character categories, which should be directly passed to the buffer */
+  uint refill_cat2;					/* Character categories, which should be processed as newlines (possibly in some built-in
+							   sequences) */
+  void (*refill)(struct xml_context *ctx);		/* Callback to decode source characters to the buffer */
+  unsigned short *refill_in_to_x;			/* Libucw-charset input table */
+  uint saved_depth;					/* Saved ctx->depth */
+  uint pending_0xd;					/* The last read character is 0xD */
+};
+
+/** Finds a qualified name (including namespace prefix) of a given element node. **/
+char *xml_node_qname(struct xml_context *ctx, struct xml_node *node);
+
+/** Finds a qualified name (including namespace prefix) of a given attribute. **/
+char *xml_attr_qname(struct xml_context *ctx, struct xml_attr *node);
+
+/** Finds a given attribute value in a `XML_NODE_ELEM` node **/
+struct xml_attr *xml_attr_find(struct xml_context *ctx, struct xml_node *node, char *name);
+
+/** The same, but namespace-aware **/
+struct xml_attr *xml_attr_find_ns(struct xml_context *ctx, struct xml_node *node, uint ns, char *name);
+
+/** Similar to xml_attr_find, but it deals also with default values **/
+char *xml_attr_value(struct xml_context *ctx, struct xml_node *node, char *name);
+
+/** The same, but namespace-aware **/
+char *xml_attr_value_ns(struct xml_context *ctx, struct xml_node *node, uint ns, char *name);
+
+/** Remove leading/trailing spaces and replaces sequences of spaces to a single space character (non-CDATA attribute normalization) **/
+uint xml_normalize_white(struct xml_context *ctx, char *value);
+
+/** Merge character contents of a given element to a single string (not recursive) **/
+char *xml_merge_chars(struct xml_context *ctx, struct xml_node *node, struct mempool *pool);
+
+/** Merge character contents of a given subtree to a single string **/
+char *xml_merge_dom_chars(struct xml_context *ctx, struct xml_node *node, struct mempool *pool);
+
+/***
+ * === Parser context
+ ***/
+
+/**
+ * The state of the parser is kept in this structure. There are some
+ * user-accessible parts (like pointers to various hooks), but the
+ * majority of fields is private.
+ **/
+struct xml_context {
+  /* Error handling */
+  char *err_msg;					/* Last error message */
+  enum xml_error err_code;				/* Last error code */
+  void *throw_buf;					/* Where to jump on error */
+  void (*h_warn)(struct xml_context *ctx);		/* Warning callback */
+  void (*h_error)(struct xml_context *ctx);		/* Recoverable error callback */
+  void (*h_fatal)(struct xml_context *ctx);		/* Unrecoverable error callback */
+
+  /* Memory management (private) */
+  struct mempool *pool;					/* DOM pool */
+  struct mempool *stack;				/* Stack pool (freed as soon as possible) */
+  struct xml_stack *stack_list;				/* See xml_push(), xml_pop() */
+  uint flags;						/* XML_FLAG_x (restored on xml_pop()) */
+  uint depth;						/* Nesting level (for checking of valid source nesting -> valid pushes/pops on memory pools) */
+  struct fastbuf chars;					/* Character data / attribute value */
+  struct mempool_state chars_state;			/* Mempool state before the current character block has started */
+  char *chars_trivial;					/* If not empty, it will be appended to chars */
+
+  /* Input (private) */
+  struct xml_source *src;				/* Current source */
+  u32 *bptr, *bstop;					/* Buffer with preprocessed characters (validated UCS-4 + category flags) */
+  uint cat_chars;					/* Unicode range of supported characters (cdata, attribute values, ...) */
+  uint cat_unrestricted;				/* Unrestricted characters (may appear in document/external entities) */
+  uint cat_new_line;					/* New line characters */
+  uint cat_name;					/* Characters that may appear in names */
+  uint cat_sname;					/* Characters that may begin a name */
+
+  /* SAX-like interface */
+  void (*h_document_start)(struct xml_context *ctx);	/* Called before entering prolog */
+  void (*h_document_end)(struct xml_context *ctx);	/* Called after leaving epilog */
+  void (*h_xml_decl)(struct xml_context *ctx);		/* Called after the XML declaration */
+  void (*h_doctype_decl)(struct xml_context *ctx);	/* Called in the doctype declaration (before optional internal subset) */
+  void (*h_comment)(struct xml_context *ctx);		/* Called after a comment (only with XML_REPORT_COMMENTS) */
+  void (*h_pi)(struct xml_context *ctx);		/* Called after a processing instruction (only with XML_REPORT_PIS) */
+  void (*h_stag)(struct xml_context *ctx);		/* Called after STag or EmptyElemTag (only with XML_REPORT_TAGS) */
+  void (*h_etag)(struct xml_context *ctx);		/* Called before ETag or after EmptyElemTag (only with XML_REPORT_TAGS) */
+  void (*h_chars)(struct xml_context *ctx);		/* Called after some characters (only with XML_REPORT_CHARS) */
+  void (*h_block)(struct xml_context *ctx, char *text, uint len);	/* Called for each continuous block of characters not reported by h_cdata() (only with XML_REPORT_CHARS) */
+  void (*h_cdata)(struct xml_context *ctx, char *text, uint len);	/* Called for each CDATA section (only with XML_REPORT_CHARS) */
+  void (*h_ignorable)(struct xml_context *ctx, char *text, uint len);	/* Called for ignorable whitespace (content in tags without #PCDATA) */
+  void (*h_dtd_start)(struct xml_context *ctx);		/* Called just after the DTD structure is initialized */
+  void (*h_dtd_end)(struct xml_context *ctx);		/* Called after DTD subsets subsets */
+  struct xml_dtd_entity *(*h_find_entity)(struct xml_context *ctx, char *name);		/* Called when needed to resolve a general entity */
+  void (*h_resolve_entity)(struct xml_context *ctx, struct xml_dtd_entity *ent);	/* User should push source fastbuf for a parsed external entity (either general or parameter) */
+
+  /* DOM */
+  struct xml_node *dom;					/* DOM root */
+  struct xml_node *node;				/* Current DOM node */
+
+  /* Namespaces (private) */
+  struct mempool *ns_pool;				/* Memory pool for NS definitions */
+  const char **ns_by_id;				/* A growing array translating NS IDs to their names */
+  void *ns_by_name;					/* Hash table translating NS names to their IDs */
+  void *ns_by_prefix;					/* Hash table translating current prefixes to NS IDs, allocated from xml->stack */
+  struct xml_ns_prefix *ns_prefix_stack;		/* A stack of prefix definitions, allocated from xml->stack */
+  uint ns_default;					/* Current default namespace */
+
+  /* Other stuff */
+  char *version_str;
+  uint standalone;
+  char *doctype;					/* The document type (or NULL if unknown) */
+  char *system_id;					/* DTD external id */
+  char *public_id;					/* DTD public id */
+  struct xml_dtd *dtd;					/* The DTD structure (or NULL) */
+  uint state;						/* Current state for the PULL interface (XML_STATE_x) */
+  uint pull;						/* Parameters for the PULL interface (XML_PULL_x) */
+};
+
+/** Initialize XML context **/
+void xml_init(struct xml_context *ctx);
+
+/** Clean up all internal structures **/
+void xml_cleanup(struct xml_context *ctx);
+
+/** Reuse XML context, equivalent to xml_cleanup() and xml_init(), but faster **/
+void xml_reset(struct xml_context *ctx);
+
+/** Add XML source (fastbuf will be automatically closed) **/
+struct xml_source *xml_push_fastbuf(struct xml_context *ctx, struct fastbuf *fb);
+
+/** Parse the whole document without the PULL interface, return `XML_ERR_x` code (zero on success) **/
+uint xml_parse(struct xml_context *ctx);
+
+/** Parse with the PULL interface, return `XML_STATE_x` (zero on EOF or fatal error) **/
+uint xml_next(struct xml_context *ctx);
+
+/** Equivalent to xml_next, but with temporarily changed ctx->pull value **/
+uint xml_next_state(struct xml_context *ctx, uint pull);
+
+/** May be called on XML_STATE_STAG to skip its content; can return `XML_STATE_ETAG` or `XML_STATE_EOF` on fatal error **/
+uint xml_skip_element(struct xml_context *ctx);
+
+/** Returns the current row (line) number in the document entity **/
+uint xml_row(struct xml_context *ctx);
+
+/* The default value of h_find_entity(), knows &lt;, &gt;, &amp;, &apos; and &quot; */
+struct xml_dtd_entity *xml_def_find_entity(struct xml_context *ctx, char *name);
+
+/* The default value of h_resolve_entity(), throws an error */
+void xml_def_resolve_entity(struct xml_context *ctx, struct xml_dtd_entity *ent);
+
+/** Throw a warning at the current node **/
+void xml_warn(struct xml_context *ctx, const char *format, ...);
+
+/** Throw an error at the current node **/
+void xml_error(struct xml_context *ctx, const char *format, ...);
+
+/** Throw a fatal error, aborting parsing. This can be called only from SAX hooks (and from parser internals). **/
+void NONRET xml_fatal(struct xml_context *ctx, const char *format, ...);
+
+/***
+ * === Namespaces
+ *
+ * When namespace-aware parsing is requested by calling xml_ns_enable(),
+ * all namespaces are collected and assigned integer identifiers. Names of
+ * elements and attributes then always contain a namespace ID and a local
+ * name within the namespace. An ID of zero corresponds to an unspecified
+ * namespace.
+ *
+ * Once an ID is assigned, it is never changed, even if the namespace
+ * goes out of scope temporarily.
+ */
+
+/** Request processing of namespaces (must be called before the first node is parsed). **/
+void xml_ns_enable(struct xml_context *ctx);
+
+/**
+ * Looks up namespace by its ID, dies on an invalid ID. Returns a pointer
+ * which remains valid until the context is cleaned up or reset.
+ **/
+const char *xml_ns_by_id(struct xml_context *ctx, uint ns);
+
+/**
+ * Looks up namespace by its name and returns its ID. Assigns a new ID if necessary.
+ * When this function returns, @name is not referenced any more.
+ **/
+uint xml_ns_by_name(struct xml_context *ctx, const char *name);
+
+/** Well-known namespaces. **/
+enum xml_ns_id {
+  XML_NS_NONE = 0,		/* This element has no namespace */
+  XML_NS_XMLNS = 1,		/* xmlns: */
+  XML_NS_XML = 2,		/* xml: */
+};
+
+#endif
diff --git a/libucw/ucw/Makefile b/libucw/ucw/Makefile
new file mode 100644
index 0000000..767cef6
--- /dev/null
+++ b/libucw/ucw/Makefile
@@ -0,0 +1,240 @@
+# Makefile for the UCW Library (c) 1997--2015 Martin Mares <mj@ucw.cz>
+
+DIRS+=ucw
+LIBUCW=$(o)/ucw/libucw.pc
+
+ifdef CONFIG_UCW_UTILS
+include $(s)/ucw/utils/Makefile
+endif
+
+LIBUCW_MODS= \
+	threads \
+	alloc alloc_str alloc-std \
+	bigalloc mempool mempool-str mempool-fmt eltpool \
+	partmap hashfunc \
+	slists simple-lists bitsig \
+	log log-stream log-file log-syslog log-conf tbf \
+	conf-context conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section conf-getopt \
+	ipaccess \
+	fastbuf ff-binary ff-string ff-printf ff-unicode ff-varint ff-stkstring \
+	fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi fb-null \
+	fw-hex \
+	char-cat char-upper char-lower unicode varint stkstring \
+	wildmatch regex \
+	prime primetable \
+	random-legacy random-fast random-strong \
+	time-stamp time-timer time-conf \
+	bit-ffs bit-fls bit-array \
+	url \
+	mainloop main-block main-rec \
+	proctitle exitstatus runcmd \
+	lizard lizard-safe adler32 sighandler \
+	md5 sha1 sha1-hmac crc crc-tables \
+	base64 base224 \
+	io-careful io-sync io-mmap io-size \
+	string str-esc str-split str-match str-imatch str-hex str-fix \
+	bbuf gary \
+	getopt \
+	strtonum \
+	resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
+	daemon daemon-ctrl \
+	signames \
+	opt opt-help opt-conf \
+	table xtypes xtypes-basic xtypes-extra
+
+LIBUCW_MAIN_INCLUDES= \
+	lib.h log.h tbf.h threads.h time.h \
+	alloc.h mempool.h eltpool.h \
+	clists.h slists.h simple-lists.h \
+	string.h stkstring.h unicode.h varint.h chartype.h regex.h \
+	wildmatch.h \
+	unaligned.h \
+	bbuf.h gbuf.h gary.h bitarray.h bitsig.h \
+	hashfunc.h hashtable.h \
+	heap.h binheap.h binheap-node.h \
+	redblack.h \
+	prime.h \
+	random.h \
+	bitops.h \
+	conf.h getopt.h ipaccess.h \
+	fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h fb-socket.h fw-hex.h \
+	url.h \
+	mainloop.h \
+	process.h \
+	lizard.h \
+	md5.h sha1.h crc.h \
+	base64.h base224.h \
+	kmp.h kmp-search.h trie.h binsearch.h \
+	partmap.h \
+	strtonum.h \
+	resource.h trans.h \
+	daemon.h \
+	signames.h \
+	sighandler.h \
+	opt.h \
+	table.h xtypes-extra.h \
+	xtypes.h
+
+ifdef CONFIG_UCW_THREADS
+# Some modules require threading
+LIBUCW_MODS+=threads-conf workqueue asio
+LIBUCW_MAIN_INCLUDES+=workqueue.h semaphore.h asio.h
+endif
+
+ifdef CONFIG_UCW_FB_DIRECT
+LIBUCW_MODS+=fb-direct
+endif
+
+ifdef CONFIG_UCW_OWN_GETOPT
+include $(s)/ucw/getopt/Makefile
+endif
+
+LIBUCW_INCLUDES=$(LIBUCW_MAIN_INCLUDES)
+
+include $(s)/ucw/sorter/Makefile
+include $(s)/ucw/doc/Makefile
+
+LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
+
+export LIBUCW_LIBS=-lm
+ifdef CONFIG_UCW_THREADS
+LIBUCW_LIBS+=-lpthread
+endif
+ifdef CONFIG_UCW_PCRE
+LIBUCW_LIBS+=-lpcre
+endif
+ifdef CONFIG_UCW_MONOTONIC_CLOCK
+LIBUCW_LIBS+=-lrt
+endif
+
+$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0
+$(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS)
+
+ifdef CONFIG_INSTALL_API
+$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a)
+endif
+
+$(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
+$(o)/ucw/lizard.o: CFLAGS += $(COPT2) -funroll-loops
+
+$(o)/ucw/ff-varint-t: $(LIBUCW)
+$(o)/ucw/varint-t: $(LIBUCW)
+$(o)/ucw/conf-test: $(o)/ucw/conf-test.o $(LIBUCW)
+$(o)/ucw/hash-test: $(o)/ucw/hash-test.o $(LIBUCW)
+$(o)/ucw/hashfunc-test: $(o)/ucw/hashfunc-test.o $(LIBUCW)
+$(o)/ucw/asort-test: $(o)/ucw/asort-test.o $(LIBUCW)
+$(o)/ucw/redblack-test: $(o)/ucw/redblack-test.o $(LIBUCW)
+$(o)/ucw/binheap-test: $(o)/ucw/binheap-test.o $(LIBUCW)
+$(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW)
+$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW)
+$(o)/ucw/strtonum-test: $(o)/ucw/strtonum-test.o $(LIBUCW)
+ifdef CONFIG_CHARSET
+$(o)/ucw/kmp-test: $(LIBCHARSET)
+endif
+$(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
+$(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
+$(o)/ucw/opt-test: $(o)/ucw/opt-test.o $(LIBUCW)
+$(o)/ucw/table-test: $(o)/ucw/table-test.o $(LIBUCW)
+$(o)/ucw/table-test-2: $(o)/ucw/table-test-2.o $(LIBUCW)
+$(o)/ucw/table-test-align: $(o)/ucw/table-test-align.o $(LIBUCW)
+$(o)/ucw/xtypes-test: $(o)/ucw/xtypes-test.o $(LIBUCW)
+$(o)/ucw/random-test: $(o)/ucw/random-test.o $(LIBUCW)
+
+TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
+    slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \
+    trie-test.test string.test sha1.test asort-test.test binheap-test.test \
+    fb-file.test fb-socket.test fb-grow.test fb-pool.test fb-atomic.test fb-limfd.test fb-temp.test \
+    fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test fb-null.test \
+    redblack-test.test url.test strtonum-test.test \
+    gary.test time.test crc.test signames.test md5.test bitops.test opt.test \
+    table.test table-test.test table-test-2.test table-test-align.test xtypes-test.test random-test.test)
+
+$(o)/ucw/varint.test: $(o)/ucw/varint-t
+$(o)/ucw/regex.test: $(o)/ucw/regex-t
+$(o)/ucw/unicode.test: $(o)/ucw/unicode-t
+$(o)/ucw/hash-test.test: $(o)/ucw/hash-test
+$(o)/ucw/mempool.test: $(o)/ucw/mempool-t $(o)/ucw/mempool-fmt-t $(o)/ucw/mempool-str-t
+$(o)/ucw/stkstring.test: $(o)/ucw/stkstring-t
+$(o)/ucw/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t
+$(o)/ucw/slists.test: $(o)/ucw/slists-t
+$(o)/ucw/kmp-test.test: $(o)/ucw/kmp-test
+$(o)/ucw/bbuf.test: $(o)/ucw/bbuf-t
+$(o)/ucw/getopt.test: $(o)/ucw/getopt-t
+$(o)/ucw/ff-unicode.test: $(o)/ucw/ff-unicode-t
+$(o)/ucw/ff-varint.test: $(o)/ucw/ff-varint-t
+$(o)/ucw/eltpool.test: $(o)/ucw/eltpool-t
+$(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t $(o)/ucw/str-fix-t
+$(o)/ucw/sha1.test: $(o)/ucw/sha1-t $(o)/ucw/sha1-hmac-t
+$(o)/ucw/trie-test.test: $(o)/ucw/trie-test
+$(o)/ucw/asort-test.test: $(o)/ucw/asort-test
+$(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test
+$(o)/ucw/redblack-test.test: $(o)/ucw/redblack-test
+$(o)/ucw/strtonum-test.test: $(o)/ucw/strtonum-test
+$(addprefix $(o)/ucw/fb-,file.test grow.test pool.test socket.test atomic.test \
+	limfd.test temp.test mem.test buffer.test mmap.test multi.test null.test): %.test: %-t
+$(o)/ucw/url.test: $(o)/ucw/url-t
+$(o)/ucw/gary.test: $(o)/ucw/gary-t
+$(o)/ucw/time.test: $(o)/ucw/time-conf-t
+$(o)/ucw/crc.test: $(o)/ucw/crc-t
+$(o)/ucw/signames.test: $(o)/ucw/signames-t
+$(o)/ucw/md5.test: $(o)/ucw/md5-t
+$(o)/ucw/opt.test: $(o)/ucw/opt-test
+$(o)/ucw/table.test: $(o)/ucw/table-t
+$(o)/ucw/table-test.test: $(o)/ucw/table-test
+$(o)/ucw/table-test-2.test: $(o)/ucw/table-test-2
+$(o)/ucw/table-test-align.test: $(o)/ucw/table-test-align
+$(o)/ucw/xtypes-test.test: $(o)/ucw/xtypes-test
+$(o)/ucw/random-test.test: $(o)/ucw/random-test
+
+ifdef CONFIG_UCW_THREADS
+TESTS+=$(addprefix $(o)/ucw/,asio.test)
+$(o)/ucw/asio.test: $(o)/ucw/asio-t
+endif
+
+# The version of autoconf.h that is a part of the public API needs to have
+# the internal symbols filtered out, so we generate ucw/autoconf.h in the
+# configure script and let the public config.h refer to <ucw/autoconf.h>
+# instead of plain "autoconf.h".
+
+API_LIBS+=libucw
+API_INCLUDES+=$(o)/ucw/.include-stamp
+$(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) $(o)/ucw/autoconf.h
+	$(Q)$(BUILDSYS)/install-includes $(<D) run/include/ucw $(LIBUCW_INCLUDES)
+	$(Q)$(BUILDSYS)/install-includes $(o)/ucw run/include/ucw autoconf.h
+	$(Q)sed -e 's/^#include "autoconf\.h"/#include <ucw\/autoconf.h>/' <$(s)/ucw/config.h >run/include/ucw/config.h
+	$(Q)touch $@
+run/lib/pkgconfig/libucw.pc: $(o)/ucw/libucw.pc
+
+ifdef CONFIG_UCW_PERL
+include $(s)/ucw/perl/Makefile
+endif
+
+ifdef CONFIG_UCW_SHELL_UTILS
+include $(s)/ucw/shell/Makefile
+endif
+
+CONFIGS+=libucw
+
+INSTALL_TARGETS+=install-libucw-lib
+install-libucw-lib:
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0.0
+	ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0
+.PHONY: install-libucw-lib
+
+INSTALL_TARGETS+=install-libucw-api
+install-libucw-api: install-ucw-sorter-api
+	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
+	install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+	ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so
+	install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
+.PHONY: install-libucw-api
+
+INSTALL_TARGETS+=install-libucw-config
+install-libucw-config:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
+.PHONY: install-libucw-config
diff --git a/libucw/ucw/adler32.c b/libucw/ucw/adler32.c
new file mode 100644
index 0000000..5a7c47c
--- /dev/null
+++ b/libucw/ucw/adler32.c
@@ -0,0 +1,48 @@
+/*
+ *	adler32.c -- compute the Adler-32 checksum of a data stream
+ *
+ *	Copyright (C) 1995--2003 Mark Adler
+ *
+ * 	Taken from zlib-1.2.1 and adjusted by Robert Spalek.  For conditions of
+ * 	distribution and use, see copyright notice in zlib.h.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/lizard.h>
+
+#define BASE 65521UL	/* largest prime smaller than 65536 */
+#define NMAX 5552	/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+#define MOD(a) a %= BASE
+
+uint
+adler32_update(uint adler, const byte *buf, uint len)
+{
+  uint s1 = adler & 0xffff;
+  uint s2 = (adler >> 16) & 0xffff;
+  int k;
+
+  if (!buf) return 1L;
+
+  while (len > 0) {
+    k = len < NMAX ? (int)len : NMAX;
+    len -= k;
+    while (k >= 16) {
+      DO16(buf);
+      buf += 16;
+      k -= 16;
+    }
+    if (k != 0) do {
+      s1 += *buf++;
+      s2 += s1;
+    } while (--k);
+    MOD(s1);
+    MOD(s2);
+  }
+  return (s2 << 16) | s1;
+}
diff --git a/libucw/ucw/alloc-std.c b/libucw/ucw/alloc-std.c
new file mode 100644
index 0000000..f3b1d46
--- /dev/null
+++ b/libucw/ucw/alloc-std.c
@@ -0,0 +1,57 @@
+/*
+ *	UCW Library -- Generic Allocator Using Malloc
+ *
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/alloc.h>
+
+#include <string.h>
+
+/* Default allocator */
+
+static void *ucw_std_alloc(struct ucw_allocator *a UNUSED, size_t size)
+{
+  return xmalloc(size);
+}
+
+static void *ucw_std_realloc(struct ucw_allocator *a UNUSED, void *ptr, size_t old_size UNUSED, size_t new_size)
+{
+  return xrealloc(ptr, new_size);
+}
+
+static void ucw_std_free(struct ucw_allocator *a UNUSED, void *ptr)
+{
+  xfree(ptr);
+}
+
+struct ucw_allocator ucw_allocator_std = {
+  .alloc = ucw_std_alloc,
+  .realloc = ucw_std_realloc,
+  .free = ucw_std_free,
+};
+
+/* Zeroing allocator */
+
+static void *ucw_zeroed_alloc(struct ucw_allocator *a UNUSED, size_t size)
+{
+  return xmalloc_zero(size);
+}
+
+static void *ucw_zeroed_realloc(struct ucw_allocator *a UNUSED, void *ptr, size_t old_size, size_t new_size)
+{
+  ptr = xrealloc(ptr, new_size);
+  if (old_size < new_size)
+    bzero((byte *) ptr + old_size, new_size - old_size);
+  return ptr;
+}
+
+struct ucw_allocator ucw_allocator_zeroed = {
+  .alloc = ucw_zeroed_alloc,
+  .realloc = ucw_zeroed_realloc,
+  .free = ucw_std_free,
+};
diff --git a/libucw/ucw/alloc.c b/libucw/ucw/alloc.c
new file mode 100644
index 0000000..816da2a
--- /dev/null
+++ b/libucw/ucw/alloc.c
@@ -0,0 +1,51 @@
+/*
+ *	UCW Library -- Memory Allocation
+ *
+ *	(c) 2000 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+void *
+xmalloc(size_t size)
+{
+  void *x = malloc(size);
+  if (!x)
+    die("Cannot allocate %zu bytes of memory", size);
+  return x;
+}
+
+void *
+xmalloc_zero(size_t size)
+{
+  void *x = xmalloc(size);
+  bzero(x, size);
+  return x;
+}
+
+void
+xfree(void *ptr)
+{
+  /*
+   * Maybe it is a little waste of resources to make this a function instead
+   * of a macro, but xmalloc() is not used for anything critical anyway,
+   * so let's prefer simplicity.
+   */
+  free(ptr);
+}
+
+void *
+xrealloc(void *old, size_t size)
+{
+  /* We assume that realloc(NULL, x) works like malloc(x), which is true with the glibc. */
+  void *x = realloc(old, size);
+  if (!x && size)
+    die("Cannot reallocate %zu bytes of memory", size);
+  return x;
+}
diff --git a/libucw/ucw/alloc.h b/libucw/ucw/alloc.h
new file mode 100644
index 0000000..668c707
--- /dev/null
+++ b/libucw/ucw/alloc.h
@@ -0,0 +1,36 @@
+/*
+ *	UCW Library -- Generic allocators
+ *
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ */
+
+#ifndef _UCW_ALLOC_H
+#define _UCW_ALLOC_H
+
+/**
+ * This structure describes a generic allocator. It provides pointers
+ * to three functions, which handle the actual (re)allocations.
+ **/
+struct ucw_allocator {
+  void * (*alloc)(struct ucw_allocator *alloc, size_t size);
+  void * (*realloc)(struct ucw_allocator *alloc, void *ptr, size_t old_size, size_t new_size);
+  void (*free)(struct ucw_allocator *alloc, void *ptr);
+};
+
+/* alloc-std.c */
+
+/**
+ * [[std]]
+ * This allocator uses <<basics:xmalloc()>>, <<basics:xrealloc()>> and <<basics:xfree()>>. The memory
+ * it allocates is left unitialized.
+ **/
+extern struct ucw_allocator ucw_allocator_std;
+
+/**
+ * [[zeroing]]
+ * This allocator uses <<basics:xmalloc()>>, <<basics:xrealloc()>> and <<basics:xfree()>>. All memory
+ * is zeroed upon allocation.
+ **/
+extern struct ucw_allocator ucw_allocator_zeroed;
+
+#endif
diff --git a/libucw/ucw/alloc_str.c b/libucw/ucw/alloc_str.c
new file mode 100644
index 0000000..90bc747
--- /dev/null
+++ b/libucw/ucw/alloc_str.c
@@ -0,0 +1,21 @@
+/*
+ *	UCW Library -- String Allocation
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+
+#include <string.h>
+
+char *
+xstrdup(const char *s)
+{
+  if (!s)
+    return NULL;
+  uint l = strlen(s) + 1;
+  return memcpy(xmalloc(l), s, l);
+}
diff --git a/libucw/ucw/asio.c b/libucw/ucw/asio.c
new file mode 100644
index 0000000..d20a6d2
--- /dev/null
+++ b/libucw/ucw/asio.c
@@ -0,0 +1,289 @@
+/*
+ *	UCW Library -- Asynchronous I/O
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/asio.h>
+#include <ucw/threads.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+static uint asio_num_users;
+static struct worker_pool asio_wpool;
+
+static void
+asio_init_unlocked(void)
+{
+  if (asio_num_users++)
+    return;
+
+  DBG("ASIO: INIT");
+  asio_wpool.num_threads = 1;
+  worker_pool_init(&asio_wpool);
+}
+
+static void
+asio_cleanup_unlocked(void)
+{
+  if (--asio_num_users)
+    return;
+
+  DBG("ASIO: CLEANUP");
+  worker_pool_cleanup(&asio_wpool);
+}
+
+void
+asio_init_queue(struct asio_queue *q)
+{
+  ucwlib_lock();
+  asio_init_unlocked();
+  ucwlib_unlock();
+
+  DBG("ASIO: New queue %p", q);
+  ASSERT(q->buffer_size);
+  q->allocated_requests = 0;
+  q->running_requests = 0;
+  q->running_writebacks = 0;
+  q->use_count = 0;
+  clist_init(&q->idle_list);
+  clist_init(&q->done_list);
+  work_queue_init(&asio_wpool, &q->queue);
+}
+
+void
+asio_cleanup_queue(struct asio_queue *q)
+{
+  DBG("ASIO: Removing queue %p", q);
+  ASSERT(!q->running_requests);
+  ASSERT(!q->running_writebacks);
+  ASSERT(!q->allocated_requests);
+  ASSERT(clist_empty(&q->done_list));
+
+  struct asio_request *r;
+  while (r = clist_remove_head(&q->idle_list))
+    {
+      big_free(r->buffer, q->buffer_size);
+      xfree(r);
+    }
+
+  work_queue_cleanup(&q->queue);
+
+  ucwlib_lock();
+  asio_cleanup_unlocked();
+  ucwlib_unlock();
+}
+
+struct asio_request *
+asio_get(struct asio_queue *q)
+{
+  q->allocated_requests++;
+  struct asio_request *r = clist_head(&q->idle_list);
+  if (!r)
+    {
+      r = xmalloc_zero(sizeof(*r));
+      r->queue = q;
+      r->buffer = big_alloc(q->buffer_size);
+      DBG("ASIO: Got %p (new)", r);
+    }
+  else
+    {
+      clist_remove(&r->work.n);
+      DBG("ASIO: Got %p", r);
+    }
+  r->op = ASIO_FREE;
+  r->fd = -1;
+  r->len = 0;
+  r->status = -1;
+  r->returned_errno = -1;
+  r->submitted = 0;
+  return r;
+}
+
+static int
+asio_raw_wait(struct asio_queue *q)
+{
+  struct asio_request *r = (struct asio_request *) work_wait(&q->queue);
+  if (!r)
+    return 0;
+  r->submitted = 0;
+  q->running_requests--;
+  if (r->op == ASIO_WRITE_BACK)
+    {
+      DBG("ASIO: Finished writeback %p", r);
+      if (r->status < 0)
+	die("Asynchronous write to fd %d failed: %s", r->fd, strerror(r->returned_errno));
+      if (r->status != (int)r->len)
+	die("Asynchronous write to fd %d wrote only %d bytes out of %d", r->fd, r->status, r->len);
+      q->running_writebacks--;
+      asio_put(r);
+    }
+  else
+    clist_add_tail(&q->done_list, &r->work.n);
+  return 1;
+}
+
+static void
+asio_handler(struct worker_thread *t UNUSED, struct work *w)
+{
+  struct asio_request *r = (struct asio_request *) w;
+
+  DBG("ASIO: Servicing %p (%s on fd=%d, len=%d)", r,
+      (char*[]) { "?", "READ", "WRITE", "WRITEBACK" }[r->op], r->fd, r->len);
+  errno = 0;
+  switch (r->op)
+    {
+    case ASIO_READ:
+      r->status = read(r->fd, r->buffer, r->len);
+      break;
+    case ASIO_WRITE:
+    case ASIO_WRITE_BACK:
+      r->status = write(r->fd, r->buffer, r->len);
+      break;
+    default:
+      die("ASIO: Got unknown request type %d", r->op);
+    }
+  r->returned_errno = errno;
+  DBG("ASIO: Finished %p (status=%d, errno=%d)", r, r->status, r->returned_errno);
+}
+
+void
+asio_submit(struct asio_request *r)
+{
+  struct asio_queue *q = r->queue;
+  DBG("ASIO: Submitting %p on queue %p", r, q);
+  ASSERT(r->op != ASIO_FREE);
+  ASSERT(!r->submitted);
+  if (r->op == ASIO_WRITE_BACK)
+    {
+      while (q->running_writebacks >= q->max_writebacks)
+	{
+	  DBG("ASIO: Waiting for free writebacks");
+	  if (!asio_raw_wait(q))
+	    ASSERT(0);
+	}
+      q->running_writebacks++;
+    }
+  q->running_requests++;
+  r->submitted = 1;
+  r->work.go = asio_handler;
+  r->work.priority = 0;
+  work_submit(&q->queue, &r->work);
+}
+
+struct asio_request *
+asio_wait(struct asio_queue *q)
+{
+  struct asio_request *r;
+  while (!(r = clist_head(&q->done_list)))
+    {
+      DBG("ASIO: Waiting on queue %p", q);
+      if (!asio_raw_wait(q))
+	return NULL;
+    }
+  clist_remove(&r->work.n);
+  DBG("ASIO: Done %p", r);
+  return r;
+}
+
+void
+asio_put(struct asio_request *r)
+{
+  struct asio_queue *q = r->queue;
+  DBG("ASIO: Put %p", r);
+  ASSERT(!r->submitted);
+  ASSERT(q->allocated_requests);
+  clist_add_tail(&q->idle_list, &r->work.n);
+  q->allocated_requests--;
+}
+
+void
+asio_sync(struct asio_queue *q)
+{
+  DBG("ASIO: Syncing queue %p", q);
+  while (q->running_requests)
+    if (!asio_raw_wait(q))
+      ASSERT(0);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct asio_queue q;
+  struct asio_request *r;
+
+  q.buffer_size = 4096;
+  q.max_writebacks = 2;
+  asio_init_queue(&q);
+
+#if 0
+
+  for (;;)
+    {
+      r = asio_get(&q);
+      r->op = ASIO_READ;
+      r->fd = 0;
+      r->len = q.buffer_size;
+      asio_submit(r);
+      r = asio_wait(&q);
+      ASSERT(r);
+      if (r->status <= 0)
+	{
+	  asio_put(r);
+	  break;
+	}
+      r->op = ASIO_WRITE_BACK;
+      r->fd = 1;
+      r->len = r->status;
+      asio_submit(r);
+    }
+  asio_sync(&q);
+
+#else
+
+  r = asio_get(&q);
+  r->op = ASIO_READ;
+  r->fd = 0;
+  r->len = 1;
+  asio_submit(r);
+  r = asio_wait(&q);
+  ASSERT(r);
+  asio_put(r);
+
+  for (uint i=0; i<10; i++)
+    {
+      r = asio_get(&q);
+      r->op = ASIO_WRITE_BACK;
+      r->fd = 1;
+      r->len = 1;
+      r->buffer[0] = 'A' + i;
+      asio_submit(r);
+    }
+  asio_sync(&q);
+
+  r = asio_get(&q);
+  r->op = ASIO_WRITE;
+  r->fd = 1;
+  r->len = 1;
+  r->buffer[0] = '\n';
+  asio_submit(r);
+  r = asio_wait(&q);
+  ASSERT(r);
+  asio_put(r);
+
+#endif
+
+  asio_cleanup_queue(&q);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/asio.h b/libucw/ucw/asio.h
new file mode 100644
index 0000000..37ef532
--- /dev/null
+++ b/libucw/ucw/asio.h
@@ -0,0 +1,80 @@
+/*
+ *	UCW Library -- Asynchronous I/O
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_ASIO_H
+#define _UCW_ASIO_H
+
+#include <ucw/workqueue.h>
+#include <ucw/clists.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define asio_cleanup_queue ucw_asio_cleanup_queue
+#define asio_get ucw_asio_get
+#define asio_init_queue ucw_asio_init_queue
+#define asio_put ucw_asio_put
+#define asio_submit ucw_asio_submit
+#define asio_sync ucw_asio_sync
+#define asio_wait ucw_asio_wait
+#endif
+
+/*
+ *  This module takes care of scheduling and executing asynchronous I/O requests
+ *  on files opened with O_DIRECT. It is primarily used by the fb-direct fastbuf
+ *  back-end, but you can use it explicitly, too.
+ *
+ *  You can define several I/O queues, each for use by a single thread. Requests
+ *  on a single queue are always processed in order of their submits, requests
+ *  from different queues may be interleaved (although the current implementation
+ *  does not do so). Normal read and write requests are returned to their queue
+ *  when they are completed. Write-back requests are automatically freed when
+ *  done, but the number of such requests in fly is limited in order to avoid
+ *  consuming all memory, so a submit of a write-back request can block.
+ */
+
+struct asio_queue {
+  uint buffer_size;			// How large buffers do we use [user-settable]
+  uint max_writebacks;			// Maximum number of writeback requests active [user-settable]
+  uint allocated_requests;
+  uint running_requests;		// Total number of running requests
+  uint running_writebacks;		// How many of them are writebacks
+  clist idle_list;			// Recycled requests waiting for get
+  clist done_list;			// Finished requests
+  struct work_queue queue;
+  uint use_count;			// For use by the caller
+};
+
+enum asio_op {
+  ASIO_FREE,
+  ASIO_READ,
+  ASIO_WRITE,
+  ASIO_WRITE_BACK,			// Background write with no success notification
+};
+
+struct asio_request {
+  struct work work;			// asio_requests are internally just work nodes
+  struct asio_queue *queue;
+  byte *buffer;
+  int fd;
+  enum asio_op op;
+  uint len;
+  int status;
+  int returned_errno;
+  int submitted;
+  void *user_data;			// For use by the caller
+};
+
+void asio_init_queue(struct asio_queue *q);			// Initialize a new queue
+void asio_cleanup_queue(struct asio_queue *q);
+struct asio_request *asio_get(struct asio_queue *q);		// Get an empty request
+void asio_submit(struct asio_request *r);			// Submit the request (can block if too many writebacks)
+struct asio_request *asio_wait(struct asio_queue *q);		// Wait for the first finished request, NULL if no more
+void asio_put(struct asio_request *r);				// Return a finished request for recycling
+void asio_sync(struct asio_queue *q);				// Wait until all requests are finished
+
+#endif	/* !_UCW_ASIO_H */
diff --git a/libucw/ucw/asio.t b/libucw/ucw/asio.t
new file mode 100644
index 0000000..a98974b
--- /dev/null
+++ b/libucw/ucw/asio.t
@@ -0,0 +1,4 @@
+# Tests for asynchronous I/O
+
+Run:	echo y | ../obj/ucw/asio-t
+Out:	ABCDEFGHIJ
diff --git a/libucw/ucw/asort-test.c b/libucw/ucw/asort-test.c
new file mode 100644
index 0000000..c35db74
--- /dev/null
+++ b/libucw/ucw/asort-test.c
@@ -0,0 +1,83 @@
+/*
+ *	UCW Library -- Universal Array Sorter Test and Benchmark
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/time.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#define N 4000037			/* a prime */
+
+struct elt {
+  u32 key;
+  u32 x, y;
+};
+
+static struct elt array[N];
+
+#define ASORT_KEY_TYPE u32
+#define ASORT_ELT(i) array[i].key
+#define ASORT_SWAP(i,j) do { struct elt e=array[j]; array[j]=array[i]; array[i]=e; } while(0)
+
+static void generate(void)
+{
+  uint i;
+  for (i=0; i<N; i++)
+#if 0
+    ASORT_ELT(i) = N-i-1;
+#elif 0
+    ASORT_ELT(i) = i;
+#else
+    ASORT_ELT(i) = (i ? ASORT_ELT(i-1)+1944833754 : 3141592) % N;
+#endif
+}
+
+static int errors = 0;
+
+static void check(void)
+{
+  uint i;
+  for (i=0; i<N; i++)
+    if (ASORT_ELT(i) != i)
+    {
+      printf("error at pos %d: %08x != %08x\n", i, ASORT_ELT(i), i);
+      errors = 1;
+    }
+}
+
+static int qs_comp(const struct elt *X, const struct elt *Y)
+{
+  if (X->key < Y->key)
+    return -1;
+  else if (X->key > Y->key)
+    return 1;
+  else
+    return 0;
+}
+
+#define ASORT_PREFIX(x) as_##x
+#include <ucw/sorter/array-simple.h>
+
+int main(void)
+{
+  timestamp_t timer;
+
+  generate();
+  init_timer(&timer);
+  qsort(array, N, sizeof(array[0]), (int (*)(const void *, const void *)) qs_comp);
+  printf("qsort: %d ms\n", get_timer(&timer));
+  check();
+  generate();
+  init_timer(&timer);
+  as_sort(N);
+  printf("asort: %d ms\n", get_timer(&timer));
+  check();
+  return errors;
+}
diff --git a/libucw/ucw/asort-test.t b/libucw/ucw/asort-test.t
new file mode 100644
index 0000000..5325080
--- /dev/null
+++ b/libucw/ucw/asort-test.t
@@ -0,0 +1,3 @@
+# Test for the arraysort module
+
+Run:	../obj/ucw/asort-test
diff --git a/libucw/ucw/base224.c b/libucw/ucw/base224.c
new file mode 100644
index 0000000..6af7178
--- /dev/null
+++ b/libucw/ucw/base224.c
@@ -0,0 +1,170 @@
+/*
+ *	UCW Library -- Base 224 Encoding & Decoding
+ *
+ *	(c) 2002 Martin Mares <mj@ucw.cz>
+ *
+ *	The `base-224' encoding transforms general sequences of bytes
+ *	to sequences of non-control 8-bit characters (0x20-0xff). Since
+ *	224 and 256 are incompatible bases (there is no k,l: 224^k=256^l)
+ *	and we want to avoid lengthy calculations, we cheat a bit:
+ *
+ *	Each base-224 digit can be represented as a (base-7 digit, base-32 digit)
+ *	pair, so we pass the lower 5 bits directly and use a base-7 encoder
+ *	for the upper part. We process blocks of 39 bits and encode them
+ *	to 5 base-224 digits: we take 5x5 bits as the lower halves and convert
+ *	the remaining 14 bits in base-7 (2^14 = 16384 < 16807 = 7^5) to get
+ *	the 7 upper parts we need (with a little redundancy). Little endian
+ *	ordering is used to make handling of partial blocks easy.
+ *
+ *	We transform 39 source bits to 40 destination bits, stretching the data
+ *	by 1/39 = approx. 2.56%.
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/base224.h>
+
+static void
+encode_block(byte *w, u32 hi, u32 lo)
+{
+  uint x, y;
+
+  /*
+   *   Splitting of the 39-bit block: [a-e][0-5] are the base-32 digits, *'s are used for base-7.
+   *   +----------------+----------------+----------------+----------------+----------------+
+   *   +00******e4e3e2e1|e0******d4d3d2d1|d0******c4c3c2c1|c0******b4b3b2b1|b0****a4a3a2a1a0|
+   *   +----------------+----------------+----------------+----------------+----------------+
+   */
+
+  w[0] = lo & 0x1f;
+  w[1] = (lo >> 7) & 0x1f;
+  w[2] = (lo >> 15) & 0x1f;
+  w[3] = (lo >> 23) & 0x1f;
+  w[4] = (lo >> 31) | ((hi << 1) & 0x1e);
+  x = (lo >> 5)  & 0x0003
+    | (lo >> 10) & 0x001c
+    | (lo >> 15) & 0x00e0
+    | (lo >> 20) & 0x0700
+    | (hi << 7)  & 0x3800;
+  DBG("<<< h=%08x l=%08x x=%d", hi, lo, x);
+  for (y=0; y<5; y++)
+    {
+      w[y] += 0x20 + ((x % 7) << 5);
+      x /= 7;
+    }
+}
+
+uint
+base224_encode(byte *dest, const byte *src, uint len)
+{
+  u32 lo=0, hi=0;			/* 64-bit buffer accumulating input bits */
+  uint i=0;				/* How many source bits do we have buffered */
+  u32 x;
+  byte *w=dest;
+
+  while (len--)
+    {
+      x = *src++;
+      if (i < 32)
+	{
+	  lo |= x << i;
+	  if (i > 24)
+	    hi |= x >> (32-i);
+	}
+      else
+	hi |= x << (i-32);
+      i += 8;
+      if (i >= 39)
+	{
+	  encode_block(w, hi, lo);
+	  w += 5;
+	  lo = hi >> 7;
+	  hi = 0;
+	  i -= 39;
+	}
+    }
+  if (i)				/* Partial block */
+    {
+      encode_block(w, hi, lo);
+      w += (i+8)/8;			/* Just check logarithms if you want to understand */
+    }
+  return w - dest;
+}
+
+uint
+base224_decode(byte *dest, const byte *src, uint len)
+{
+  u32 hi=0, lo=0;			/* 64-bit buffer accumulating output bits */
+  uint i=0;				/* How many bits do we have accumulated */
+  u32 h, l;				/* Decoding of the current block */
+  uint x;				/* base-7 part of the current block */
+  uint len0;
+  byte *start = dest;
+
+  do
+    {
+      if (!len)
+	break;
+      len0 = len;
+
+      ASSERT(*src >= 0x20);		/* byte 0 */
+      h = 0;
+      l = *src & 0x1f;
+      x = (*src++ >> 5) - 1;
+      if (!--len)
+	goto blockend;
+
+      ASSERT(*src >= 0x20);		/* byte 1 */
+      l |= (*src & 0x1f) << 7;
+      x += ((*src++ >> 5) - 1) * 7;
+      if (!--len)
+	goto blockend;
+
+      ASSERT(*src >= 0x20);		/* byte 2 */
+      l |= (*src & 0x1f) << 15;
+      x += ((*src++ >> 5) - 1) * 7*7;
+      if (!--len)
+	goto blockend;
+
+      ASSERT(*src >= 0x20);		/* byte 3 */
+      l |= (*src & 0x1f) << 23;
+      x += ((*src++ >> 5) - 1) * 7*7*7;
+      if (!--len)
+	goto blockend;
+
+      ASSERT(*src >= 0x20);		/* byte 4 */
+      l |= *src << 31;
+      h = (*src & 0x1f) >> 1;
+      x += ((*src++ >> 5) - 1) * 7*7*7*7;
+      --len;
+
+    blockend:
+      len0 -= len;
+      l |= ((x & 0x0003) << 5)		/* Decode base-7 */
+	|  ((x & 0x001c) << 10)
+	|  ((x & 0x00e0) << 15)
+	|  ((x & 0x0700) << 20);
+      h |=  (x & 0x3800) >> 7;
+
+      DBG("<<< i=%d h=%08x l=%08x x=%d len0=%d", i, h, l, x, len0);
+      lo |= l << i;
+      hi |= h << i;
+      if (i)
+	hi |= l >> (32-i);
+      i += len0*8 - 1;
+
+      while (i >= 8)
+	{
+	  *dest++ = lo;
+	  lo = (lo >> 8U) | (hi << 24);
+	  hi >>= 8;
+	  i -= 8;
+	}
+    }
+  while (len0 == 5);
+  return dest-start;
+}
diff --git a/libucw/ucw/base224.h b/libucw/ucw/base224.h
new file mode 100644
index 0000000..0dd2cab
--- /dev/null
+++ b/libucw/ucw/base224.h
@@ -0,0 +1,41 @@
+/*
+ *	UCW Library -- Base 224 Encoding & Decoding
+ *
+ *	(c) 2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define base224_decode ucw_base224_decode
+#define base224_encode ucw_base224_encode
+#endif
+
+/**
+ * Encodes @len bytes of data pointed to by @src by base224 encoding.
+ * Stores them in @dest and returns the number of bytes the output
+ * takes.
+ */
+uint base224_encode(byte *dest, const byte *src, uint len);
+/**
+ * Decodes @len bytes of data pointed to by @src from base224 encoding.
+ * All invalid characters are ignored. The result is stored into @dest
+ * and length of the result is returned.
+ */
+uint base224_decode(byte *dest, const byte *src, uint len);
+
+/**
+ * Use this macro to calculate @base224_encode() output buffer size.
+ * It can happen 4 more bytes would be needed, this macro takes care
+ * of that.
+ */
+#define BASE224_ENC_LENGTH(x) (((x)*8+38)/39*5)
+
+/*
+ * When called for BASE224_IN_CHUNK-byte chunks, the result will be
+ * always BASE224_OUT_CHUNK bytes long. If a longer block is split
+ * to such chunks, the result will be identical.
+ */
+#define BASE224_IN_CHUNK 39 /** Chunk size on the un-encoded side. **/
+#define BASE224_OUT_CHUNK 40 /** Chunk size on the encoded side. **/
diff --git a/libucw/ucw/base64.c b/libucw/ucw/base64.c
new file mode 100644
index 0000000..8d8f837
--- /dev/null
+++ b/libucw/ucw/base64.c
@@ -0,0 +1,127 @@
+/*
+ *	UCW Library -- Base 64 Encoding & Decoding
+ *
+ *	(c) 2002, Robert Spalek <robert@ucw.cz>
+ *	(c) 2018, Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/base64.h>
+
+const byte base64_enc_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+const byte base64_dec_table[256] = {
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x3e, 0x80, 0x80, 0x80, 0x3f,
+  0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x80, 0x80, 0x80, 0x40, 0x80, 0x80,
+  0x80, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+  0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+  0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+};
+
+uint base64_encode(byte *dest, const byte *src, uint len)
+{
+  const byte *ptr = src;
+  const byte *end = src + len;
+  byte *out = dest;
+
+  /* keep going until we have less than 24 bits */
+  if (end - ptr >= 3)
+    for (const byte *x = end - 2; ptr < x; )
+      {
+	out[0] = base64_enc_table[ptr[0] >> 2];
+	out[1] = base64_enc_table[((ptr[0] & 0x03) << 4) + (ptr[1] >> 4)];
+	out[2] = base64_enc_table[((ptr[1] & 0x0f) << 2) + (ptr[2] >> 6)];
+	out[3] = base64_enc_table[ptr[2] & 0x3f];
+	out += 4;
+	ptr += 3;
+      }
+
+  /* now deal with the tail end of things */
+  if (ptr != end)
+    {
+      out[0] = base64_enc_table[ptr[0] >> 2];
+      out[3] = BASE64_PADDING;
+      if (end - ptr >= 2)
+	{
+	  out[1] = base64_enc_table[((ptr[0] & 0x03) << 4) + (ptr[1] >> 4)];
+	  out[2] = base64_enc_table[(ptr[1] & 0x0f) << 2];
+	}
+      else
+	{
+	  out[1] = base64_enc_table[(ptr[0] & 0x03) << 4];
+	  out[2] = BASE64_PADDING;
+	}
+      out += 4;
+    }
+
+  return out - dest;
+}
+
+uint base64_decode(byte *dest, const byte *src, uint len)
+{
+  const byte *ptr = src;
+  const byte *end = src + len;
+  byte *out = dest;
+  while (1)
+    {
+      uint val, ch;
+      do
+	{
+	  if (ptr == end || (ch = base64_dec_table[*ptr++]) == BASE64_DEC_PADDING)
+	    goto end;
+	}
+      while (ch > BASE64_DEC_PADDING);
+      val = ch;
+      do
+	{
+	  if (ptr == end || (ch = base64_dec_table[*ptr++]) == BASE64_DEC_PADDING)
+	    goto end; // Broken base64 encoding, we only have 6 bits
+	}
+      while (ch > BASE64_DEC_PADDING);
+      val = (val << 6) | ch;
+      do
+	{
+	  if (ptr == end || (ch = base64_dec_table[*ptr++]) == BASE64_DEC_PADDING)
+	    {
+	      out[0] = val >> 4;
+	      out += 1;
+	      goto end;
+	    }
+	}
+      while (ch > BASE64_DEC_PADDING);
+      val = (val << 6) | ch;
+      do
+	{
+	  if (ptr == end || (ch = base64_dec_table[*ptr++]) == BASE64_DEC_PADDING)
+	    {
+	      out[0] = val >> 10;
+	      out[1] = val >> 2;
+	      out += 2;
+	      goto end;
+	    }
+	}
+      while (ch > BASE64_DEC_PADDING);
+      val = (val << 6) | ch;
+      out[0] = val >> 16;
+      out[1] = val >> 8;
+      out[2] = val;
+      out += 3;
+    }
+end:
+  return out - dest;
+}
diff --git a/libucw/ucw/base64.h b/libucw/ucw/base64.h
new file mode 100644
index 0000000..a8edc36
--- /dev/null
+++ b/libucw/ucw/base64.h
@@ -0,0 +1,63 @@
+/*
+ *	UCW Library -- Base 64 Encoding & Decoding
+ *
+ *	(c) 2002, Robert Spalek <robert@ucw.cz>
+ *	(c) 2017, Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define base64_decode ucw_base64_decode
+#define base64_encode ucw_base64_encode
+#define base64_enc_table ucw_base64_enc_table
+#define base64_dec_table ucw_base64_dec_table
+#endif
+
+/**
+ * Encodes @len bytes of data pointed to by @src by base64 encoding.
+ * Stores them in @dest and returns the number of bytes the output
+ * takes.
+ */
+uint base64_encode(byte *dest, const byte *src, uint len);
+/**
+ * Decodes @len bytes of data pointed to by @src from base64 encoding.
+ * All invalid characters are ignored. The result is stored into @dest
+ * and length of the result is returned. It is allowed to use the
+ * same buffer for both input and output.
+ */
+uint base64_decode(byte *dest, const byte *src, uint len);
+
+/**
+ * Use this macro to calculate @base64_encode() output buffer size.
+ */
+#define BASE64_ENC_LENGTH(x) (((x)+2)/3 *4)
+
+/*
+ * When called for BASE64_IN_CHUNK-byte chunks, the result will be
+ * always BASE64_OUT_CHUNK bytes long. If a longer block is split
+ * to such chunks, the result will be identical.
+ */
+#define BASE64_IN_CHUNK 3 /** Size of chunk on the un-encoded side. **/
+#define BASE64_OUT_CHUNK 4 /** Size of chunk on the encoded side. **/
+
+/*
+ * Lookup table for fast encoding.
+ * For each 6bit value contains corresponding base64 character.
+ */
+extern const byte base64_enc_table[65];
+#define BASE64_PADDING '=' /* Padding character */
+
+/*
+ * Lookup table for fast decoding:
+ * -- for valid base64 characters contains their 6bit values
+ * -- for BASE64_PADDING character contains special value BASE64_DEC_PADDING
+ * -- for all other characters contains BASE64_DEC_INVALID
+ *
+ * Note that BASE64_DEC_INVALID is greater than BASE64_DEC_PADDING
+ * (can be useful to know for some optimizations).
+ */
+extern const byte base64_dec_table[256];
+#define BASE64_DEC_PADDING 0x40
+#define BASE64_DEC_INVALID 0x80
diff --git a/libucw/ucw/bbuf.c b/libucw/ucw/bbuf.c
new file mode 100644
index 0000000..36ece2a
--- /dev/null
+++ b/libucw/ucw/bbuf.c
@@ -0,0 +1,86 @@
+/*
+ *	UCW Library -- A simple growing buffers for byte-sized items
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/bbuf.h>
+
+#include <stdio.h>
+
+char *
+bb_vprintf_at(bb_t *bb, size_t ofs, const char *fmt, va_list args)
+{
+  bb_grow(bb, ofs + 1);
+  va_list args2;
+  va_copy(args2, args);
+  int cnt = vsnprintf(bb->ptr + ofs, bb->len - ofs, fmt, args2);
+  va_end(args2);
+  if (cnt < 0)
+    {
+      /* Our C library doesn't support C99 return value of vsnprintf, so we need to iterate */
+      do
+        {
+	  bb_do_grow(bb, bb->len + 1);
+          va_copy(args2, args);
+          cnt = vsnprintf(bb->ptr + ofs, bb->len - ofs, fmt, args2);
+          va_end(args2);
+	}
+      while (cnt < 0);
+    }
+  else if ((uint)cnt >= bb->len - ofs)
+    {
+      bb_do_grow(bb, ofs + cnt + 1);
+      va_copy(args2, args);
+      int cnt2 = vsnprintf(bb->ptr + ofs, bb->len - ofs, fmt, args2);
+      va_end(args2);
+      ASSERT(cnt2 == cnt);
+    }
+  return bb->ptr + ofs;
+}
+
+char *
+bb_printf_at(bb_t *bb, size_t ofs, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  char *res = bb_vprintf_at(bb, ofs, fmt, args);
+  va_end(args);
+  return res;
+}
+
+char *
+bb_vprintf(bb_t *bb, const char *fmt, va_list args)
+{
+  return bb_vprintf_at(bb, 0, fmt, args);
+}
+
+char *
+bb_printf(bb_t *bb, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  char *res = bb_vprintf_at(bb, 0, fmt, args);
+  va_end(args);
+  return res;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  bb_t bb;
+  bb_init(&bb);
+  char *x = bb_printf(&bb, "<Hello, %s!>", "World");
+  fputs(x, stdout);
+  x = bb_printf_at(&bb, 5, "<Hello, %50s!>\n", "World");
+  fputs(x, stdout);
+  bb_done(&bb);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/bbuf.h b/libucw/ucw/bbuf.h
new file mode 100644
index 0000000..0cbccbc
--- /dev/null
+++ b/libucw/ucw/bbuf.h
@@ -0,0 +1,56 @@
+/*
+ *	UCW Library -- A simple growing buffer for byte-sized items.
+ *
+ *	(c) 2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_BBUF_H
+#define _UCW_BBUF_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bb_printf ucw_bb_printf
+#define bb_printf_at ucw_bb_printf_at
+#define bb_vprintf ucw_bb_vprintf
+#define bb_vprintf_at ucw_bb_vprintf_at
+#endif
+
+#define	GBUF_TYPE	byte
+#define	GBUF_PREFIX(x)	bb_##x
+#include <ucw/gbuf.h>
+
+/**
+ * printf() into a growing buffer with `va_list` arguments.
+ * Generates a `'\0'`-terminated string at the beginning of the buffer
+ * and returns pointer to it.
+ *
+ * See @bb_printf().
+ **/
+char *bb_vprintf(bb_t *bb, const char *fmt, va_list args);
+
+/**
+ * printf() into a growing buffer.
+ * Generates a `'\0'`-terminated string at the beginning of the buffer
+ * and returns pointer to it.
+ *
+ * See @bb_vprintf().
+ **/
+char *bb_printf(bb_t *bb, const char *fmt, ...);
+
+/**
+ * Like @bb_vprintf(), but it does not start at the beginning of the
+ * buffer, but @ofs bytes further.
+ *
+ * Returns pointer to the new string (eg. @ofs bytes after the
+ * beginning of buffer).
+ **/
+char *bb_vprintf_at(bb_t *bb, size_t ofs, const char *fmt, va_list args);
+
+/**
+ * Like @bb_vprintf_at(), but it takes individual arguments.
+ **/
+char *bb_printf_at(bb_t *bb, size_t ofs, const char *fmt, ...);
+
+#endif
diff --git a/libucw/ucw/bbuf.t b/libucw/ucw/bbuf.t
new file mode 100644
index 0000000..ca8f64f
--- /dev/null
+++ b/libucw/ucw/bbuf.t
@@ -0,0 +1,4 @@
+# Tests for growing buffers
+
+Run:	../obj/ucw/bbuf-t
+Out:	<Hello, World!><Hello,                                              World!>
diff --git a/libucw/ucw/bigalloc.c b/libucw/ucw/bigalloc.c
new file mode 100644
index 0000000..0044846
--- /dev/null
+++ b/libucw/ucw/bigalloc.c
@@ -0,0 +1,113 @@
+/*
+ *	UCW Library -- Allocation of Large Aligned Buffers
+ *
+ *	(c) 2006--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <char@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+
+#include <sys/mman.h>
+#include <string.h>
+#include <limits.h>
+
+void *
+page_alloc(u64 len)
+{
+  if (!len)
+    return NULL;
+  if (len > SIZE_MAX)
+    die("page_alloc: Size %llu is too large for the current architecture", (long long) len);
+  ASSERT(!(len & (CPU_PAGE_SIZE-1)));
+  byte *p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+  if (p == (byte*) MAP_FAILED)
+    die("Cannot mmap %llu bytes of memory: %m", (long long)len);
+  return p;
+}
+
+void *
+page_alloc_zero(u64 len)
+{
+  void *p = page_alloc(len);
+  bzero(p, len);
+  return p;
+}
+
+void
+page_free(void *start, u64 len)
+{
+  ASSERT(!(len & (CPU_PAGE_SIZE-1)));
+  ASSERT(!((uintptr_t) start & (CPU_PAGE_SIZE-1)));
+  munmap(start, len);
+}
+
+void *
+page_realloc(void *start, u64 old_len, u64 new_len)
+{
+  void *p = page_alloc(new_len);
+  memcpy(p, start, MIN(old_len, new_len));
+  page_free(start, old_len);
+  return p;
+}
+
+static u64
+big_round(u64 len)
+{
+  return ALIGN_TO(len, (u64)CPU_PAGE_SIZE);
+}
+
+void *
+big_alloc(u64 len)
+{
+  u64 l = big_round(len);
+  if (l > SIZE_MAX - 2*CPU_PAGE_SIZE)
+    die("big_alloc: Size %llu is too large for the current architecture", (long long) len);
+#ifdef CONFIG_UCW_DEBUG
+  l += 2*CPU_PAGE_SIZE;
+#endif
+  byte *p = page_alloc(l);
+#ifdef CONFIG_UCW_DEBUG
+  *(u64*)p = len;
+  mprotect(p, CPU_PAGE_SIZE, PROT_NONE);
+  mprotect(p+l-CPU_PAGE_SIZE, CPU_PAGE_SIZE, PROT_NONE);
+  p += CPU_PAGE_SIZE;
+#endif
+  return p;
+}
+
+void *
+big_alloc_zero(u64 len)
+{
+  void *p = big_alloc(len);
+  bzero(p, big_round(len));
+  return p;
+}
+
+void
+big_free(void *start, u64 len)
+{
+  byte *p = start;
+  u64 l = big_round(len);
+#ifdef CONFIG_UCW_DEBUG
+  p -= CPU_PAGE_SIZE;
+  mprotect(p, CPU_PAGE_SIZE, PROT_READ);
+  ASSERT(*(u64*)p == len);
+  l += 2*CPU_PAGE_SIZE;
+#endif
+  page_free(p, l);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  byte *p = big_alloc(123456);
+  // p[-1] = 1;
+  big_free(p, 123456);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/binheap-node.h b/libucw/ucw/binheap-node.h
new file mode 100644
index 0000000..c0cb16b
--- /dev/null
+++ b/libucw/ucw/binheap-node.h
@@ -0,0 +1,36 @@
+/*
+ *	UCW Library -- Binomial Heaps: Declarations
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_BINHEAP_NODE_H
+#define _UCW_BINHEAP_NODE_H
+
+/***
+ * [[common]]
+ * Common definitions
+ * ------------------
+ ***/
+
+/**
+ * Common header of binomial heap nodes.
+ **/
+struct bh_node {
+  struct bh_node *first_son;
+  struct bh_node *last_son;
+  struct bh_node *next_sibling;
+  byte order;
+};
+
+/**
+ * A binomial heap.
+ **/
+struct bh_heap {
+  struct bh_node root;
+};
+
+#endif
diff --git a/libucw/ucw/binheap-test.c b/libucw/ucw/binheap-test.c
new file mode 100644
index 0000000..8d95367
--- /dev/null
+++ b/libucw/ucw/binheap-test.c
@@ -0,0 +1,94 @@
+/*
+ *	UCW Library -- Binomial Heaps: Testing
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#define BH_PREFIX(x) bht_##x
+#define BH_WANT_INSERT
+#define BH_WANT_FINDMIN
+#define BH_WANT_DELETEMIN
+#include <ucw/binheap-node.h>
+
+struct item {
+  struct bh_node n;
+  uint key;
+};
+
+static inline uint bht_key(struct bh_node *n)
+{
+  return ((struct item *)n)->key;
+}
+
+static inline uint bht_less(struct bh_node *a, struct bh_node *b)
+{
+  return bht_key(a) < bht_key(b);
+}
+
+static void
+bht_do_dump(struct bh_node *a, struct bh_node *expected_last, uint offset)
+{
+  if (!a)
+    return;
+  printf("%*s", offset, "");
+  printf("[%d](%d)%s\n", a->order, bht_key(a), a == expected_last ? " L" : "");
+  for (struct bh_node *b=a->first_son; b; b=b->next_sibling)
+    bht_do_dump(b, a->last_son, offset+1);
+}
+
+static void
+bht_dump(struct bh_heap *h)
+{
+  printf("root\n");
+  for (struct bh_node *b=h->root.first_son; b; b=b->next_sibling)
+    bht_do_dump(b, b->last_son, 1);
+}
+
+#include <ucw/binheap.h>
+
+int main(void)
+{
+  uint i;
+  struct bh_heap h;
+#define N 1048576
+#define K(i) ((259309*i+1009)%N)
+
+  bht_init(&h);
+
+  for (i=0; i<N; i++)
+    {
+      struct item *a = xmalloc_zero(sizeof(*a));
+      a->key = K(i);
+      // printf("Insert %d\n", a->key);
+      bht_insert(&h, &a->n);
+      // bht_dump(&h);
+    }
+  // bht_dump(&h);
+  ASSERT(bht_key(bht_findmin(&h)) == 0);
+  uint cnt = 0;
+  BH_FOR_ALL(bht_, &h, a)
+    {
+      cnt++;
+    }
+  BH_END_FOR;
+  printf("cnt=%d\n", cnt);
+  ASSERT(cnt == N);
+  for (i=0; i<N; i++)
+    {
+      struct item *a = (struct item *) bht_deletemin(&h);
+      // printf("\nDeleted %d:\n", a->key);
+      ASSERT(a->key == i);
+      // bht_dump(&h);
+    }
+  bht_dump(&h);
+
+  return 0;
+}
diff --git a/libucw/ucw/binheap-test.t b/libucw/ucw/binheap-test.t
new file mode 100644
index 0000000..109d6e9
--- /dev/null
+++ b/libucw/ucw/binheap-test.t
@@ -0,0 +1,5 @@
+# Test for the binheap module
+
+Run:	../obj/ucw/binheap-test
+Out:	cnt=1048576
+	root
diff --git a/libucw/ucw/binheap.h b/libucw/ucw/binheap.h
new file mode 100644
index 0000000..f367899
--- /dev/null
+++ b/libucw/ucw/binheap.h
@@ -0,0 +1,208 @@
+/*
+ *	UCW Library -- Binomial Heaps
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This is a generic implementation of Binomial Heaps. Each time you include
+ *  this file with parameters set in the corresponding preprocessor macros
+ *  as described below, it generates functions for manipulating the particular
+ *  version of the binomial heap.
+ */
+
+/***
+ * [[generator]]
+ * Interface to the generator
+ * --------------------------
+ *
+ * To use the binomial heaps, you need to specify:
+ *
+ * - `BH_PREFIX(x)`  -- macro to add a name prefix (used on all global names
+ *			defined by the generator). All further names mentioned
+ *			here except for macro names will be implicitly prefixed.
+ *
+ * Then you continue by including `ucw/binheap-node.h` which defines <<struct_bh_node,struct bh_node>>
+ * and <<struct_bh_heap,struct bh_heap>> (both without prefix). The heap elements are always allocated by
+ * you and they must include `struct bh_node` which serves as a handle used for all
+ * the heap functions and it contains all information needed for heap-keeping.
+ * The heap itself is also allocated by you and it's represented by `struct bh_heap`.
+ *
+ * When you have the declaration of heap nodes, you continue with defining:
+ *
+ * - `less(p,q)`     -- returns `1` if the key corresponding to `bh_node *p`
+ *			is less than the one corresponding to `*q`.
+ *
+ * Then specify what operations you request:
+ *
+ * - `init(heap\*)` -- initialize the heap (always defined).
+ * - `insert(heap\*, node\*)` -- insert the node to the heap (`BH_WANT_INSERT`).
+ * - `node\* findmin(heap\*)` -- find node with minimum key (`BH_WANT_FINDMIN`).
+ * - `node\* deletemin(heap\*)` -- findmin and delete the node (`BH_WANT_DELETEMIN`).
+ *
+ * Then include `ucw/binheap.h` and voila, you have a binomial heap
+ * suiting all your needs (at least those which you've revealed :) ).
+ *
+ * You also get a iterator macro at no extra charge:
+ *
+ *   BH_FOR_ALL(bh_prefix, heap*, variable)
+ *     {
+ *       // node* variable gets declared automatically
+ *       do_something_with_node(variable);
+ *       // use BH_BREAK and BH_CONTINUE instead of break and continue
+ *       // you must not alter contents of the binomial heap here
+ *     }
+ *   BH_END_FOR;
+ *
+ * After including this file, all parameter macros are automatically undef'd.
+ ***/
+
+#define BH_NODE struct bh_node
+#define BH_HEAP struct bh_heap
+
+static void
+BH_PREFIX(merge)(BH_NODE *a, BH_NODE *b)
+{
+  BH_NODE **pp = &a->first_son;
+  BH_NODE *q = b->first_son;
+  BH_NODE *p, *r, *s;
+
+  while ((p = *pp) && q)
+    {
+      /* p,q are the next nodes of a,b; pp points to where p is linked */
+      if (p->order < q->order)		/* p is smaller => skip it */
+	pp = &p->next_sibling;
+      else if (p->order > q->order)	/* q is smaller => insert it before p */
+	{
+	  r = q;
+	  q = q->next_sibling;
+	  r->next_sibling = p;
+	  *pp = r;
+	  pp = &r->next_sibling;
+	}
+      else				/* p and q are of the same order => need to merge them */
+	{
+	  if (BH_PREFIX(less)(p, q))	/* we'll hang r below s */
+	    {
+	      r = q;
+	      s = p;
+	    }
+	  else
+	    {
+	      r = p;
+	      s = q;
+	    }
+	  *pp = p->next_sibling;	/* unlink p,q from their lists */
+	  q = q->next_sibling;
+
+	  if (s->last_son)		/* merge r to s, increasing order */
+	    s->last_son->next_sibling = r;
+	  else
+	    s->first_son = r;
+	  s->last_son = r;
+	  s->order++;
+	  r->next_sibling = NULL;
+
+	  if (!q || q->order > s->order) /* put the result into the b's list if possible */
+	    {
+	      s->next_sibling = q;
+	      q = s;
+	    }
+	  else				/* otherwise put the result to the a's list */
+	    {
+	      p = s->next_sibling = *pp;
+	      *pp = s;
+	      if (p && p->order == s->order) /* 3-collision */
+		pp = &s->next_sibling;
+	    }
+	}
+    }
+  if (!p)
+    *pp = q;
+}
+
+#ifdef BH_WANT_INSERT
+static void
+BH_PREFIX(insert)(BH_HEAP *heap, BH_NODE *a)
+{
+  BH_NODE sh;
+
+  sh.first_son = a;
+  a->first_son = a->last_son = a->next_sibling = NULL;
+  a->order = 0;
+  BH_PREFIX(merge)(&heap->root, &sh);
+}
+#endif
+
+#ifdef BH_WANT_FINDMIN
+static BH_NODE *
+BH_PREFIX(findmin)(BH_HEAP *heap)
+{
+  BH_NODE *p, *best;
+
+  best = NULL;
+  for (p=heap->root.first_son; p; p=p->next_sibling)
+    if (!best || BH_PREFIX(less)(p, best))
+      best = p;
+  return best;
+}
+#endif
+
+#ifdef BH_WANT_DELETEMIN
+static BH_NODE *
+BH_PREFIX(deletemin)(BH_HEAP *heap)
+{
+  BH_NODE *p, **pp, **bestp;
+
+  bestp = NULL;
+  for (pp=&heap->root.first_son; p=*pp; pp=&p->next_sibling)
+    if (!bestp || BH_PREFIX(less)(p, *bestp))
+      bestp = pp;
+  if (!bestp)
+    return NULL;
+
+  p = *bestp;
+  *bestp = p->next_sibling;
+  BH_PREFIX(merge)(&heap->root, p);
+  return p;
+}
+#endif
+
+static inline void
+BH_PREFIX(init)(BH_HEAP *heap)
+{
+  bzero(heap, sizeof(*heap));
+}
+
+#ifndef BH_FOR_ALL
+
+#define BH_FOR_ALL(bh_px, bh_heap, bh_var)	\
+do {						\
+  struct bh_node *bh_stack[32];			\
+  uint bh_sp = 0;				\
+  if (bh_stack[0] = (bh_heap)->root.first_son)  \
+    bh_sp++;					\
+  while (bh_sp) {				\
+    struct bh_node *bh_var = bh_stack[--bh_sp];	\
+    if (bh_var->next_sibling)			\
+      bh_stack[bh_sp++] = bh_var->next_sibling; \
+    if (bh_var->first_son)			\
+      bh_stack[bh_sp++] = bh_var->first_son;
+#define BH_END_FOR				\
+  }						\
+} while (0)
+
+#define BH_BREAK { bh_sp=0; break; }
+#define BH_CONTINUE continue
+
+#endif
+
+#undef BH_PREFIX
+#undef BH_NODE
+#undef BH_HEAP
+#undef BH_WANT_INSERT
+#undef BH_WANT_FINDMIN
+#undef BH_WANT_DELETEMIN
diff --git a/libucw/ucw/binsearch.h b/libucw/ucw/binsearch.h
new file mode 100644
index 0000000..99bf33a
--- /dev/null
+++ b/libucw/ucw/binsearch.h
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- Generic Binary Search
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/***
+ * [[defs]]
+ * Definitions
+ * -----------
+ ***/
+
+/**
+ * Find the first element not lower than @x in the sorted array @ary of @N elements (non-decreasing order).
+ * Returns the index of the found element or @N if no exists. Uses `ary_lt_x(ary,i,x)` to compare the @i'th element with @x.
+ * The time complexity is `O(log(N))`.
+ **/
+#define BIN_SEARCH_FIRST_GE_CMP(ary,N,x,ary_lt_x)  ({		\
+  uint l = 0, r = (N);						\
+  while (l < r)							\
+    {								\
+      uint m = (l+r)/2;						\
+      if (ary_lt_x(ary,m,x))					\
+	l = m+1;						\
+      else							\
+	r = m;							\
+    }								\
+  l;								\
+})
+
+/**
+ * The default comparision macro for @BIN_SEARCH_FIRST_GE_CMP().
+ **/
+#define ARY_LT_NUM(ary,i,x) (ary)[i] < (x)
+
+/**
+ * Same as @BIN_SEARCH_FIRST_GE_CMP(), but uses the default `<` operator for comparisions.
+ **/
+#define BIN_SEARCH_FIRST_GE(ary,N,x) BIN_SEARCH_FIRST_GE_CMP(ary,N,x,ARY_LT_NUM)
+
+/**
+ * Search the sorted array @ary of @N elements (non-decreasing) for the first occurence of @x.
+ * Returns the index or -1 if no such element exists. Uses the `<` operator for comparisions.
+ **/
+#define BIN_SEARCH_EQ(ary,N,x) ({ int i = BIN_SEARCH_FIRST_GE(ary,N,x); if (i >= (N) || (ary)[i] != (x)) i=-1; i; })
diff --git a/libucw/ucw/bit-array.c b/libucw/ucw/bit-array.c
new file mode 100644
index 0000000..ff8d473
--- /dev/null
+++ b/libucw/ucw/bit-array.c
@@ -0,0 +1,59 @@
+/*
+ *	UCW Library -- Support routines for bitarray
+ *
+ *	(c) 2012 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2013 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/bitops.h>
+#include <ucw/bitarray.h>
+
+uint bit_array_count_bits(bitarray_t a, uint n)
+{
+  uint m = 0;
+  n = BIT_ARRAY_WORDS(n);
+  while (n--)
+    m += bit_count(*a++);
+  return m;
+}
+
+bitarray_t bit_array_xrealloc(bitarray_t a, uint old_n, uint new_n)
+{
+  uint old_bytes = BIT_ARRAY_BYTES(old_n);
+  uint new_bytes =  BIT_ARRAY_BYTES(new_n);
+  if (old_bytes == new_bytes)
+    return a;
+  a = xrealloc(a, new_bytes);
+  if (old_bytes < new_bytes)
+    bzero(a + old_bytes, new_bytes - old_bytes);
+  return a;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <alloca.h>
+
+int main(void)
+{
+  char buf[1024];
+  bitarray_t a = alloca(BIT_ARRAY_BYTES(sizeof(buf)));
+  while (1)
+    {
+      if (!fgets(buf, sizeof(buf), stdin))
+	return 0;
+      uint n;
+      for (n = 0; buf[n] == '0' || buf[n] == '1'; n++);
+      bit_array_zero(a, n);
+      for (uint i = 0; i < n; i++)
+	if (buf[i] == '1')
+	  bit_array_set(a, i);
+      printf("%u\n", bit_array_count_bits(a, n));
+    }
+}
+
+#endif
diff --git a/libucw/ucw/bit-ffs.c b/libucw/ucw/bit-ffs.c
new file mode 100644
index 0000000..88f21e0
--- /dev/null
+++ b/libucw/ucw/bit-ffs.c
@@ -0,0 +1,46 @@
+/*
+ *	UCW Library -- Find Lowest Set Bit
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/bitops.h>
+
+/* Just a table, the rest is in bitops.h */
+
+const byte ffs_table[] = {
+  0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
+};
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  uint i;
+  while (scanf("%x", &i) == 1)
+    printf("%d\n", bit_ffs(i));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/bit-fls.c b/libucw/ucw/bit-fls.c
new file mode 100644
index 0000000..4100256
--- /dev/null
+++ b/libucw/ucw/bit-fls.c
@@ -0,0 +1,42 @@
+/*
+ *	UCW Library -- Find Highest Set Bit
+ *
+ *	(c) 1997-2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/bitops.h>
+
+int
+bit_fls(u32 x)
+{
+  uint l;
+
+  if (!x)
+	return -1;
+
+  l = 0;
+  if (x & 0xffff0000) { l += 16; x &= 0xffff0000; }
+  if (x & 0xff00ff00) { l += 8;  x &= 0xff00ff00; }
+  if (x & 0xf0f0f0f0) { l += 4;  x &= 0xf0f0f0f0; }
+  if (x & 0xcccccccc) { l += 2;  x &= 0xcccccccc; }
+  if (x & 0xaaaaaaaa) l++;
+  return l;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  uint i;
+  while (scanf("%x", &i) == 1)
+    printf("%d\n", bit_fls(i));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/bitarray.h b/libucw/ucw/bitarray.h
new file mode 100644
index 0000000..78ee9d9
--- /dev/null
+++ b/libucw/ucw/bitarray.h
@@ -0,0 +1,110 @@
+/*
+ *	UCW Library -- Bit Array Operations
+ *
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2012 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_BITARRAY_H
+#define _UCW_BITARRAY_H
+
+#include <string.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bit_array_count_bits ucw_bit_array_count_bits
+#define bit_array_xrealloc ucw_bit_array_xrealloc
+#endif
+
+typedef u32 *bitarray_t; // Must be initialized by bit_array_xmalloc(), bit_array_zero() or bit_array_set_all()
+
+#define BIT_ARRAY_WORDS(n) (((n)+31)/32)
+#define BIT_ARRAY_BYTES(n) (4*BIT_ARRAY_WORDS(n))
+#define BIT_ARRAY(name,size) u32 name[BIT_ARRAY_WORDS(size)]
+
+static inline bitarray_t bit_array_xmalloc(uint n)
+{
+  return xmalloc(BIT_ARRAY_BYTES(n));
+}
+
+bitarray_t bit_array_xrealloc(bitarray_t a, uint old_n, uint new_n);
+
+static inline bitarray_t bit_array_xmalloc_zero(uint n)
+{
+  return xmalloc_zero(BIT_ARRAY_BYTES(n));
+}
+
+static inline void bit_array_zero(bitarray_t a, uint n)
+{
+  bzero(a, BIT_ARRAY_BYTES(n));
+}
+
+static inline void bit_array_set_all(bitarray_t a, uint n)
+{
+  uint w = n / 32;
+  memset(a, 255, w * 4);
+  uint m = n & 31;
+  if (m)
+    a[w] = (1U << m) - 1;
+}
+
+static inline void bit_array_set(bitarray_t a, uint i)
+{
+  a[i/32] |= (1 << (i%32));
+}
+
+static inline void bit_array_clear(bitarray_t a, uint i)
+{
+  a[i/32] &= ~(1 << (i%32));
+}
+
+static inline void bit_array_assign(bitarray_t a, uint i, uint x)
+{
+  if (x)
+    bit_array_set(a, i);
+  else
+    bit_array_clear(a, i);
+}
+
+static inline uint bit_array_isset(bitarray_t a, uint i)
+{
+  return a[i/32] & (1 << (i%32));
+}
+
+static inline uint bit_array_get(bitarray_t a, uint i)
+{
+  return !! bit_array_isset(a, i);
+}
+
+static inline uint bit_array_test_and_set(bitarray_t a, uint i)
+{
+  uint t = bit_array_isset(a, i);
+  bit_array_set(a, i);
+  return t;
+}
+
+static inline uint bit_array_test_and_clear(bitarray_t a, uint i)
+{
+  uint t = bit_array_isset(a, i);
+  bit_array_clear(a, i);
+  return t;
+}
+
+uint bit_array_count_bits(bitarray_t a, uint n);
+
+/* Iterate over all set bits */
+#define BIT_ARRAY_FISH_BITS_BEGIN(var,ary,size)					\
+  for (uint var##_hi=0; var##_hi < BIT_ARRAY_WORDS(size); var##_hi++)		\
+    {										\
+      u32 var##_cur = ary[var##_hi];						\
+      for (uint var = 32 * var##_hi; var##_cur; var++, var##_cur >>= 1)		\
+        if (var##_cur & 1)							\
+	  do
+
+#define BIT_ARRAY_FISH_BITS_END							\
+	  while (0);								\
+    }
+
+#endif
diff --git a/libucw/ucw/bitops.h b/libucw/ucw/bitops.h
new file mode 100644
index 0000000..21f40c4
--- /dev/null
+++ b/libucw/ucw/bitops.h
@@ -0,0 +1,53 @@
+/*
+ *	UCW Library -- Bit Operations
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2012 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_BITOPS_H
+#define _UCW_BITOPS_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bit_fls ucw_bit_fls
+#define ffs_table ucw_ffs_table
+#endif
+
+/* Find highest bit set (i.e., the floor of the binary logarithm) (bit-fls.c) */
+
+int bit_fls(u32 x);		/* bit_fls(0)=-1 */
+
+/* Find lowest bit set, undefined for zero argument (bit-ffs.c) */
+
+extern const byte ffs_table[256];
+
+#ifdef __pentium4		/* On other ia32 machines, the C version is faster */
+
+static inline uint bit_ffs(uint w)
+{
+  asm("bsfl %1,%0" :"=r" (w) :"rm" (w));
+  return w;
+}
+
+#else
+
+static inline uint bit_ffs(uint w)
+{
+  uint b = (w & 0xffff) ? 0 : 16;
+  b += ((w >> b) & 0xff) ? 0 : 8;
+  return b + ffs_table[(w >> b) & 0xff];
+}
+
+#endif
+
+/* Count the number of bits set */
+
+static inline uint bit_count(uint w)
+{
+  return __builtin_popcount(w);
+}
+
+#endif
diff --git a/libucw/ucw/bitops.t b/libucw/ucw/bitops.t
new file mode 100644
index 0000000..4224066
--- /dev/null
+++ b/libucw/ucw/bitops.t
@@ -0,0 +1,53 @@
+# Tests for bitops modules
+
+Run:	../obj/ucw/bit-ffs-t
+In:	1
+	2
+	3
+	4
+	5
+	6
+	12345678
+	23030300
+	23030000
+	23000000
+	40000000
+	80000000
+Out:	0
+	1
+	0
+	2
+	0
+	1
+	3
+	8
+	16
+	24
+	30
+	31
+
+Run:	../obj/ucw/bit-fls-t
+In:	1
+	2
+	3
+	4
+	5
+	6
+	12345678
+	23030303
+	03030303
+	00030303
+	00000303
+	0fedcba9
+Out:	0
+	1
+	1
+	2
+	2
+	2
+	28
+	29
+	25
+	17
+	9
+	27
diff --git a/libucw/ucw/bitsig.c b/libucw/ucw/bitsig.c
new file mode 100644
index 0000000..21215a4
--- /dev/null
+++ b/libucw/ucw/bitsig.c
@@ -0,0 +1,158 @@
+/*
+ *	UCW Library -- Bit Array Signatures -- A Dubious Detector of Duplicates
+ *
+ *	(c) 2002 Martin Mares <mj@ucw.cz>
+ *
+ *	Greatly inspired by: Faloutsos, C. and Christodoulakis, S.: Signature files
+ *	(An access method for documents and its analytical performance evaluation),
+ *	ACM Trans. Office Inf. Syst., 2(4):267--288, Oct. 1984.
+ *
+ *	This data structure provides a very compact representation
+ *	of a set of strings with insertion and membership search,
+ *	but with a certain low probability it cheats by incidentally
+ *	reporting a non-member as a member. Generally the larger you
+ *	create the structure, the lower this probability is.
+ *
+ *	How does it work: the structure is just an array of M bits
+ *	and each possible element is hashed to a set of (at most) L
+ *	bit positions. For each element of the represented set, we
+ *	set its L bits to ones and we report as present all elements
+ *	whose all L bits ar set.
+ *
+ *	Analysis: Let's assume N items have already been stored	and let A
+ *	denote L/M (density of the hash function). The probability that
+ *	a fixed bit of the array is set by any of the N items is
+ *    	1 - (1-1/M)^(NL) = 1 - ((1-1/M)^M)^NA = approx. 1 - e^-NA.
+ *	This is minimized by setting A=(ln 2)/N (try taking derivative).
+ *	Given a non-present item, the probability that all of the bits
+ *	corresponding to this item are set by the other items (that is,
+ *	the structure gives a false answer) is (1-e^-NA)^L = 2^-L.
+ *	Hence, if we want to give false answers with probability less
+ *	than epsilon, we take L := -log_2 epsilon, M := 1.45*N*L.
+ *
+ *	Example: For a set of 10^7 items with P[error] < 10^-6, we set
+ *	L := 20 and M :=  290*10^6 bits = cca 34.5 MB (29 bits per item).
+ *
+ *	We leave L and an upper bound for N as parameters set during
+ *	creation of the structure. Currently, the structure is limited
+ *	to 4 Gb = 512 MB.
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/bitsig.h>
+#include <ucw/md5.h>
+
+#include <string.h>
+
+struct bitsig {
+  uint l, m, n, maxn, max_m_mult;
+  u32 hash[4];
+  uint hindex;
+  byte array[0];
+};
+
+struct bitsig *
+bitsig_init(uint perrlog, uint maxn)
+{
+  struct bitsig *b;
+  u64 m;
+  uint mbytes;
+
+  m = ((u64) maxn * perrlog * 145 + 99) / 100;
+  if (m >= (u64) 1 << 32)
+    die("bitsig_init: bitsig array too large (maximum is 4 Gb)");
+  mbytes = (m + 7) >> 3U;
+  b = xmalloc(sizeof(struct bitsig) + mbytes);
+  b->l = perrlog;
+  b->m = m;
+  b->n = 0;
+  b->maxn = maxn;
+  b->max_m_mult = (0xffffffff / m) * m;
+  bzero(b->array, mbytes);
+  msg(L_DEBUG, "Initialized bitsig array with l=%d, m=%u (%u KB), expecting %d items", b->l, b->m, (mbytes+1023)/1024, maxn);
+  return b;
+}
+
+void
+bitsig_free(struct bitsig *b)
+{
+  xfree(b);
+}
+
+static void
+bitsig_hash_init(struct bitsig *b, byte *item)
+{
+  md5_hash_buffer((byte *) b->hash, item, strlen(item));
+  b->hindex = 0;
+}
+
+static inline uint
+bitsig_hash_bit(struct bitsig *b)
+{
+  u32 h;
+  do
+    {
+      h = b->hash[b->hindex];
+      b->hash[b->hindex] *= 3006477127U;
+      b->hindex = (b->hindex+1) % 4;
+    }
+  while (h >= b->max_m_mult);
+  return h % b->m;
+}
+
+int
+bitsig_member(struct bitsig *b, byte *item)
+{
+  uint i, bit;
+
+  bitsig_hash_init(b, item);
+  for (i=0; i<b->l; i++)
+    {
+      bit = bitsig_hash_bit(b);
+      if (!(b->array[bit >> 3] & (1 << (bit & 7))))
+	return 0;
+    }
+  return 1;
+}
+
+int
+bitsig_insert(struct bitsig *b, byte *item)
+{
+  uint i, bit, was;
+
+  bitsig_hash_init(b, item);
+  was = 1;
+  for (i=0; i<b->l; i++)
+    {
+      bit = bitsig_hash_bit(b);
+      if (!(b->array[bit >> 3] & (1 << (bit & 7))))
+	{
+	  was = 0;
+	  b->array[bit >> 3] |= (1 << (bit & 7));
+	}
+    }
+  if (!was && b->n++ == b->maxn+1)
+    msg(L_ERROR, "bitsig: Too many items inserted, error rate will be higher than estimated!");
+  return was;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+  struct bitsig *b = bitsig_init(atol(argv[1]), atol(argv[2]));
+  byte buf[1024];
+
+  while (fgets(buf, 1024, stdin))
+    printf("%d\n", bitsig_insert(b, buf));
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/bitsig.h b/libucw/ucw/bitsig.h
new file mode 100644
index 0000000..556b3c9
--- /dev/null
+++ b/libucw/ucw/bitsig.h
@@ -0,0 +1,27 @@
+/*
+ *	UCW Library -- Bit Array Signatures -- A Dubious Detector of Duplicates
+ *
+ *	(c) 2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_BITSIG_H
+#define _UCW_BITSIG_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bitsig_free ucw_bitsig_free
+#define bitsig_init ucw_bitsig_init
+#define bitsig_insert ucw_bitsig_insert
+#define bitsig_member ucw_bitsig_member
+#endif
+
+struct bitsig;
+
+struct bitsig *bitsig_init(uint perrlog, uint maxn);
+void bitsig_free(struct bitsig *b);
+int bitsig_member(struct bitsig *b, byte *item);
+int bitsig_insert(struct bitsig *b, byte *item);
+
+#endif
diff --git a/libucw/ucw/char-cat.c b/libucw/ucw/char-cat.c
new file mode 100644
index 0000000..9ca8e75
--- /dev/null
+++ b/libucw/ucw/char-cat.c
@@ -0,0 +1,17 @@
+/*
+ *	UCW Library -- Character Classes
+ *
+ *	(c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+
+const byte ucw_c_cat[256] = {
+#define CHAR(code,upper,lower,cat) cat,
+#include <ucw/char-map.h>
+#undef CHAR
+};
diff --git a/libucw/ucw/char-lower.c b/libucw/ucw/char-lower.c
new file mode 100644
index 0000000..db97583
--- /dev/null
+++ b/libucw/ucw/char-lower.c
@@ -0,0 +1,17 @@
+/*
+ *	UCW Library -- Lowercase Map
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+
+const byte ucw_c_lower[256] = {
+#define CHAR(code,upper,lower,cat) lower,
+#include <ucw/char-map.h>
+#undef CHAR
+};
diff --git a/libucw/ucw/char-map.h b/libucw/ucw/char-map.h
new file mode 100644
index 0000000..3e348fc
--- /dev/null
+++ b/libucw/ucw/char-map.h
@@ -0,0 +1,268 @@
+/*
+ *	UCW Library -- Character Code Map (UTF-8 Version)
+ *
+ *	(c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/* Syntax: CHAR(code, uppercase, lowercase, category) */
+
+CHAR(0x00,0x00,0x00,_C_CTRL)				//	<control>
+CHAR(0x01,0x01,0x01,_C_CTRL)				//	<control>
+CHAR(0x02,0x02,0x02,_C_CTRL)				//	<control>
+CHAR(0x03,0x03,0x03,_C_CTRL)				//	<control>
+CHAR(0x04,0x04,0x04,_C_CTRL)				//	<control>
+CHAR(0x05,0x05,0x05,_C_CTRL)				//	<control>
+CHAR(0x06,0x06,0x06,_C_CTRL)				//	<control>
+CHAR(0x07,0x07,0x07,_C_CTRL)				//	<control>
+CHAR(0x08,0x08,0x08,_C_CTRL | _C_BLANK)			//	<control>
+CHAR(0x09,0x09,0x09,_C_CTRL | _C_BLANK | _C_PRINT)	//	<control>
+CHAR(0x0A,0x0A,0x0A,_C_CTRL | _C_BLANK)			//	<control>
+CHAR(0x0B,0x0B,0x0B,_C_CTRL)				//	<control>
+CHAR(0x0C,0x0C,0x0C,_C_CTRL | _C_BLANK)			//	<control>
+CHAR(0x0D,0x0D,0x0D,_C_CTRL | _C_BLANK)			//	<control>
+CHAR(0x0E,0x0E,0x0E,_C_CTRL)				//	<control>
+CHAR(0x0F,0x0F,0x0F,_C_CTRL)				//	<control>
+CHAR(0x10,0x10,0x10,_C_CTRL)				//	<control>
+CHAR(0x11,0x11,0x11,_C_CTRL)				//	<control>
+CHAR(0x12,0x12,0x12,_C_CTRL)				//	<control>
+CHAR(0x13,0x13,0x13,_C_CTRL)				//	<control>
+CHAR(0x14,0x14,0x14,_C_CTRL)				//	<control>
+CHAR(0x15,0x15,0x15,_C_CTRL)				//	<control>
+CHAR(0x16,0x16,0x16,_C_CTRL)				//	<control>
+CHAR(0x17,0x17,0x17,_C_CTRL)				//	<control>
+CHAR(0x18,0x18,0x18,_C_CTRL)				//	<control>
+CHAR(0x19,0x19,0x19,_C_CTRL)				//	<control>
+CHAR(0x1A,0x1A,0x1A,_C_CTRL)				//	<control>
+CHAR(0x1B,0x1B,0x1B,_C_CTRL)				//	<control>
+CHAR(0x1C,0x1C,0x1C,_C_CTRL)				//	<control>
+CHAR(0x1D,0x1D,0x1D,_C_CTRL)				//	<control>
+CHAR(0x1E,0x1E,0x1E,_C_CTRL)				//	<control>
+CHAR(0x1F,0x1F,0x1F,_C_CTRL)				//	<control>
+CHAR(0x20,0x20,0x20,_C_BLANK | _C_PRINT)		//	SPACE
+CHAR(0x21,0x21,0x21,_C_PRINT)				//	EXCLAMATION MARK
+CHAR(0x22,0x22,0x22,_C_PRINT)				//	QUOTATION MARK
+CHAR(0x23,0x23,0x23,_C_PRINT)				//	NUMBER SIGN
+CHAR(0x24,0x24,0x24,_C_PRINT)				//	DOLLAR SIGN
+CHAR(0x25,0x25,0x25,_C_PRINT)				//	PERCENT SIGN
+CHAR(0x26,0x26,0x26,_C_PRINT)				//	AMPERSAND
+CHAR(0x27,0x27,0x27,_C_PRINT)				//	APOSTROPHE
+CHAR(0x28,0x28,0x28,_C_PRINT)				//	LEFT PARENTHESIS
+CHAR(0x29,0x29,0x29,_C_PRINT)				//	RIGHT PARENTHESIS
+CHAR(0x2A,0x2A,0x2A,_C_PRINT)				//	ASTERISK
+CHAR(0x2B,0x2B,0x2B,_C_PRINT)				//	PLUS SIGN
+CHAR(0x2C,0x2C,0x2C,_C_PRINT)				//	COMMA
+CHAR(0x2D,0x2D,0x2D,_C_PRINT)				//	HYPHEN-MINUS
+CHAR(0x2E,0x2E,0x2E,_C_PRINT)				//	FULL STOP
+CHAR(0x2F,0x2F,0x2F,_C_PRINT)				//	SOLIDUS
+CHAR(0x30,0x30,0x30,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT ZERO
+CHAR(0x31,0x31,0x31,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT ONE
+CHAR(0x32,0x32,0x32,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT TWO
+CHAR(0x33,0x33,0x33,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT THREE
+CHAR(0x34,0x34,0x34,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT FOUR
+CHAR(0x35,0x35,0x35,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT FIVE
+CHAR(0x36,0x36,0x36,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT SIX
+CHAR(0x37,0x37,0x37,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT SEVEN
+CHAR(0x38,0x38,0x38,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT EIGHT
+CHAR(0x39,0x39,0x39,_C_DIGIT | _C_XDIGIT | _C_PRINT)	//	DIGIT NINE
+CHAR(0x3A,0x3A,0x3A,_C_PRINT)				//	COLON
+CHAR(0x3B,0x3B,0x3B,_C_PRINT)				//	SEMICOLON
+CHAR(0x3C,0x3C,0x3C,_C_PRINT)				//	LESS-THAN SIGN
+CHAR(0x3D,0x3D,0x3D,_C_PRINT)				//	EQUALS SIGN
+CHAR(0x3E,0x3E,0x3E,_C_PRINT)				//	GREATER-THAN SIGN
+CHAR(0x3F,0x3F,0x3F,_C_PRINT)				//	QUESTION MARK
+CHAR(0x40,0x40,0x40,_C_PRINT)				//	COMMERCIAL AT
+CHAR(0x41,0x41,0x61,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER A
+CHAR(0x42,0x42,0x62,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER B
+CHAR(0x43,0x43,0x63,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER C
+CHAR(0x44,0x44,0x64,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER D
+CHAR(0x45,0x45,0x65,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER E
+CHAR(0x46,0x46,0x66,_C_UPPER | _C_XDIGIT | _C_PRINT)	//	LATIN CAPITAL LETTER F
+CHAR(0x47,0x47,0x67,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER G
+CHAR(0x48,0x48,0x68,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER H
+CHAR(0x49,0x49,0x69,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER I
+CHAR(0x4A,0x4A,0x6A,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER J
+CHAR(0x4B,0x4B,0x6B,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER K
+CHAR(0x4C,0x4C,0x6C,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER L
+CHAR(0x4D,0x4D,0x6D,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER M
+CHAR(0x4E,0x4E,0x6E,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER N
+CHAR(0x4F,0x4F,0x6F,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER O
+CHAR(0x50,0x50,0x70,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER P
+CHAR(0x51,0x51,0x71,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER Q
+CHAR(0x52,0x52,0x72,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER R
+CHAR(0x53,0x53,0x73,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER S
+CHAR(0x54,0x54,0x74,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER T
+CHAR(0x55,0x55,0x75,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER U
+CHAR(0x56,0x56,0x76,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER V
+CHAR(0x57,0x57,0x77,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER W
+CHAR(0x58,0x58,0x78,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER X
+CHAR(0x59,0x59,0x79,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER Y
+CHAR(0x5A,0x5A,0x7A,_C_UPPER | _C_PRINT)		//	LATIN CAPITAL LETTER Z
+CHAR(0x5B,0x5B,0x5B,_C_PRINT)				//	LEFT SQUARE BRACKET
+CHAR(0x5C,0x5C,0x5C,_C_PRINT)				//	REVERSE SOLIDUS
+CHAR(0x5D,0x5D,0x5D,_C_PRINT)				//	RIGHT SQUARE BRACKET
+CHAR(0x5E,0x5E,0x5E,_C_PRINT)				//	CIRCUMFLEX ACCENT
+CHAR(0x5F,0x5F,0x5F,_C_INNER | _C_PRINT)		//	LOW LINE
+CHAR(0x60,0x60,0x60,_C_PRINT)				//	GRAVE ACCENT
+CHAR(0x61,0x41,0x61,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER A
+CHAR(0x62,0x42,0x62,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER B
+CHAR(0x63,0x43,0x63,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER C
+CHAR(0x64,0x44,0x64,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER D
+CHAR(0x65,0x45,0x65,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER E
+CHAR(0x66,0x46,0x66,_C_LOWER | _C_XDIGIT | _C_PRINT)	//	LATIN SMALL LETTER F
+CHAR(0x67,0x47,0x67,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER G
+CHAR(0x68,0x48,0x68,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER H
+CHAR(0x69,0x49,0x69,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER I
+CHAR(0x6A,0x4A,0x6A,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER J
+CHAR(0x6B,0x4B,0x6B,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER K
+CHAR(0x6C,0x4C,0x6C,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER L
+CHAR(0x6D,0x4D,0x6D,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER M
+CHAR(0x6E,0x4E,0x6E,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER N
+CHAR(0x6F,0x4F,0x6F,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER O
+CHAR(0x70,0x50,0x70,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER P
+CHAR(0x71,0x51,0x71,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER Q
+CHAR(0x72,0x52,0x72,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER R
+CHAR(0x73,0x53,0x73,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER S
+CHAR(0x74,0x54,0x74,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER T
+CHAR(0x75,0x55,0x75,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER U
+CHAR(0x76,0x56,0x76,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER V
+CHAR(0x77,0x57,0x77,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER W
+CHAR(0x78,0x58,0x78,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER X
+CHAR(0x79,0x59,0x79,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER Y
+CHAR(0x7A,0x5A,0x7A,_C_LOWER | _C_PRINT)		//	LATIN SMALL LETTER Z
+CHAR(0x7B,0x7B,0x7B,_C_PRINT)				//	LEFT CURLY BRACKET
+CHAR(0x7C,0x7C,0x7C,_C_PRINT)	       			//	VERTICAL LINE
+CHAR(0x7D,0x7D,0x7D,_C_PRINT)				//	RIGHT CURLY BRACKET
+CHAR(0x7E,0x7E,0x7E,_C_PRINT)				//	TILDE
+CHAR(0x7F,0x7F,0x7F,_C_CTRL)				//	<control>
+CHAR(0x80,0x80,0x80,_C_PRINT)				//	UTF-8
+CHAR(0x81,0x81,0x81,_C_PRINT)				//	UTF-8
+CHAR(0x82,0x82,0x82,_C_PRINT)				//	UTF-8
+CHAR(0x83,0x83,0x83,_C_PRINT)				//	UTF-8
+CHAR(0x84,0x84,0x84,_C_PRINT)				//	UTF-8
+CHAR(0x85,0x85,0x85,_C_PRINT)				//	UTF-8
+CHAR(0x86,0x86,0x86,_C_PRINT)				//	UTF-8
+CHAR(0x87,0x87,0x87,_C_PRINT)				//	UTF-8
+CHAR(0x88,0x88,0x88,_C_PRINT)				//	UTF-8
+CHAR(0x89,0x89,0x89,_C_PRINT)				//	UTF-8
+CHAR(0x8A,0x8A,0x8A,_C_PRINT)				//	UTF-8
+CHAR(0x8B,0x8B,0x8B,_C_PRINT)				//	UTF-8
+CHAR(0x8C,0x8C,0x8C,_C_PRINT)				//	UTF-8
+CHAR(0x8D,0x8D,0x8D,_C_PRINT)				//	UTF-8
+CHAR(0x8E,0x8E,0x8E,_C_PRINT)				//	UTF-8
+CHAR(0x8F,0x8F,0x8F,_C_PRINT)				//	UTF-8
+CHAR(0x90,0x90,0x90,_C_PRINT)				//	UTF-8
+CHAR(0x91,0x91,0x91,_C_PRINT)				//	UTF-8
+CHAR(0x92,0x92,0x92,_C_PRINT)				//	UTF-8
+CHAR(0x93,0x93,0x93,_C_PRINT)				//	UTF-8
+CHAR(0x94,0x94,0x94,_C_PRINT)				//	UTF-8
+CHAR(0x95,0x95,0x95,_C_PRINT)				//	UTF-8
+CHAR(0x96,0x96,0x96,_C_PRINT)				//	UTF-8
+CHAR(0x97,0x97,0x97,_C_PRINT)				//	UTF-8
+CHAR(0x98,0x98,0x98,_C_PRINT)				//	UTF-8
+CHAR(0x99,0x99,0x99,_C_PRINT)				//	UTF-8
+CHAR(0x9A,0x9A,0x9A,_C_PRINT)				//	UTF-8
+CHAR(0x9B,0x9B,0x9B,_C_PRINT)				//	UTF-8
+CHAR(0x9C,0x9C,0x9C,_C_PRINT)				//	UTF-8
+CHAR(0x9D,0x9D,0x9D,_C_PRINT)				//	UTF-8
+CHAR(0x9E,0x9E,0x9E,_C_PRINT)				//	UTF-8
+CHAR(0x9F,0x9F,0x9F,_C_PRINT)				//	UTF-8
+CHAR(0xA0,0xA0,0xA0,_C_PRINT)				//	UTF-8
+CHAR(0xA1,0xA1,0xA1,_C_PRINT)				//	UTF-8
+CHAR(0xA2,0xA2,0xA2,_C_PRINT)				//	UTF-8
+CHAR(0xA3,0xA3,0xA3,_C_PRINT)				//	UTF-8
+CHAR(0xA4,0xA4,0xA4,_C_PRINT)				//	UTF-8
+CHAR(0xA5,0xA5,0xA5,_C_PRINT)				//	UTF-8
+CHAR(0xA6,0xA6,0xA6,_C_PRINT)				//	UTF-8
+CHAR(0xA7,0xA7,0xA7,_C_PRINT)				//	UTF-8
+CHAR(0xA8,0xA8,0xA8,_C_PRINT)				//	UTF-8
+CHAR(0xA9,0xA9,0xA9,_C_PRINT)				//	UTF-8
+CHAR(0xAA,0xAA,0xAA,_C_PRINT)				//	UTF-8
+CHAR(0xAB,0xAB,0xAB,_C_PRINT)				//	UTF-8
+CHAR(0xAC,0xAC,0xAC,_C_PRINT)				//	UTF-8
+CHAR(0xAD,0xAD,0xAD,_C_PRINT)				//	UTF-8
+CHAR(0xAE,0xAE,0xAE,_C_PRINT)				//	UTF-8
+CHAR(0xAF,0xAF,0xAF,_C_PRINT)				//	UTF-8
+CHAR(0xB0,0xB0,0xB0,_C_PRINT)				//	UTF-8
+CHAR(0xB1,0xB1,0xB1,_C_PRINT)				//	UTF-8
+CHAR(0xB2,0xB2,0xB2,_C_PRINT)				//	UTF-8
+CHAR(0xB3,0xB3,0xB3,_C_PRINT)				//	UTF-8
+CHAR(0xB4,0xB4,0xB4,_C_PRINT)				//	UTF-8
+CHAR(0xB5,0xB5,0xB5,_C_PRINT)				//	UTF-8
+CHAR(0xB6,0xB6,0xB6,_C_PRINT)				//	UTF-8
+CHAR(0xB7,0xB7,0xB7,_C_PRINT)				//	UTF-8
+CHAR(0xB8,0xB8,0xB8,_C_PRINT)				//	UTF-8
+CHAR(0xB9,0xB9,0xB9,_C_PRINT)				//	UTF-8
+CHAR(0xBA,0xBA,0xBA,_C_PRINT)				//	UTF-8
+CHAR(0xBB,0xBB,0xBB,_C_PRINT)				//	UTF-8
+CHAR(0xBC,0xBC,0xBC,_C_PRINT)				//	UTF-8
+CHAR(0xBD,0xBD,0xBD,_C_PRINT)				//	UTF-8
+CHAR(0xBE,0xBE,0xBE,_C_PRINT)				//	UTF-8
+CHAR(0xBF,0xBF,0xBF,_C_PRINT)				//	UTF-8
+CHAR(0xC0,0xC0,0xC0,_C_PRINT)				//	UTF-8
+CHAR(0xC1,0xC1,0xC1,_C_PRINT)				//	UTF-8
+CHAR(0xC2,0xC2,0xC2,_C_PRINT)				//	UTF-8
+CHAR(0xC3,0xC3,0xC3,_C_PRINT)				//	UTF-8
+CHAR(0xC4,0xC4,0xC4,_C_PRINT)				//	UTF-8
+CHAR(0xC5,0xC5,0xC5,_C_PRINT)				//	UTF-8
+CHAR(0xC6,0xC6,0xC6,_C_PRINT)				//	UTF-8
+CHAR(0xC7,0xC7,0xC7,_C_PRINT)				//	UTF-8
+CHAR(0xC8,0xC8,0xC8,_C_PRINT)				//	UTF-8
+CHAR(0xC9,0xC9,0xC9,_C_PRINT)				//	UTF-8
+CHAR(0xCA,0xCA,0xCA,_C_PRINT)				//	UTF-8
+CHAR(0xCB,0xCB,0xCB,_C_PRINT)				//	UTF-8
+CHAR(0xCC,0xCC,0xCC,_C_PRINT)				//	UTF-8
+CHAR(0xCD,0xCD,0xCD,_C_PRINT)				//	UTF-8
+CHAR(0xCE,0xCE,0xCE,_C_PRINT)				//	UTF-8
+CHAR(0xCF,0xCF,0xCF,_C_PRINT)				//	UTF-8
+CHAR(0xD0,0xD0,0xD0,_C_PRINT)				//	UTF-8
+CHAR(0xD1,0xD1,0xD1,_C_PRINT)				//	UTF-8
+CHAR(0xD2,0xD2,0xD2,_C_PRINT)				//	UTF-8
+CHAR(0xD3,0xD3,0xD3,_C_PRINT)				//	UTF-8
+CHAR(0xD4,0xD4,0xD4,_C_PRINT)				//	UTF-8
+CHAR(0xD5,0xD5,0xD5,_C_PRINT)				//	UTF-8
+CHAR(0xD6,0xD6,0xD6,_C_PRINT)				//	UTF-8
+CHAR(0xD7,0xD7,0xD7,_C_PRINT)				//	UTF-8
+CHAR(0xD8,0xD8,0xD8,_C_PRINT)				//	UTF-8
+CHAR(0xD9,0xD9,0xD9,_C_PRINT)				//	UTF-8
+CHAR(0xDA,0xDA,0xDA,_C_PRINT)				//	UTF-8
+CHAR(0xDB,0xDB,0xDB,_C_PRINT)				//	UTF-8
+CHAR(0xDC,0xDC,0xDC,_C_PRINT)				//	UTF-8
+CHAR(0xDD,0xDD,0xDD,_C_PRINT)				//	UTF-8
+CHAR(0xDE,0xDE,0xDE,_C_PRINT)				//	UTF-8
+CHAR(0xDF,0xDF,0xDF,_C_PRINT)				//	UTF-8
+CHAR(0xE0,0xE0,0xE0,_C_PRINT)				//	UTF-8
+CHAR(0xE1,0xE1,0xE1,_C_PRINT)				//	UTF-8
+CHAR(0xE2,0xE2,0xE2,_C_PRINT)				//	UTF-8
+CHAR(0xE3,0xE3,0xE3,_C_PRINT)				//	UTF-8
+CHAR(0xE4,0xE4,0xE4,_C_PRINT)				//	UTF-8
+CHAR(0xE5,0xE5,0xE5,_C_PRINT)				//	UTF-8
+CHAR(0xE6,0xE6,0xE6,_C_PRINT)				//	UTF-8
+CHAR(0xE7,0xE7,0xE7,_C_PRINT)				//	UTF-8
+CHAR(0xE8,0xE8,0xE8,_C_PRINT)				//	UTF-8
+CHAR(0xE9,0xE9,0xE9,_C_PRINT)				//	UTF-8
+CHAR(0xEA,0xEA,0xEA,_C_PRINT)				//	UTF-8
+CHAR(0xEB,0xEB,0xEB,_C_PRINT)				//	UTF-8
+CHAR(0xEC,0xEC,0xEC,_C_PRINT)				//	UTF-8
+CHAR(0xED,0xED,0xED,_C_PRINT)				//	UTF-8
+CHAR(0xEE,0xEE,0xEE,_C_PRINT)				//	UTF-8
+CHAR(0xEF,0xEF,0xEF,_C_PRINT)				//	UTF-8
+CHAR(0xF0,0xF0,0xF0,_C_PRINT)				//	UTF-8
+CHAR(0xF1,0xF1,0xF1,_C_PRINT)				//	UTF-8
+CHAR(0xF2,0xF2,0xF2,_C_PRINT)				//	UTF-8
+CHAR(0xF3,0xF3,0xF3,_C_PRINT)				//	UTF-8
+CHAR(0xF4,0xF4,0xF4,_C_PRINT)				//	UTF-8
+CHAR(0xF5,0xF5,0xF5,_C_PRINT)				//	UTF-8
+CHAR(0xF6,0xF6,0xF6,_C_PRINT)				//	UTF-8
+CHAR(0xF7,0xF7,0xF7,_C_PRINT)				//	UTF-8
+CHAR(0xF8,0xF8,0xF8,_C_PRINT)				//	UTF-8
+CHAR(0xF9,0xF9,0xF9,_C_PRINT)				//	UTF-8
+CHAR(0xFA,0xFA,0xFA,_C_PRINT)				//	UTF-8
+CHAR(0xFB,0xFB,0xFB,_C_PRINT)				//	UTF-8
+CHAR(0xFC,0xFC,0xFC,_C_PRINT)				//	UTF-8
+CHAR(0xFD,0xFD,0xFD,_C_PRINT)				//	UTF-8
+CHAR(0xFE,0xFE,0xFE,_C_PRINT)				//	UTF-8
+CHAR(0xFF,0xFF,0xFF,_C_PRINT)				//	UTF-8
diff --git a/libucw/ucw/char-upper.c b/libucw/ucw/char-upper.c
new file mode 100644
index 0000000..c56528c
--- /dev/null
+++ b/libucw/ucw/char-upper.c
@@ -0,0 +1,17 @@
+/*
+ *	UCW Library -- Uppercase Map
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+
+const byte ucw_c_upper[256] = {
+#define CHAR(code,upper,lower,cat) upper,
+#include <ucw/char-map.h>
+#undef CHAR
+};
diff --git a/libucw/ucw/chartype.h b/libucw/ucw/chartype.h
new file mode 100644
index 0000000..65972ce
--- /dev/null
+++ b/libucw/ucw/chartype.h
@@ -0,0 +1,64 @@
+/*
+ *	UCW Library -- Character Types
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_CHARTYPE_H
+#define _UCW_CHARTYPE_H
+
+/***
+ * We define our own routines to classify 8-bit characters (based on US-ASCII charset).
+ * This way we bypass most possible problems with different compilation environments.
+ *
+ * All functions and macros accept any numbers and if it is necessary, they simply ignore higher bits.
+ * It does not matter whether a parameter is signed or uintigned. Parameters are evaluated exactly once,
+ * so they can have side-effects.
+ ***/
+
+#define _C_UPPER 1			/* Upper-case letters */
+#define _C_LOWER 2			/* Lower-case letters */
+#define _C_PRINT 4			/* Printable */
+#define _C_DIGIT 8			/* Digits */
+#define _C_CTRL 16			/* Control characters */
+#define _C_XDIGIT 32			/* Hexadecimal digits */
+#define _C_BLANK 64			/* White spaces (spaces, tabs, newlines) */
+#define _C_INNER 128			/* `inner punctuation' -- underscore etc. */
+
+#define _C_ALPHA (_C_UPPER | _C_LOWER)
+#define _C_ALNUM (_C_ALPHA | _C_DIGIT)
+#define _C_WORD (_C_ALNUM | _C_INNER)
+#define _C_WSTART (_C_ALPHA | _C_INNER)
+
+extern const byte ucw_c_cat[256], ucw_c_upper[256], ucw_c_lower[256];
+
+#define Category(x) (ucw_c_cat[(byte)(x)])
+#define Ccat(x,y) (Category(x) & y)
+
+#define Cupper(x) Ccat(x, _C_UPPER)	/** Checks for an upper-case character (`A-Z`). **/
+#define Clower(x) Ccat(x, _C_LOWER)	/** Checks for a lower-case character (`a-z`). **/
+#define Calpha(x) Ccat(x, _C_ALPHA)	/** Checks for an alphabetic character (`a-z`, `A-Z`). **/
+#define Calnum(x) Ccat(x, _C_ALNUM)	/** Checks for an alpha-numeric character (`a-z`, `A-Z`, `0-9`). */
+#define Cprint(x) Ccat(x, _C_PRINT)	/** Checks for printable characters, including 8-bit values (`\t`, `0x20-0x7E`, `0x80-0xFF`). **/
+#define Cdigit(x) Ccat(x, _C_DIGIT)	/** Checks for a digit (`0-9`). **/
+#define Cxdigit(x) Ccat(x, _C_XDIGIT)	/** Checks for a hexadecimal digit (`0-9`, `a-f`, `A-F`). **/
+#define Cword(x) Ccat(x, _C_WORD)	/** Checks for an alpha-numeric character or an inner punctation (`a-z`, `A-Z`, `0-9`, `_`). **/
+#define Cblank(x) Ccat(x, _C_BLANK)	/** Checks for a white space (`0x20`, `\t`, `\n`, `\r`, `0x8`, `0xC`). **/
+#define Cctrl(x) Ccat(x, _C_CTRL)	/** Checks for control characters (`0x0-0x1F`, `0x7F`). **/
+#define Cspace(x) Cblank(x)
+
+#define Cupcase(x) (ucw_c_upper[(byte)(x)]) /** Convert a letter to upper case, leave non-letter characters unchanged. **/
+#define Clocase(x) (ucw_c_lower[(byte)(x)]) /** Convert a letter to lower case, leave non-letter characters unchanged. **/
+
+/**
+ * Compute the value of a valid hexadecimal character (ie. passed the @Cxdigit() check).
+ **/
+static inline uint Cxvalue(byte x)
+{
+  return (x < (uint)'A') ? x - '0' : (x & 0xdf) - 'A' + 10;
+}
+
+#endif
diff --git a/libucw/ucw/clists.h b/libucw/ucw/clists.h
new file mode 100644
index 0000000..809c480
--- /dev/null
+++ b/libucw/ucw/clists.h
@@ -0,0 +1,279 @@
+/*
+ *	UCW Library -- Circular Linked Lists
+ *
+ *	(c) 2003--2010 Martin Mares <mj@ucw.cz>
+ *	(c) 2017 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_CLISTS_H
+#define _UCW_CLISTS_H
+
+/**
+ * Common header for list nodes.
+ **/
+typedef struct cnode {
+  struct cnode *next, *prev;
+} cnode;
+
+/**
+ * Circular doubly linked list.
+ **/
+typedef struct clist {
+  struct cnode head;
+} clist;
+
+/**
+ * Initialize a new circular linked list. Must be called before any other function.
+ **/
+static inline void clist_init(clist *l)
+{
+  cnode *head = &l->head;
+  head->next = head->prev = head;
+}
+
+/**
+ * Return the first node on @l or NULL if @l is empty.
+ **/
+static inline void *clist_head(clist *l)
+{
+  return (l->head.next != &l->head) ? l->head.next : NULL;
+}
+
+/**
+ * Return the last node on @l or NULL if @l is empty.
+ **/
+static inline void *clist_tail(clist *l)
+{
+  return (l->head.prev != &l->head) ? l->head.prev : NULL;
+}
+
+/**
+ * Find the next node to @n or NULL if @n is the last one.
+ **/
+static inline void *clist_next(clist *l, cnode *n)
+{
+  return (n->next != &l->head) ? (void *) n->next : NULL;
+}
+
+/**
+ * Find the previous node to @n or NULL if @n is the first one.
+ **/
+static inline void *clist_prev(clist *l, cnode *n)
+{
+  return (n->prev != &l->head) ? (void *) n->prev : NULL;
+}
+
+/**
+ * Return a non-zero value iff @l is empty.
+ **/
+static inline int clist_empty(clist *l)
+{
+  return (l->head.next == &l->head);
+}
+
+/**
+ * Loop over all nodes in the @list and perform the next C statement on them. The current node is stored in @n which must be defined before as pointer to any type.
+ * The list should not be changed during this loop command.
+ **/
+#define CLIST_WALK(n,list) for(n=(void*)(list).head.next; (cnode*)(n) != &(list).head; n=(void*)((cnode*)(n))->next)
+
+/**
+ * Same as @CLIST_WALK(), but allows removal of the current node. This macro requires one more variable to store some temporary pointers.
+ **/
+#define CLIST_WALK_DELSAFE(n,list,tmp) for(n=(void*)(list).head.next; tmp=(void*)((cnode*)(n))->next, (cnode*)(n) != &(list).head; n=(void*)tmp)
+
+/**
+ * Same as @CLIST_WALK(), but it defines the variable for the current node in place. @type should be a pointer type.
+ **/
+#define CLIST_FOR_EACH(type,n,list) for(type n=(void*)(list).head.next; (cnode*)(n) != &(list).head; n=(void*)((cnode*)(n))->next)
+
+/**
+ * Same as @CLIST_WALK_DELSAFE(), but it defines the variable for the current node in place. @type should be a pointer type. The temporary variable must be still known before.
+ **/
+#define CLIST_FOR_EACH_DELSAFE(type,n,list,tmp) for(type n=(void*)(list).head.next; tmp=(void*)((cnode*)(n))->next, (cnode*)(n) != &(list).head; n=(void*)tmp)
+
+/**
+ * Reversed version of @CLIST_FOR_EACH().
+ **/
+#define CLIST_FOR_EACH_BACKWARDS(type,n,list) for(type n=(void*)(list).head.prev; (cnode*)(n) != &(list).head; n=(void*)((cnode*)(n))->prev)
+
+/**
+ * Insert a new node just after the node @after. To insert at the head of the list, use @clist_add_head() instead.
+ **/
+static inline void clist_insert_after(cnode *what, cnode *after)
+{
+  cnode *before = after->next;
+  what->next = before;
+  what->prev = after;
+  before->prev = what;
+  after->next = what;
+}
+
+/**
+ * Insert a new node just before the node @before. To insert at the tail of the list, use @clist_add_tail() instead.
+ **/
+static inline void clist_insert_before(cnode *what, cnode *before)
+{
+  cnode *after = before->prev;
+  what->next = before;
+  what->prev = after;
+  before->prev = what;
+  after->next = what;
+}
+
+/**
+ * Insert a new node in front of all other nodes.
+ **/
+static inline void clist_add_head(clist *l, cnode *n)
+{
+  clist_insert_after(n, &l->head);
+}
+
+/**
+ * Insert a new node after all other nodes.
+ **/
+static inline void clist_add_tail(clist *l, cnode *n)
+{
+  clist_insert_before(n, &l->head);
+}
+
+/**
+ * Remove node @n.
+ **/
+static inline void clist_remove(cnode *n)
+{
+  cnode *before = n->prev;
+  cnode *after = n->next;
+  before->next = after;
+  after->prev = before;
+}
+
+/**
+ * Remove the first node in @l, if it exists. Return the pointer to that node or NULL.
+ **/
+static inline void *clist_remove_head(clist *l)
+{
+  cnode *n = clist_head(l);
+  if (n)
+    clist_remove(n);
+  return n;
+}
+
+/**
+ * Remove the last node in @l, if it exists. Return the pointer to that node or NULL.
+ **/
+static inline void *clist_remove_tail(clist *l)
+{
+  cnode *n = clist_tail(l);
+  if (n)
+    clist_remove(n);
+  return n;
+}
+
+/**
+ * Merge two lists by inserting the list @what just after the node @after in a different list.
+ * The first list is then cleared.
+ **/
+static inline void clist_insert_list_after(clist *what, cnode *after)
+{
+  if (!clist_empty(what))
+    {
+      cnode *w = &what->head;
+      w->prev->next = after->next;
+      after->next->prev = w->prev;
+      w->next->prev = after;
+      after->next = w->next;
+      clist_init(what);
+    }
+}
+
+/**
+ * Merge two lists by inserting the list @what in front of all other nodes in a different list @l.
+ * The first list is then cleared.
+ **/
+static inline void clist_add_list_head(clist *l, clist *what)
+{
+  clist_insert_list_after(what, &l->head);
+}
+
+/**
+ * Merge two lists by inserting the list @what after all other nodes in a different list @l.
+ * The first list is then cleared.
+ **/
+static inline void clist_add_list_tail(clist *l, clist *what)
+{
+  clist_insert_list_after(what, l->head.prev);
+}
+
+/**
+ * Move all items from a source list to a destination list. The source list
+ * becomes empty, the original contents of the destination list are destroyed.
+ **/
+static inline void clist_move(clist *to, clist *from)
+{
+  clist_init(to);
+  clist_insert_list_after(from, &to->head);
+  clist_init(from);
+}
+
+/**
+ * Compute the number of nodes in @l. Beware of linear time complexity.
+ **/
+static inline uint clist_size(clist *l)
+{
+  uint i = 0;
+  CLIST_FOR_EACH(cnode *, n, *l)
+    i++;
+  return i;
+}
+
+/**
+ * Remove a node @n and mark it as unlinked by setting the previous and next pointers to NULL.
+ **/
+static inline void clist_unlink(cnode *n)
+{
+  clist_remove(n);
+  n->prev = n->next = NULL;
+}
+
+/**
+ * Remove the first node on @l and mark it as unlinked.
+ * Return the pointer to that node or NULL.
+ **/
+static inline void *clist_unlink_head(clist *l)
+{
+  cnode *n = clist_head(l);
+  if (n)
+    clist_unlink(n);
+  return n;
+}
+
+/**
+ * Remove the last node on @l and mark it as unlinked.
+ * Return the pointer to that node or NULL.
+ **/
+static inline void *clist_unlink_tail(clist *l)
+{
+  cnode *n = clist_tail(l);
+  if (n)
+    clist_unlink(n);
+  return n;
+}
+
+/**
+ * Check if a node is linked a list. Unlinked nodes are recognized by having their
+ * previous and next pointers equal to NULL. Returns 0 or 1.
+ *
+ * Nodes initialized to all zeroes are unlinked, inserting a node anywhere in a list
+ * makes it linked. Normal removal functions like @clist_remove() do not mark nodes
+ * as unlinked, you need to call @clist_unlink() instead.
+ **/
+static inline int clist_is_linked(cnode *n)
+{
+  return !!n->next;
+}
+
+#endif
diff --git a/libucw/ucw/conf-alloc.c b/libucw/ucw/conf-alloc.c
new file mode 100644
index 0000000..bf4569e
--- /dev/null
+++ b/libucw/ucw/conf-alloc.c
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- Configuration files: memory allocation
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/mempool.h>
+
+inline struct mempool *
+cf_get_pool(void)
+{
+  return cf_get_context()->pool;
+}
+
+void *
+cf_malloc(uint size)
+{
+  return mp_alloc(cf_get_pool(), size);
+}
+
+void *
+cf_malloc_zero(uint size)
+{
+  return mp_alloc_zero(cf_get_pool(), size);
+}
+
+char *
+cf_strdup(const char *s)
+{
+  return mp_strdup(cf_get_pool(), s);
+}
+
+char *
+cf_printf(const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  char *res = mp_vprintf(cf_get_pool(), fmt, args);
+  va_end(args);
+  return res;
+}
diff --git a/libucw/ucw/conf-context.c b/libucw/ucw/conf-context.c
new file mode 100644
index 0000000..050e43b
--- /dev/null
+++ b/libucw/ucw/conf-context.c
@@ -0,0 +1,72 @@
+/*
+ *	UCW Library -- Configuration files: Contexts
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/threads.h>
+
+static struct cf_context cf_default_context;
+
+static void
+cf_init_context(struct cf_context *cc)
+{
+  cc->enable_journal = 1;
+  clist_init(&cc->conf_entries);
+}
+
+struct cf_context *
+cf_new_context(void)
+{
+  struct cf_context *cc = xmalloc_zero(sizeof(*cc));
+  cf_init_context(cc);
+  return cc;
+}
+
+void
+cf_delete_context(struct cf_context *cc)
+{
+  ASSERT(!cc->is_active);
+  ASSERT(cc != &cf_default_context);
+  struct cf_context *prev = cf_switch_context(cc);
+  cf_revert();
+  cf_switch_context(prev);
+  xfree(cc->parser);
+  xfree(cc);
+}
+
+struct cf_context *
+cf_switch_context(struct cf_context *cc)
+{
+  struct ucwlib_context *uc = ucwlib_thread_context();
+  struct cf_context *prev = uc->cf_context;
+  if (prev)
+    prev->is_active = 0;
+  if (cc)
+    {
+      ASSERT(!cc->is_active);
+      cc->is_active = 1;
+    }
+  uc->cf_context = cc;
+  return prev;
+}
+
+static void CONSTRUCTOR_WITH_PRIORITY(10100)
+cf_init_default_context(void)
+{
+  cf_init_context(&cf_default_context);
+  ucwlib_thread_context()->cf_context = &cf_default_context;
+  cf_default_context.is_active = 1;
+}
+
+struct cf_context *
+cf_obtain_context(void)
+{
+  return cf_get_context();
+}
diff --git a/libucw/ucw/conf-dump.c b/libucw/ucw/conf-dump.c
new file mode 100644
index 0000000..9932f1d
--- /dev/null
+++ b/libucw/ucw/conf-dump.c
@@ -0,0 +1,131 @@
+/*
+ *	UCW Library -- Configuration files: dumping
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/conf-internal.h>
+#include <ucw/clists.h>
+#include <ucw/fastbuf.h>
+#include <ucw/xtypes.h>
+
+static void
+spaces(struct fastbuf *fb, uint nr)
+{
+  for (uint i=0; i<nr; i++)
+    bputs(fb, "  ");
+}
+
+static void
+dump_basic(struct fastbuf *fb, void *ptr, enum cf_type type, union cf_union *u)
+{
+  switch (type) {
+    case CT_INT:	bprintf(fb, "%d ", *(uint*)ptr); break;
+    case CT_U64:	bprintf(fb, "%llu ", (long long) *(u64*)ptr); break;
+    case CT_DOUBLE:	bprintf(fb, "%lg ", *(double*)ptr); break;
+    case CT_IP:		bprintf(fb, "%08x ", *(uint*)ptr); break;
+    case CT_STRING:
+      if (*(char**)ptr)
+	bprintf(fb, "'%s' ", *(char**)ptr);
+      else
+	bprintf(fb, "NULL ");
+      break;
+    case CT_LOOKUP:	bprintf(fb, "%s ", *(int*)ptr >= 0 ? u->lookup[ *(int*)ptr ] : "???"); break;
+    case CT_USER:
+      if (u->utype->dumper)
+	u->utype->dumper(fb, ptr);
+      else
+	bprintf(fb, "??? ");
+      break;
+    case CT_XTYPE:
+      bprintf(fb, "'%s' ", u->xtype->format(ptr, XTYPE_FMT_DEFAULT, cf_get_pool()));
+      break;
+  }
+}
+
+static void dump_section(struct fastbuf *fb, struct cf_section *sec, int level, void *ptr);
+
+static char *class_names[] = { "end", "static", "dynamic", "parser", "section", "list", "bitmap" };
+
+static void
+dump_item(struct fastbuf *fb, struct cf_item *item, int level, void *ptr)
+{
+  ptr += (uintptr_t) item->ptr;
+  enum cf_type type = item->type;
+  uint size = cf_type_size(item->type, &item->u);
+  int i;
+  spaces(fb, level);
+  bprintf(fb, "%s: C%s #", item->name, class_names[item->cls]);
+  if (item->number == CF_ANY_NUM)
+    bputs(fb, "any ");
+  else
+    bprintf(fb, "%d ", item->number);
+  if (item->cls == CC_STATIC || item->cls == CC_DYNAMIC || item->cls == CC_BITMAP) {
+    bprintf(fb, "T%s ", cf_type_names[type]);
+    if (item->type == CT_USER)
+      bprintf(fb, "U%s S%d ", item->u.utype->name, size);
+    else if (item->type == CT_XTYPE)
+      bprintf(fb, "X%s S%d ", item->u.xtype->name, size);
+  }
+  if (item->cls == CC_STATIC) {
+    for (i=0; i<item->number; i++)
+      dump_basic(fb, ptr + i * size, type, &item->u);
+  } else if (item->cls == CC_DYNAMIC) {
+    ptr = * (void**) ptr;
+    if (ptr) {
+      int real_nr = GARY_SIZE(ptr);
+      bprintf(fb, "N%d ", real_nr);
+      for (i=0; i<real_nr; i++)
+	dump_basic(fb, ptr + i * size, type, &item->u);
+    } else
+      bprintf(fb, "NULL ");
+  } else if (item->cls == CC_BITMAP) {
+    u32 mask = * (u32*) ptr;
+    for (i=0; i<32; i++) {
+      if (item->type == CT_LOOKUP && !item->u.lookup[i])
+	break;
+      if (mask & (1<<i)) {
+	if (item->type == CT_INT)
+	  bprintf(fb, "%d ", i);
+	else if (item->type == CT_LOOKUP)
+	  bprintf(fb, "%s ", item->u.lookup[i]);
+      }
+    }
+  }
+  bputc(fb, '\n');
+  if (item->cls == CC_SECTION)
+    dump_section(fb, item->u.sec, level+1, ptr);
+  else if (item->cls == CC_LIST) {
+    uint idx = 0;
+    CLIST_FOR_EACH(cnode *, n, * (clist*) ptr) {
+      spaces(fb, level+1);
+      bprintf(fb, "item %d\n", ++idx);
+      dump_section(fb, item->u.sec, level+2, n);
+    }
+  }
+}
+
+static void
+dump_section(struct fastbuf *fb, struct cf_section *sec, int level, void *ptr)
+{
+  spaces(fb, level);
+  bprintf(fb, "S%d F%x:\n", sec->size, sec->flags);
+  for (struct cf_item *item=sec->cfg; item->cls; item++)
+    dump_item(fb, item, level, ptr);
+}
+
+void
+cf_dump_sections(struct fastbuf *fb)
+{
+  struct cf_context *cc = cf_get_context();
+  dump_section(fb, &cc->sections, 0, NULL);
+}
+
diff --git a/libucw/ucw/conf-getopt.c b/libucw/ucw/conf-getopt.c
new file mode 100644
index 0000000..bbb81e1
--- /dev/null
+++ b/libucw/ucw/conf-getopt.c
@@ -0,0 +1,108 @@
+/*
+ *	UCW Library -- Configuration files: getopt wrapper
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+
+#include <stdlib.h>
+
+#ifndef CONFIG_UCW_DEFAULT_CONFIG
+#define CONFIG_UCW_DEFAULT_CONFIG NULL
+#endif
+char *cf_def_file = CONFIG_UCW_DEFAULT_CONFIG;
+
+#ifndef CONFIG_UCW_ENV_VAR_CONFIG
+#define CONFIG_UCW_ENV_VAR_CONFIG NULL
+#endif
+char *cf_env_file = CONFIG_UCW_ENV_VAR_CONFIG;
+
+void
+cf_load_default(struct cf_context *cc)
+{
+  if (cc->config_loaded++)
+    return;
+  if (cf_def_file)
+    {
+      char *env;
+      if (cf_env_file && (env = getenv(cf_env_file)))
+        {
+	  if (cf_load(env))
+	    die("Cannot load config file %s", env);
+	}
+      else if (cf_load(cf_def_file))
+        die("Cannot load default config %s", cf_def_file);
+    }
+  else
+    {
+      // We need to create an empty pool and initialize all configuration items
+      struct cf_journal_item *oldj = cf_journal_new_transaction(1);
+      cf_init_stack(cc);
+      cf_done_stack(cc);
+      cf_journal_commit_transaction(1, oldj);
+    }
+}
+
+static void
+end_of_options(struct cf_context *cc)
+{
+  cf_load_default(cc);
+  if (cc->postpone_commit && cf_close_group())
+    die("Loading of configuration failed");
+}
+
+int
+cf_getopt(int argc, char *const argv[], const char *short_opts, const struct option *long_opts, int *long_index)
+{
+  struct cf_context *cc = cf_get_context();
+  if (!cc->postpone_commit)
+    cf_open_group();
+
+  while (1)
+    {
+      int res = getopt_long(argc, argv, short_opts, long_opts, long_index);
+      if (res == 'S' || res == 'C' || res == 0x64436667)
+	{
+	  if (cc->other_options)
+	    die("The -S and -C options must precede all other arguments");
+	  if (res == 'S')
+	    {
+	      cf_load_default(cc);
+	      if (cf_set(optarg))
+		die("Cannot set %s", optarg);
+	    }
+	  else if (res == 'C')
+	    {
+	      if (cf_load(optarg))
+		die("Cannot load config file %s", optarg);
+	    }
+#ifdef CONFIG_UCW_DEBUG
+	  else
+	    {			/* --dumpconfig */
+	      end_of_options(cc);
+	      struct fastbuf *b = bfdopen(1, 4096);
+	      cf_dump_sections(b);
+	      bclose(b);
+	      exit(0);
+	    }
+#endif
+	}
+      else
+	{
+	  /* unhandled option or end of options */
+	  if (res != ':' && res != '?')
+	    end_of_options(cc);
+	  cc->other_options++;
+	  return res;
+	}
+    }
+}
diff --git a/libucw/ucw/conf-input.c b/libucw/ucw/conf-input.c
new file mode 100644
index 0000000..f8d2eb8
--- /dev/null
+++ b/libucw/ucw/conf-input.c
@@ -0,0 +1,460 @@
+/*
+ *	UCW Library -- Configuration files: parsing input streams
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/clists.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <ucw/chartype.h>
+#include <ucw/string.h>
+#include <ucw/stkstring.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+
+/* Text file parser */
+
+#define MAX_LINE	4096
+
+#include <ucw/bbuf.h>
+
+#define GBUF_TYPE	uint
+#define GBUF_PREFIX(x)	split_##x
+#include <ucw/gbuf.h>
+
+struct cf_parser_state {
+  const char *name_parse_fb;
+  struct fastbuf *parse_fb;
+  uint line_num;
+  char *line;
+  split_t word_buf;
+  uint words;
+  uint ends_by_brace;		// the line is ended by "{"
+  bb_t copy_buf;
+  uint copied;
+  char line_buf[];
+};
+
+static int
+get_line(struct cf_parser_state *p, char **msg)
+{
+  int err = bgets_nodie(p->parse_fb, p->line_buf, MAX_LINE);
+  p->line_num++;
+  if (err <= 0) {
+    *msg = err < 0 ? "Line too long" : NULL;
+    return 0;
+  }
+  p->line = p->line_buf;
+  while (Cblank(*p->line))
+    p->line++;
+  return 1;
+}
+
+static void
+append(struct cf_parser_state *p, char *start, char *end)
+{
+  uint len = end - start;
+  bb_grow(&p->copy_buf, p->copied + len + 1);
+  memcpy(p->copy_buf.ptr + p->copied, start, len);
+  p->copied += len + 1;
+  p->copy_buf.ptr[p->copied-1] = 0;
+}
+
+static char *
+get_word(struct cf_parser_state *p, uint is_command_name)
+{
+  char *msg;
+  char *line = p->line;
+
+  if (*line == '\'') {
+    line++;
+    while (1) {
+      char *start = line;
+      while (*line && *line != '\'')
+	line++;
+      append(p, start, line);
+      if (*line)
+	break;
+      p->copy_buf.ptr[p->copied-1] = '\n';
+      if (!get_line(p, &msg))
+	return msg ? : "Unterminated apostrophe word at the end";
+      line = p->line;
+    }
+    line++;
+
+  } else if (*line == '"') {
+    line++;
+    uint start_copy = p->copied;
+    while (1) {
+      char *start = line;
+      uint escape = 0;
+      while (*line) {
+	if (*line == '"' && !escape)
+	  break;
+	else if (*line == '\\')
+	  escape ^= 1;
+	else
+	  escape = 0;
+	line++;
+      }
+      append(p, start, line);
+      if (*line)
+	break;
+      if (!escape)
+	p->copy_buf.ptr[p->copied-1] = '\n';
+      else // merge two lines
+	p->copied -= 2;
+      if (!get_line(p, &msg))
+	return msg ? : "Unterminated quoted word at the end";
+      line = p->line;
+    }
+    line++;
+
+    char *tmp = stk_str_unesc(p->copy_buf.ptr + start_copy);
+    uint l = strlen(tmp);
+    bb_grow(&p->copy_buf, start_copy + l + 1);
+    strcpy(p->copy_buf.ptr + start_copy, tmp);
+    p->copied = start_copy + l + 1;
+
+  } else {
+    // promised that *line is non-null and non-blank
+    char *start = line;
+    while (*line && !Cblank(*line)
+	&& *line != '{' && *line != '}' && *line != ';'
+	&& (*line != '=' || !is_command_name))
+      line++;
+    if (*line == '=') {				// nice for setting from a command-line
+      if (line == start)
+	return "Assignment without a variable";
+      *line = ' ';
+    }
+    if (line == start)				// already the first char is control
+      line++;
+    append(p, start, line);
+  }
+  while (Cblank(*line))
+    line++;
+  p->line = line;
+  return NULL;
+}
+
+static char *
+get_token(struct cf_parser_state *p, uint is_command_name, char **err)
+{
+  *err = NULL;
+  while (1) {
+    if (!*p->line || *p->line == '#') {
+      if (!is_command_name || !get_line(p, err))
+	return NULL;
+    } else if (*p->line == ';') {
+      *err = get_word(p, 0);
+      if (!is_command_name || *err)
+	return NULL;
+    } else if (*p->line == '\\' && !p->line[1]) {
+      if (!get_line(p, err)) {
+	if (!*err)
+	  *err = "Last line ends by a backslash";
+	return NULL;
+      }
+      if (!*p->line || *p->line == '#')
+	msg(L_WARN, "The line %s:%d following a backslash is empty", p->name_parse_fb ? : "", p->line_num);
+    } else {
+      split_grow(&p->word_buf, p->words+1);
+      uint start = p->copied;
+      p->word_buf.ptr[p->words++] = p->copied;
+      *err = get_word(p, is_command_name);
+      return *err ? NULL : p->copy_buf.ptr + start;
+    }
+  }
+}
+
+static char *
+split_command(struct cf_parser_state *p)
+{
+  p->words = p->copied = p->ends_by_brace = 0;
+  char *msg, *start_word;
+  if (!(start_word = get_token(p, 1, &msg)))
+    return msg;
+  if (*start_word == '{')			// only one opening brace
+    return "Unexpected opening brace";
+  while (*p->line != '}')			// stays for the next time
+  {
+    if (!(start_word = get_token(p, 0, &msg)))
+      return msg;
+    if (*start_word == '{') {
+      p->words--;				// discard the brace
+      p->ends_by_brace = 1;
+      break;
+    }
+  }
+  return NULL;
+}
+
+/* Parsing multiple files */
+
+static int
+maybe_commit(struct cf_context *cc)
+{
+  if (cf_commit_all(cc->postpone_commit ? CF_NO_COMMIT : cc->everything_committed ? CF_COMMIT : CF_COMMIT_ALL))
+    return 1;
+  if (!cc->postpone_commit)
+    cc->everything_committed = 1;
+  return 0;
+}
+
+static char *
+parse_fastbuf(struct cf_context *cc, const char *name_fb, struct fastbuf *fb, uint depth)
+{
+  struct cf_parser_state *p = cc->parser;
+  if (!p)
+    p = cc->parser = xmalloc_zero(sizeof(*p) + MAX_LINE);
+  p->name_parse_fb = name_fb;
+  p->parse_fb = fb;
+  p->line_num = 0;
+  p->line = p->line_buf;
+  *p->line = 0;
+
+  if (!depth)
+    cf_init_stack(cc);
+
+  char *err = NULL;
+  while (1)
+  {
+    err = split_command(p);
+    if (err)
+      goto error;
+    if (!p->words)
+      break;
+    char *name = p->copy_buf.ptr + p->word_buf.ptr[0];
+    char *pars[p->words-1];
+    for (uint i=1; i<p->words; i++)
+      pars[i-1] = p->copy_buf.ptr + p->word_buf.ptr[i];
+    int optional_include = !strcasecmp(name, "optionalinclude");
+    if (optional_include || !strcasecmp(name, "include"))
+    {
+      if (p->words != 2)
+	err = "Expecting one filename";
+      else if (depth > 8)
+	err = "Too many nested files";
+      else if (*p->line && *p->line != '#')	// because the contents of line_buf is not re-entrant and will be cleared
+	err = "The include command must be the last one on a line";
+      if (err)
+	goto error;
+      struct fastbuf *new_fb = bopen_try(pars[0], O_RDONLY, 1<<14);
+      if (!new_fb) {
+	if (optional_include && errno == ENOENT)
+	  continue;
+	err = cf_printf("Cannot open file %s: %m", pars[0]);
+	goto error;
+      }
+      uint ll = p->line_num;
+      err = parse_fastbuf(cc, stk_strdup(pars[0]), new_fb, depth+1);
+      p->line_num = ll;
+      bclose(new_fb);
+      if (err)
+	goto error;
+      p->parse_fb = fb;
+      continue;
+    }
+    enum cf_operation op;
+    char *c = strchr(name, ':');
+    if (!c)
+      op = strcmp(name, "}") ? OP_SET : OP_CLOSE;
+    else {
+      *c++ = 0;
+      switch (Clocase(*c)) {
+	case 's': op = OP_SET; break;
+	case 'c': op = Clocase(c[1]) == 'l' ? OP_CLEAR: OP_COPY; break;
+	case 'a': switch (Clocase(c[1])) {
+		    case 'p': op = OP_APPEND; break;
+		    case 'f': op = OP_AFTER; break;
+		    default: op = OP_ALL;
+		  }; break;
+	case 'p': op = OP_PREPEND; break;
+	case 'r': op = (c[1] && Clocase(c[2]) == 'm') ? OP_REMOVE : OP_RESET; break;
+	case 'e': op = OP_EDIT; break;
+	case 'b': op = OP_BEFORE; break;
+	default: op = OP_SET; break;
+      }
+      if (strcasecmp(c, cf_op_names[op])) {
+	err = cf_printf("Unknown operation %s", c);
+	goto error;
+      }
+    }
+    if (p->ends_by_brace)
+      op |= OP_OPEN;
+    err = cf_interpret_line(cc, name, op, p->words-1, pars);
+    if (err)
+      goto error;
+  }
+
+  if (!depth)
+    {
+      if (cf_done_stack(cc))
+	err = "Unterminated block";
+      else if (maybe_commit(cc))
+	err = "Commit failed";
+    }
+  if (!err)
+    return NULL;
+
+error:
+  if (name_fb)
+    msg(L_ERROR, "File %s, line %d: %s", name_fb, p->line_num, err);
+  else if (p->line_num == 1)
+    msg(L_ERROR, "Manual setting of configuration: %s", err);
+  else
+    msg(L_ERROR, "Manual setting of configuration, line %d: %s", p->line_num, err);
+  return "included from here";
+}
+
+static int
+load_file(struct cf_context *cc, const char *file)
+{
+  struct fastbuf *fb = bopen_try(file, O_RDONLY, 1<<14);
+  if (!fb) {
+    msg(L_ERROR, "Cannot open configuration file %s: %m", file);
+    return 1;
+  }
+  char *err_msg = parse_fastbuf(cc, file, fb, 0);
+  bclose(fb);
+  return !!err_msg;
+}
+
+static int
+load_string(struct cf_context *cc, const char *string)
+{
+  struct fastbuf fb;
+  fbbuf_init_read(&fb, (byte *)string, strlen(string), 0);
+  char *msg = parse_fastbuf(cc, NULL, &fb, 0);
+  return !!msg;
+}
+
+/* Safe loading and reloading */
+
+struct conf_entry {	/* We remember a list of actions to apply upon reload */
+  cnode n;
+  enum {
+    CE_FILE = 1,
+    CE_STRING = 2,
+  } type;
+  char *arg;
+};
+
+static void
+cf_remember_entry(struct cf_context *cc, uint type, const char *arg)
+{
+  if (!cc->enable_journal)
+    return;
+  struct conf_entry *ce = cf_malloc(sizeof(*ce));
+  ce->type = type;
+  ce->arg = cf_strdup(arg);
+  clist_add_tail(&cc->conf_entries, &ce->n);
+}
+
+int
+cf_reload(const char *file)
+{
+  struct cf_context *cc = cf_get_context();
+  ASSERT(cc->enable_journal);
+  cf_journal_swap();
+  struct cf_journal_item *oldj = cf_journal_new_transaction(1);
+  uint ec = cc->everything_committed;
+  cc->everything_committed = 0;
+
+  clist old_entries;
+  clist_move(&old_entries, &cc->conf_entries);
+  cf_open_group();
+
+  int err = 0;
+  if (file)
+    err = load_file(cc, file);
+  else
+    CLIST_FOR_EACH(struct conf_entry *, ce, old_entries) {
+      if (ce->type == CE_FILE)
+	err |= load_file(cc, ce->arg);
+      else
+	err |= load_string(cc, ce->arg);
+      if (err)
+	break;
+      cf_remember_entry(cc, ce->type, ce->arg);
+    }
+
+  err |= cf_close_group();
+
+  if (!err) {
+    cf_journal_delete();
+    cf_journal_commit_transaction(1, NULL);
+  } else {
+    cc->everything_committed = ec;
+    cf_journal_rollback_transaction(1, oldj);
+    cf_journal_swap();
+    clist_move(&cc->conf_entries, &old_entries);
+  }
+  return err;
+}
+
+int
+cf_load(const char *file)
+{
+  struct cf_context *cc = cf_get_context();
+  struct cf_journal_item *oldj = cf_journal_new_transaction(1);
+  int err = load_file(cc, file);
+  if (!err) {
+    cf_journal_commit_transaction(1, oldj);
+    cf_remember_entry(cc, CE_FILE, file);
+    cc->config_loaded = 1;
+  } else
+    cf_journal_rollback_transaction(1, oldj);
+  return err;
+}
+
+int
+cf_set(const char *string)
+{
+  struct cf_context *cc = cf_get_context();
+  struct cf_journal_item *oldj = cf_journal_new_transaction(0);
+  int err = load_string(cc, string);
+  if (!err) {
+    cf_journal_commit_transaction(0, oldj);
+    cf_remember_entry(cc, CE_STRING, string);
+  } else
+    cf_journal_rollback_transaction(0, oldj);
+  return err;
+}
+
+void
+cf_revert(void)
+{
+  cf_journal_swap();
+  cf_journal_delete();
+}
+
+void
+cf_open_group(void)
+{
+  struct cf_context *cc = cf_get_context();
+  cc->postpone_commit++;
+}
+
+int
+cf_close_group(void)
+{
+  struct cf_context *cc = cf_get_context();
+  ASSERT(cc->postpone_commit);
+  if (!--cc->postpone_commit)
+    return maybe_commit(cc);
+  else
+    return 0;
+}
diff --git a/libucw/ucw/conf-internal.h b/libucw/ucw/conf-internal.h
new file mode 100644
index 0000000..408fc19
--- /dev/null
+++ b/libucw/ucw/conf-internal.h
@@ -0,0 +1,126 @@
+/*
+ *	UCW Library -- Configuration files: only for internal use of conf-*.c
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef	_UCW_CONF_INTERNAL_H
+#define	_UCW_CONF_INTERNAL_H
+
+#include <ucw/threads.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cf_add_dirty ucw_cf_add_dirty
+#define cf_commit_all ucw_cf_commit_all
+#define cf_done_stack ucw_cf_done_stack
+#define cf_find_subitem ucw_cf_find_subitem
+#define cf_init_stack ucw_cf_init_stack
+#define cf_interpret_line ucw_cf_interpret_line
+#define cf_journal_delete ucw_cf_journal_delete
+#define cf_journal_swap ucw_cf_journal_swap
+#define cf_load_default ucw_cf_load_default
+#define cf_obtain_context ucw_cf_obtain_context
+#define cf_op_names ucw_cf_op_names
+#define cf_sections ucw_cf_sections
+#define cf_type_names ucw_cf_type_names
+#define cf_type_size ucw_cf_type_size
+#endif
+
+/* Item stack used by conf-intr.c */
+
+#define MAX_STACK_SIZE 16
+
+struct item_stack {		// used by conf-intr.c
+  struct cf_section *sec;	// nested section
+  void *base_ptr;		// because original pointers are often relative
+  int op;			// it is performed when a closing brace is encountered
+  void *list;			// list the operations should be done on
+  u32 mask;			// bit array of selectors searching in a list
+  struct cf_item *item;		// cf_item of the list
+};
+
+/* List of dirty sections used by conf-section.c */
+
+struct dirty_section {
+  struct cf_section *sec;
+  void *ptr;
+};
+
+#define GBUF_TYPE	struct dirty_section
+#define GBUF_PREFIX(x)	dirtsec_##x
+#include <ucw/gbuf.h>
+
+/* Configuration context */
+
+struct cf_context {
+  struct mempool *pool;
+  int is_active;
+  int config_loaded;			// at least one config file was loaded
+  struct cf_parser_state *parser;
+  uint everything_committed;		// did we already commit each section?
+  uint postpone_commit;			// counter of calls to cf_open_group()
+  uint other_options;			// used internally by cf_getopt()
+  clist conf_entries;			// files/strings to reload
+  struct cf_journal_item *journal;	// journalling
+  int enable_journal;
+  struct old_pools *pools;
+  struct item_stack stack[MAX_STACK_SIZE];	// interpreter stack
+  uint stack_level;
+  struct cf_section sections;		// root section
+  uint sections_initialized;
+  dirtsec_t dirty;			// dirty sections
+  uint dirties;
+};
+
+/* conf-ctxt.c */
+static inline struct cf_context *cf_get_context(void)
+{
+  struct cf_context *cc = ucwlib_thread_context()->cf_context;
+  ASSERT(cc->is_active);
+  return cc;
+}
+
+// In fact, this is equivalent to cf_get_context(), but it is not inlined,
+// because we want to force the linker to include conf-context.c, which contains
+// a constructor of the whole context mechanism.
+struct cf_context *cf_obtain_context(void);
+
+/* conf-intr.c */
+#define OP_MASK 0xff		// only get the operation
+#define OP_OPEN 0x100		// here we only get an opening brace instead of parameters
+#define OP_1ST 0x200		// in the 1st phase selectors are recorded into the mask
+#define OP_2ND 0x400		// in the 2nd phase real data are entered
+enum cf_operation;
+extern char *cf_op_names[];
+extern char *cf_type_names[];
+
+uint cf_type_size(enum cf_type type, const union cf_union *u);
+char *cf_interpret_line(struct cf_context *cc, char *name, enum cf_operation op, int number, char **pars);
+void cf_init_stack(struct cf_context *cc);
+int cf_done_stack(struct cf_context *cc);
+
+/* conf-journal.c */
+void cf_journal_swap(void);
+void cf_journal_delete(void);
+
+/* conf-section.c */
+#define SEC_FLAG_DYNAMIC	0x80000000	// contains a dynamic attribute
+#define SEC_FLAG_UNKNOWN	0x40000000	// ignore unknown entriies
+#define SEC_FLAG_CANT_COPY	0x20000000	// contains lists or parsers
+#define SEC_FLAG_NUMBER		0x0fffffff	// number of entries
+enum cf_commit_mode { CF_NO_COMMIT, CF_COMMIT, CF_COMMIT_ALL };
+extern struct cf_section cf_sections;
+
+struct cf_item *cf_find_subitem(struct cf_section *sec, const char *name);
+int cf_commit_all(enum cf_commit_mode cm);
+void cf_add_dirty(struct cf_section *sec, void *ptr);
+
+/* conf-getopt.c */
+void cf_load_default(struct cf_context *cc);
+
+#endif
diff --git a/libucw/ucw/conf-intr.c b/libucw/ucw/conf-intr.c
new file mode 100644
index 0000000..b512b10
--- /dev/null
+++ b/libucw/ucw/conf-intr.c
@@ -0,0 +1,665 @@
+/*
+ *	UCW Library -- Configuration files: interpreter
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/conf-internal.h>
+#include <ucw/clists.h>
+#include <ucw/gary.h>
+#include <ucw/mempool.h>
+#include <ucw/xtypes.h>
+
+#include <string.h>
+#include <stdio.h>
+
+#define TRY(f)	do { char *_msg = f; if (_msg) return _msg; } while (0)
+
+/* Register size of and parser for each basic type */
+
+static char *
+cf_parse_string(char *str, char **ptr)
+{
+  *ptr = cf_strdup(str);
+  return NULL;
+}
+
+typedef char *cf_basic_parser(char *str, void *ptr);
+static struct {
+  uint size;
+  void *parser;
+} parsers[] = {
+  { sizeof(int), cf_parse_int },
+  { sizeof(u64), cf_parse_u64 },
+  { sizeof(double), cf_parse_double },
+  { sizeof(u32), cf_parse_ip },
+  { sizeof(char*), cf_parse_string },
+  { sizeof(int), NULL },			// lookups are parsed extra
+  { 0, NULL },					// user-defined types are parsed extra
+};
+
+inline uint
+cf_type_size(enum cf_type type, const union cf_union *u)
+{
+  switch (type)
+    {
+      case CT_USER:
+        return u->utype->size;
+      case CT_XTYPE:
+	return u->xtype->size;
+      default:
+	ASSERT(type < ARRAY_SIZE(parsers) - 1);
+	return parsers[type].size;
+    }
+}
+
+static char *
+cf_parse_lookup(char *str, int *ptr, const char * const *t)
+{
+  const char * const *n = t;
+  uint total_len = 0;
+  while (*n && strcasecmp(*n, str)) {
+    total_len += strlen(*n) + 2;
+    n++;
+  }
+  if (*n) {
+    *ptr = n - t;
+    return NULL;
+  }
+  char *err = cf_malloc(total_len + strlen(str) + 60), *c = err;
+  c += sprintf(err, "Invalid value %s, possible values are: ", str);
+  for (n=t; *n; n++)
+    c+= sprintf(c, "%s, ", *n);
+  if (*t)
+    c[-2] = 0;
+  *ptr = -1;
+  return err;
+}
+
+static char *
+cf_parse_ary(uint number, char **pars, void *ptr, enum cf_type type, union cf_union *u)
+{
+  for (uint i=0; i<number; i++)
+  {
+    char *msg;
+    uint size = cf_type_size(type, u);
+    if (type < CT_LOOKUP)
+      msg = ((cf_basic_parser*) parsers[type].parser) (pars[i], ptr + i * size);
+    else if (type == CT_LOOKUP)
+      msg = cf_parse_lookup(pars[i], ptr + i * size, u->lookup);
+    else if (type == CT_USER)
+      msg = u->utype->parser(pars[i], ptr + i * size);
+    else if (type == CT_XTYPE)
+      msg = (char *)u->xtype->parse(pars[i], ptr + i * size, cf_get_pool());
+    else
+      ASSERT(0);
+    if (msg)
+      return number > 1 ? cf_printf("Item %d: %s", i+1, msg) : msg;
+  }
+  return NULL;
+}
+
+/* Interpreter */
+
+#define T(x) #x,
+char *cf_op_names[] = { CF_OPERATIONS };
+#undef T
+char *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user", "xtype" };
+
+static char *
+interpret_set_dynamic(struct cf_item *item, int number, char **pars, void **ptr)
+{
+  enum cf_type type = item->type;
+  uint size = cf_type_size(type, &item->u);
+  cf_journal_block(ptr, sizeof(void*));
+  // boundary checks done by the caller
+  *ptr = gary_init(size, number, mp_get_allocator(cf_get_pool()));
+  return cf_parse_ary(number, pars, *ptr, type, &item->u);
+}
+
+static char *
+interpret_add_dynamic(struct cf_item *item, int number, char **pars, int *processed, void **ptr, enum cf_operation op)
+{
+  enum cf_type type = item->type;
+  void *old_p = *ptr;
+  uint size = cf_type_size(item->type, &item->u);
+  ASSERT(size >= sizeof(uint));
+  int old_nr = old_p ? GARY_SIZE(old_p) : 0;
+  int taken = MIN(number, ABS(item->number)-old_nr);
+  *processed = taken;
+  // stretch the dynamic array
+  void *new_p = gary_init(size, old_nr + taken, mp_get_allocator(cf_get_pool()));
+  cf_journal_block(ptr, sizeof(void*));
+  *ptr = new_p;
+  if (op == OP_APPEND) {
+    memcpy(new_p, old_p, old_nr * size);
+    return cf_parse_ary(taken, pars, new_p + old_nr * size, type, &item->u);
+  } else if (op == OP_PREPEND) {
+    memcpy(new_p + taken * size, old_p, old_nr * size);
+    return cf_parse_ary(taken, pars, new_p, type, &item->u);
+  } else
+    return cf_printf("Dynamic arrays do not support operation %s", cf_op_names[op]);
+}
+
+static char *interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uint allow_dynamic);
+
+static char *
+interpret_section(struct cf_section *sec, int number, char **pars, int *processed, void *ptr, uint allow_dynamic)
+{
+  cf_add_dirty(sec, ptr);
+  *processed = 0;
+  for (struct cf_item *ci=sec->cfg; ci->cls; ci++)
+  {
+    int taken = 0;		// assignment only to silence false positive warnings in some compilers about possibly uninitialized variable
+    char *msg = interpret_set_item(ci, number, pars, &taken, ptr + (uintptr_t) ci->ptr, allow_dynamic && !ci[1].cls);
+    if (msg)
+      return cf_printf("Item %s: %s", ci->name, msg);
+    *processed += taken;
+    number -= taken;
+    pars += taken;
+    if (!number)		// stop parsing, because many parsers would otherwise complain that number==0
+      break;
+  }
+  return NULL;
+}
+
+static void
+add_to_list(cnode *where, cnode *new_node, enum cf_operation op)
+{
+  switch (op)
+  {
+    case OP_EDIT:		// editation has been done in-place
+      break;
+    case OP_REMOVE:
+      CF_JOURNAL_VAR(where->prev->next);
+      CF_JOURNAL_VAR(where->next->prev);
+      clist_remove(where);
+      break;
+    case OP_AFTER:		// implementation dependent (prepend_head = after(list)), and where==list, see clists.h:74
+    case OP_PREPEND:
+    case OP_COPY:
+      CF_JOURNAL_VAR(where->next->prev);
+      CF_JOURNAL_VAR(where->next);
+      clist_insert_after(new_node, where);
+      break;
+    case OP_BEFORE:		// implementation dependent (append_tail = before(list))
+    case OP_APPEND:
+    case OP_SET:
+      CF_JOURNAL_VAR(where->prev->next);
+      CF_JOURNAL_VAR(where->prev);
+      clist_insert_before(new_node, where);
+      break;
+    default:
+      ASSERT(0);
+  }
+}
+
+static char *
+interpret_add_list(struct cf_item *item, int number, char **pars, int *processed, void *ptr, enum cf_operation op)
+{
+  if (op >= OP_REMOVE)
+    return cf_printf("You have to open a block for operation %s", cf_op_names[op]);
+  if (!number)
+    return "Nothing to add to the list";
+  struct cf_section *sec = item->u.sec;
+  *processed = 0;
+  uint index = 0;
+  while (number > 0)
+  {
+    void *node = cf_malloc(sec->size);
+    cf_init_section(item->name, sec, node, 1);
+    add_to_list(ptr, node, op);
+    int taken;
+    /* If the node contains any dynamic attribute at the end, we suppress
+     * auto-repetition here and pass the flag inside instead.  */
+    index++;
+    char *msg = interpret_section(sec, number, pars, &taken, node, sec->flags & SEC_FLAG_DYNAMIC);
+    if (msg)
+      return sec->flags & SEC_FLAG_DYNAMIC ? msg : cf_printf("Node %d of list %s: %s", index, item->name, msg);
+    *processed += taken;
+    number -= taken;
+    pars += taken;
+    if (sec->flags & SEC_FLAG_DYNAMIC)
+      break;
+  }
+  return NULL;
+}
+
+static char *
+interpret_add_bitmap(struct cf_item *item, int number, char **pars, int *processed, u32 *ptr, enum cf_operation op)
+{
+  if (op == OP_PREPEND || op == OP_APPEND)
+    op = OP_SET;
+  if (op != OP_SET && op != OP_REMOVE)
+    return cf_printf("Cannot apply operation %s on a bitmap", cf_op_names[op]);
+  else if (item->type != CT_INT && item->type != CT_LOOKUP)
+    return cf_printf("Type %s cannot be used with bitmaps", cf_type_names[item->type]);
+  cf_journal_block(ptr, sizeof(u32));
+  for (int i=0; i<number; i++) {
+    uint idx;
+    if (item->type == CT_INT)
+      TRY( cf_parse_int(pars[i], &idx) );
+    else
+      TRY( cf_parse_lookup(pars[i], &idx, item->u.lookup) );
+    if (idx >= 32)
+      return "Bitmaps only have 32 bits";
+    if (op == OP_SET)
+      *ptr |= 1<<idx;
+    else
+      *ptr &= ~(1<<idx);
+  }
+  *processed = number;
+  return NULL;
+}
+
+static char *
+interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uint allow_dynamic)
+{
+  int taken;
+  switch (item->cls)
+  {
+    case CC_STATIC:
+      if (!number)
+	return "Missing value";
+      taken = MIN(number, item->number);
+      *processed = taken;
+      uint size = cf_type_size(item->type, &item->u);
+      cf_journal_block(ptr, taken * size);
+      return cf_parse_ary(taken, pars, ptr, item->type, &item->u);
+    case CC_DYNAMIC:
+      if (!allow_dynamic)
+	return "Dynamic array cannot be used here";
+      taken = MIN(number, ABS(item->number));
+      *processed = taken;
+      return interpret_set_dynamic(item, taken, pars, ptr);
+    case CC_PARSER:
+      if (item->number < 0 && !allow_dynamic)
+	return "Parsers with variable number of parameters cannot be used here";
+      if (item->number > 0 && number < item->number)
+	return "Not enough parameters available for the parser";
+      taken = MIN(number, ABS(item->number));
+      *processed = taken;
+      for (int i=0; i<taken; i++)
+	pars[i] = cf_strdup(pars[i]);
+      return item->u.par(taken, pars, ptr);
+    case CC_SECTION:
+      return interpret_section(item->u.sec, number, pars, processed, ptr, allow_dynamic);
+    case CC_LIST:
+      if (!allow_dynamic)
+	return "Lists cannot be used here";
+      return interpret_add_list(item, number, pars, processed, ptr, OP_SET);
+    case CC_BITMAP:
+      if (!allow_dynamic)
+	return "Bitmaps cannot be used here";
+      return interpret_add_bitmap(item, number, pars, processed, ptr, OP_SET);
+    default:
+      ASSERT(0);
+  }
+}
+
+static char *
+interpret_set_all(struct cf_item *item, void *ptr, enum cf_operation op)
+{
+  if (item->cls == CC_BITMAP) {
+    cf_journal_block(ptr, sizeof(u32));
+    if (op == OP_CLEAR)
+      * (u32*) ptr = 0;
+    else
+      if (item->type == CT_INT)
+	* (u32*) ptr = ~0u;
+      else {
+	uint nr = -1;
+	while (item->u.lookup[++nr]);
+	* (u32*) ptr = ~0u >> (32-nr);
+      }
+    return NULL;
+  } else if (op != OP_CLEAR)
+    return "The item is not a bitmap";
+
+  if (item->cls == CC_LIST) {
+    cf_journal_block(ptr, sizeof(clist));
+    clist_init(ptr);
+  } else if (item->cls == CC_DYNAMIC) {
+    cf_journal_block(ptr, sizeof(void *));
+    * (void**) ptr = GARY_FOREVER_EMPTY;
+  } else if (item->cls == CC_STATIC && item->type == CT_STRING) {
+    cf_journal_block(ptr, item->number * sizeof(char*));
+    bzero(ptr, item->number * sizeof(char*));
+  } else
+    return "The item is not a list, dynamic array, bitmap, or string";
+  return NULL;
+}
+
+static int
+cmp_items(void *i1, void *i2, struct cf_item *item)
+{
+  ASSERT(item->cls == CC_STATIC);
+  i1 += (uintptr_t) item->ptr;
+  i2 += (uintptr_t) item->ptr;
+  if (item->type == CT_STRING)
+    return strcmp(* (char**) i1, * (char**) i2);
+  else				// all numeric types
+    return memcmp(i1, i2, cf_type_size(item->type, &item->u));
+}
+
+static void *
+find_list_node(clist *list, void *query, struct cf_section *sec, u32 mask)
+{
+  CLIST_FOR_EACH(cnode *, n, *list)
+  {
+    uint found = 1;
+    for (uint i=0; i<32; i++)
+      if (mask & (1<<i))
+	if (cmp_items(n, query, sec->cfg+i))
+	{
+	  found = 0;
+	  break;
+	}
+    if (found)
+      return n;
+  }
+  return NULL;
+}
+
+static char *
+record_selector(struct cf_item *item, struct cf_section *sec, u32 *mask)
+{
+  uint nr = sec->flags & SEC_FLAG_NUMBER;
+  if (item >= sec->cfg && item < sec->cfg + nr)	// setting an attribute relative to this section
+  {
+    uint i = item - sec->cfg;
+    if (i >= 32)
+      return "Cannot select list nodes by this attribute";
+    if (sec->cfg[i].cls != CC_STATIC)
+      return "Selection can only be done based on basic attributes";
+    *mask |= 1 << i;
+  }
+  return NULL;
+}
+
+static char *
+opening_brace(struct cf_context *cc, struct cf_item *item, void *ptr, enum cf_operation op)
+{
+  if (cc->stack_level >= MAX_STACK_SIZE-1)
+    return "Too many nested sections";
+  enum cf_operation pure_op = op & OP_MASK;
+  cc->stack[++cc->stack_level] = (struct item_stack) {
+    .sec = NULL,
+    .base_ptr = NULL,
+    .op = pure_op,
+    .list = NULL,
+    .mask = 0,
+    .item = NULL,
+  };
+  if (!item)			// unknown is ignored; we just need to trace recursion
+    return NULL;
+  cc->stack[cc->stack_level].sec = item->u.sec;
+  if (item->cls == CC_SECTION)
+  {
+    if (pure_op != OP_SET)
+      return "Only SET operation can be used with a section";
+    cc->stack[cc->stack_level].base_ptr = ptr;
+    cc->stack[cc->stack_level].op = OP_EDIT | OP_2ND;	// this list operation does nothing
+  }
+  else if (item->cls == CC_LIST)
+  {
+    cc->stack[cc->stack_level].base_ptr = cf_malloc(item->u.sec->size);
+    cf_init_section(item->name, item->u.sec, cc->stack[cc->stack_level].base_ptr, 1);
+    cc->stack[cc->stack_level].list = ptr;
+    cc->stack[cc->stack_level].item = item;
+    if (pure_op == OP_ALL)
+      return "Operation ALL cannot be applied on lists";
+    else if (pure_op < OP_REMOVE) {
+      add_to_list(ptr, cc->stack[cc->stack_level].base_ptr, pure_op);
+      cc->stack[cc->stack_level].op |= OP_2ND;
+    } else
+      cc->stack[cc->stack_level].op |= OP_1ST;
+  }
+  else
+    return "Opening brace can only be used on sections and lists";
+  return NULL;
+}
+
+static char *
+closing_brace(struct cf_context *cc, struct item_stack *st, enum cf_operation op, int number, char **pars)
+{
+  if (st->op == OP_CLOSE)	// top-level
+    return "Unmatched } parenthesis";
+  if (!st->sec) {		// dummy run on unknown section
+    if (!(op & OP_OPEN))
+      cc->stack_level--;
+    return NULL;
+  }
+  enum cf_operation pure_op = st->op & OP_MASK;
+  if (st->op & OP_1ST)
+  {
+    st->list = find_list_node(st->list, st->base_ptr, st->sec, st->mask);
+    if (!st->list)
+      return "Cannot find a node matching the query";
+    if (pure_op != OP_REMOVE)
+    {
+      if (pure_op == OP_EDIT)
+	st->base_ptr = st->list;
+      else if (pure_op == OP_AFTER || pure_op == OP_BEFORE)
+	cf_init_section(st->item->name, st->sec, st->base_ptr, 1);
+      else if (pure_op == OP_COPY) {
+	if (st->sec->flags & SEC_FLAG_CANT_COPY)
+	  return cf_printf("Item %s cannot be copied", st->item->name);
+	memcpy(st->base_ptr, st->list, st->sec->size);	// strings and dynamic arrays are shared
+	if (st->sec->copy)
+	  TRY( st->sec->copy(st->base_ptr, st->list) );
+      } else
+	ASSERT(0);
+      if (op & OP_OPEN) {	// stay at the same recursion level
+	st->op = (st->op | OP_2ND) & ~OP_1ST;
+	add_to_list(st->list, st->base_ptr, pure_op);
+	return NULL;
+      }
+      int taken;		// parse parameters on 1 line immediately
+      TRY( interpret_section(st->sec, number, pars, &taken, st->base_ptr, 1) );
+      number -= taken;
+      pars += taken;
+      // and fall-thru to the 2nd phase
+    }
+    add_to_list(st->list, st->base_ptr, pure_op);
+  }
+  cc->stack_level--;
+  if (number)
+    return "No parameters expected after the }";
+  else if (op & OP_OPEN)
+    return "No { is expected";
+  else
+    return NULL;
+}
+
+static struct cf_item *
+find_item(struct cf_section *curr_sec, const char *name, char **msg, void **ptr)
+{
+  struct cf_context *cc = cf_get_context();
+  *msg = NULL;
+  if (name[0] == '^')				// absolute name instead of relative
+    name++, curr_sec = &cc->sections, *ptr = NULL;
+  if (!curr_sec)				// don't even search in an unknown section
+    return NULL;
+  while (1)
+  {
+    if (curr_sec != &cc->sections)
+      cf_add_dirty(curr_sec, *ptr);
+    char *c = strchr(name, '.');
+    if (c)
+      *c++ = 0;
+    struct cf_item *ci = cf_find_subitem(curr_sec, name);
+    if (!ci->cls)
+    {
+      if (!(curr_sec->flags & SEC_FLAG_UNKNOWN))	// ignore silently unknown top-level sections and unknown attributes in flagged sections
+	*msg = cf_printf("Unknown item %s", name);
+      return NULL;
+    }
+    *ptr += (uintptr_t) ci->ptr;
+    if (!c)
+      return ci;
+    if (ci->cls != CC_SECTION)
+    {
+      *msg = cf_printf("Item %s is not a section", name);
+      return NULL;
+    }
+    curr_sec = ci->u.sec;
+    name = c;
+  }
+}
+
+static char *
+interpret_add(char *name, struct cf_item *item, int number, char **pars, int *takenp, void *ptr, enum cf_operation op)
+{
+  switch (item->cls) {
+    case CC_DYNAMIC:
+      return interpret_add_dynamic(item, number, pars, takenp, ptr, op);
+    case CC_LIST:
+      return interpret_add_list(item, number, pars, takenp, ptr, op);
+    case CC_BITMAP:
+      return interpret_add_bitmap(item, number, pars, takenp, ptr, op);
+    default:
+      return cf_printf("Operation %s not supported on attribute %s", cf_op_names[op], name);
+  }
+}
+
+char *
+cf_interpret_line(struct cf_context *cc, char *name, enum cf_operation op, int number, char **pars)
+{
+  char *msg;
+  if ((op & OP_MASK) == OP_CLOSE)
+    return closing_brace(cc, cc->stack+cc->stack_level, op, number, pars);
+  void *ptr = cc->stack[cc->stack_level].base_ptr;
+  struct cf_item *item = find_item(cc->stack[cc->stack_level].sec, name, &msg, &ptr);
+  if (msg)
+    return msg;
+  if (cc->stack[cc->stack_level].op & OP_1ST)
+    TRY( record_selector(item, cc->stack[cc->stack_level].sec, &cc->stack[cc->stack_level].mask) );
+  if (op & OP_OPEN) {		// the operation will be performed after the closing brace
+    if (number)
+      return "Cannot open a block after a parameter has been passed on a line";
+    return opening_brace(cc, item, ptr, op);
+  }
+  if (!item)			// ignored item in an unknown section
+    return NULL;
+  op &= OP_MASK;
+
+  int taken = 0;		// process as many parameters as possible
+  switch (op) {
+    case OP_CLEAR:
+    case OP_ALL:
+      msg = interpret_set_all(item, ptr, op);
+      break;
+    case OP_SET:
+      msg = interpret_set_item(item, number, pars, &taken, ptr, 1);
+      break;
+    case OP_RESET:
+      msg = interpret_set_all(item, ptr, OP_CLEAR);
+      if (!msg)
+	msg = interpret_add(name, item, number, pars, &taken, ptr, OP_APPEND);
+      break;
+    default:
+      msg = interpret_add(name, item, number, pars, &taken, ptr, op);
+  }
+  if (msg)
+    return msg;
+  if (taken < number)
+    return cf_printf("Too many parameters: %d>%d", number, taken);
+
+  return NULL;
+}
+
+char *
+cf_find_item(const char *name, struct cf_item *item)
+{
+  struct cf_context *cc = cf_get_context();
+  char *msg;
+  void *ptr = NULL;
+  struct cf_item *ci = find_item(&cc->sections, name, &msg, &ptr);
+  if (msg)
+    return msg;
+  if (ci) {
+    *item = *ci;
+    item->ptr = ptr;
+  } else
+    bzero(item, sizeof(struct cf_item));
+  return NULL;
+}
+
+char *
+cf_modify_item(struct cf_item *item, enum cf_operation op, int number, char **pars)
+{
+  char *msg;
+  int taken = 0;
+  switch (op) {
+    case OP_SET:
+      msg = interpret_set_item(item, number, pars, &taken, item->ptr, 1);
+      break;
+    case OP_CLEAR:
+    case OP_ALL:
+      msg = interpret_set_all(item, item->ptr, op);
+      break;
+    case OP_APPEND:
+    case OP_PREPEND:
+      switch (item->cls) {
+	case CC_DYNAMIC:
+	  msg = interpret_add_dynamic(item, number, pars, &taken, item->ptr, op);
+	  break;
+	case CC_LIST:
+	  msg = interpret_add_list(item, number, pars, &taken, item->ptr, op);
+	  break;
+	case CC_BITMAP:
+	  msg = interpret_add_bitmap(item, number, pars, &taken, item->ptr, op);
+	  break;
+	default:
+	  return "The attribute does not support append/prepend";
+      }
+      break;
+    case OP_REMOVE:
+      if (item->cls == CC_BITMAP)
+	msg = interpret_add_bitmap(item, number, pars, &taken, item->ptr, op);
+      else
+	return "Only applicable on bitmaps";
+      break;
+    default:
+      return "Unsupported operation";
+  }
+  if (msg)
+    return msg;
+  if (taken < number)
+    return "Too many parameters";
+  return NULL;
+}
+
+void
+cf_init_stack(struct cf_context *cc)
+{
+  if (!cc->sections_initialized++) {
+    cc->sections.flags |= SEC_FLAG_UNKNOWN;
+    cc->sections.size = 0;			// size of allocated array used to be stored here
+    cf_init_section(NULL, &cc->sections, NULL, 0);
+  }
+  cc->stack_level = 0;
+  cc->stack[0] = (struct item_stack) {
+    .sec = &cc->sections,
+    .base_ptr = NULL,
+    .op = OP_CLOSE,
+    .list = NULL,
+    .mask = 0,
+    .item = NULL
+  };
+}
+
+int
+cf_done_stack(struct cf_context *cc)
+{
+  return (cc->stack_level > 0);
+}
diff --git a/libucw/ucw/conf-journal.c b/libucw/ucw/conf-journal.c
new file mode 100644
index 0000000..7d3ccdc
--- /dev/null
+++ b/libucw/ucw/conf-journal.c
@@ -0,0 +1,128 @@
+/*
+ *	UCW Library -- Configuration files: journaling
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/conf-internal.h>
+#include <ucw/mempool.h>
+
+#include <string.h>
+
+struct old_pools {
+  struct old_pools *prev;
+  struct mempool *pool;
+};				// link-list of older cf_pool's
+
+struct cf_journal_item {
+  struct cf_journal_item *prev;
+  byte *ptr;
+  uint len;
+  byte copy[0];
+};
+
+void
+cf_set_journalling(int enable)
+{
+  struct cf_context *cc = cf_get_context();
+  ASSERT(!cc->journal);
+  cc->enable_journal = enable;
+}
+
+void
+cf_journal_block(void *ptr, uint len)
+{
+  struct cf_context *cc = cf_get_context();
+  if (!cc->enable_journal)
+    return;
+  struct cf_journal_item *ji = cf_malloc(sizeof(struct cf_journal_item) + len);
+  ji->prev = cc->journal;
+  ji->ptr = ptr;
+  ji->len = len;
+  memcpy(ji->copy, ptr, len);
+  cc->journal = ji;
+}
+
+void
+cf_journal_swap(void)
+  // swaps the contents of the memory and the journal, and reverses the list
+{
+  struct cf_context *cc = cf_get_context();
+  struct cf_journal_item *curr, *prev, *next;
+  for (next=NULL, curr=cc->journal; curr; next=curr, curr=prev)
+  {
+    prev = curr->prev;
+    curr->prev = next;
+    for (uint i=0; i<curr->len; i++)
+    {
+      byte x = curr->copy[i];
+      curr->copy[i] = curr->ptr[i];
+      curr->ptr[i] = x;
+    }
+  }
+  cc->journal = next;
+}
+
+struct cf_journal_item *
+cf_journal_new_transaction(uint new_pool)
+{
+  struct cf_context *cc = cf_get_context();
+  if (new_pool)
+    cc->pool = mp_new(1<<10);
+  struct cf_journal_item *oldj = cc->journal;
+  cc->journal = NULL;
+  return oldj;
+}
+
+void
+cf_journal_commit_transaction(uint new_pool, struct cf_journal_item *oldj)
+{
+  struct cf_context *cc = cf_get_context();
+  if (new_pool)
+  {
+    struct old_pools *p = cf_malloc(sizeof(struct old_pools));
+    p->prev = cc->pools;
+    p->pool = cc->pool;
+    cc->pools = p;
+  }
+  if (oldj)
+  {
+    struct cf_journal_item **j = &cc->journal;
+    while (*j)
+      j = &(*j)->prev;
+    *j = oldj;
+  }
+}
+
+void
+cf_journal_rollback_transaction(uint new_pool, struct cf_journal_item *oldj)
+{
+  struct cf_context *cc = cf_get_context();
+  if (!cc->enable_journal)
+    return;
+  cf_journal_swap();
+  cc->journal = oldj;
+  if (new_pool)
+  {
+    mp_delete(cc->pool);
+    cc->pool = cc->pools ? cc->pools->pool : NULL;
+  }
+}
+
+void
+cf_journal_delete(void)
+{
+  struct cf_context *cc = cf_get_context();
+  for (struct old_pools *p=cc->pools; p; p=cc->pools)
+  {
+    cc->pools = p->prev;
+    mp_delete(p->pool);
+  }
+}
diff --git a/libucw/ucw/conf-parse.c b/libucw/ucw/conf-parse.c
new file mode 100644
index 0000000..fc18504
--- /dev/null
+++ b/libucw/ucw/conf-parse.c
@@ -0,0 +1,171 @@
+/*
+ *	UCW Library -- Configuration files: parsers for basic types
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2019 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/chartype.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+struct unit {
+  uint name;			// one-letter name of the unit
+  uint den;			// fraction
+  u64 num;
+};
+
+static const struct unit units[] = {
+  { 'd', 1, 86400 },
+  { 'h', 1, 3600 },
+  { 'k', 1, 1000 },
+  { 'm', 1, 1000000 },
+  { 'g', 1, 1000000000 },
+  { 't', 1, 1000000000000LLU },
+  { 'K', 1, 1<<10 },
+  { 'M', 1, 1<<20 },
+  { 'G', 1, 1<<30 },
+  { 'T', 1, 1LLU<<40 },
+  { '%', 100, 1 },
+  { 0, 0, 0 }
+};
+
+static const struct unit *
+lookup_unit(const char *value, const char *end, char **msg)
+{
+  if (end && *end) {
+    if (end == value || end[1] || *end >= '0' && *end <= '9')
+      *msg = "Invalid number";
+    else {
+      for (const struct unit *u=units; u->name; u++)
+	if ((char)u->name == *end)
+	  return u;
+      *msg = "Invalid unit";
+    }
+  }
+  return NULL;
+}
+
+static char cf_rngerr[] = "Number out of range";
+
+char *
+cf_parse_int(const char *str, int *ptr)
+{
+  char *msg = NULL;
+  if (!*str)
+    msg = "Missing number";
+  else {
+    const struct unit *u;
+    char *end;
+    errno = 0;
+    uint x = strtoul(str, &end, 0);
+    if (errno == ERANGE)
+      msg = cf_rngerr;
+    else if (u = lookup_unit(str, end, &msg)) {
+      u64 y = (u64)x * u->num;
+      if (y % u->den)
+	msg = "Number is not an integer";
+      else {
+	y /= u->den;
+	if (y > 0xffffffff)
+	  msg = cf_rngerr;
+	*ptr = y;
+      }
+    } else
+      *ptr = x;
+  }
+  return msg;
+}
+
+char *
+cf_parse_u64(const char *str, u64 *ptr)
+{
+  char *msg = NULL;
+  if (!*str)
+    msg = "Missing number";
+  else {
+    const struct unit *u;
+    char *end;
+    errno = 0;
+    u64 x = strtoull(str, &end, 0);
+    if (errno == ERANGE)
+      msg = cf_rngerr;
+    else if (u = lookup_unit(str, end, &msg)) {
+      if (x > ~(u64)0 / u->num)
+	msg = "Number out of range";
+      else {
+	x *= u->num;
+	if (x % u->den)
+	  msg = "Number is not an integer";
+	else
+	  *ptr = x / u->den;
+      }
+    } else
+      *ptr = x;
+  }
+  return msg;
+}
+
+char *
+cf_parse_double(const char *str, double *ptr)
+{
+  char *msg = NULL;
+  if (!*str)
+    msg = "Missing number";
+  else {
+    const struct unit *u;
+    double x;
+    uint read_chars;
+    if (sscanf(str, "%lf%n", &x, &read_chars) != 1)
+      msg = "Invalid number";
+    else if (u = lookup_unit(str, str + read_chars, &msg))
+      *ptr = x * u->num / u->den;
+    else
+      *ptr = x;
+  }
+  return msg;
+}
+
+char *
+cf_parse_ip(const char *p, u32 *varp)
+{
+  if (!*p)
+    return "Missing IP address";
+  uint x = 0;
+  char *p2;
+  if (*p == '0' && (p[1] | 32) == 'x' && Cxdigit(p[2])) {
+    errno = 0;
+    x = strtoul(p, &p2, 16);
+    if (errno == ERANGE || x > 0xffffffff)
+      goto error;
+    p = p2;
+  }
+  else
+    for (uint i = 0; i < 4; i++) {
+      if (i) {
+	if (*p++ != '.')
+	  goto error;
+      }
+      if (!Cdigit(*p))
+	goto error;
+      errno = 0;
+      uint y = strtoul(p, &p2, 10);
+      if (errno == ERANGE || p2 == (char*) p || y > 255)
+	goto error;
+      p = p2;
+      x = (x << 8) + y;
+    }
+  *varp = x;
+  return *p ? "Trailing characters" : NULL;
+error:
+  return "Invalid IP address";
+}
+
diff --git a/libucw/ucw/conf-section.c b/libucw/ucw/conf-section.c
new file mode 100644
index 0000000..30f5898
--- /dev/null
+++ b/libucw/ucw/conf-section.c
@@ -0,0 +1,200 @@
+/*
+ *	UCW Library -- Configuration files: sections
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/clists.h>
+#include <ucw/binsearch.h>
+#include <ucw/gary.h>
+
+#include <string.h>
+
+/* Dirty sections */
+
+void
+cf_add_dirty(struct cf_section *sec, void *ptr)
+{
+  struct cf_context *cc = cf_get_context();
+  dirtsec_grow(&cc->dirty, cc->dirties+1);
+  struct dirty_section *dest = cc->dirty.ptr + cc->dirties;
+  if (cc->dirties && dest[-1].sec == sec && dest[-1].ptr == ptr)
+    return;
+  dest->sec = sec;
+  dest->ptr = ptr;
+  cc->dirties++;
+}
+
+#define ASORT_PREFIX(x)	dirtsec_##x
+#define ASORT_KEY_TYPE	struct dirty_section
+#define ASORT_LT(x,y)	x.sec < y.sec || x.sec == y.sec && x.ptr < y.ptr
+#include <ucw/sorter/array-simple.h>
+
+static void
+sort_dirty(struct cf_context *cc)
+{
+  if (cc->dirties <= 1)
+    return;
+  dirtsec_sort(cc->dirty.ptr, cc->dirties);
+  // and compress the list
+  struct dirty_section *read = cc->dirty.ptr + 1, *write = cc->dirty.ptr + 1, *limit = cc->dirty.ptr + cc->dirties;
+  while (read < limit) {
+    if (read->sec != read[-1].sec || read->ptr != read[-1].ptr) {
+      if (read != write)
+	*write = *read;
+      write++;
+    }
+    read++;
+  }
+  cc->dirties = write - cc->dirty.ptr;
+}
+
+/* Initialization */
+
+struct cf_item *
+cf_find_subitem(struct cf_section *sec, const char *name)
+{
+  struct cf_item *ci = sec->cfg;
+  for (; ci->cls; ci++)
+    if (!strcasecmp(ci->name, name))
+      return ci;
+  return ci;
+}
+
+static void
+inspect_section(struct cf_section *sec)
+{
+  sec->flags = 0;
+  struct cf_item *ci;
+  for (ci=sec->cfg; ci->cls; ci++)
+    if (ci->cls == CC_SECTION) {
+      inspect_section(ci->u.sec);
+      sec->flags |= ci->u.sec->flags & (SEC_FLAG_DYNAMIC | SEC_FLAG_CANT_COPY);
+    } else if (ci->cls == CC_LIST) {
+      inspect_section(ci->u.sec);
+      sec->flags |= SEC_FLAG_DYNAMIC | SEC_FLAG_CANT_COPY;
+    } else if (ci->cls == CC_DYNAMIC || ci->cls == CC_BITMAP)
+      sec->flags |= SEC_FLAG_DYNAMIC;
+    else if (ci->cls == CC_PARSER) {
+      sec->flags |= SEC_FLAG_CANT_COPY;
+      if (ci->number < 0)
+	sec->flags |= SEC_FLAG_DYNAMIC;
+    }
+  if (sec->copy)
+    sec->flags &= ~SEC_FLAG_CANT_COPY;
+  sec->flags |= ci - sec->cfg;		// record the number of entries
+}
+
+void
+cf_declare_rel_section(const char *name, struct cf_section *sec, void *ptr, uint allow_unknown)
+{
+  struct cf_context *cc = cf_obtain_context();
+  if (!cc->sections.cfg)
+  {
+    cc->sections.size = 50;
+    cc->sections.cfg = xmalloc_zero(cc->sections.size * sizeof(struct cf_item));
+  }
+  struct cf_item *ci = cf_find_subitem(&cc->sections, name);
+  if (ci->cls)
+    die("Cannot register section %s twice", name);
+  ci->cls = CC_SECTION;
+  ci->name = name;
+  ci->number = 1;
+  ci->ptr = ptr;
+  ci->u.sec = sec;
+  inspect_section(sec);
+  if (allow_unknown)
+    sec->flags |= SEC_FLAG_UNKNOWN;
+  ci++;
+  if (ci - cc->sections.cfg >= (int) cc->sections.size)
+  {
+    cc->sections.cfg = xrealloc(cc->sections.cfg, 2*cc->sections.size * sizeof(struct cf_item));
+    bzero(cc->sections.cfg + cc->sections.size, cc->sections.size * sizeof(struct cf_item));
+    cc->sections.size *= 2;
+  }
+}
+
+void
+cf_declare_section(const char *name, struct cf_section *sec, uint allow_unknown)
+{
+  cf_declare_rel_section(name, sec, NULL, allow_unknown);
+}
+
+void
+cf_init_section(const char *name, struct cf_section *sec, void *ptr, uint do_bzero)
+{
+  if (do_bzero) {
+    ASSERT(sec->size);
+    bzero(ptr, sec->size);
+  }
+  for (struct cf_item *ci=sec->cfg; ci->cls; ci++)
+    if (ci->cls == CC_SECTION)
+      cf_init_section(ci->name, ci->u.sec, ptr + (uintptr_t) ci->ptr, 0);
+    else if (ci->cls == CC_LIST)
+      clist_init(ptr + (uintptr_t) ci->ptr);
+    else if (ci->cls == CC_DYNAMIC) {
+      void **dyn = ptr + (uintptr_t) ci->ptr;
+      if (!*dyn)			// replace NULL by an empty array
+	*dyn = GARY_FOREVER_EMPTY;
+    }
+  if (sec->init) {
+    char *msg = sec->init(ptr);
+    if (msg)
+      die("Cannot initialize section %s: %s", name, msg);
+  }
+}
+
+static char *
+commit_section(struct cf_section *sec, void *ptr, uint commit_all)
+{
+  struct cf_context *cc = cf_get_context();
+  char *err;
+
+  for (struct cf_item *ci=sec->cfg; ci->cls; ci++)
+    if (ci->cls == CC_SECTION) {
+      if ((err = commit_section(ci->u.sec, ptr + (uintptr_t) ci->ptr, commit_all))) {
+	msg(L_ERROR, "Cannot commit section %s: %s", ci->name, err);
+	return "commit of a subsection failed";
+      }
+    } else if (ci->cls == CC_LIST) {
+      uint idx = 0;
+      CLIST_FOR_EACH(cnode *, n, * (clist*) (ptr + (uintptr_t) ci->ptr))
+	if (idx++, err = commit_section(ci->u.sec, n, commit_all)) {
+	  msg(L_ERROR, "Cannot commit node #%d of list %s: %s", idx, ci->name, err);
+	  return "commit of a list failed";
+	}
+    }
+  if (sec->commit) {
+    /* We have to process the whole tree of sections even if just a few changes
+     * have been made, because there are dependencies between commit-hooks and
+     * hence we need to call them in a fixed order.  */
+#define ARY_LT_X(ary,i,x) ary[i].sec < x.sec || ary[i].sec == x.sec && ary[i].ptr < x.ptr
+    struct dirty_section comp = { sec, ptr };
+    uint pos = BIN_SEARCH_FIRST_GE_CMP(cc->dirty.ptr, cc->dirties, comp, ARY_LT_X);
+
+    if (commit_all
+	|| (pos < cc->dirties && cc->dirty.ptr[pos].sec == sec && cc->dirty.ptr[pos].ptr == ptr))
+      return sec->commit(ptr);
+  }
+  return 0;
+}
+
+int
+cf_commit_all(enum cf_commit_mode cm)
+{
+  struct cf_context *cc = cf_get_context();
+  sort_dirty(cc);
+  if (cm == CF_NO_COMMIT)
+    return 0;
+  if (commit_section(&cc->sections, NULL, cm == CF_COMMIT_ALL))
+    return 1;
+  cc->dirties = 0;
+  return 0;
+}
diff --git a/libucw/ucw/conf-test.c b/libucw/ucw/conf-test.c
new file mode 100644
index 0000000..8ec5dd9
--- /dev/null
+++ b/libucw/ucw/conf-test.c
@@ -0,0 +1,260 @@
+/*
+ *	Insane tester of reading configuration files
+ *
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2012--2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/clists.h>
+#include <ucw/fastbuf.h>
+#include <ucw/gary.h>
+#include <ucw/xtypes.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+
+static int verbose;
+static int reload;
+
+struct sub_sect_1 {
+  cnode n;
+  char *name;
+  time_t t;
+  char *level;
+  int confidence[2];
+  double *list;
+};
+
+static struct sub_sect_1 sec1 = { {}, "Charlie", 0, "WBAFC", { 0, -1}, NULL };
+
+static char *
+init_sec_1(struct sub_sect_1 *s)
+{
+  if (s == &sec1)			// this is a static variable; skip clearing
+    return NULL;
+  s->name = "unknown";
+  s->level = "default";
+  s->confidence[0] = 5;
+  s->confidence[1] = 6;
+  // leave s->list==NULL
+  return NULL;
+}
+
+static char *
+commit_sec_1(struct sub_sect_1 *s)
+{
+  if (s->confidence[0] < 0 || s->confidence[0] > 10)
+    return "Well, this can't be";
+  return NULL;
+}
+
+static char *
+time_parser(uint number, char **pars, time_t *ptr)
+{
+  *ptr = number ? atoi(pars[0]) : time(NULL);
+  return NULL;
+}
+
+static struct cf_section cf_sec_1 = {
+  CF_TYPE(struct sub_sect_1),
+  CF_INIT(init_sec_1),
+  CF_COMMIT(commit_sec_1),
+#define F(x)	PTR_TO(struct sub_sect_1, x)
+  CF_ITEMS {
+    CF_STRING("name", F(name)),
+    //CF_PARSER("t", F(t), time_parser, 0),
+    CF_STRING("level", F(level)),
+    CF_INT_ARY("confidence", F(confidence[0]), 2),		// XXX: the [0] is needed for the sake of type checking
+    CF_DOUBLE_DYN("list", F(list), 100),
+    CF_END
+  }
+#undef F
+};
+
+static uint nr1 = 15;
+static int *nrs1;
+static int nrs2[5];
+static char *str1 = "no worries";
+static char **str2;
+static u64 u1 = 0xCafeBeefDeadC00ll;
+static double d1 = -1.1;
+static clist secs;
+static time_t t1, t2;
+static u32 ip;
+static int *look;
+static u16 numbers[10] = { 2, 100, 1, 5 };
+static u32 bitmap1 = 0xff;
+static u32 bitmap2 = 3;
+static intmax_t intmax;
+
+static char *
+parse_u16(char *string, u16 *ptr)
+{
+  uint a;
+  char *msg = cf_parse_int(string, &a);
+  if (msg)
+    return msg;
+  if (a >= (1<<16))
+    return "Come on, man, this doesn't fit to 16 bits";
+  *ptr = a;
+  return NULL;
+}
+
+static void
+dump_u16(struct fastbuf *fb, u16 *ptr)
+{
+  bprintf(fb, "%d ", *ptr);
+}
+
+static struct cf_user_type u16_type = {
+  .size = sizeof(u16),
+  .name = "u16",
+  .parser = (cf_parser1*) parse_u16,
+  .dumper = (cf_dumper1*) dump_u16
+};
+
+static char *
+init_top(void *ptr UNUSED)
+{
+  for (uint i=0; i<5; i++)
+  {
+    struct sub_sect_1 *s = xmalloc(sizeof(struct sub_sect_1));	// XXX: cannot by cf_malloc(), because it's deleted when cf_reload()'ed
+    cf_init_section("slaves", &cf_sec_1, s, 1);
+    s->confidence[1] = i;
+    clist_add_tail(&secs, &s->n);
+  }
+  return NULL;
+}
+
+static char *
+commit_top(void *ptr UNUSED)
+{
+  if (nr1 != 15)
+    return "Don't touch my variable!";
+  return NULL;
+}
+
+static const char * const alphabet[] = { "alpha", "beta", "gamma", "delta", NULL };
+static struct cf_section cf_top = {
+  CF_INIT(init_top),
+  CF_COMMIT(commit_top),
+  CF_ITEMS {
+    CF_UINT("nr1", &nr1),
+    CF_INT_DYN("nrs1", &nrs1, 1000),
+    CF_INT_ARY("nrs2", nrs2, 5),
+    CF_STRING("str1", &str1),
+    CF_STRING_DYN("str2", &str2, 20),
+    CF_U64("u1", &u1),
+    CF_DOUBLE("d1", &d1),
+    CF_PARSER("FirstTime", &t1, time_parser, -1),
+    CF_PARSER("SecondTime", &t2, time_parser, 1),
+    CF_SECTION("master", &sec1, &cf_sec_1),
+    CF_LIST("slaves", &secs, &cf_sec_1),
+    CF_IP("ip", &ip),
+    CF_LOOKUP_DYN("look", &look, alphabet, 1000),
+    CF_USER_ARY("numbers", numbers, &u16_type, 10),
+    CF_XTYPE("intmax", &intmax, &xt_intmax),
+    CF_BITMAP_INT("bitmap1", &bitmap1),
+    CF_BITMAP_LOOKUP("bitmap2", &bitmap2, ((const char* const[]) {
+	  "one", "two", "three", "four", "five", "six", "seven", "eight", 
+	  "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "seventeen", 
+	  "eighteen", "nineteen", "twenty", NULL	// hidden joke here
+	  })),
+    CF_END
+  }
+};
+
+static char short_opts[] = CF_SHORT_OPTS "rv";
+static struct option long_opts[] = {
+	CF_LONG_OPTS
+	{"reload",	0, 0, 'r'},
+	{"verbose",	0, 0, 'v'},
+	{NULL,		0, 0, 0}
+};
+
+static char *help = "\
+Usage: conf-test [ctxt] [nojournal] <options>\n\
+\n\
+Options:\n" CF_USAGE "\
+-r, --reload\t\tReload configuration\n\
+-v, --verbose\t\tBe verbose\n\
+";
+
+static void NONRET
+usage(char *msg, ...)
+{
+  va_list va;
+  va_start(va, msg);
+  if (msg)
+    vfprintf(stderr, msg, va);
+  fputs(help, stderr);
+  exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+  log_init(argv[0]);
+  struct cf_context *cc = NULL, *prev = NULL;
+
+  // Special arguments which have to be parsed before cf_getopt()
+  while (argc > 1) {
+    if (!strcmp(argv[1], "ctxt")) {
+      cc = cf_new_context();
+      prev = cf_switch_context(cc);
+      argc--, argv++;
+    } else if (!strcmp(argv[1], "nojournal")) {
+      cf_set_journalling(0);
+      argc--, argv++;
+    } else
+      break;
+  }
+
+  cf_declare_section("top", &cf_top, 0);
+  cf_def_file = "ucw/conf-test.cf";
+
+  // Create and initialize dynamic arrays
+  GARY_INIT(nrs1, 6);
+  memcpy(nrs1, (int []) { 5, 5, 4, 3, 2, 1 }, 6 * sizeof(int));
+  GARY_INIT(str2, 2);
+  str2[0] = "Alice";
+  str2[1] = "Bob";
+  GARY_INIT(look, 2);
+  look[0] = 2;
+  look[1] = 1;
+  GARY_INIT(sec1.list, 3);
+  memcpy(sec1.list, (double []) { 1e4, -1e-4, 8 }, 3 * sizeof(double));
+
+  int opt;
+  while ((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)
+    switch (opt) {
+      case 'r': reload++; break;
+      case 'v': verbose++; break;
+      default: usage("unknown option %c\n", opt);
+    }
+  if (optind < argc)
+    usage("too many parameters (%d more)\n", argc-optind);
+
+  if (reload) {
+    cf_reload(NULL);
+    cf_reload(NULL);
+  }
+
+  if (verbose) {
+    struct fastbuf *out = bfdopen(1, 1<<14);
+    cf_dump_sections(out);
+    bclose(out);
+  }
+
+  if (cc) {
+    cf_switch_context(prev);
+    cf_delete_context(cc);
+  }
+
+  return 0;
+}
diff --git a/libucw/ucw/conf-test.cf b/libucw/ucw/conf-test.cf
new file mode 100644
index 0000000..33a9643
--- /dev/null
+++ b/libucw/ucw/conf-test.cf
@@ -0,0 +1,52 @@
+# test config file
+#include ucw/conf-test.t ; top.xa=1
+#include 'non-existent file'; #top.xa=1
+Top {
+  nr1=16	#!!!
+  nrs1		2 3 5 \
+	    7 11 13 \
+	    \
+	    17M
+  nrs2	3 3k 3 3 3 ; \
+  str1	"hello,\t\x2bworld%%\n"
+  str2	'Hagenuk,
+      the best' "\
+      " qu'est-ce que c'est?
+  u1	0xbadcafebadbeefc0
+  str2:prepend prepended
+  str2:append appended
+  d1 7%
+  d1	-1.14e-25
+  firsttime ; secondtime 56
+  ^top.master:set	alice HB8+
+  slaves:clear
+  ip 0xa
+  ip 195.113.31.123
+  look Alpha
+  look:prepend Beta GAMMA
+  numbers 11000 65535
+  bitmap1 31
+  bitmap1:remove 3 3
+  bitmap2:all
+  bitmap2:remove eleven twelve one
+  intmax 1000000000
+};;;;;;
+
+unknown.ignored :-)
+
+top.slaves:reset	cairns gpua 7 7 -10% +10%
+top.slaves	daintree rafc 4 5 -171%
+top.slaves	coogee pum 9 8
+top.slaves:prepend	{name=bondi; level=\
+  "PUG"; confidence	10 10}
+top.slaves:remove {name daintree}
+top.slaveS:edit {level PUG} Bondi PUG!
+top.slaveS:before {level pum}{
+  confidence 2
+  list 123 456 789
+}
+top.slaves:copy {name coogee} Coogee2 PUM
+
+topp.a=15
+top.nr1=   ' 15'
+a { ;-D }
diff --git a/libucw/ucw/conf.h b/libucw/ucw/conf.h
new file mode 100644
index 0000000..acd7460
--- /dev/null
+++ b/libucw/ucw/conf.h
@@ -0,0 +1,633 @@
+/*
+ *	UCW Library -- Configuration files
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef	_UCW_CONF_H
+#define	_UCW_CONF_H
+
+#include <ucw/clists.h>
+#include <ucw/gary.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cf_close_group ucw_cf_close_group
+#define cf_declare_rel_section ucw_cf_declare_rel_section
+#define cf_declare_section ucw_cf_declare_section
+#define cf_delete_context ucw_cf_delete_context
+#define cf_dump_sections ucw_cf_dump_sections
+#define cf_find_item ucw_cf_find_item
+#define cf_get_pool ucw_cf_get_pool
+#define cf_init_section ucw_cf_init_section
+#define cf_journal_block ucw_cf_journal_block
+#define cf_journal_commit_transaction ucw_cf_journal_commit_transaction
+#define cf_journal_new_transaction ucw_cf_journal_new_transaction
+#define cf_journal_rollback_transaction ucw_cf_journal_rollback_transaction
+#define cf_load ucw_cf_load
+#define cf_malloc ucw_cf_malloc
+#define cf_malloc_zero ucw_cf_malloc_zero
+#define cf_modify_item ucw_cf_modify_item
+#define cf_new_context ucw_cf_new_context
+#define cf_open_group ucw_cf_open_group
+#define cf_parse_double ucw_cf_parse_double
+#define cf_parse_int ucw_cf_parse_int
+#define cf_parse_ip ucw_cf_parse_ip
+#define cf_parse_u64 ucw_cf_parse_u64
+#define cf_printf ucw_cf_printf
+#define cf_reload ucw_cf_reload
+#define cf_revert ucw_cf_revert
+#define cf_set ucw_cf_set
+#define cf_set_journalling ucw_cf_set_journalling
+#define cf_strdup ucw_cf_strdup
+#define cf_switch_context ucw_cf_switch_context
+#endif
+
+struct mempool;
+
+/***
+ * [[conf_ctxt]]
+ * Configuration contexts
+ * ~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * The state of the configuration parser is stored within a configuration context.
+ * One such context is automatically created during initialization of the library
+ * and you need not care about more, as long as you use a single configuration file.
+ *
+ * In full generality, you can define as many contexts as you wish and switch
+ * between them. Each thread has its own pointer to the current context, which
+ * must not be shared with other threads.
+ ***/
+
+/** Create a new configuration context. **/
+struct cf_context *cf_new_context(void);
+
+/**
+ * Free a configuration context. The context must not be set as current
+ * for any thread, nor can it be the default context.
+ *
+ * All configuration settings made within the context are rolled back
+ * (except when journalling is turned off). All memory allocated on behalf
+ * of the context is freed, which includes memory obtained by calls to
+ * @cf_malloc().
+ **/
+void cf_delete_context(struct cf_context *cc);
+
+/**
+ * Make the given configuration context current and return the previously
+ * active context. Both the new and the old context may be NULL.
+ **/
+struct cf_context *cf_switch_context(struct cf_context *cc);
+
+/***
+ * [[conf_load]]
+ * Safe configuration loading
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * These functions can be used to to safely load or reload configuration.
+ */
+
+/**
+ * Load configuration from @file.
+ * Returns a non-zero value upon error. In that case, all changes to the
+ * configuration specified in the file are undone.
+ **/
+int cf_load(const char *file);
+
+/**
+ * Reload configuration from @file, replace the old one.
+ * If @file is NULL, reload all loaded configuration files and re-apply
+ * bits of configuration passed to @cf_set().
+ * Returns a non-zero value upon error. In that case, all configuration
+ * settings are rolled back to the state before calling this function.
+ **/
+int cf_reload(const char *file);
+
+/**
+ * Parse some part of configuration passed in @string.
+ * The syntax is the same as in the <<config:,configuration file>>.
+ * Returns a non-zero value upon error. In that case, all changes to the
+ * configuration specified by the already executed parts of the string
+ * are undone.
+ **/
+int cf_set(const char *string);
+
+/**
+ * Sometimes, the configuration is split to multiple files and when only
+ * some of the are loaded, the settings are not consistent -- for example,
+ * they might have been rejected by a commit hook, because a mandatory setting
+ * is missing.
+ *
+ * This function opens a configuration group, in which multiple files can be
+ * loaded and all commit hooks are deferred until the group is closed.
+ **/
+void cf_open_group(void);
+
+/**
+ * Close a group opened by @cf_open_group(). Returns a non-zero value upon error,
+ * which usually means that a commit hook has failed.
+ **/
+int cf_close_group(void);
+
+/**
+ * Return all configuration items to their initial state before loading the
+ * configuration file. If journalling is disabled, it does nothing.
+ **/
+void cf_revert(void);
+
+/*** === Data types [[conf_types]] ***/
+
+enum cf_class {				/** Class of the configuration item. **/
+  CC_END,				// end of list
+  CC_STATIC,				// single variable or static array
+  CC_DYNAMIC,				// dynamically allocated array
+  CC_PARSER,				// arbitrary parser function
+  CC_SECTION,				// section appears exactly once
+  CC_LIST,				// list with 0..many nodes
+  CC_BITMAP				// of up to 32 items
+};
+
+enum cf_type {				/** Type of a single value. **/
+  CT_INT, CT_U64, CT_DOUBLE,		// number types
+  CT_IP,				// IP address
+  CT_STRING,				// string type
+  CT_LOOKUP,				// in a string table
+  CT_USER,				// user-defined type (obsolete)
+  CT_XTYPE				// extended type
+};
+
+struct fastbuf;
+
+/**
+ * A parser function gets an array of (strdup'ed) strings and a pointer with
+ * the customized information (most likely the target address).  It can store
+ * the parsed value anywhere in any way it likes, however it must first call
+ * @cf_journal_block() on the overwritten memory block.  It returns an error
+ * message or NULL if everything is all right.
+ **/
+typedef char *cf_parser(uint number, char **pars, void *ptr);
+/**
+ * A parser function for user-defined types gets a string and a pointer to
+ * the destination variable.  It must store the value within [ptr,ptr+size),
+ * where size is fixed for each type.  It should not call @cf_journal_block().
+ **/
+typedef char *cf_parser1(char *string, void *ptr);
+/**
+ * An init- or commit-hook gets a pointer to the section or NULL if this
+ * is the global section.  It returns an error message or NULL if everything
+ * is all right.  The init-hook should fill in default values (needed for
+ * dynamically allocated nodes of link lists or for filling global variables
+ * that are run-time dependent).  The commit-hook should perform sanity
+ * checks and postprocess the parsed values.  Commit-hooks must call
+ * @cf_journal_block() too.  Caveat! init-hooks for static sections must not
+ * use @cf_malloc() but normal <<memory:xmalloc()>>.
+ **/
+typedef char *cf_hook(void *ptr);
+/**
+ * Dumps the contents of a variable of a user-defined type.
+ **/
+typedef void cf_dumper1(struct fastbuf *fb, void *ptr);
+/**
+ * Similar to init-hook, but it copies attributes from another list node
+ * instead of setting the attributes to default values.  You have to provide
+ * it if your node contains parsed values and/or sub-lists.
+ **/
+typedef char *cf_copier(void *dest, void *src);
+
+struct cf_user_type {			/** Structure to store information about user-defined variable type. **/
+  uint size;				// of the parsed attribute
+  char *name;				// name of the type (for dumping)
+  cf_parser1 *parser;			// how to parse it
+  cf_dumper1 *dumper;			// how to dump the type
+};
+
+struct cf_section;
+struct cf_item {			/** Single configuration item. **/
+  const char *name;			// case insensitive
+  int number;				// length of an array or #parameters of a parser (negative means at most)
+  void *ptr;				// pointer to a global variable or an offset in a section
+  union cf_union {
+    struct cf_section *sec;		// declaration of a section or a list
+    cf_parser *par;			// parser function
+    const char * const *lookup;		// NULL-terminated sequence of allowed strings for lookups
+    struct cf_user_type *utype;		// specification of the user-defined type (obsolete)
+    const struct xtype *xtype;		// specification of the extended type
+  } u;
+  enum cf_class cls:16;			// attribute class
+  enum cf_type type:16;			// type of a static or dynamic attribute
+};
+
+struct cf_section {			/** A section. **/
+  uint size;				// 0 for a global block, sizeof(struct) for a section
+  cf_hook *init;			// fills in default values (no need to bzero)
+  cf_hook *commit;			// verifies parsed data (optional)
+  cf_copier *copy;			// copies values from another instance (optional, no need to copy basic attributes)
+  struct cf_item *cfg;			// CC_END-terminated array of items
+  uint flags;				// for internal use only
+};
+
+/***
+ * [[conf_macros]]
+ * Convenience macros
+ * ~~~~~~~~~~~~~~~~~~
+ *
+ * You could create the structures manually, but you can use these macros to
+ * save some typing.
+ */
+
+/***
+ * Declaration of <<struct_cf_section,`cf_section`>>
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ *
+ * These macros can be used to configure the <<struct_cf_section,`cf_section`>>
+ * structure.
+ ***/
+
+/**
+ * Data type of a section.
+ * If you store the section into a structure, use this macro.
+ *
+ * Storing a section into a structure is useful mostly when you may have multiple instances of the
+ * section (eg. <<conf_multi,array or list>>).
+ *
+ * Example:
+ *
+ *   struct list_node {
+ *     cnode n;		// This one is for the list itself
+ *     char *name;
+ *     uint value;
+ *   };
+ *
+ *   static struct clist nodes;
+ *
+ *   static struct cf_section node = {
+ *     CF_TYPE(struct list_node),
+ *     CF_ITEMS {
+ *       CF_STRING("name", PTR_TO(struct list_node, name)),
+ *       CF_UINT("value", PTR_TO(struct list_node, value)),
+ *       CF_END
+ *     }
+ *   };
+ *
+ *   static struct cf_section section = {
+ *     CF_LIST("node", &nodes, &node),
+ *     CF_END
+ *   };
+ *
+ * You could use <<def_CF_STATIC,`CF_STATIC`>> or <<def_CF_DYNAMIC,`CF_DYNAMIC`>>
+ * macros to create arrays.
+ */
+#define CF_TYPE(s)	.size = sizeof(s)
+/**
+ * An init <<hooks,hook>>.
+ * You can use this to initialize dynamically allocated items (for a dynamic array or list).
+ * The hook returns an error message or NULL if everything was OK.
+ */
+#define CF_INIT(f)	.init = (cf_hook*) f
+/**
+ * A commit <<hooks,hook>>.
+ * You can use this one to check sanity of loaded data and postprocess them.
+ * You must call @cf_journal_block() if you change anything.
+ *
+ * Return error message or NULL if everything went OK.
+ **/
+#define CF_COMMIT(f)	.commit = (cf_hook*) f
+/**
+ * A <<hooks,copy function>>.
+ * You need to provide one for too complicated sections where a memcpy is not
+ * enough to copy it properly. It happens, for example, when you have a dynamically
+ * allocated section containing a list of other sections.
+ *
+ * You return an error message or NULL if you succeed.
+ **/
+#define CF_COPY(f)	.copy = (cf_copier*) f		/**  **/
+#define CF_ITEMS	.flags = 0, .cfg = ( struct cf_item[] )	/** List of sub-items. **/
+#define CF_END		{ .cls = CC_END }		/** End of the structure. **/
+/***
+ * Declaration of a configuration item
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ *
+ * Each of these describe single <<struct_cf_item,configuration item>>. They are mostly
+ * for internal use, do not use them directly unless you really know what you are doing.
+ ***/
+
+/**
+ * Static array of items.
+ * Expects you to allocate the memory and provide pointer to it.
+ **/
+#define CF_STATIC(n,p,T,t,c)	{ .cls = CC_STATIC, .type = CT_##T, .name = n, .number = c, .ptr = CHECK_PTR_TYPE(p,t*) }
+/**
+ * Dynamic array of items.
+ * Expects you to provide pointer to your pointer to data and it will allocate new memory for it
+ * and set your pointer to it.
+ **/
+#define CF_DYNAMIC(n,p,T,t,c)	{ .cls = CC_DYNAMIC, .type = CT_##T, .name = n, .number = c, .ptr = CHECK_PTR_TYPE(p,t**) }
+#define CF_PARSER(n,p,f,c)	{ .cls = CC_PARSER, .name = n, .number = c, .ptr = p, .u.par = (cf_parser*) f }					/** A low-level parser. **/
+#define CF_SECTION(n,p,s)	{ .cls = CC_SECTION, .name = n, .number = 1, .ptr = p, .u.sec = s }						/** A sub-section. **/
+#define CF_LIST(n,p,s)		{ .cls = CC_LIST, .name = n, .number = 1, .ptr = CHECK_PTR_TYPE(p,clist*), .u.sec = s }				/** A list with sub-items. **/
+#define CF_BITMAP_INT(n,p)	{ .cls = CC_BITMAP, .type = CT_INT, .name = n, .number = 1, .ptr = CHECK_PTR_TYPE(p,u32*) }			/** A bitmap. **/
+#define CF_BITMAP_LOOKUP(n,p,t)	{ .cls = CC_BITMAP, .type = CT_LOOKUP, .name = n, .number = 1, .ptr = CHECK_PTR_TYPE(p,u32*), .u.lookup = t }	/** A bitmap with named bits. **/
+/***
+ * Basic configuration items
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ *
+ * They describe basic data types used in the configuration. This should be enough for
+ * most real-life purposes.
+ *
+ * The parameters are as follows:
+ *
+ * * @n -- name of the item.
+ * * @p -- pointer to the variable where it shall be stored.
+ * * @c -- count.
+ **/
+#define CF_INT(n,p)		CF_STATIC(n,p,INT,int,1)		/** Single `int` value. **/
+#define CF_INT_ARY(n,p,c)	CF_STATIC(n,p,INT,int,c)		/** Static array of integers. **/
+#define CF_INT_DYN(n,p,c)	CF_DYNAMIC(n,p,INT,int,c)		/** Dynamic array of integers. **/
+#define CF_UINT(n,p)		CF_STATIC(n,p,INT,uint,1)		/** Single `uint` (`unsigned`) value. **/
+#define CF_UINT_ARY(n,p,c)	CF_STATIC(n,p,INT,uint,c)		/** Static array of unsigned integers. **/
+#define CF_UINT_DYN(n,p,c)	CF_DYNAMIC(n,p,INT,uint,c)		/** Dynamic array of unsigned integers. **/
+#define CF_U64(n,p)		CF_STATIC(n,p,U64,u64,1)		/** Single unsigned 64bit integer (`u64`). **/
+#define CF_U64_ARY(n,p,c)	CF_STATIC(n,p,U64,u64,c)		/** Static array of u64s. **/
+#define CF_U64_DYN(n,p,c)	CF_DYNAMIC(n,p,U64,u64,c)		/** Dynamic array of u64s. **/
+#define CF_DOUBLE(n,p)		CF_STATIC(n,p,DOUBLE,double,1)		/** Single instance of `double`. **/
+#define CF_DOUBLE_ARY(n,p,c)	CF_STATIC(n,p,DOUBLE,double,c)		/** Static array of doubles. **/
+#define CF_DOUBLE_DYN(n,p,c)	CF_DYNAMIC(n,p,DOUBLE,double,c)		/** Dynamic array of doubles. **/
+#define CF_IP(n,p)		CF_STATIC(n,p,IP,u32,1)			/** Single IPv4 address. **/
+#define CF_IP_ARY(n,p,c)	CF_STATIC(n,p,IP,u32,c)			/** Static array of IP addresses. **/.
+#define CF_IP_DYN(n,p,c)	CF_DYNAMIC(n,p,IP,u32,c)		/** Dynamic array of IP addresses. **/
+
+/* FIXME: Backwards compatibility only, should not be used at is will be removed soon. */
+#define CF_UNS CF_UINT
+#define CF_UNS_ARY CF_UINT_ARY
+#define CF_UNS_DYN CF_UINT_DYN
+
+/**
+ * A string.
+ * You provide a pointer to a `char *` variable and it will fill it with
+ * dynamically allocated string. For example:
+ *
+ *   static char *string = "Default string";
+ *
+ *   static struct cf_section section = {
+ *     CF_ITEMS {
+ *       CF_STRING("string", &string),
+ *       CF_END
+ *     }
+ *   };
+ **/
+#define CF_STRING(n,p)		CF_STATIC(n,p,STRING,char*,1)
+#define CF_STRING_ARY(n,p,c)	CF_STATIC(n,p,STRING,char*,c)		/** Static array of strings. **/
+#define CF_STRING_DYN(n,p,c)	CF_DYNAMIC(n,p,STRING,char*,c)		/** Dynamic array of strings. **/
+/**
+ * One string out of a predefined set.
+ * You provide the set as an array of strings terminated by NULL (similar to @argv argument
+ * of main()) as the @t parameter.
+ *
+ * The configured variable (pointer to `int`) is set to index of the string.
+ * So, it works this way:
+ *
+ *   static *strings[] = { "First", "Second", "Third", NULL };
+ *
+ *   static int variable;
+ *
+ *   static struct cf_section section = {
+ *     CF_ITEMS {
+ *       CF_LOOKUP("choice", &variable, strings),
+ *       CF_END
+ *     }
+ *   };
+ *
+ * Now, if the configuration contains `choice "Second"`, `variable` will be set to 1.
+ **/
+#define CF_LOOKUP(n,p,t)	{ .cls = CC_STATIC, .type = CT_LOOKUP, .name = n, .number = 1, .ptr = CHECK_PTR_TYPE(p,int*), .u.lookup = t }
+/**
+ * Static array of strings out of predefined set.
+ **/
+#define CF_LOOKUP_ARY(n,p,t,c)	{ .cls = CC_STATIC, .type = CT_LOOKUP, .name = n, .number = c, .ptr = CHECK_PTR_TYPE(p,int*), .u.lookup = t }
+/**
+ * Dynamic array of strings out of predefined set.
+ **/
+#define CF_LOOKUP_DYN(n,p,t,c)	{ .cls = CC_DYNAMIC, .type = CT_LOOKUP, .name = n, .number = c, .ptr = CHECK_PTR_TYPE(p,int**), .u.lookup = t }
+/**
+ * A user-defined type.
+ * See <<custom_parser,creating custom parsers>> section if you want to know more.
+ **/
+#define CF_USER(n,p,t)		{ .cls = CC_STATIC, .type = CT_USER, .name = n, .number = 1, .ptr = p, .u.utype = t }
+/**
+ * Static array of user-defined types (all of the same type).
+ * See <<custom_parser,creating custom parsers>> section.
+ **/
+#define CF_USER_ARY(n,p,t,c)	{ .cls = CC_STATIC, .type = CT_USER, .name = n, .number = c, .ptr = p, .u.utype = t }
+/**
+ * Dynamic array of user-defined types.
+ * See <<custom_parser,creating custom parsers>> section.
+ **/
+#define CF_USER_DYN(n,p,t,c)	{ .cls = CC_DYNAMIC, .type = CT_USER, .name = n, .number = c, .ptr = p, .u.utype = t }
+/**
+ * An extended type.
+ * See <<xtypes:,extended types>> if you want to know more.
+ **/
+#define CF_XTYPE(n,p,t)		{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = 1, .ptr = p, .u.xtype = t }
+/**
+ * Static array of extended types (all of the same type).
+ * See <<xtypes:,extended types>>.
+ **/
+#define CF_XTYPE_ARY(n,p,t,c)	{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = t }
+/**
+ * Dynamic array of extended types.
+ * See <<xtypes:,extended types>>.
+ **/
+#define CF_XTYPE_DYN(n,p,t,c)	{ .cls = CC_DYNAMIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = t }
+
+/**
+ * Any number of dynamic array elements
+ **/
+#define CF_ANY_NUM		-0x7fffffff
+
+#define DARY_LEN(a) GARY_SIZE(a)		/** Length of an dynamic array. An alias for `GARY_SIZE`. **/
+
+/***
+ * [[alloc]]
+ * Memory allocation
+ * ~~~~~~~~~~~~~~~~~
+ *
+ * Each configuration context has one or more <<mempool:,memory pools>>, where all
+ * data related to the configuration are stored.
+ *
+ * The following set of functions allocate from these pools. The allocated memory
+ * is valid as long as the current configuration (when the configuration file is
+ * reloaded or rolled back, or the context is deleted, it gets lost).
+ *
+ * Memory allocated from within custom parsers should be allocated from the pools.
+ *
+ * Please note that the pool is not guaranteed to exist before you call cf_load(),
+ * cf_set(), or cf_getopt() on the particular context.
+ ***/
+struct mempool *cf_get_pool(void); /** Return a pointer to the current configuration pool. **/
+void *cf_malloc(uint size);	/** Returns @size bytes of memory allocated from the current configuration pool. **/
+void *cf_malloc_zero(uint size);	/** Like @cf_malloc(), but zeroes the memory. **/
+char *cf_strdup(const char *s);	/** Copy a string into @cf_malloc()ed memory. **/
+char *cf_printf(const char *fmt, ...) FORMAT_CHECK(printf,1,2); /** printf() into @cf_malloc()ed memory. **/
+
+/***
+ * [[journal]]
+ * Undo journal
+ * ~~~~~~~~~~~~
+ *
+ * The configuration system uses a simple journaling mechanism, which makes
+ * it possible to undo changes to configuration. A typical example is loading
+ * of configuration by cf_load(): internally, it creates a transaction, applies
+ * all changes specified by the configuration and if one of them fails, the whole
+ * journal is replayed to restore the whole original state. Similarly, cf_reload()
+ * uses the journal to switch between configurations.
+ *
+ * In most cases, you need not care about the journal, except when you need
+ * to change some data from a <<hooks,hook>>, or if you want to call cf_modify_item() and then
+ * undo the changes.
+ ***/
+/**
+ * This function can be used to disable the whole journalling mechanism.
+ * It saves some memory, but it makes undoing of configuration changes impossible,
+ * which breaks for example cf_reload().
+ **/
+void cf_set_journalling(int enable);
+/**
+ * When a block of memory is about to be changed, put the old value
+ * into journal with this function. You need to call it from a <<hooks,commit hook>>
+ * if you change anything. It is used internally by low-level parsers.
+ * <<custom_parser,Custom parsers>> do not need to call it, it is called
+ * before them.
+ **/
+void cf_journal_block(void *ptr, uint len);
+#define CF_JOURNAL_VAR(var) cf_journal_block(&(var), sizeof(var))	// Store a single value into the journal
+
+struct cf_journal_item;		/** Opaque identifier of the journal state. **/
+/**
+ * Starts a new transaction. It returns the current state so you can
+ * get back to it. The @new_pool parameter tells if a new memory pool
+ * should be created and used from now.
+ **/
+struct cf_journal_item *cf_journal_new_transaction(uint new_pool);
+/**
+ * Marks current state as a complete transaction. The @new_pool
+ * parameter tells if the transaction was created with new memory pool
+ * (the parameter must be the same as the one with
+ * @cf_journal_new_transaction() was called with). The @oldj parameter
+ * is the journal state returned from last
+ * @cf_journal_new_transaction() call.
+ **/
+void cf_journal_commit_transaction(uint new_pool, struct cf_journal_item *oldj);
+/**
+ * Returns to an old journal state, reverting anything the current
+ * transaction did. The @new_pool parameter must be the same as the
+ * one you used when you created the transaction. The @oldj parameter
+ * is the journal state you got from @cf_journal_new_transaction() --
+ * it is the state to return to.
+ **/
+void cf_journal_rollback_transaction(uint new_pool, struct cf_journal_item *oldj);
+
+/***
+ * [[declare]]
+ * Section declaration
+ * ~~~~~~~~~~~~~~~~~~~
+ **/
+
+/**
+ * Plug another top-level section into the configuration system.
+ * @name is the name in the configuration file,
+ * @sec is pointer to the section description.
+ * If @allow_unknown is set to 0 and a variable not described in @sec
+ * is found in the configuration file, it produces an error.
+ * If you set it to 1, all such variables are ignored.
+ *
+ * Please note that a single section definition cannot be used in multiple
+ * configuration contexts simultaneously.
+ **/
+void cf_declare_section(const char *name, struct cf_section *sec, uint allow_unknown);
+/**
+ * Like @cf_declare_section(), but instead of item pointers, the section
+ * contains offsets relative to @ptr. In other words, it does the same
+ * as `CF_SECTION`, but for top-level sections.
+ **/
+void cf_declare_rel_section(const char *name, struct cf_section *sec, void *ptr, uint allow_unknown);
+/**
+ * If you have a section in a structure and you want to initialize it
+ * (eg. if you want a copy of default values outside the configuration),
+ * you can use this. It initializes it recursively.
+ *
+ * This is used mostly internally. You probably do not need it.
+ **/
+void cf_init_section(const char *name, struct cf_section *sec, void *ptr, uint do_bzero);
+
+/***
+ * [[bparser]]
+ * Parsers for basic types
+ * ~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Each of them gets a string to parse and pointer to store the value.
+ * It returns either NULL or error message.
+ *
+ * The parsers support units. See <<config:units,their list>>.
+ ***/
+char *cf_parse_int(const char *str, int *ptr);		/** Parser for integers. **/
+char *cf_parse_u64(const char *str, u64 *ptr);		/** Parser for 64 unsigned integers. **/
+char *cf_parse_double(const char *str, double *ptr);	/** Parser for doubles. **/
+char *cf_parse_ip(const char *p, u32 *varp);		/** Parser for IP addresses. **/
+
+/***
+ * [[conf_direct]]
+ * Direct access
+ * ~~~~~~~~~~~~~
+ *
+ * Direct access to configuration items.
+ * You probably should not need this, but in your do, you have to handle
+ * <<journal,journalling>> yourself.
+ ***/
+
+/**
+ * List of operations used on items.
+ * This macro is used to generate internal source code,
+ * but you may be interested in the list of operations it creates.
+ *
+ * Each operation corresponds to the same-named operation
+ * described in <<config:operations,configuration syntax>>.
+ **/
+#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(ALL) \
+  T(APPEND) T(PREPEND) T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY) T(RESET)
+  /* Closing brace finishes previous block.
+   * Basic attributes (static, dynamic, parsed) can be used with SET.
+   * Dynamic arrays can be used with SET, APPEND, PREPEND.
+   * Sections can be used with SET.
+   * Lists can be used with everything. */
+#define T(x) OP_##x,
+enum cf_operation { CF_OPERATIONS };	/** Allowed operations on items. See <<def_CF_OPERATIONS,`CF_OPERATIONS`>> for list (they have an `OP_` prefix -- it means you use `OP_SET` instead of just `SET`). **/
+#undef T
+
+/**
+ * Searches for a configuration item called @name.
+ * If it is found, it is copied into @item and NULL is returned.
+ * Otherwise, an error is returned and @item is zeroed.
+ **/
+char *cf_find_item(const char *name, struct cf_item *item);
+/**
+ * Performs a single operation on a given item.
+ **/
+char *cf_modify_item(struct cf_item *item, enum cf_operation op, int number, char **pars);
+
+/***
+ * [[conf_dump]]
+ * Debug dumping
+ * ~~~~~~~~~~~~~
+ ***/
+
+struct fastbuf;
+/**
+ * Write the current state of all configuration items into @fb.
+ **/
+void cf_dump_sections(struct fastbuf *fb);
+
+#endif
diff --git a/libucw/ucw/config.h b/libucw/ucw/config.h
new file mode 100644
index 0000000..a4768b7
--- /dev/null
+++ b/libucw/ucw/config.h
@@ -0,0 +1,51 @@
+/*
+ *	UCW Library -- Configuration-Dependent Definitions
+ *
+ *	(c) 1997--2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
+
+/* Configuration switches */
+
+#include "autoconf.h"
+
+/* Tell libc we're going to use all extensions available */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+/* Types (based on standard C99 integers) */
+
+#include <stddef.h>
+#include <stdint.h>
+
+typedef uint8_t byte;			/** Exactly 8 bits, unsigned **/
+typedef uint8_t u8;			/** Exactly 8 bits, unsigned **/
+typedef int8_t s8;			/** Exactly 8 bits, signed **/
+typedef uint16_t u16;			/** Exactly 16 bits, unsigned **/
+typedef int16_t s16;			/** Exactly 16 bits, signed **/
+typedef uint32_t u32;			/** Exactly 32 bits, unsigned **/
+typedef int32_t s32;			/** Exactly 32 bits, signed **/
+typedef uint64_t u64;			/** Exactly 64 bits, unsigned **/
+typedef int64_t s64;			/** Exactly 64 bits, signed **/
+
+typedef unsigned int uint;		/** A better pronounceable alias for `unsigned int` **/
+typedef s64 timestamp_t;		/** Milliseconds since an unknown epoch **/
+
+// FIXME: This should be removed soon
+typedef uint uns;			/** Backwards compatible alias for `uint' ***/
+
+#ifdef CONFIG_UCW_LARGE_FILES
+typedef s64 ucw_off_t;			/** File position (either 32- or 64-bit, depending on `CONFIG_UCW_LARGE_FILES`). **/
+#else
+typedef s32 ucw_off_t;
+#endif
+
+#endif
diff --git a/libucw/ucw/crc-tables.c b/libucw/ucw/crc-tables.c
new file mode 100644
index 0000000..bb05d32
--- /dev/null
+++ b/libucw/ucw/crc-tables.c
@@ -0,0 +1,467 @@
+/*
+ *	CRC32 (Castagnoli 1993) -- Tables
+ *
+ *	Based on Michael E. Kounavis and Frank L. Berry: A Systematic Approach
+ *	to Building High Performance Software-based CRC Generators
+ *	(Proceedings of the 10th IEEE Symposium on Computers and Communications 2005)
+ *
+ *	Includes code from http://sourceforge.net/projects/slicing-by-8/,
+ *	which carried the following copyright notice:
+ *
+ *	Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
+ *
+ *	This software program is licensed subject to the BSD License,
+ *	available at http://www.opensource.org/licenses/bsd-license.html
+ *
+ *	Adapted for LibUCW by Martin Mares <mj@ucw.cz> in 2012.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/crc-tables.h>
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o32[256] =
+{
+ 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+ 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B, 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+ 0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B, 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+ 0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, 0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+ 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A, 0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+ 0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5, 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+ 0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, 0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+ 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A, 0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+ 0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48, 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+ 0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, 0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+ 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927, 0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+ 0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8, 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+ 0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, 0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+ 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859, 0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+ 0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9, 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+ 0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, 0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+ 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C, 0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+ 0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043, 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+ 0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, 0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+ 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C, 0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+ 0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652, 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+ 0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, 0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+ 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D, 0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+ 0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2, 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+ 0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, 0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+ 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF, 0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+ 0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F, 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+ 0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, 0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+ 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE, 0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+ 0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321, 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+ 0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, 0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+ 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E, 0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o32
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o40[256] =
+{
+ 0x00000000, 0x13A29877, 0x274530EE, 0x34E7A899, 0x4E8A61DC, 0x5D28F9AB, 0x69CF5132, 0x7A6DC945,
+ 0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21, 0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD,
+ 0x3FC5F181, 0x2C6769F6, 0x1880C16F, 0x0B225918, 0x714F905D, 0x62ED082A, 0x560AA0B3, 0x45A838C4,
+ 0xA2D13239, 0xB173AA4E, 0x859402D7, 0x96369AA0, 0xEC5B53E5, 0xFFF9CB92, 0xCB1E630B, 0xD8BCFB7C,
+ 0x7F8BE302, 0x6C297B75, 0x58CED3EC, 0x4B6C4B9B, 0x310182DE, 0x22A31AA9, 0x1644B230, 0x05E62A47,
+ 0xE29F20BA, 0xF13DB8CD, 0xC5DA1054, 0xD6788823, 0xAC154166, 0xBFB7D911, 0x8B507188, 0x98F2E9FF,
+ 0x404E1283, 0x53EC8AF4, 0x670B226D, 0x74A9BA1A, 0x0EC4735F, 0x1D66EB28, 0x298143B1, 0x3A23DBC6,
+ 0xDD5AD13B, 0xCEF8494C, 0xFA1FE1D5, 0xE9BD79A2, 0x93D0B0E7, 0x80722890, 0xB4958009, 0xA737187E,
+ 0xFF17C604, 0xECB55E73, 0xD852F6EA, 0xCBF06E9D, 0xB19DA7D8, 0xA23F3FAF, 0x96D89736, 0x857A0F41,
+ 0x620305BC, 0x71A19DCB, 0x45463552, 0x56E4AD25, 0x2C896460, 0x3F2BFC17, 0x0BCC548E, 0x186ECCF9,
+ 0xC0D23785, 0xD370AFF2, 0xE797076B, 0xF4359F1C, 0x8E585659, 0x9DFACE2E, 0xA91D66B7, 0xBABFFEC0,
+ 0x5DC6F43D, 0x4E646C4A, 0x7A83C4D3, 0x69215CA4, 0x134C95E1, 0x00EE0D96, 0x3409A50F, 0x27AB3D78,
+ 0x809C2506, 0x933EBD71, 0xA7D915E8, 0xB47B8D9F, 0xCE1644DA, 0xDDB4DCAD, 0xE9537434, 0xFAF1EC43,
+ 0x1D88E6BE, 0x0E2A7EC9, 0x3ACDD650, 0x296F4E27, 0x53028762, 0x40A01F15, 0x7447B78C, 0x67E52FFB,
+ 0xBF59D487, 0xACFB4CF0, 0x981CE469, 0x8BBE7C1E, 0xF1D3B55B, 0xE2712D2C, 0xD69685B5, 0xC5341DC2,
+ 0x224D173F, 0x31EF8F48, 0x050827D1, 0x16AABFA6, 0x6CC776E3, 0x7F65EE94, 0x4B82460D, 0x5820DE7A,
+ 0xFBC3FAF9, 0xE861628E, 0xDC86CA17, 0xCF245260, 0xB5499B25, 0xA6EB0352, 0x920CABCB, 0x81AE33BC,
+ 0x66D73941, 0x7575A136, 0x419209AF, 0x523091D8, 0x285D589D, 0x3BFFC0EA, 0x0F186873, 0x1CBAF004,
+ 0xC4060B78, 0xD7A4930F, 0xE3433B96, 0xF0E1A3E1, 0x8A8C6AA4, 0x992EF2D3, 0xADC95A4A, 0xBE6BC23D,
+ 0x5912C8C0, 0x4AB050B7, 0x7E57F82E, 0x6DF56059, 0x1798A91C, 0x043A316B, 0x30DD99F2, 0x237F0185,
+ 0x844819FB, 0x97EA818C, 0xA30D2915, 0xB0AFB162, 0xCAC27827, 0xD960E050, 0xED8748C9, 0xFE25D0BE,
+ 0x195CDA43, 0x0AFE4234, 0x3E19EAAD, 0x2DBB72DA, 0x57D6BB9F, 0x447423E8, 0x70938B71, 0x63311306,
+ 0xBB8DE87A, 0xA82F700D, 0x9CC8D894, 0x8F6A40E3, 0xF50789A6, 0xE6A511D1, 0xD242B948, 0xC1E0213F,
+ 0x26992BC2, 0x353BB3B5, 0x01DC1B2C, 0x127E835B, 0x68134A1E, 0x7BB1D269, 0x4F567AF0, 0x5CF4E287,
+ 0x04D43CFD, 0x1776A48A, 0x23910C13, 0x30339464, 0x4A5E5D21, 0x59FCC556, 0x6D1B6DCF, 0x7EB9F5B8,
+ 0x99C0FF45, 0x8A626732, 0xBE85CFAB, 0xAD2757DC, 0xD74A9E99, 0xC4E806EE, 0xF00FAE77, 0xE3AD3600,
+ 0x3B11CD7C, 0x28B3550B, 0x1C54FD92, 0x0FF665E5, 0x759BACA0, 0x663934D7, 0x52DE9C4E, 0x417C0439,
+ 0xA6050EC4, 0xB5A796B3, 0x81403E2A, 0x92E2A65D, 0xE88F6F18, 0xFB2DF76F, 0xCFCA5FF6, 0xDC68C781,
+ 0x7B5FDFFF, 0x68FD4788, 0x5C1AEF11, 0x4FB87766, 0x35D5BE23, 0x26772654, 0x12908ECD, 0x013216BA,
+ 0xE64B1C47, 0xF5E98430, 0xC10E2CA9, 0xD2ACB4DE, 0xA8C17D9B, 0xBB63E5EC, 0x8F844D75, 0x9C26D502,
+ 0x449A2E7E, 0x5738B609, 0x63DF1E90, 0x707D86E7, 0x0A104FA2, 0x19B2D7D5, 0x2D557F4C, 0x3EF7E73B,
+ 0xD98EEDC6, 0xCA2C75B1, 0xFECBDD28, 0xED69455F, 0x97048C1A, 0x84A6146D, 0xB041BCF4, 0xA3E32483
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o40
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o48[256] =
+{
+ 0x00000000, 0xA541927E, 0x4F6F520D, 0xEA2EC073, 0x9EDEA41A, 0x3B9F3664, 0xD1B1F617, 0x74F06469,
+ 0x38513EC5, 0x9D10ACBB, 0x773E6CC8, 0xD27FFEB6, 0xA68F9ADF, 0x03CE08A1, 0xE9E0C8D2, 0x4CA15AAC,
+ 0x70A27D8A, 0xD5E3EFF4, 0x3FCD2F87, 0x9A8CBDF9, 0xEE7CD990, 0x4B3D4BEE, 0xA1138B9D, 0x045219E3,
+ 0x48F3434F, 0xEDB2D131, 0x079C1142, 0xA2DD833C, 0xD62DE755, 0x736C752B, 0x9942B558, 0x3C032726,
+ 0xE144FB14, 0x4405696A, 0xAE2BA919, 0x0B6A3B67, 0x7F9A5F0E, 0xDADBCD70, 0x30F50D03, 0x95B49F7D,
+ 0xD915C5D1, 0x7C5457AF, 0x967A97DC, 0x333B05A2, 0x47CB61CB, 0xE28AF3B5, 0x08A433C6, 0xADE5A1B8,
+ 0x91E6869E, 0x34A714E0, 0xDE89D493, 0x7BC846ED, 0x0F382284, 0xAA79B0FA, 0x40577089, 0xE516E2F7,
+ 0xA9B7B85B, 0x0CF62A25, 0xE6D8EA56, 0x43997828, 0x37691C41, 0x92288E3F, 0x78064E4C, 0xDD47DC32,
+ 0xC76580D9, 0x622412A7, 0x880AD2D4, 0x2D4B40AA, 0x59BB24C3, 0xFCFAB6BD, 0x16D476CE, 0xB395E4B0,
+ 0xFF34BE1C, 0x5A752C62, 0xB05BEC11, 0x151A7E6F, 0x61EA1A06, 0xC4AB8878, 0x2E85480B, 0x8BC4DA75,
+ 0xB7C7FD53, 0x12866F2D, 0xF8A8AF5E, 0x5DE93D20, 0x29195949, 0x8C58CB37, 0x66760B44, 0xC337993A,
+ 0x8F96C396, 0x2AD751E8, 0xC0F9919B, 0x65B803E5, 0x1148678C, 0xB409F5F2, 0x5E273581, 0xFB66A7FF,
+ 0x26217BCD, 0x8360E9B3, 0x694E29C0, 0xCC0FBBBE, 0xB8FFDFD7, 0x1DBE4DA9, 0xF7908DDA, 0x52D11FA4,
+ 0x1E704508, 0xBB31D776, 0x511F1705, 0xF45E857B, 0x80AEE112, 0x25EF736C, 0xCFC1B31F, 0x6A802161,
+ 0x56830647, 0xF3C29439, 0x19EC544A, 0xBCADC634, 0xC85DA25D, 0x6D1C3023, 0x8732F050, 0x2273622E,
+ 0x6ED23882, 0xCB93AAFC, 0x21BD6A8F, 0x84FCF8F1, 0xF00C9C98, 0x554D0EE6, 0xBF63CE95, 0x1A225CEB,
+ 0x8B277743, 0x2E66E53D, 0xC448254E, 0x6109B730, 0x15F9D359, 0xB0B84127, 0x5A968154, 0xFFD7132A,
+ 0xB3764986, 0x1637DBF8, 0xFC191B8B, 0x595889F5, 0x2DA8ED9C, 0x88E97FE2, 0x62C7BF91, 0xC7862DEF,
+ 0xFB850AC9, 0x5EC498B7, 0xB4EA58C4, 0x11ABCABA, 0x655BAED3, 0xC01A3CAD, 0x2A34FCDE, 0x8F756EA0,
+ 0xC3D4340C, 0x6695A672, 0x8CBB6601, 0x29FAF47F, 0x5D0A9016, 0xF84B0268, 0x1265C21B, 0xB7245065,
+ 0x6A638C57, 0xCF221E29, 0x250CDE5A, 0x804D4C24, 0xF4BD284D, 0x51FCBA33, 0xBBD27A40, 0x1E93E83E,
+ 0x5232B292, 0xF77320EC, 0x1D5DE09F, 0xB81C72E1, 0xCCEC1688, 0x69AD84F6, 0x83834485, 0x26C2D6FB,
+ 0x1AC1F1DD, 0xBF8063A3, 0x55AEA3D0, 0xF0EF31AE, 0x841F55C7, 0x215EC7B9, 0xCB7007CA, 0x6E3195B4,
+ 0x2290CF18, 0x87D15D66, 0x6DFF9D15, 0xC8BE0F6B, 0xBC4E6B02, 0x190FF97C, 0xF321390F, 0x5660AB71,
+ 0x4C42F79A, 0xE90365E4, 0x032DA597, 0xA66C37E9, 0xD29C5380, 0x77DDC1FE, 0x9DF3018D, 0x38B293F3,
+ 0x7413C95F, 0xD1525B21, 0x3B7C9B52, 0x9E3D092C, 0xEACD6D45, 0x4F8CFF3B, 0xA5A23F48, 0x00E3AD36,
+ 0x3CE08A10, 0x99A1186E, 0x738FD81D, 0xD6CE4A63, 0xA23E2E0A, 0x077FBC74, 0xED517C07, 0x4810EE79,
+ 0x04B1B4D5, 0xA1F026AB, 0x4BDEE6D8, 0xEE9F74A6, 0x9A6F10CF, 0x3F2E82B1, 0xD50042C2, 0x7041D0BC,
+ 0xAD060C8E, 0x08479EF0, 0xE2695E83, 0x4728CCFD, 0x33D8A894, 0x96993AEA, 0x7CB7FA99, 0xD9F668E7,
+ 0x9557324B, 0x3016A035, 0xDA386046, 0x7F79F238, 0x0B899651, 0xAEC8042F, 0x44E6C45C, 0xE1A75622,
+ 0xDDA47104, 0x78E5E37A, 0x92CB2309, 0x378AB177, 0x437AD51E, 0xE63B4760, 0x0C158713, 0xA954156D,
+ 0xE5F54FC1, 0x40B4DDBF, 0xAA9A1DCC, 0x0FDB8FB2, 0x7B2BEBDB, 0xDE6A79A5, 0x3444B9D6, 0x91052BA8
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o48
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o56[256] =
+{
+ 0x00000000, 0xDD45AAB8, 0xBF672381, 0x62228939, 0x7B2231F3, 0xA6679B4B, 0xC4451272, 0x1900B8CA,
+ 0xF64463E6, 0x2B01C95E, 0x49234067, 0x9466EADF, 0x8D665215, 0x5023F8AD, 0x32017194, 0xEF44DB2C,
+ 0xE964B13D, 0x34211B85, 0x560392BC, 0x8B463804, 0x924680CE, 0x4F032A76, 0x2D21A34F, 0xF06409F7,
+ 0x1F20D2DB, 0xC2657863, 0xA047F15A, 0x7D025BE2, 0x6402E328, 0xB9474990, 0xDB65C0A9, 0x06206A11,
+ 0xD725148B, 0x0A60BE33, 0x6842370A, 0xB5079DB2, 0xAC072578, 0x71428FC0, 0x136006F9, 0xCE25AC41,
+ 0x2161776D, 0xFC24DDD5, 0x9E0654EC, 0x4343FE54, 0x5A43469E, 0x8706EC26, 0xE524651F, 0x3861CFA7,
+ 0x3E41A5B6, 0xE3040F0E, 0x81268637, 0x5C632C8F, 0x45639445, 0x98263EFD, 0xFA04B7C4, 0x27411D7C,
+ 0xC805C650, 0x15406CE8, 0x7762E5D1, 0xAA274F69, 0xB327F7A3, 0x6E625D1B, 0x0C40D422, 0xD1057E9A,
+ 0xABA65FE7, 0x76E3F55F, 0x14C17C66, 0xC984D6DE, 0xD0846E14, 0x0DC1C4AC, 0x6FE34D95, 0xB2A6E72D,
+ 0x5DE23C01, 0x80A796B9, 0xE2851F80, 0x3FC0B538, 0x26C00DF2, 0xFB85A74A, 0x99A72E73, 0x44E284CB,
+ 0x42C2EEDA, 0x9F874462, 0xFDA5CD5B, 0x20E067E3, 0x39E0DF29, 0xE4A57591, 0x8687FCA8, 0x5BC25610,
+ 0xB4868D3C, 0x69C32784, 0x0BE1AEBD, 0xD6A40405, 0xCFA4BCCF, 0x12E11677, 0x70C39F4E, 0xAD8635F6,
+ 0x7C834B6C, 0xA1C6E1D4, 0xC3E468ED, 0x1EA1C255, 0x07A17A9F, 0xDAE4D027, 0xB8C6591E, 0x6583F3A6,
+ 0x8AC7288A, 0x57828232, 0x35A00B0B, 0xE8E5A1B3, 0xF1E51979, 0x2CA0B3C1, 0x4E823AF8, 0x93C79040,
+ 0x95E7FA51, 0x48A250E9, 0x2A80D9D0, 0xF7C57368, 0xEEC5CBA2, 0x3380611A, 0x51A2E823, 0x8CE7429B,
+ 0x63A399B7, 0xBEE6330F, 0xDCC4BA36, 0x0181108E, 0x1881A844, 0xC5C402FC, 0xA7E68BC5, 0x7AA3217D,
+ 0x52A0C93F, 0x8FE56387, 0xEDC7EABE, 0x30824006, 0x2982F8CC, 0xF4C75274, 0x96E5DB4D, 0x4BA071F5,
+ 0xA4E4AAD9, 0x79A10061, 0x1B838958, 0xC6C623E0, 0xDFC69B2A, 0x02833192, 0x60A1B8AB, 0xBDE41213,
+ 0xBBC47802, 0x6681D2BA, 0x04A35B83, 0xD9E6F13B, 0xC0E649F1, 0x1DA3E349, 0x7F816A70, 0xA2C4C0C8,
+ 0x4D801BE4, 0x90C5B15C, 0xF2E73865, 0x2FA292DD, 0x36A22A17, 0xEBE780AF, 0x89C50996, 0x5480A32E,
+ 0x8585DDB4, 0x58C0770C, 0x3AE2FE35, 0xE7A7548D, 0xFEA7EC47, 0x23E246FF, 0x41C0CFC6, 0x9C85657E,
+ 0x73C1BE52, 0xAE8414EA, 0xCCA69DD3, 0x11E3376B, 0x08E38FA1, 0xD5A62519, 0xB784AC20, 0x6AC10698,
+ 0x6CE16C89, 0xB1A4C631, 0xD3864F08, 0x0EC3E5B0, 0x17C35D7A, 0xCA86F7C2, 0xA8A47EFB, 0x75E1D443,
+ 0x9AA50F6F, 0x47E0A5D7, 0x25C22CEE, 0xF8878656, 0xE1873E9C, 0x3CC29424, 0x5EE01D1D, 0x83A5B7A5,
+ 0xF90696D8, 0x24433C60, 0x4661B559, 0x9B241FE1, 0x8224A72B, 0x5F610D93, 0x3D4384AA, 0xE0062E12,
+ 0x0F42F53E, 0xD2075F86, 0xB025D6BF, 0x6D607C07, 0x7460C4CD, 0xA9256E75, 0xCB07E74C, 0x16424DF4,
+ 0x106227E5, 0xCD278D5D, 0xAF050464, 0x7240AEDC, 0x6B401616, 0xB605BCAE, 0xD4273597, 0x09629F2F,
+ 0xE6264403, 0x3B63EEBB, 0x59416782, 0x8404CD3A, 0x9D0475F0, 0x4041DF48, 0x22635671, 0xFF26FCC9,
+ 0x2E238253, 0xF36628EB, 0x9144A1D2, 0x4C010B6A, 0x5501B3A0, 0x88441918, 0xEA669021, 0x37233A99,
+ 0xD867E1B5, 0x05224B0D, 0x6700C234, 0xBA45688C, 0xA345D046, 0x7E007AFE, 0x1C22F3C7, 0xC167597F,
+ 0xC747336E, 0x1A0299D6, 0x782010EF, 0xA565BA57, 0xBC65029D, 0x6120A825, 0x0302211C, 0xDE478BA4,
+ 0x31035088, 0xEC46FA30, 0x8E647309, 0x5321D9B1, 0x4A21617B, 0x9764CBC3, 0xF54642FA, 0x2803E842
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o56
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o64[256] =
+{
+ 0x00000000, 0x38116FAC, 0x7022DF58, 0x4833B0F4, 0xE045BEB0, 0xD854D11C, 0x906761E8, 0xA8760E44,
+ 0xC5670B91, 0xFD76643D, 0xB545D4C9, 0x8D54BB65, 0x2522B521, 0x1D33DA8D, 0x55006A79, 0x6D1105D5,
+ 0x8F2261D3, 0xB7330E7F, 0xFF00BE8B, 0xC711D127, 0x6F67DF63, 0x5776B0CF, 0x1F45003B, 0x27546F97,
+ 0x4A456A42, 0x725405EE, 0x3A67B51A, 0x0276DAB6, 0xAA00D4F2, 0x9211BB5E, 0xDA220BAA, 0xE2336406,
+ 0x1BA8B557, 0x23B9DAFB, 0x6B8A6A0F, 0x539B05A3, 0xFBED0BE7, 0xC3FC644B, 0x8BCFD4BF, 0xB3DEBB13,
+ 0xDECFBEC6, 0xE6DED16A, 0xAEED619E, 0x96FC0E32, 0x3E8A0076, 0x069B6FDA, 0x4EA8DF2E, 0x76B9B082,
+ 0x948AD484, 0xAC9BBB28, 0xE4A80BDC, 0xDCB96470, 0x74CF6A34, 0x4CDE0598, 0x04EDB56C, 0x3CFCDAC0,
+ 0x51EDDF15, 0x69FCB0B9, 0x21CF004D, 0x19DE6FE1, 0xB1A861A5, 0x89B90E09, 0xC18ABEFD, 0xF99BD151,
+ 0x37516AAE, 0x0F400502, 0x4773B5F6, 0x7F62DA5A, 0xD714D41E, 0xEF05BBB2, 0xA7360B46, 0x9F2764EA,
+ 0xF236613F, 0xCA270E93, 0x8214BE67, 0xBA05D1CB, 0x1273DF8F, 0x2A62B023, 0x625100D7, 0x5A406F7B,
+ 0xB8730B7D, 0x806264D1, 0xC851D425, 0xF040BB89, 0x5836B5CD, 0x6027DA61, 0x28146A95, 0x10050539,
+ 0x7D1400EC, 0x45056F40, 0x0D36DFB4, 0x3527B018, 0x9D51BE5C, 0xA540D1F0, 0xED736104, 0xD5620EA8,
+ 0x2CF9DFF9, 0x14E8B055, 0x5CDB00A1, 0x64CA6F0D, 0xCCBC6149, 0xF4AD0EE5, 0xBC9EBE11, 0x848FD1BD,
+ 0xE99ED468, 0xD18FBBC4, 0x99BC0B30, 0xA1AD649C, 0x09DB6AD8, 0x31CA0574, 0x79F9B580, 0x41E8DA2C,
+ 0xA3DBBE2A, 0x9BCAD186, 0xD3F96172, 0xEBE80EDE, 0x439E009A, 0x7B8F6F36, 0x33BCDFC2, 0x0BADB06E,
+ 0x66BCB5BB, 0x5EADDA17, 0x169E6AE3, 0x2E8F054F, 0x86F90B0B, 0xBEE864A7, 0xF6DBD453, 0xCECABBFF,
+ 0x6EA2D55C, 0x56B3BAF0, 0x1E800A04, 0x269165A8, 0x8EE76BEC, 0xB6F60440, 0xFEC5B4B4, 0xC6D4DB18,
+ 0xABC5DECD, 0x93D4B161, 0xDBE70195, 0xE3F66E39, 0x4B80607D, 0x73910FD1, 0x3BA2BF25, 0x03B3D089,
+ 0xE180B48F, 0xD991DB23, 0x91A26BD7, 0xA9B3047B, 0x01C50A3F, 0x39D46593, 0x71E7D567, 0x49F6BACB,
+ 0x24E7BF1E, 0x1CF6D0B2, 0x54C56046, 0x6CD40FEA, 0xC4A201AE, 0xFCB36E02, 0xB480DEF6, 0x8C91B15A,
+ 0x750A600B, 0x4D1B0FA7, 0x0528BF53, 0x3D39D0FF, 0x954FDEBB, 0xAD5EB117, 0xE56D01E3, 0xDD7C6E4F,
+ 0xB06D6B9A, 0x887C0436, 0xC04FB4C2, 0xF85EDB6E, 0x5028D52A, 0x6839BA86, 0x200A0A72, 0x181B65DE,
+ 0xFA2801D8, 0xC2396E74, 0x8A0ADE80, 0xB21BB12C, 0x1A6DBF68, 0x227CD0C4, 0x6A4F6030, 0x525E0F9C,
+ 0x3F4F0A49, 0x075E65E5, 0x4F6DD511, 0x777CBABD, 0xDF0AB4F9, 0xE71BDB55, 0xAF286BA1, 0x9739040D,
+ 0x59F3BFF2, 0x61E2D05E, 0x29D160AA, 0x11C00F06, 0xB9B60142, 0x81A76EEE, 0xC994DE1A, 0xF185B1B6,
+ 0x9C94B463, 0xA485DBCF, 0xECB66B3B, 0xD4A70497, 0x7CD10AD3, 0x44C0657F, 0x0CF3D58B, 0x34E2BA27,
+ 0xD6D1DE21, 0xEEC0B18D, 0xA6F30179, 0x9EE26ED5, 0x36946091, 0x0E850F3D, 0x46B6BFC9, 0x7EA7D065,
+ 0x13B6D5B0, 0x2BA7BA1C, 0x63940AE8, 0x5B856544, 0xF3F36B00, 0xCBE204AC, 0x83D1B458, 0xBBC0DBF4,
+ 0x425B0AA5, 0x7A4A6509, 0x3279D5FD, 0x0A68BA51, 0xA21EB415, 0x9A0FDBB9, 0xD23C6B4D, 0xEA2D04E1,
+ 0x873C0134, 0xBF2D6E98, 0xF71EDE6C, 0xCF0FB1C0, 0x6779BF84, 0x5F68D028, 0x175B60DC, 0x2F4A0F70,
+ 0xCD796B76, 0xF56804DA, 0xBD5BB42E, 0x854ADB82, 0x2D3CD5C6, 0x152DBA6A, 0x5D1E0A9E, 0x650F6532,
+ 0x081E60E7, 0x300F0F4B, 0x783CBFBF, 0x402DD013, 0xE85BDE57, 0xD04AB1FB, 0x9879010F, 0xA0686EA3
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o64
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o72[256] =
+{
+ 0x00000000, 0xEF306B19, 0xDB8CA0C3, 0x34BCCBDA, 0xB2F53777, 0x5DC55C6E, 0x697997B4, 0x8649FCAD,
+ 0x6006181F, 0x8F367306, 0xBB8AB8DC, 0x54BAD3C5, 0xD2F32F68, 0x3DC34471, 0x097F8FAB, 0xE64FE4B2,
+ 0xC00C303E, 0x2F3C5B27, 0x1B8090FD, 0xF4B0FBE4, 0x72F90749, 0x9DC96C50, 0xA975A78A, 0x4645CC93,
+ 0xA00A2821, 0x4F3A4338, 0x7B8688E2, 0x94B6E3FB, 0x12FF1F56, 0xFDCF744F, 0xC973BF95, 0x2643D48C,
+ 0x85F4168D, 0x6AC47D94, 0x5E78B64E, 0xB148DD57, 0x370121FA, 0xD8314AE3, 0xEC8D8139, 0x03BDEA20,
+ 0xE5F20E92, 0x0AC2658B, 0x3E7EAE51, 0xD14EC548, 0x570739E5, 0xB83752FC, 0x8C8B9926, 0x63BBF23F,
+ 0x45F826B3, 0xAAC84DAA, 0x9E748670, 0x7144ED69, 0xF70D11C4, 0x183D7ADD, 0x2C81B107, 0xC3B1DA1E,
+ 0x25FE3EAC, 0xCACE55B5, 0xFE729E6F, 0x1142F576, 0x970B09DB, 0x783B62C2, 0x4C87A918, 0xA3B7C201,
+ 0x0E045BEB, 0xE13430F2, 0xD588FB28, 0x3AB89031, 0xBCF16C9C, 0x53C10785, 0x677DCC5F, 0x884DA746,
+ 0x6E0243F4, 0x813228ED, 0xB58EE337, 0x5ABE882E, 0xDCF77483, 0x33C71F9A, 0x077BD440, 0xE84BBF59,
+ 0xCE086BD5, 0x213800CC, 0x1584CB16, 0xFAB4A00F, 0x7CFD5CA2, 0x93CD37BB, 0xA771FC61, 0x48419778,
+ 0xAE0E73CA, 0x413E18D3, 0x7582D309, 0x9AB2B810, 0x1CFB44BD, 0xF3CB2FA4, 0xC777E47E, 0x28478F67,
+ 0x8BF04D66, 0x64C0267F, 0x507CEDA5, 0xBF4C86BC, 0x39057A11, 0xD6351108, 0xE289DAD2, 0x0DB9B1CB,
+ 0xEBF65579, 0x04C63E60, 0x307AF5BA, 0xDF4A9EA3, 0x5903620E, 0xB6330917, 0x828FC2CD, 0x6DBFA9D4,
+ 0x4BFC7D58, 0xA4CC1641, 0x9070DD9B, 0x7F40B682, 0xF9094A2F, 0x16392136, 0x2285EAEC, 0xCDB581F5,
+ 0x2BFA6547, 0xC4CA0E5E, 0xF076C584, 0x1F46AE9D, 0x990F5230, 0x763F3929, 0x4283F2F3, 0xADB399EA,
+ 0x1C08B7D6, 0xF338DCCF, 0xC7841715, 0x28B47C0C, 0xAEFD80A1, 0x41CDEBB8, 0x75712062, 0x9A414B7B,
+ 0x7C0EAFC9, 0x933EC4D0, 0xA7820F0A, 0x48B26413, 0xCEFB98BE, 0x21CBF3A7, 0x1577387D, 0xFA475364,
+ 0xDC0487E8, 0x3334ECF1, 0x0788272B, 0xE8B84C32, 0x6EF1B09F, 0x81C1DB86, 0xB57D105C, 0x5A4D7B45,
+ 0xBC029FF7, 0x5332F4EE, 0x678E3F34, 0x88BE542D, 0x0EF7A880, 0xE1C7C399, 0xD57B0843, 0x3A4B635A,
+ 0x99FCA15B, 0x76CCCA42, 0x42700198, 0xAD406A81, 0x2B09962C, 0xC439FD35, 0xF08536EF, 0x1FB55DF6,
+ 0xF9FAB944, 0x16CAD25D, 0x22761987, 0xCD46729E, 0x4B0F8E33, 0xA43FE52A, 0x90832EF0, 0x7FB345E9,
+ 0x59F09165, 0xB6C0FA7C, 0x827C31A6, 0x6D4C5ABF, 0xEB05A612, 0x0435CD0B, 0x308906D1, 0xDFB96DC8,
+ 0x39F6897A, 0xD6C6E263, 0xE27A29B9, 0x0D4A42A0, 0x8B03BE0D, 0x6433D514, 0x508F1ECE, 0xBFBF75D7,
+ 0x120CEC3D, 0xFD3C8724, 0xC9804CFE, 0x26B027E7, 0xA0F9DB4A, 0x4FC9B053, 0x7B757B89, 0x94451090,
+ 0x720AF422, 0x9D3A9F3B, 0xA98654E1, 0x46B63FF8, 0xC0FFC355, 0x2FCFA84C, 0x1B736396, 0xF443088F,
+ 0xD200DC03, 0x3D30B71A, 0x098C7CC0, 0xE6BC17D9, 0x60F5EB74, 0x8FC5806D, 0xBB794BB7, 0x544920AE,
+ 0xB206C41C, 0x5D36AF05, 0x698A64DF, 0x86BA0FC6, 0x00F3F36B, 0xEFC39872, 0xDB7F53A8, 0x344F38B1,
+ 0x97F8FAB0, 0x78C891A9, 0x4C745A73, 0xA344316A, 0x250DCDC7, 0xCA3DA6DE, 0xFE816D04, 0x11B1061D,
+ 0xF7FEE2AF, 0x18CE89B6, 0x2C72426C, 0xC3422975, 0x450BD5D8, 0xAA3BBEC1, 0x9E87751B, 0x71B71E02,
+ 0x57F4CA8E, 0xB8C4A197, 0x8C786A4D, 0x63480154, 0xE501FDF9, 0x0A3196E0, 0x3E8D5D3A, 0xD1BD3623,
+ 0x37F2D291, 0xD8C2B988, 0xEC7E7252, 0x034E194B, 0x8507E5E6, 0x6A378EFF, 0x5E8B4525, 0xB1BB2E3C
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o72
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o80[256] =
+{
+ 0x00000000, 0x68032CC8, 0xD0065990, 0xB8057558, 0xA5E0C5D1, 0xCDE3E919, 0x75E69C41, 0x1DE5B089,
+ 0x4E2DFD53, 0x262ED19B, 0x9E2BA4C3, 0xF628880B, 0xEBCD3882, 0x83CE144A, 0x3BCB6112, 0x53C84DDA,
+ 0x9C5BFAA6, 0xF458D66E, 0x4C5DA336, 0x245E8FFE, 0x39BB3F77, 0x51B813BF, 0xE9BD66E7, 0x81BE4A2F,
+ 0xD27607F5, 0xBA752B3D, 0x02705E65, 0x6A7372AD, 0x7796C224, 0x1F95EEEC, 0xA7909BB4, 0xCF93B77C,
+ 0x3D5B83BD, 0x5558AF75, 0xED5DDA2D, 0x855EF6E5, 0x98BB466C, 0xF0B86AA4, 0x48BD1FFC, 0x20BE3334,
+ 0x73767EEE, 0x1B755226, 0xA370277E, 0xCB730BB6, 0xD696BB3F, 0xBE9597F7, 0x0690E2AF, 0x6E93CE67,
+ 0xA100791B, 0xC90355D3, 0x7106208B, 0x19050C43, 0x04E0BCCA, 0x6CE39002, 0xD4E6E55A, 0xBCE5C992,
+ 0xEF2D8448, 0x872EA880, 0x3F2BDDD8, 0x5728F110, 0x4ACD4199, 0x22CE6D51, 0x9ACB1809, 0xF2C834C1,
+ 0x7AB7077A, 0x12B42BB2, 0xAAB15EEA, 0xC2B27222, 0xDF57C2AB, 0xB754EE63, 0x0F519B3B, 0x6752B7F3,
+ 0x349AFA29, 0x5C99D6E1, 0xE49CA3B9, 0x8C9F8F71, 0x917A3FF8, 0xF9791330, 0x417C6668, 0x297F4AA0,
+ 0xE6ECFDDC, 0x8EEFD114, 0x36EAA44C, 0x5EE98884, 0x430C380D, 0x2B0F14C5, 0x930A619D, 0xFB094D55,
+ 0xA8C1008F, 0xC0C22C47, 0x78C7591F, 0x10C475D7, 0x0D21C55E, 0x6522E996, 0xDD279CCE, 0xB524B006,
+ 0x47EC84C7, 0x2FEFA80F, 0x97EADD57, 0xFFE9F19F, 0xE20C4116, 0x8A0F6DDE, 0x320A1886, 0x5A09344E,
+ 0x09C17994, 0x61C2555C, 0xD9C72004, 0xB1C40CCC, 0xAC21BC45, 0xC422908D, 0x7C27E5D5, 0x1424C91D,
+ 0xDBB77E61, 0xB3B452A9, 0x0BB127F1, 0x63B20B39, 0x7E57BBB0, 0x16549778, 0xAE51E220, 0xC652CEE8,
+ 0x959A8332, 0xFD99AFFA, 0x459CDAA2, 0x2D9FF66A, 0x307A46E3, 0x58796A2B, 0xE07C1F73, 0x887F33BB,
+ 0xF56E0EF4, 0x9D6D223C, 0x25685764, 0x4D6B7BAC, 0x508ECB25, 0x388DE7ED, 0x808892B5, 0xE88BBE7D,
+ 0xBB43F3A7, 0xD340DF6F, 0x6B45AA37, 0x034686FF, 0x1EA33676, 0x76A01ABE, 0xCEA56FE6, 0xA6A6432E,
+ 0x6935F452, 0x0136D89A, 0xB933ADC2, 0xD130810A, 0xCCD53183, 0xA4D61D4B, 0x1CD36813, 0x74D044DB,
+ 0x27180901, 0x4F1B25C9, 0xF71E5091, 0x9F1D7C59, 0x82F8CCD0, 0xEAFBE018, 0x52FE9540, 0x3AFDB988,
+ 0xC8358D49, 0xA036A181, 0x1833D4D9, 0x7030F811, 0x6DD54898, 0x05D66450, 0xBDD31108, 0xD5D03DC0,
+ 0x8618701A, 0xEE1B5CD2, 0x561E298A, 0x3E1D0542, 0x23F8B5CB, 0x4BFB9903, 0xF3FEEC5B, 0x9BFDC093,
+ 0x546E77EF, 0x3C6D5B27, 0x84682E7F, 0xEC6B02B7, 0xF18EB23E, 0x998D9EF6, 0x2188EBAE, 0x498BC766,
+ 0x1A438ABC, 0x7240A674, 0xCA45D32C, 0xA246FFE4, 0xBFA34F6D, 0xD7A063A5, 0x6FA516FD, 0x07A63A35,
+ 0x8FD9098E, 0xE7DA2546, 0x5FDF501E, 0x37DC7CD6, 0x2A39CC5F, 0x423AE097, 0xFA3F95CF, 0x923CB907,
+ 0xC1F4F4DD, 0xA9F7D815, 0x11F2AD4D, 0x79F18185, 0x6414310C, 0x0C171DC4, 0xB412689C, 0xDC114454,
+ 0x1382F328, 0x7B81DFE0, 0xC384AAB8, 0xAB878670, 0xB66236F9, 0xDE611A31, 0x66646F69, 0x0E6743A1,
+ 0x5DAF0E7B, 0x35AC22B3, 0x8DA957EB, 0xE5AA7B23, 0xF84FCBAA, 0x904CE762, 0x2849923A, 0x404ABEF2,
+ 0xB2828A33, 0xDA81A6FB, 0x6284D3A3, 0x0A87FF6B, 0x17624FE2, 0x7F61632A, 0xC7641672, 0xAF673ABA,
+ 0xFCAF7760, 0x94AC5BA8, 0x2CA92EF0, 0x44AA0238, 0x594FB2B1, 0x314C9E79, 0x8949EB21, 0xE14AC7E9,
+ 0x2ED97095, 0x46DA5C5D, 0xFEDF2905, 0x96DC05CD, 0x8B39B544, 0xE33A998C, 0x5B3FECD4, 0x333CC01C,
+ 0x60F48DC6, 0x08F7A10E, 0xB0F2D456, 0xD8F1F89E, 0xC5144817, 0xAD1764DF, 0x15121187, 0x7D113D4F
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o80
+ */
+
+
+
+/*
+ * The following CRC lookup table was generated automagically
+ * using the following model parameters:
+ *
+ * Generator Polynomial = ................. 0x1EDC6F41
+ * Generator Polynomial Length = .......... 32 bits
+ * Reflected Bits = ....................... TRUE
+ * Table Generation Offset = .............. 32 bits
+ * Number of Slices = ..................... 8 slices
+ * Slice Lengths = ........................ 8 8 8 8 8 8 8 8
+ * Directory Name = ....................... .\
+ * File Name = ............................ 8x256_tables.c
+ */
+
+const u32 crc_tableil8_o88[256] =
+{
+ 0x00000000, 0x493C7D27, 0x9278FA4E, 0xDB448769, 0x211D826D, 0x6821FF4A, 0xB3657823, 0xFA590504,
+ 0x423B04DA, 0x0B0779FD, 0xD043FE94, 0x997F83B3, 0x632686B7, 0x2A1AFB90, 0xF15E7CF9, 0xB86201DE,
+ 0x847609B4, 0xCD4A7493, 0x160EF3FA, 0x5F328EDD, 0xA56B8BD9, 0xEC57F6FE, 0x37137197, 0x7E2F0CB0,
+ 0xC64D0D6E, 0x8F717049, 0x5435F720, 0x1D098A07, 0xE7508F03, 0xAE6CF224, 0x7528754D, 0x3C14086A,
+ 0x0D006599, 0x443C18BE, 0x9F789FD7, 0xD644E2F0, 0x2C1DE7F4, 0x65219AD3, 0xBE651DBA, 0xF759609D,
+ 0x4F3B6143, 0x06071C64, 0xDD439B0D, 0x947FE62A, 0x6E26E32E, 0x271A9E09, 0xFC5E1960, 0xB5626447,
+ 0x89766C2D, 0xC04A110A, 0x1B0E9663, 0x5232EB44, 0xA86BEE40, 0xE1579367, 0x3A13140E, 0x732F6929,
+ 0xCB4D68F7, 0x827115D0, 0x593592B9, 0x1009EF9E, 0xEA50EA9A, 0xA36C97BD, 0x782810D4, 0x31146DF3,
+ 0x1A00CB32, 0x533CB615, 0x8878317C, 0xC1444C5B, 0x3B1D495F, 0x72213478, 0xA965B311, 0xE059CE36,
+ 0x583BCFE8, 0x1107B2CF, 0xCA4335A6, 0x837F4881, 0x79264D85, 0x301A30A2, 0xEB5EB7CB, 0xA262CAEC,
+ 0x9E76C286, 0xD74ABFA1, 0x0C0E38C8, 0x453245EF, 0xBF6B40EB, 0xF6573DCC, 0x2D13BAA5, 0x642FC782,
+ 0xDC4DC65C, 0x9571BB7B, 0x4E353C12, 0x07094135, 0xFD504431, 0xB46C3916, 0x6F28BE7F, 0x2614C358,
+ 0x1700AEAB, 0x5E3CD38C, 0x857854E5, 0xCC4429C2, 0x361D2CC6, 0x7F2151E1, 0xA465D688, 0xED59ABAF,
+ 0x553BAA71, 0x1C07D756, 0xC743503F, 0x8E7F2D18, 0x7426281C, 0x3D1A553B, 0xE65ED252, 0xAF62AF75,
+ 0x9376A71F, 0xDA4ADA38, 0x010E5D51, 0x48322076, 0xB26B2572, 0xFB575855, 0x2013DF3C, 0x692FA21B,
+ 0xD14DA3C5, 0x9871DEE2, 0x4335598B, 0x0A0924AC, 0xF05021A8, 0xB96C5C8F, 0x6228DBE6, 0x2B14A6C1,
+ 0x34019664, 0x7D3DEB43, 0xA6796C2A, 0xEF45110D, 0x151C1409, 0x5C20692E, 0x8764EE47, 0xCE589360,
+ 0x763A92BE, 0x3F06EF99, 0xE44268F0, 0xAD7E15D7, 0x572710D3, 0x1E1B6DF4, 0xC55FEA9D, 0x8C6397BA,
+ 0xB0779FD0, 0xF94BE2F7, 0x220F659E, 0x6B3318B9, 0x916A1DBD, 0xD856609A, 0x0312E7F3, 0x4A2E9AD4,
+ 0xF24C9B0A, 0xBB70E62D, 0x60346144, 0x29081C63, 0xD3511967, 0x9A6D6440, 0x4129E329, 0x08159E0E,
+ 0x3901F3FD, 0x703D8EDA, 0xAB7909B3, 0xE2457494, 0x181C7190, 0x51200CB7, 0x8A648BDE, 0xC358F6F9,
+ 0x7B3AF727, 0x32068A00, 0xE9420D69, 0xA07E704E, 0x5A27754A, 0x131B086D, 0xC85F8F04, 0x8163F223,
+ 0xBD77FA49, 0xF44B876E, 0x2F0F0007, 0x66337D20, 0x9C6A7824, 0xD5560503, 0x0E12826A, 0x472EFF4D,
+ 0xFF4CFE93, 0xB67083B4, 0x6D3404DD, 0x240879FA, 0xDE517CFE, 0x976D01D9, 0x4C2986B0, 0x0515FB97,
+ 0x2E015D56, 0x673D2071, 0xBC79A718, 0xF545DA3F, 0x0F1CDF3B, 0x4620A21C, 0x9D642575, 0xD4585852,
+ 0x6C3A598C, 0x250624AB, 0xFE42A3C2, 0xB77EDEE5, 0x4D27DBE1, 0x041BA6C6, 0xDF5F21AF, 0x96635C88,
+ 0xAA7754E2, 0xE34B29C5, 0x380FAEAC, 0x7133D38B, 0x8B6AD68F, 0xC256ABA8, 0x19122CC1, 0x502E51E6,
+ 0xE84C5038, 0xA1702D1F, 0x7A34AA76, 0x3308D751, 0xC951D255, 0x806DAF72, 0x5B29281B, 0x1215553C,
+ 0x230138CF, 0x6A3D45E8, 0xB179C281, 0xF845BFA6, 0x021CBAA2, 0x4B20C785, 0x906440EC, 0xD9583DCB,
+ 0x613A3C15, 0x28064132, 0xF342C65B, 0xBA7EBB7C, 0x4027BE78, 0x091BC35F, 0xD25F4436, 0x9B633911,
+ 0xA777317B, 0xEE4B4C5C, 0x350FCB35, 0x7C33B612, 0x866AB316, 0xCF56CE31, 0x14124958, 0x5D2E347F,
+ 0xE54C35A1, 0xAC704886, 0x7734CFEF, 0x3E08B2C8, 0xC451B7CC, 0x8D6DCAEB, 0x56294D82, 0x1F1530A5
+};
+
+/*
+ * end of the CRC lookup table crc_tableil8_o88
+ */
+
diff --git a/libucw/ucw/crc-tables.h b/libucw/ucw/crc-tables.h
new file mode 100644
index 0000000..d93d337
--- /dev/null
+++ b/libucw/ucw/crc-tables.h
@@ -0,0 +1,37 @@
+/*
+ *	CRC32 (Castagnoli 1993) -- Tables
+ *
+ *	Based on Michael E. Kounavis and Frank L. Berry: A Systematic Approach
+ *	to Building High Performance Software-based CRC Generators
+ *	(Proceedings of the 10th IEEE Symposium on Computers and Communications 2005)
+ *
+ *	Includes code from http://sourceforge.net/projects/slicing-by-8/,
+ *	which carried the following copyright notice:
+ *
+ *	Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
+ *
+ *	This software program is licensed subject to the BSD License,
+ *	available at http://www.opensource.org/licenses/bsd-license.html
+ *
+ *	Adapted for LibUCW by Martin Mares <mj@ucw.cz> in 2012.
+ */
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define crc_tableil8_o32 ucw_crc_tableil8_o32
+#define crc_tableil8_o40 ucw_crc_tableil8_o40
+#define crc_tableil8_o48 ucw_crc_tableil8_o48
+#define crc_tableil8_o56 ucw_crc_tableil8_o56
+#define crc_tableil8_o64 ucw_crc_tableil8_o64
+#define crc_tableil8_o72 ucw_crc_tableil8_o72
+#define crc_tableil8_o80 ucw_crc_tableil8_o80
+#define crc_tableil8_o88 ucw_crc_tableil8_o88
+#endif
+
+extern const u32 crc_tableil8_o32[256];
+extern const u32 crc_tableil8_o40[256];
+extern const u32 crc_tableil8_o48[256];
+extern const u32 crc_tableil8_o56[256];
+extern const u32 crc_tableil8_o64[256];
+extern const u32 crc_tableil8_o72[256];
+extern const u32 crc_tableil8_o80[256];
+extern const u32 crc_tableil8_o88[256];
diff --git a/libucw/ucw/crc.c b/libucw/ucw/crc.c
new file mode 100644
index 0000000..070a261
--- /dev/null
+++ b/libucw/ucw/crc.c
@@ -0,0 +1,196 @@
+/*
+ *	CRC32 (Castagnoli 1993)
+ *
+ *	Based on Michael E. Kounavis and Frank L. Berry: A Systematic Approach
+ *	to Building High Performance Software-based CRC Generators
+ *	(Proceedings of the 10th IEEE Symposium on Computers and Communications 2005)
+ *
+ *	Includes code from http://sourceforge.net/projects/slicing-by-8/,
+ *	which carried the following copyright notice:
+ *
+ *	Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
+ *
+ *	This software program is licensed subject to the BSD License,
+ *	available at http://www.opensource.org/licenses/bsd-license.html
+ *
+ *	Adapted for LibUCW by Martin Mares <mj@ucw.cz> in 2012.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/crc.h>
+#include <ucw/crc-tables.h>
+
+static void crc32_update_by1(crc32_context *ctx, const byte *buf, uint len)
+{
+  u32 crc = ctx->state;
+  while (len--)
+    crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
+  ctx->state = crc;
+}
+
+static void crc32_update_by4(crc32_context *ctx, const byte *buf, uint len)
+{
+  uint init_bytes, words;
+  u32 crc = ctx->state;
+  u32 term1, term2;
+  const u32 *buf32;
+
+  // Special case
+  if (len < 4)
+    goto small;
+
+  // Align start address to a multiple of 4 bytes
+  init_bytes = ((uintptr_t) buf) & 3;
+  if (init_bytes)
+    {
+      init_bytes = 4 - init_bytes;
+      len -= init_bytes;
+      while (init_bytes--)
+	crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
+    }
+
+  // Process 4 bytes at a time
+  words = len/4;
+  len -= 4*words;
+  buf32 = (const u32 *) buf;
+  while (words--)
+    {
+      crc ^= *buf32++;
+      term1 = crc_tableil8_o56[crc & 0x000000FF] ^ crc_tableil8_o48[(crc >> 8) & 0x000000FF];
+      term2 = crc >> 16;
+      crc = term1 ^
+	    crc_tableil8_o40[term2 & 0x000000FF] ^
+	    crc_tableil8_o32[(term2 >> 8) & 0x000000FF];
+    }
+
+  // Process remaining up to 7 bytes
+  buf = (const byte *) buf32;
+small:
+  while (len--)
+    crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
+
+  ctx->state = crc;
+}
+
+static void crc32_update_by8(crc32_context *ctx, const byte *buf, uint len)
+{
+  uint init_bytes, quads;
+  u32 crc = ctx->state;
+  u32 term1, term2;
+  const u32 *buf32;
+
+  // Special case
+  if (len < 8)
+    goto small;
+
+  // Align start address to a multiple of 8 bytes
+  init_bytes = ((uintptr_t) buf) & 7;
+  if (init_bytes)
+    {
+      init_bytes = 8 - init_bytes;
+      len -= init_bytes;
+      while (init_bytes--)
+	crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
+    }
+
+  // Process 8 bytes at a time
+  quads = len/8;
+  len -= 8*quads;
+  buf32 = (const u32 *) buf;
+  while (quads--)
+    {
+      crc ^= *buf32++;
+      term1 = crc_tableil8_o88[crc & 0x000000FF] ^
+	      crc_tableil8_o80[(crc >> 8) & 0x000000FF];
+      term2 = crc >> 16;
+      crc = term1 ^
+	      crc_tableil8_o72[term2 & 0x000000FF] ^
+	      crc_tableil8_o64[(term2 >> 8) & 0x000000FF];
+      term1 = crc_tableil8_o56[*buf32 & 0x000000FF] ^
+	      crc_tableil8_o48[(*buf32 >> 8) & 0x000000FF];
+
+      term2 = *buf32 >> 16;
+      crc =	crc ^
+	      term1 ^
+	      crc_tableil8_o40[term2  & 0x000000FF] ^
+	      crc_tableil8_o32[(term2 >> 8) & 0x000000FF];
+      buf32++;
+    }
+
+  // Process remaining up to 7 bytes
+  buf = (const byte *) buf32;
+small:
+  while (len--)
+    crc = crc_tableil8_o32[(crc ^ *buf++) & 0x000000FF] ^ (crc >> 8);
+
+  ctx->state = crc;
+}
+
+void
+crc32_init(crc32_context *ctx, uint crc_mode)
+{
+  ctx->state = 0xffffffff;
+  switch (crc_mode)
+    {
+    case CRC_MODE_DEFAULT:
+      ctx->update_func = crc32_update_by4;
+      break;
+    case CRC_MODE_SMALL:
+      ctx->update_func = crc32_update_by1;
+      break;
+    case CRC_MODE_BIG:
+      ctx->update_func = crc32_update_by8;
+      break;
+    default:
+      ASSERT(0);
+    }
+}
+
+u32
+crc32_hash_buffer(const byte *buf, uint len)
+{
+  crc32_context ctx;
+  crc32_init(&ctx, CRC_MODE_DEFAULT);
+  crc32_update(&ctx, buf, len);
+  return crc32_final(&ctx);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+  if (argc != 5)
+    die("Usage: crc-t <alg> <len> <block> <iters>");
+  uint alg = atoi(argv[1]);
+  uint len = atoi(argv[2]);
+  uint block = atoi(argv[3]);
+  uint iters = atoi(argv[4]);
+
+  byte *buf = xmalloc(len);
+  for (uint i=0; i<len; i++)
+    buf[i] = i ^ (i >> 5) ^ (i >> 11);
+
+  for (uint i=0; i<iters; i++)
+    {
+      crc32_context ctx;
+      uint modes[] = { CRC_MODE_DEFAULT, CRC_MODE_SMALL, CRC_MODE_BIG };
+      ASSERT(alg < ARRAY_SIZE(modes));
+      crc32_init(&ctx, modes[alg]);
+      for (uint p=0; p<len;)
+	{
+	  uint l = MIN(len-p, block);
+	  crc32_update(&ctx, buf+p, l);
+	  p += l;
+	}
+      uint crc = crc32_final(&ctx);
+      if (!i)
+	printf("%08x\n", crc);
+    }
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/crc.h b/libucw/ucw/crc.h
new file mode 100644
index 0000000..1aa73dc
--- /dev/null
+++ b/libucw/ucw/crc.h
@@ -0,0 +1,77 @@
+/*
+ *	CRC32 (Castagnoli 1993)
+ *
+ *	Based on Michael E. Kounavis and Frank L. Berry: A Systematic Approach
+ *	to Building High Performance Software-based CRC Generators
+ *	(Proceedings of the 10th IEEE Symposium on Computers and Communications 2005)
+ *
+ *	Includes code from http://sourceforge.net/projects/slicing-by-8/,
+ *	which carried the following copyright notice:
+ *
+ *	Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
+ *
+ *	This software program is licensed subject to the BSD License,
+ *	available at http://www.opensource.org/licenses/bsd-license.html
+ *
+ *	Adapted for LibUCW by Martin Mares <mj@ucw.cz> in 2012.
+ */
+
+#ifndef _UCW_CRC_H
+#define _UCW_CRC_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define crc32_hash_buffer ucw_crc32_hash_buffer
+#define crc32_init ucw_crc32_init
+#endif
+
+/**
+ * Internal CRC calculator context.
+ * You should use it just as an opaque handle only.
+ */
+typedef struct crc32_context {
+  u32 state;
+  void (*update_func)(struct crc32_context *ctx, const byte *buf, uint len);
+} crc32_context;
+
+/**
+ * Initialize new calculation of CRC in a given context.
+ * @crc_mode selects which algorithm should be used.
+ **/
+void crc32_init(crc32_context *ctx, uint crc_mode);
+
+/**
+ * Algorithm used for CRC calculation. The algorithms differ by the amount
+ * of precomputed tables they use. Bigger tables imply faster calculation
+ * at the cost of an increased cache footprint.
+ **/
+enum crc_mode {
+  CRC_MODE_DEFAULT,		/* Default algorithm (4K table) */
+  CRC_MODE_SMALL,		/* Optimize for small data (1K table) */
+  CRC_MODE_BIG,			/* Optimize for large data (8K table) */
+  CRC_MODE_MAX,
+};
+
+/** Feed @len bytes starting at @buf to the CRC calculator. **/
+static inline void crc32_update(crc32_context *ctx, const byte *buf, uint len)
+{
+  ctx->update_func(ctx, buf, len);
+}
+
+/** Finish calculation and return the CRC value. **/
+static inline u32 crc32_final(crc32_context *ctx)
+{
+  return ctx->state ^ 0xffffffff;
+}
+
+/**
+ * A convenience one-shot function for CRC.
+ * It is equivalent to this snippet of code:
+ *
+ *  crc32_context ctx;
+ *  crc32_init(&ctx, CRC_MODE_DEFAULT);
+ *  crc32_update(&ctx, buf, len);
+ *  return crc32_final(&ctx);
+ */
+u32 crc32_hash_buffer(const byte *buf, uint len);
+
+#endif
diff --git a/libucw/ucw/crc.t b/libucw/ucw/crc.t
new file mode 100644
index 0000000..9b2bb8c
--- /dev/null
+++ b/libucw/ucw/crc.t
@@ -0,0 +1,25 @@
+# Tests for crc
+
+Name:	Default/small
+Run:	../obj/ucw/crc-t 0 123456 37 3
+Out:	d620f179
+
+Name:	Default/big
+Run:	../obj/ucw/crc-t 0 123456 10037 3
+Out:	d620f179
+
+Name:	Small/small
+Run:	../obj/ucw/crc-t 1 123456 37 3
+Out:	d620f179
+
+Name:	Small/big
+Run:	../obj/ucw/crc-t 1 123456 10037 3
+Out:	d620f179
+
+Name:	Large/small
+Run:	../obj/ucw/crc-t 2 123456 37 3
+Out:	d620f179
+
+Name:	Large/big
+Run:	../obj/ucw/crc-t 2 123456 10037 3
+Out:	d620f179
diff --git a/libucw/ucw/daemon-ctrl.c b/libucw/ucw/daemon-ctrl.c
new file mode 100644
index 0000000..6834b0c
--- /dev/null
+++ b/libucw/ucw/daemon-ctrl.c
@@ -0,0 +1,222 @@
+/*
+ *	UCW Library -- Daemon Control
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/daemon.h>
+#include <ucw/process.h>
+#include <ucw/strtonum.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/file.h>
+#include <sys/wait.h>
+
+static enum daemon_control_status
+daemon_control_err(struct daemon_control_params *dc, char *msg, ...)
+{
+  va_list args;
+  va_start(args, msg);
+  vsnprintf(dc->error_msg, DAEMON_ERR_LEN, msg, args);
+  va_end(args);
+  return DAEMON_STATUS_ERROR;
+}
+
+static enum daemon_control_status
+daemon_read_pid(struct daemon_control_params *dc, int will_wait, int *pidp)
+{
+  // We expect successfully locked guard file, so no foreign process
+  // can be inside daemon_control() and therefore also in daemon_init()
+  // or daemon_run(). Only these results are then possible:
+  //
+  // -- DAEMON_STATUS_ERROR -- some local failure
+  // -- DAEMON_STATUS_NOT_RUNNING -- no daemon is running
+  // -- DAEMON_STATUS_STALE -- crashed daemon
+  // -- DAEMON_STATUS_OK, pid > 0 -- running daemon with known PID
+  // -- DAEMON_STATUS_OK, pid == 0 -- just exiting daemon, after ftruncate()
+
+  enum daemon_control_status st = DAEMON_STATUS_NOT_RUNNING;
+  *pidp = 0;
+
+  int pid_fd = open(dc->pid_file, O_RDONLY);
+  if (pid_fd < 0)
+    {
+      if (errno == ENOENT)
+	return st;
+      return daemon_control_err(dc, "Cannot open PID file `%s': %m", dc->pid_file);
+    }
+
+  while (flock(pid_fd, LOCK_SH | (will_wait ? 0 : LOCK_NB)) < 0)
+    {
+      if (errno == EWOULDBLOCK)
+	{
+	  st = DAEMON_STATUS_OK;
+	  break;
+	}
+      else if (errno != EINTR)
+	{
+	  daemon_control_err(dc, "Cannot lock PID file `%s': %m", dc->pid_file);
+	  goto fail;
+	}
+    }
+
+  char buf[16];
+  int n = read(pid_fd, buf, sizeof(buf));
+  if (n < 0)
+    {
+      daemon_control_err(dc, "Error reading `%s': %m", dc->pid_file);
+      goto fail;
+    }
+  if (n == (int) sizeof(buf))
+    {
+      daemon_control_err(dc, "PID file `%s' is too long", dc->pid_file);
+      goto fail;
+    }
+  buf[n] = 0;
+
+  if (!n)
+    {
+      close(pid_fd);
+      return st;
+    }
+
+  if (st != DAEMON_STATUS_OK)
+    {
+      close(pid_fd);
+      return DAEMON_STATUS_STALE;
+    }
+
+  int pid;
+  const char *next;
+  if (str_to_int(&pid, buf, &next, 10) || strcmp(next, "\n"))
+    {
+      daemon_control_err(dc, "PID file `%s' does not contain a valid PID", dc->pid_file);
+      goto fail;
+    }
+
+  close(pid_fd);
+  *pidp = pid;
+  return DAEMON_STATUS_OK;
+
+fail:
+  close(pid_fd);
+  return DAEMON_STATUS_ERROR;
+}
+
+enum daemon_control_status
+daemon_control(struct daemon_control_params *dc)
+{
+  int guard_fd = open(dc->guard_file, O_RDWR | O_CREAT, 0666);
+  if (guard_fd < 0)
+    return daemon_control_err(dc, "Cannot open guard file `%s': %m", dc->guard_file);
+  if (flock(guard_fd, LOCK_EX) < 0)
+    return daemon_control_err(dc, "Cannot lock guard file `%s': %m", dc->guard_file);
+
+  // Read the PID file
+  int pid, sig;
+  enum daemon_control_status st = daemon_read_pid(dc, 0, &pid);
+  if (st == DAEMON_STATUS_ERROR)
+    goto done;
+
+  switch (dc->action)
+    {
+    case DAEMON_CONTROL_CHECK:
+      break;
+    case DAEMON_CONTROL_START:
+      if (st == DAEMON_STATUS_OK)
+	st = DAEMON_STATUS_ALREADY_DONE;
+      else
+	{
+	  pid_t pp = fork();
+	  if (pp < 0)
+	    {
+	      st = daemon_control_err(dc, "Cannot fork: %m");
+	      goto done;
+	    }
+	  if (!pp)
+	    {
+	      close(guard_fd);
+	      execvp(dc->argv[0], dc->argv);
+	      fprintf(stderr, "Cannot execute `%s': %m\n", dc->argv[0]);
+	      exit(DAEMON_STATUS_ERROR);
+	    }
+	  int stat;
+	  int ec = waitpid(pp, &stat, 0);
+	  if (ec < 0)
+	    {
+	      st = daemon_control_err(dc, "Cannot wait: %m");
+	      goto done;
+	    }
+	  if (WIFEXITED(stat) && WEXITSTATUS(stat) == DAEMON_STATUS_ERROR)
+	    {
+	      st = daemon_control_err(dc, "Cannot execute the daemon");
+	      goto done;
+	    }
+	  char ecmsg[EXIT_STATUS_MSG_SIZE];
+	  if (format_exit_status(ecmsg, stat))
+	    {
+	      st = daemon_control_err(dc, "Daemon %s %s", dc->argv[0], ecmsg);
+	      goto done;
+	    }
+	  enum daemon_control_status st2 = daemon_read_pid(dc, 0, &pid);
+	  if (st2 != DAEMON_STATUS_OK && st2 != DAEMON_STATUS_NOT_RUNNING)
+	    st = daemon_control_err(dc, "Daemon %s failed to write the PID file `%s'", dc->argv[0], dc->pid_file);
+	  else if (st != DAEMON_STATUS_STALE)
+	    st = DAEMON_STATUS_OK;
+	}
+      break;
+    case DAEMON_CONTROL_STOP:
+      if (st != DAEMON_STATUS_OK)
+	{
+	  if (st == DAEMON_STATUS_NOT_RUNNING)
+	    st = DAEMON_STATUS_ALREADY_DONE;
+	  goto done;
+	}
+      if (pid)
+	{
+	  sig = dc->signal ? : SIGTERM;
+	  if (kill(pid, sig) < 0 && errno != ESRCH)
+	    {
+	      st = daemon_control_err(dc, "Cannot send signal %d: %m", sig);
+	      goto done;
+	    }
+	}
+      else
+	{
+	  // Just exiting daemon => we can safely wait without sending any signal
+	}
+      st = daemon_read_pid(dc, 1, &pid);
+      if (st != DAEMON_STATUS_ERROR)
+	st = DAEMON_STATUS_OK;
+      break;
+    case DAEMON_CONTROL_SIGNAL:
+      if (!pid)
+	return DAEMON_STATUS_NOT_RUNNING;
+      sig = dc->signal ? : SIGHUP;
+      if (kill(pid, sig) >= 0)
+	st = DAEMON_STATUS_OK;
+      else if (errno == ESRCH)
+	st = DAEMON_STATUS_NOT_RUNNING;
+      else
+	st = daemon_control_err(dc, "Cannot send signal %d: %m", sig);
+      break;
+    default:
+      ASSERT(0);
+    }
+
+done:
+  close(guard_fd);
+  return st;
+}
diff --git a/libucw/ucw/daemon.c b/libucw/ucw/daemon.c
new file mode 100644
index 0000000..cfaa05e
--- /dev/null
+++ b/libucw/ucw/daemon.c
@@ -0,0 +1,291 @@
+/*
+ *	UCW Library -- Daemonization
+ *
+ *	(c) 2012--2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/daemon.h>
+#include <ucw/strtonum.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+
+void
+daemon_resolve_ugid(struct daemon_params *dp)
+{
+  // Resolve user name
+  const char *u = dp->run_as_user;
+  struct passwd *pw = NULL;
+  if (u)
+    {
+      if (u[0] == '#')
+	{
+	  uint id;
+	  const char *err = str_to_uint(&id, u, NULL, 10 | STN_WHOLE);
+	  if (err)
+	    die("Cannot parse user `%s': %s", u, err);
+	  dp->run_as_uid = id;
+	  dp->want_setuid = 1;
+	}
+      else
+	{
+	  pw = getpwnam(u);
+	  if (!pw)
+	    die("No such user `%s'", u);
+	  dp->run_as_uid = pw->pw_uid;
+	  dp->want_setuid = 1;
+	}
+    }
+
+  // Resolve group name
+  const char *g = dp->run_as_group;
+  struct group *gr;
+  if (g)
+    {
+      if (g[0] == '#')
+	{
+	  uint id;
+	  const char *err = str_to_uint(&id, g, NULL, 10 | STN_WHOLE);
+	  if (err)
+	    die("Cannot parse group `%s': %s", g, err);
+	  dp->run_as_gid = id;
+	  dp->want_setgid = 1;
+	}
+      else
+	{
+	  gr = getgrnam(g);
+	  if (!gr)
+	    die("No such group `%s'", g);
+	  dp->run_as_gid = gr->gr_gid;
+	  dp->want_setgid = 1;
+	}
+    }
+  else if (pw)
+    {
+      dp->run_as_gid = pw->pw_gid;
+      dp->want_setgid = 2;
+    }
+}
+
+void
+daemon_switch_ugid(struct daemon_params *dp)
+{
+  if (dp->want_setgid && setresgid(dp->run_as_gid, dp->run_as_gid, dp->run_as_gid) < 0)
+    die("Cannot set GID to %d: %m", (int) dp->run_as_gid);
+  if (dp->want_setgid > 1 && initgroups(dp->run_as_user, dp->run_as_gid) < 0)
+    die("Cannot initialize groups: %m");
+  if (dp->want_setuid && setresuid(dp->run_as_uid, dp->run_as_uid, dp->run_as_uid) < 0)
+    die("Cannot set UID to %d: %m", (int) dp->run_as_uid);
+}
+
+void
+daemon_init(struct daemon_params *dp)
+{
+  daemon_resolve_ugid(dp);
+
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    return;
+
+  if (dp->pid_file)
+    {
+      // Check that PID file path is absolute
+      if (!(dp->flags & DAEMON_FLAG_PRESERVE_CWD) && dp->pid_file[0] != '/')
+	die("Path to PID file `%s' must be absolute", dp->pid_file);
+
+      // Open PID file
+      dp->pid_fd = open(dp->pid_file, O_RDWR | O_CREAT, 0666);
+      if (dp->pid_fd < 0)
+	die("Cannot open `%s': %m", dp->pid_file);
+      int fl = fcntl(dp->pid_fd, F_GETFD);
+      if (fl < 0 || fcntl(dp->pid_fd, F_SETFD, fl | FD_CLOEXEC))
+	die("Cannot set FD_CLOEXEC: %m");
+
+      // Try to lock it with an exclusive lock
+      if (flock(dp->pid_fd, LOCK_EX | LOCK_NB) < 0)
+	{
+	  if (errno == EINTR || errno == EWOULDBLOCK)
+	    die("Daemon is already running (`%s' locked)", dp->pid_file);
+	  else
+	    die("Cannot lock `%s': %m", dp->pid_file);
+	}
+
+      // Make a note that the daemon is starting
+      if (ftruncate(dp->pid_fd, 0) < 0 ||
+          write(dp->pid_fd, "(starting)\n", 11) != 11)
+	die("Error writing `%s': %m", dp->pid_file);
+    }
+}
+
+void
+daemon_run(struct daemon_params *dp, void (*body)(struct daemon_params *dp))
+{
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    {
+      body(dp);
+      return;
+    }
+
+  // Switch GID and UID
+  daemon_switch_ugid(dp);
+
+  // Create a new session and close stdio
+  setsid();
+  close(0);
+  if (open("/dev/null", O_RDWR, 0) < 0 ||
+      dup2(0, 1) < 0)
+    die("Cannot redirect stdio to `/dev/null': %m");
+
+  // Set umask to a reasonable value
+  umask(022);
+
+  // Do not hold the current working directory
+  if (!(dp->flags & DAEMON_FLAG_PRESERVE_CWD))
+    {
+      if (chdir("/") < 0)
+	die("Cannot chdir to root: %m");
+    }
+
+  // Create pipe to synchronize child process with master and avoid possible
+  // collision between writing of PID and daemon_exit()
+  int pipe_fd[2];
+  if (dp->pid_file && pipe(pipe_fd) < 0)
+    die("Cannot create pipe: %m");
+
+  // Fork
+  pid_t pid = fork();
+  if (pid < 0)
+    die("Cannot fork: %m");
+  if (!pid)
+    {
+      // Wait for master process to finish writing of PID
+      if (dp->pid_file)
+	{
+	  byte pipe_buf[1];
+	  close(pipe_fd[1]);
+	  if (read(pipe_fd[0], pipe_buf, 1) < 0)
+	    die("Cannot read pipe: %m");
+	  close(pipe_fd[0]);
+	}
+
+      // We still keep the PID file open and thus locked
+      body(dp);
+      exit(0);
+    }
+
+  // Write PID
+  if (dp->pid_file)
+    {
+      char buf[32];
+      int c = snprintf(buf, sizeof(buf), "%d\n", (int) pid);
+      ASSERT(c <= (int) sizeof(buf));
+      if (lseek(dp->pid_fd, 0, SEEK_SET) < 0 ||
+	  write(dp->pid_fd, buf, c) != c ||
+	  ftruncate(dp->pid_fd, c) ||
+	  close(dp->pid_fd) < 0)
+	die("Cannot write PID to `%s': %m", dp->pid_file);
+      close(pipe_fd[0]);
+      close(pipe_fd[1]);
+    }
+}
+
+void
+daemon_exit(struct daemon_params *dp)
+{
+  if (dp->flags & DAEMON_FLAG_SIMULATE)
+    return;
+
+  if (dp->pid_file)
+    {
+      if (ftruncate(dp->pid_fd, 0))
+	die("Error truncating `%s': %m", dp->pid_file);
+      close(dp->pid_fd);
+    }
+}
+
+#ifdef TEST
+
+#include <signal.h>
+
+static volatile sig_atomic_t terminate;
+
+static void term_handler(int sig UNUSED)
+{
+  msg(L_INFO | L_SIGHANDLER, "SIGTERM received, terminating in a while");
+  terminate = 1;
+}
+
+static void hup_handler(int sig UNUSED)
+{
+  msg(L_INFO | L_SIGHANDLER, "SIGHUP received");
+}
+
+static void body(struct daemon_params *dp)
+{
+  log_fork();
+  msg(L_INFO, "Daemon is running");
+  msg(L_INFO, "uid=%d/%d gid=%d/%d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid());
+
+  struct sigaction sa_term = { .sa_handler = term_handler };
+  struct sigaction sa_hup = { .sa_handler = hup_handler };
+  if (sigaction(SIGTERM, &sa_term, NULL) < 0 ||
+      sigaction(SIGHUP, &sa_hup, NULL) < 0)
+    ASSERT(0);
+
+  while (!terminate)
+    {
+      if (!sleep(60))
+	{
+	  msg(L_INFO, "Timeout elapsed, terminating in a while");
+	  break;
+	}
+    }
+
+  sleep(2);
+  msg(L_INFO, "Daemon is shutting down");
+  daemon_exit(dp);
+}
+
+int main(int argc, char **argv)
+{
+  struct daemon_params dp = {
+    .pid_file = "/tmp/123",
+  };
+
+  int opt;
+  while ((opt = getopt(argc, argv, "p:u:g:")) >= 0)
+    switch (opt)
+      {
+      case 'p':
+	dp.pid_file = optarg;
+	break;
+      case 'u':
+	dp.run_as_user = optarg;
+	break;
+      case 'g':
+	dp.run_as_group = optarg;
+	break;
+      default:
+	die("Invalid arguments");
+      }
+
+  daemon_init(&dp);
+  daemon_run(&dp, body);
+  msg(L_INFO, "Main program has ended");
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/daemon.h b/libucw/ucw/daemon.h
new file mode 100644
index 0000000..25a34f8
--- /dev/null
+++ b/libucw/ucw/daemon.h
@@ -0,0 +1,131 @@
+/*
+ *	UCW Library -- Daemonization
+ *
+ *	(c) 2012--2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_DAEMON_H
+#define _UCW_DAEMON_H
+
+#include <sys/types.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define daemon_control ucw_daemon_control
+#define daemon_exit ucw_daemon_exit
+#define daemon_init ucw_daemon_init
+#define daemon_resolve_ugid ucw_daemon_resolve_ugid
+#define daemon_run ucw_daemon_run
+#define daemon_switch_ugid ucw_daemon_switch_ugid
+#endif
+
+/** Parameters passed to the daemon helper. **/
+struct daemon_params {
+  uint flags;				// DAEMON_FLAG_xxx
+  const char *pid_file;			// A path to PID file (optional)
+  const char *run_as_user;		// User name or "#uid" (optional)
+  const char *run_as_group;		// Group name or "#gid" (optional)
+
+  // Internal
+  uid_t run_as_uid;
+  uid_t run_as_gid;
+  int want_setuid;
+  int want_setgid;
+  int pid_fd;
+};
+
+/** Flags passed to the daemon helper. **/
+enum daemon_flags {
+  DAEMON_FLAG_PRESERVE_CWD = 1,		// Skip chdir("/")
+  DAEMON_FLAG_SIMULATE = 2,		// Simulate daemonization (avoid fork etc.)
+};
+
+/**
+ * Daemon initialization. Should be run after parsing of options.
+ * It resolves the UID and GID to run with and locks the PID file.
+ * Upon error, it calls @die().
+ **/
+void daemon_init(struct daemon_params *dp);
+
+/**
+ * Run the daemon. Should be run when everything is initialized. It forks off
+ * a new process and does all necessary setup. Inside the new process, it calls
+ * @body (and when it returns, it exits the process). In the original process, it writes
+ * the PID file and returns.
+ *
+ * When `DAEMON_FLAG_SIMULATE` is set, it justs calls @body. This is useful
+ * for running of daemons in a debugger.
+ **/
+void daemon_run(struct daemon_params *dp, void (*body)(struct daemon_params *dp));
+
+/**
+ * Clean up when the daemon is about to exit. It removes the PID file.
+ **/
+void daemon_exit(struct daemon_params *dp);
+
+/**
+ * Parse `run_as_user` and `run_as_group` and remember the results in internal fields.
+ * This is called automatically by daemon_init(), but also provided as a separate
+ * function in case you want to use daemon_switch_ugid(). Upon parse error, it calls die().
+ **/
+void daemon_resolve_ugid(struct daemon_params *dp);
+
+/**
+ * Switch user and group as specified by the `run_as_user` and `run_as_group`.
+ * This is performed automatically by daemon_run(), but sometimes you might want to
+ * switch the user and group separately. In this case, you have to call daemon_resolve_ugid()
+ * beforehand.
+ **/
+void daemon_switch_ugid(struct daemon_params *dp);
+
+#define DAEMON_ERR_LEN 256
+
+/** Parameters passed to @daemon_control() **/
+struct daemon_control_params {
+  const char *pid_file;		// A path to PID file
+  const char *guard_file;	// A path to guard file
+  int action;			// Action to perform (DAEMON_CONTROL_xxx)
+  char * const *argv;		// Daemon's arguments, NULL-terminated (for DAEMON_CONTROL_START)
+  int signal;			// Signal to send (for DAEMON_CONTROL_SIGNAL)
+  char error_msg[DAEMON_ERR_LEN];	// A detailed error message returned (for DAEMON_STATUS_ERROR)
+};
+
+enum daemon_control_action {
+  DAEMON_CONTROL_CHECK = 1,
+  DAEMON_CONTROL_START,
+  DAEMON_CONTROL_STOP,
+  DAEMON_CONTROL_SIGNAL,
+};
+
+/**
+ * Perform an action on a daemon:
+ *
+ * * `DAEMON_CONTROL_START` to start the daemon
+ * * `DAEMON_CONTROL_STOP` to stop the daemon (send `SIGTERM` or `dc->signal` if non-zero)
+ * * `DAEMON_CONTROL_CHECK` to check that the daemon is running
+ * * `DAEMON_CONTROL_SIGNAL` to send a signal to the daemon (send `SIGHUP` or `dc->signal` if non-zero)
+ *
+ * The function returns a status code:
+ *
+ * * `DAEMON_STATUS_OK` if the action has been performed successfully
+ * * `DAEMON_STATUS_ALREADY_DONE` if the daemon is already in the requested state
+ * * `DAEMON_STATUS_NOT_RUNNING` if the action failed, because the daemon is not running
+ * * `DAEMON_STATUS_ERROR` if the action failed for some other reason (in this case,
+ *   `dc->error_msg` contains a full error message)
+ * * `DAEMON_STATUS_STALE` if the daemon was in an undefined state (e.g., a stale PID file);
+ *   for `DAEMON_CONTROL_START`, it means success
+ **/
+enum daemon_control_status daemon_control(struct daemon_control_params *dc);
+
+// XXX: Also used as exit codes of the ucw-daemon-control utility.
+enum daemon_control_status {
+  DAEMON_STATUS_OK = 0,
+  DAEMON_STATUS_ALREADY_DONE = 100,
+  DAEMON_STATUS_NOT_RUNNING = 101,
+  DAEMON_STATUS_ERROR = 102,
+  DAEMON_STATUS_STALE = 103,
+};
+
+#endif
diff --git a/libucw/ucw/default.cfg b/libucw/ucw/default.cfg
new file mode 100644
index 0000000..825baeb
--- /dev/null
+++ b/libucw/ucw/default.cfg
@@ -0,0 +1,86 @@
+# Configuration variables of the UCW library and their default values
+# (c) 2005--2015 Martin Mares <mj@ucw.cz>
+# (c) 2020--2022 Pavel Charvat <pchar@ucw.cz>
+
+# Version of the whole package
+Set("UCW_VERSION" => "6.5.14");
+Set("UCW_VERSION_CODE" => 6005014);
+
+# Name of libraries in packages (libucw$UCW_ABI_SUFFIX.so.0.0, etc.)
+Set("UCW_ABI_SUFFIX" => "-6.5");
+
+# Compile everything with debug information and ASSERT's
+UnSet("CONFIG_DEBUG");
+
+# Environment variable with a switch to abort() on die().
+# Any non-empty value of the variable turns this feature on.
+Set("CONFIG_UCW_ENV_VAR_DIE_BY_ABORT" => "UCW_DIE_BY_ABORT");
+
+# Enable aggressive optimizations depending on exact CPU type (don't use for portable packages)
+UnSet("CONFIG_EXACT_CPU");
+
+# Support files >2GB
+Set("CONFIG_UCW_LARGE_FILES");
+
+# Use shared libraries
+UnSet("CONFIG_SHARED");
+
+# If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
+# of GNU libc's getopt. This should not be necessary on GNU libc.
+UnSet("CONFIG_UCW_OWN_GETOPT");
+
+# Install libraries and their API includes
+UnSet("CONFIG_INSTALL_API");
+
+# Build with support for multi-threaded programs
+Set("CONFIG_UCW_THREADS" => 1);
+
+# Include Perl modules
+Set("CONFIG_UCW_PERL" => 1);
+
+# Include Perl modules written in C
+UnSet("CONFIG_UCW_PERL_MODULES");
+
+# Include support utilities for shell scripts
+Set("CONFIG_UCW_SHELL_UTILS" => 1);
+
+# Include utilities
+Set("CONFIG_UCW_UTILS" => 1);
+
+# Include obsolete ucw-daemon-helper utility
+UnSet("CONFIG_UCW_OBSOLETE_DAEMON_HELPER");
+
+# Default configuration file
+UnSet("CONFIG_UCW_DEFAULT_CONFIG");
+
+# Environment variable with configuration file
+UnSet("CONFIG_UCW_ENV_VAR_CONFIG");
+
+# Allow use of direct IO on files
+Set("CONFIG_UCW_DIRECT_IO");
+Set("CONFIG_UCW_FB_DIRECT");
+
+# Use thread-local storage (needs GCC-support, default: auto-detect)
+# Set("CONFIG_UCW_TLS");
+
+# Use epoll (needs support in libc and kernel, default: auto-detect)
+# Set("CONFIG_UCW_EPOLL");
+
+# Use getrandom (needs support in libc and kernel, default: auto-detect)
+# Set("CONFIG_UCW_GETRANDOM");
+
+# Use monotonic clock (default: yes on Linux, no elsewhere)
+# Set("CONFIG_UCW_MONOTONIC_CLOCK");
+
+# Which regular expression library should be used? If none is selected, we use BSD regex from libc.
+UnSet("CONFIG_UCW_POSIX_REGEX");
+UnSet("CONFIG_UCW_PCRE");
+
+# Compile tools used for debugging and testing of LibUCW
+UnSet("CONFIG_UCW_DEBUG_TOOLS");
+
+# Clean up library ABI by attaching "ucw_" prefix to all externally visible symbols
+Set("CONFIG_UCW_CLEAN_ABI" => 1);
+
+# Return success
+1;
diff --git a/libucw/ucw/doc/Makefile b/libucw/ucw/doc/Makefile
new file mode 100644
index 0000000..26afcd6
--- /dev/null
+++ b/libucw/ucw/doc/Makefile
@@ -0,0 +1,35 @@
+# Makefile for the UCW documentation, (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+DIRS+=ucw/doc
+
+UCW_DOCS=basics log fastbuf index config configure install basecode hash docsys conf mempool eltpool mainloop generic growbuf unaligned lists chartype unicode prime binsearch heap binheap compress sort hashtable relnotes trans string time daemon signal varint opt alloc gary table xtypes
+UCW_INDEX=$(o)/ucw/doc/def_index.html
+UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))
+
+UCW_MANPAGES=ucw-tableprinter.5
+UCW_MANPAGES_HTML=$(patsubst %,$(o)/ucw/doc/%.html,$(UCW_MANPAGES))
+UCW_MANPAGES_NROFF=$(addprefix $(o)/ucw/doc/,$(UCW_MANPAGES))
+MANPAGES+=$(UCW_MANPAGES_NROFF)
+UCW_DOCS_HTML+=$(UCW_MANPAGES_HTML)
+
+$(UCW_INDEX): DOC_HEAD=$(s)/ucw/doc/def_index.txt
+$(UCW_INDEX): DOC_LIST=$(patsubst %,$(o)/ucw/doc/%.deflist,$(UCW_DOCS))
+$(UCW_INDEX) $(UCW_DOCS_HTML): DOC_MODULE=ucw
+
+DOCS+=$(UCW_DOCS_HTML)
+DOC_INDICES+=$(UCW_INDEX)
+DOC_MODULES+=ucw
+
+ifdef CONFIG_DOC
+INSTALL_TARGETS+=install-libucw-docs install-libucw-man
+endif
+
+.PHONY: install-libucw-docs install-libucw-man
+
+install-libucw-docs: $(UCW_INDEX) $(UCW_DOCS_HTML)
+	install -d -m 755 $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
+	install -m 644 $^ $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
+
+install-libucw-man: $(UCW_MANPAGES_NROFF)
+	install -d -m 755 $(DESTDIR)$(INSTALL_MAN_DIR)/man1/
+	install -m 644 $(UCW_MANPAGES_NROFF) $(DESTDIR)$(INSTALL_MAN_DIR)/man1/
diff --git a/libucw/ucw/doc/alloc.txt b/libucw/ucw/doc/alloc.txt
new file mode 100644
index 0000000..adb233f
--- /dev/null
+++ b/libucw/ucw/doc/alloc.txt
@@ -0,0 +1,24 @@
+Generic allocators
+==================
+
+Sometimes, we want to define data structures, whose memory allocation can be
+parametrized. If we wish to squeeze out the last bit of performance, we
+tie the structure to a certain allocator in compile time (as we do for
+  <<hashtable:,hash tables>>). If performance is not so critical, allocators
+can be swapped in run time.
+
+This module defines a generic interface to memory allocators. You can use
+the following pre-defined allocators, or define some of your own.
+
+* <<std,Standard malloc-based allocator>>
+* <<zeroing,Zeroing malloc-based allocator>>
+* <<mempool:fun_mp_get_allocator,Memory pools>>
+
+These data structures accept an allocator (more will come later):
+
+* Growing arrays
+
+ucw/alloc.h
+-----------
+
+!!ucw/alloc.h
diff --git a/libucw/ucw/doc/basecode.txt b/libucw/ucw/doc/basecode.txt
new file mode 100644
index 0000000..d4e307e
--- /dev/null
+++ b/libucw/ucw/doc/basecode.txt
@@ -0,0 +1,76 @@
+Base64 and Base224 encodings
+============================
+
+These modules can be used to encode and decode data to and from
+base64 (described in RFC 3548) and base224 (not described in any
+standard, uses all non-control characters, briefly described in
+a comment at the beginning of `ucw/base224.c`).
+
+- <<base64,Base64>>
+- <<base224,Base224>>
+- <<usage,Usage>>
+- <<basecode,The basecode utility>>
+
+[[base64]]
+ucw/base64.h
+------------
+!!ucw/base64.h
+
+[[base224]]
+ucw/base224.h
+-------------
+!!ucw/base224.h
+
+[[usage]]
+Usage
+-----
+
+- You may want to encode small block of known size. Just allocate the
+  output buffer and feed the data to the function.
+
+  byte output[BASE64_ENC_LENGTH(input_size)];
+  uint output_size = base64_encode(output, input, input_size);
+
+- Decoding can be done in similar way. It is enough to have output
+  buffer of the same size as the input one.
+
+- Encoding of a stream of unknown or large size can be split into
+  chunks. The input chunk size must be multiple of `BASE64_IN_CHUNK`.
+  The output will be corresponding multiple of `BASE64_OUT_CHUNK`.
+
+  uint input_size;
+  byte input[BASE64_IN_CHUNK * 10];
+  while(input_size = read_chunk(input, BASE64_IN_CHUNK * 10)) {
+    byte output[BASE64_OUT_CHUNK * 10];
+    uint output_size = base64_encode(output, input, input_size);
+    use_chunk(output, output_size);
+  }
+
+- Decoding of a stream is done in the same way, just swap
+  `BASE64_IN_CHUNK` and `BASE64_OUT_CHUNK` (you feed the decode
+  function with `BASE64_OUT_CHUNK` multiple and get `BASE64_IN_CHUNK`
+  multiple).
+
+The base224 has similar interface, therefore you can use it the same
+way as base64.
+
+[[basecode]]
+The basecode utility
+--------------------
+You can use the encoding/decoding routines from command line, trough
+`ucw-basecode` command. You have to specify the operation by a command
+line argument and give it the data on standard input. The arguments
+are:
+
+- `-e`: Encode to base64.
+- `-d`: Decode from base64.
+- `-E`: Encode to base224.
+- `-D`: Decode from base224.
+
+Furthermore, you can provide `--prefix` argument. If you do, the
+output (when encoding) will be split to lines by default number of
+chunks and the value of prefix will be prepended to each of them.
+When decoding, it removes the prefix from the beginning of line.
+
+You can override the default number of blocks for line-splitting by
+`--blocks` argument.
diff --git a/libucw/ucw/doc/basics.txt b/libucw/ucw/doc/basics.txt
new file mode 100644
index 0000000..ab1c94a
--- /dev/null
+++ b/libucw/ucw/doc/basics.txt
@@ -0,0 +1,38 @@
+LibUCW Basics
+=============
+
+Every program using LibUCW should start with `#include <ucw/lib.h>` which
+brings in the most frequently used library functions, macros and types.
+This should be done before you include any of the system headers, since
+`lib.h` defines the feature macros of the system C library.
+
+Portability
+-----------
+
+LibUCW is written in C99 with a couple of GNU extensions mixed in where needed.
+It currently requires the GNU C compiler version 4.0 or newer, but most modules
+should be very easy to adapt to a different C99 compiler. (A notable exception
+is `stkstring.h`, which is heavily tied to GNU extensions.)
+
+The library has been developed on Linux with the GNU libc and it is known to run
+on Darwin, too. The authors did not try using it on other systems, but most of
+the code is written for a generic POSIX system, so porting to any UNIX-like system
+should be a piece of cake.
+
+Threads
+-------
+Generally, functions in the UCW library are reentrant as long as you call them
+on different data. Accessing the same object from different threads is not supported,
+unless otherwise told. This also applies to functions acting on any kind of global state.
+
+ucw/lib.h
+---------
+
+!!ucw/lib.h
+
+ucw/config.h
+------------
+This header contains the standard set of types used by LibUCW. It is automatically
+included by `ucw/lib.h`.
+
+!!ucw/config.h
diff --git a/libucw/ucw/doc/binheap.txt b/libucw/ucw/doc/binheap.txt
new file mode 100644
index 0000000..adc2601
--- /dev/null
+++ b/libucw/ucw/doc/binheap.txt
@@ -0,0 +1,19 @@
+Binomial heaps
+==============
+
+* <<intro,Introduction>>
+* <<common,Common definitions>>
+* <<generator,Interface to the generator>>
+
+[[intro]]
+Introduction
+------------
+
+Binomial heap is a data structure that supports for example efficient merge of two heaps, insertions, deletions or access to the minimum element.
+All these operations are logarithimc in the worst case. If the merge is not significat, it is usually better to use simplier <<heap:,binary heaps>>.
+
+They are defined in `ucw/binheap.h` as <<generic:,generics generated by preprocessor>>, some common definitions are also in `ucw/binheap-node.h`.
+
+!!ucw/binheap-node.h
+
+!!ucw/binheap.h
diff --git a/libucw/ucw/doc/binsearch.txt b/libucw/ucw/doc/binsearch.txt
new file mode 100644
index 0000000..211bd73
--- /dev/null
+++ b/libucw/ucw/doc/binsearch.txt
@@ -0,0 +1,51 @@
+Binary search
+=============
+
+* <<defs,Definitions>>
+* <<examples,Examples>>
+
+!!ucw/binsearch.h
+
+[[examples]]
+Examples
+--------
+
+You can find few examples of binary search usage. Although we define only few macros, they can be used
+for several different cases, for example to find lower elements in a (non-)decreasing array or even to find 
+elements in a (non-)increasing array.
+
+  static int inc[10] = { 1, 4, 4, 5, 6, 10, 11, 20, 25, 50 };
+  static const char *str[5] = { "aaa", "abc", "bflmpsvz", "rep", "rep" };
+  static int dec[3] = { 5, 2, 1 };
+
+  // find the first equal element
+  printf("%d\n", BIN_SEARCH_EQ(inc, 10, 4));				// prints 1
+  printf("%d\n", BIN_SEARCH_EQ(inc, 10, 15));				// prints -1 (not found)
+
+  // find the first greater or equal element
+  printf("%d\n", BIN_SEARCH_GE(inc, 10, 9));				// prints 5
+  printf("%d\n", BIN_SEARCH_GE(inc, 10, 10));				// prints 5
+  printf("%d\n", BIN_SEARCH_GE(inc, 10, 4));				// prints 1
+  printf("%d\n", BIN_SEARCH_GE(inc, 10, 99));				// prints 10 (not found)
+
+  // find the last equal element (or -1 if does not exist)
+  #define CMP_LE(ary, i, x) ((ary[i]) <= (x))
+  int i = BIN_SEARCH_FIRST_GE_CMP(inc, 10, 4, CMP_LE);
+  printf("%d\n", (i && inc[i - 1] == 4) ? i - 1 : -1);			// prints 2
+
+  // find the first greater element
+  printf("%d\n", BIN_SEARCH_FIRST_GE_CMP(inc, 10, 25, CMP_LE));		// prints 9
+
+  // find the last lower or equal element (or -1 if does not exist)
+  printf("%d\n", BIN_SEARCH_FIRST_GE_CMP(inc, 10, 25, CMP_LE) - 1);	// prints 8
+
+  // find the last lower element (or -1 if does not exist)
+  printf("%d\n", BIN_SEARCH_FIRST_GE(inc, 10, 25) - 1);			// prints 7
+
+  // find the first greater or equal string
+  #define CMP_STR(ary, i, x) (strcmp((ary[i]), (x)) < 0)
+  printf("%d\n", BIN_SEARCH_GE_CMP(str, 5, "bfl", CMP_STR));            // prints 2
+
+  // find the first lower or equal element in the non-increasing array
+  #define CMP_GT(ary, i, x) ((ary[i]) > (x))
+  printf("%d\n", BIN_SEARCH_FIRST_GE_CMP(dec, 3, 4, CMP_GT));		// prints 1
diff --git a/libucw/ucw/doc/chartype.txt b/libucw/ucw/doc/chartype.txt
new file mode 100644
index 0000000..a19560d
--- /dev/null
+++ b/libucw/ucw/doc/chartype.txt
@@ -0,0 +1,4 @@
+Single-byte characters
+======================
+
+!!ucw/chartype.h
diff --git a/libucw/ucw/doc/compress.txt b/libucw/ucw/doc/compress.txt
new file mode 100644
index 0000000..d452763
--- /dev/null
+++ b/libucw/ucw/doc/compress.txt
@@ -0,0 +1,17 @@
+Compression
+===========
+
+The library contains a compression routine, called LiZaRd.  It is
+modified Lempel-Ziv 77 method with slightly worse compression ratio,
+but with faster compression and decompression (compression is few times
+faster than zlib, decompression is slightly slower than memcpy()).
+
+The data format and inspiration for code comes from the LZO project
+(which couldn't be used due to licence problems). They might be
+compatible, but no-one tested that.
+
+- <<basic,Basic application>>
+- <<safe,Safe decompression>>
+- <<adler,Adler-32 checksum>>
+
+!!ucw/lizard.h
diff --git a/libucw/ucw/doc/conf.txt b/libucw/ucw/doc/conf.txt
new file mode 100644
index 0000000..813a183
--- /dev/null
+++ b/libucw/ucw/doc/conf.txt
@@ -0,0 +1,327 @@
+Configuration parser
+====================
+
+Libucw contains a parser for configuration files. The syntax of the
+configuration files is described in <<config:>>, here we explain the
+interface of the parser.
+
+Basically, you write a description of the configuration file syntax,
+which maps configuration items to variables of your program. Then
+Then you run the parser and it fills your variables with the values
+from the configuration file.
+
+The descriptions are modular. The configuration can be split to sections,
+each section declared at a separate place. You can also define your own
+data types.
+
+- <<example,Example>>
+  * <<ex_structure,The structure>>
+  * <<ex_load,Loading configuration>>
+- <<deep,Getting deeper>>
+  * <<conf_multi,Arrays and lists>>
+  * <<reload,Reloading configuration>>
+  * <<custom_parser,Creating custom parsers>>
+  * <<hooks,Hooks>>
+- <<conf_h,ucw/conf.h>>
+  * <<conf_ctxt,Configuration contexts>>
+  * <<conf_load,Safe configuration loading>>
+  * <<conf_types,Data types>>
+  * <<conf_macros,Convenience macros>>
+  * <<alloc,Memory allocation>>
+  * <<journal,Undo journal>>
+  * <<declare,Section declaration>>
+  * <<bparser,Parsers for basic types>>
+  * <<conf_direct,Direct access>>
+  * <<conf_dump,Debug dumping>>
+- <<getopt_h,ucw/getopt.h>>
+  * <<conf_getopt,Loading configuration by cf_getopt()>> (obsolete)
+  * <<getopt_example,Example>> (obsolete)
+
+[[example]]
+Example
+-------
+If you want to just load simple configuration, this is the part you
+want to read. This simple example should give you the overview. Look
+at the <<conf_macros,convenience macros>> section to see list of
+supported data types, sections, etc.
+
+[[ex_cfile]]
+Suppose you have configuration file with the following content and you
+want to load it:
+
+  HelloWorld {
+    Text	"Hello planet"
+    Count	3
+  }
+
+[[ex_structure]]
+The structure
+~~~~~~~~~~~~~
+First, you declare the structure and let the configuration parser know
+it exists.
+
+  #include <ucw/lib.h>
+  #include <ucw/conf.h>
+
+  static char *hw_text = "Hello world";
+  static int hw_count = 1;
+  static int hw_wait_answer = 0;
+
+  static struct cf_section hw_config = {
+    CF_ITEMS {
+      CF_STRING("Text", &hw_text),
+      CF_INT("Count", &hw_count),
+      CF_INT("WaitAnswer", &hw_wait_answer),
+      CF_END
+    }
+  };
+
+  static void CONSTRUCTOR hw_init(void) {
+    cf_declare_section("HelloWorld", &hw_config, 0);
+  }
+
+The variables are used to store the loaded values. Their initial
+values work as defaults, if nothing else is loaded. The hw_config()
+structure assigns the variables to configuration names. The hw_init()
+function (because of the `CONSTRUCTOR` macro) is run before main()
+is called and it tells the parser that the section exists (alternatively,
+you can call @cf_declare_section() at the start of your main()).
+
+You can plug in as many configuration sections as you like, from
+various places across your code.
+
+[[ex_load]]
+Loading configuration
+~~~~~~~~~~~~~~~~~~~~~
+You can load the configuration explicitly by calling @cf_load().
+That can be convenient when writing a library, but in normal programs,
+you can ask the <<opt:,option parser>> to handle it for you.
+
+A typical example follows, please see the <<opt:conf,interface between
+conf and opt>> for details.
+
+  #include <ucw/lib.h>
+  #include <ucw/opt.h>
+  
+  static struct opt_section options = {
+    OPT_ITEMS {
+      // More options can be specified here
+      OPT_HELP("Configuration options:"),
+      OPT_CONF_OPTIONS,
+      OPT_END
+    }
+  };
+  
+  int main(int argc, char **argv)
+  {
+    cf_def_file = "default.cf";
+    opt_parse(&options, argv+1);
+    // Configuration file is already loaded here
+    return 0;
+  }
+
+[[deep]]
+Getting deeper
+--------------
+
+Since the configuration system is somehow complicated, this part gives
+you a little overview of what you can find and where.
+
+[[conf_multi]]
+Arrays and lists
+~~~~~~~~~~~~~~~~
+
+It is sometime needed to have multiple items of the same type. There
+are three ways to do that:
+
+*Static arrays*::
+  An array with fixed maximum length. You provide
+  the length and already allocated array which is filled with items.
+  The configuration may contain less than the maximum length items.
++
+For example, you can have an static array of five unsigned integers:
++
+  static uint array[] = { 1, 2, 3, 4, 5 };
++
+  static struct cf_section section = {
+    CF_ITEMS {
+      CF_UINT_ARY("array", array, 5),
+      CF_END
+    }
+  };
+
+*Dynamic arrays*::
+  Similar to static array, but you provide pointer
+  to pointer to the given item (eg. if you want dynamic array of
+  integers, you give `**int`). The parser allocates a <<gary:,growing array>>
+  of the required size.
++
+If you want dynamic array of strings, you would use:
++
+  static char *array[];
++
+  static struct cf_section section = {
+    CF_ITEMS {
+      CF_STRING_DYN("array", &array, CF_ANY_NUM),
+      CF_END
+    }
+  };
+
+*Lists*::
+  Linked lists based on <<lists:clists,clists>>. You provide description
+  of single node and pointer to the
+  <<lists:struct_clist,`struct clist`>> variable. All the nodes will
+  be created dynamically and put there.
++
+First element of your structure must be <<lists:struct_cnode,`cnode`>>.
++
+The first example is list of strings and uses <<lists:simple_lists,simple
+lists>>:
++
+  static struct clist list;
++
+  static struct cf_section section = {
+    CF_ITEMS {
+      CF_LIST("list", &list, &cf_string_list_config),
+      CF_END
+    }
+  };
++
+Another example, describing how to create more complicated list node
+than just a string can be found at the <<def_CF_TYPE,`CF_TYPE`>> macro.
+
+[[reload]]
+Reloading configuration
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The configuration system allows you to reload configuration at
+runtime. The new config changes the values against the default values.
+It means, if the default value for variable `A` is `10`, the currently
+loaded config sets it to `42` and the new config does not talk about
+this variable, `A` will have a value of `10` after a successful load.
+
+Furthermore, if the loading of a new configuration fails, the current
+configuration is preserved.
+
+All this is done with <<journal,config journalling>>. The load of the
+first config creates a journal entry. If you try to load some new
+configuration, it is partially rolled back to defaults (the rollback
+happens, but instead of removing the journal entry, another journal
+entry is added for the rollback). If the loading succeeds, the two
+journal entries are removed and a new one, for the new configuration,
+is added. If it fails, the first one is replayed and the rollback
+entry is removed.
+
+See @cf_reload().
+
+[[custom_parser]]
+Creating custom parsers
+~~~~~~~~~~~~~~~~~~~~~~~
+
+If you need to parse some data type the configuration system can't
+handle, you can write your own <<xtypes:,extended type>>
+and use <<def_CF_XTYPE,`CF_XTYPE`>> macro to declare a new option.
+
+There is also an obsolete way to write a custom parser.
+Before you start, you should know a few things.
+
+The parser needs to support <<journal,journalling>>. To accomplish that,
+you have to use the <<alloc,configuration mempool>> for memory allocation.
+
+Now, you need a function with the same signature as
+<<type_cf_parser1,`cf_parser1`>>. Parse the first parameter (the
+string) and store the data in the second parameter. You may want to
+write a dumper function, with signature of
+<<type_cf_dumper1,`cf_dumper1`>> (needed for debug dumps).
+
+Fill in a structure <<struct_cf_user_type,cf_user_type>> and use the
+new data type in your configuration description with
+<<def_CF_USER,`CF_USER`>> macro as its @t parameter.
+
+You do not need to call @cf_journal_block() on the variable you store
+the result. It is true you change it, but it was stored to journal
+before your parser function was called.
+
+[[hooks]]
+Hooks
+~~~~~
+
+The configuration system supports hooks. They are used to initialize the
+configuration (if simple default value of variable is not enough) and
+to check the sanity of loaded data.
+
+Each hook is of type <<type_cf_hook,`cf_hook`>> and you can include
+them in configuration description using <<def_CF_INIT,`CF_INIT`>> and
+<<def_CF_COMMIT,`CF_COMMIT`>> macros.
+
+The hooks should follow similar guidelines as custom parsers (well,
+init hooks do not need to call @cf_journal_block()) to support
+journalling. If you change nothing in the commit hook, you do not need
+to care about the journalling either.
+
+You may use the return value to inform about errors. Just return the
+error message, or NULL if everything went well.
+
+Another similar function is a copy function. It is very similar to a
+hook and is used when the item is copied and is too complicated to use
+simple memcpy(). Its type is <<type_cf_copier,`cf_copier`>> and is
+specified by the <<def_CF_COPY,`CF_COPY`>> macro. It's return value is
+the same as the one of a hook.
+
+[[conf_h]]
+ucw/conf.h
+----------
+
+This header file contains the public interface of the configuration module.
+
+!!ucw/conf.h
+
+[[getopt_h]]
+ucw/getopt.h
+------------
+
+This header contains routines for parsing command line arguments and
+loading the default configuration.
+
+In new programs, please consider using the new <<opt:,option parser>>
+instead. The getopt interface is already considered obsolete and may
+be removed in the future.
+
+!!ucw/getopt.h
+
+Example
+~~~~~~~
+Typically, @cf_getopt() is used as follows: it works like
+the traditional @getopt_long() from the C library, but it also handles
+configuration files.
+
+  #include <ucw/lib.h>
+  #include <ucw/conf.h>
+  #include <ucw/getopt.h>
+
+  static char short_opts[] = CF_SHORT_OPTS "v";
+  static struct option long_opts[] = {
+    CF_LONG_OPTS
+    { "verbose", 0, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+
+  static int verbose;
+
+  int main(int argc, char *argv[]) {
+    cf_def_file = "default.cf";
+    int opt;
+    while((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)
+      switch(opt) {
+	case 'v': verbose = 1; break;
+	default: fprintf("Unknown option %c\n", opt); return 1;
+      }
+  }
+
+The `short_opts` and `long_opts` variables describe the command line
+arguments. Notice the `CF_SHORT_OPTS` and `CF_LONG_OPTS` macros. They
+add the `-S` and `-C` options for the configuration parser as described
+in <<config:>>. These options are handled internally by @cf_getopt().
+
+You can rely on the configuration files having been loaded before the
+first of your program's options is parsed.
diff --git a/libucw/ucw/doc/config.txt b/libucw/ucw/doc/config.txt
new file mode 100644
index 0000000..6b32c5a
--- /dev/null
+++ b/libucw/ucw/doc/config.txt
@@ -0,0 +1,196 @@
+Configuration files
+===================
+
+This document describes run-time configuration of libucw-based
+programs using config files. For compile-time configuration,
+see <<configure:>>.
+
+[[terminology]]
+Terminology
+-----------
+
+Configuration items of all modules are organized into sections.
+The sections form a tree structure with top-level sections corresponding
+to program modules.
+
+Each configuration item belongs to one of the following classes:
+
+  1. single value or a fixed-length array of values
+  2. variable-length array of values
+  3. subsection with several nested attributes
+  4. list of nodes, each being an instance of a subsection
+  5. bitmap of small integers (0..31) or fixed list of strings
+  6. exceptions (items with irregular syntax; however, they always
+     appear as a sequence of strings, only the semantics differ)
+
+Both fixed- and variable-length arrays consist of items of the same
+type.  The basic types supported by the configuration mechanism are:
+
+  1. 32-bit integer
+  2. 64-bit integer
+  3. floating point number
+  4. IP address
+  5. string
+  6. choice (one of a fixed list of strings)
+
+Program modules can define their own special types (such as network
+masks or attribute names) and decide how are they parsed.
+
+[[format]]
+Format of configuration files
+-----------------------------
+
+Configuration files are text files that usually set one attribute per
+line, though it is possible to split one assignment into multiple lines
+and/or assign several attributes in one line.  The basic format of an
+assignment command is
+
+  name value1 value2 ... valueN
+
+or
+
+  name=value1 value2 ... valueN
+
+The end of line means also end of a command unless it is preceded by a
+backslash.  On the other hand, a semicolon terminates the command and
+another command can start after the semicolon.  A hash starts a comment
+that lasts until the end of the line.  A value can be enclosed in
+apostrophes or quotation marks and then it can contain spaces and/or
+control characters, otherwise the first space or control character
+denotes the end of the value.  Values enclosed in quotation marks are
+interpreted as C-strings.  For example, the following are valid
+assignment commands:
+
+  Database "main db\x2b"; Directory='index/'; Weights 100 20 30 \
+    40 50 80				# a comment that is ignored
+
+Numerical values can be succeeded by a unit.  The following units are
+supported:
+
+[[units]]
+
+	d=86400		k=1000		K=1024
+	h=3600		m=1000000	M=1048576
+	%=0.01		g=1000000000	G=1073741824
+			t=1000000000000	T=1099511627776
+
+Attributes of a section or a list node can be set in two ways.  First,
+you can write the name of the section or list, open a bracket, and then
+set the attributes inside the section.  For example,
+
+  Section1 {
+    Attr1	value1
+    Attr2	value2
+    ListNode {		#creates a list and adds its first node
+      Attr3	value3
+      Attr4	value4
+    }
+    ListNode { Attr3=value5; Attr4=value6 }
+			#appends a new node; this is still the same syntax
+  }
+
+The second possibility is using a shorter syntax when all attributes of a
+section are set on one line in a fixed order.  The above example could
+be as well written as
+
+  Section1 {
+    Attr1	value1
+    Attr2	value2
+    ListNode	value3 value4
+    ListNode	value5 value6
+  }
+
+Of course, you cannot use the latter syntax when the attributes allow
+variable numbers of parameters.  The parser of the configuration files
+checks this possibility.
+
+If you want to set a single attribute in some section, you can also
+refer to the attribute as Section.Attribute.
+
+Lists support several operations besides adding a new node.  You just
+have to write a colon immediately after the attribute name, followed by
+the name of the operation.  The following operations are supported:
+
+[[operations]]
+
+  List:clear				# removes all nodes
+  List:append { attr1=value1; ... }	# adds a new node at the end
+  List:prepend { attr1=value1; ... }	# adds a new node at the beginning
+  List:remove { attr1=search1 }		# find a node and delete it
+  List:edit { attr1=search1 } { attr1=value1; ... }
+					# find a node and edit it
+  List:after { attr1=search1 } { ... }	# insert a node after a found node
+  List:before { attr1=search1 } { ... }	# insert a node before a found node
+  List:copy { attr1=search1 } { ... }	# duplicate a node and edit the copy
+  List:reset { attr=value1; ... }	# equivalent to :clear and :append
+
+You can specify several attributes in the search condition and the nodes
+are tested for equality in all these attributes.  In the editing
+commands, you can either open a second block with overridden attributes,
+or specify the new values using the shorter one-line syntax.
+
+The commands :clear, :append, and :prepend are also supported by var-length
+arrays.  The command :clear can also be used on string values.  The following
+operations can be used on bitmaps: :set (which is equal to :append and :prepend),
+:remove, :clear, and :all (set all bits).
+
+[[include]]
+Including other files
+---------------------
+
+To include another file, use the command
+
+  Include another/file
+
+or if the file needs not to exist
+
+  OptionalInclude another/file
+
+(Beware that this command has to be the last one on the line.)
+
+[[command_line]]
+Command-line parameters
+-----------------------
+
+The default configuration file (cf_def_file possibly overriden
+by environment variable cf_env_file) is read before the program is started.
+You can use a -C option to override the name of the configuration file.
+If you use this parameter several times, then all those files are loaded
+consecutively. A parameter -S can be used to execute a configuration
+command directly (after loading the default or specified configuration
+file).  Example:
+
+  bin/program -Ccf/my-config -S'module.trace=2;module.logfile:clear' ...
+
+If the program is compiled with debugging information, then one more
+parameter `--dumpconfig` is supported.  It prints all parsed configuration
+items and exits.
+
+All these switches must be used before any other parameters of the
+program.
+
+[[preprocess]]
+Preprocessing
+-------------
+
+During compilation, all configuration files are pre-processed by a simple
+C-like preprocessor, which supports `#ifdef`, `#ifndef`, `#if`,
+`#elsif`, `#else` and `#endif` directives referring to compile-time
+configuration variables (the ones detected by `configure` script, you
+can see list of them in `obj/autoconf.h`). `#if` and `#elsif` can contain
+any Perl expression where each `CONFIG_xyz` configuration variable is
+substituted to 0 or 1 depending on its value.
+
+The preprocessor also substitutes `@VARIABLE@` by the value of the variable,
+which must be defined.
+
+[[caveats]]
+Caveats
+-------
+
+Trying to access an unknown attribute causes an error, but unrecognized
+top-level sections are ignored.  The reason is that a common config file
+is used for a lot of programs which recognize only their own sections.
+
+Names of sections, attributes and choices are case-insensitive. Units are
+case-sensitive.
diff --git a/libucw/ucw/doc/configure.txt b/libucw/ucw/doc/configure.txt
new file mode 100644
index 0000000..e655228
--- /dev/null
+++ b/libucw/ucw/doc/configure.txt
@@ -0,0 +1,78 @@
+How to Configure libucw libraries
+=================================
+
+What can be configured
+----------------------
+There are two different levels of configuring program
+based on the libucw libraries:
+
+  - runtime configuration in configuration files (see <<config:>>)
+
+  - compile-time configuration of the libraries: config switches set
+    before compiling, selecting optional features.
+
+Where to build
+--------------
+If you run configure in the source directory, it prepares for compilation inside
+the source tree. In this case, an `obj` subdirectory is created to hold all generated
+files (object files, binaries, generated source files etc.) and all final files
+are linked to the `run` subdirectory. No other parts of the source tree are written into.
+
+Alternatively, you can compile in a separate object tree (which is useful when you
+want to build several different configurations from a single source tree). In order
+to do that, switch to the destination directory and issue `<source-dir>/configure ...`.
+This way, configure will create the `obj` and `run` directories locally and set up
+a Makefile which refers to the original source tree.
+
+How to configure
+----------------
+To set up compilation, possibly overriding default compile-time
+options, just run:
+
+	./configure [<option> | -<option> | <option>=<value> ...]
+
+The default values of feature options are taken from `default.cfg`.
+Compiler flags and options dependent on compiler, OS and CPU type
+are set in `ucw/perl/UCW/Configure/C.pm`. Everything can be overriden by
+options specified on the configure's command line, which have the highest
+priority.
+
+If you want to see the resulting set of options, take a look at
+`obj/config.mk`.
+
+Options specifying compiler/linker/debugger options can be also overriden
+during compilation by `make <option>=<value>`. While it's also possible
+to specify the other options in this way, it probably won't have the desired
+effect, because configure also generates C include files containing the
+options.
+
+Installation options
+--------------------
+By default, the package is compiled to be installed and it chooses a
+place where it will install. If you want to place it somewhere else,
+set the `PREFIX` option:
+
+	./configure PREFIX=/where/to/install
+
+[[local_build]]
+You can create a local compilation, which does not need to be
+installed. To compile it that way, turn on the `CONFIG_LOCAL` option
+(and do not set `PREFIX`):
+
+	./configure CONFIG_LOCAL
+
+Alternatively you can add the `CONFIG_RELATIVE_PATHS` option.
+All paths are then set relative to a `run` directory and
+programs expect to have current working directory set to it. However,
+you can move the `run` directory around your filesystem as you like:
+
+	./configure CONFIG_LOCAL CONFIG_RELATIVE_PATHS
+
+Examples
+--------
+  - `./configure -CONFIG_SHARED` will build the libraries statically.
+  - `./configure -CONFIG_XML` avoids building the XML library.
+  - `./configure -CONFIG_UCW_UTILS` compiles only the libraries
+    without its utility programs.
+  - `./configure CONFIG_IMAGES PREFIX=$HOME/libucw` includes an image
+    library and installs into your home directory.
diff --git a/libucw/ucw/doc/daemon.txt b/libucw/ucw/doc/daemon.txt
new file mode 100644
index 0000000..f6037b6
--- /dev/null
+++ b/libucw/ucw/doc/daemon.txt
@@ -0,0 +1,94 @@
+Daemon helpers
+==============
+
+Daemonization
+-------------
+
+When programs run as daemons, they frequently forget to detach themselves
+from the parent environment. LibUCW therefore offers a simple daemonization
+helper which performs the necessary actions. Namely:
+
+* Establishing a new session via a call to `setsid()`.
+* Switching the user and group ID if needed. The user and group can be specified
+  by either a name or `#uid`. If only the user is given, the relevant groups are
+  set according to `/etc/passwd` and `/etc/group`.
+* Redirecting standard input and output from `/dev/null`. Standard error
+  output is left open, so that error messages can be printed before you
+  set up proper <<log:,logging>>. If you are not sure that your log streams
+  replaced stderr, you can call <<log:log_drop_stderr()>> to do that.
+* Setting the `umask()` to a fixed value (022).
+* Switching from the current directory to `/`, so that it is not kept busy.
+* Writing a PID file. While the daemon is running, the PID file is kept locked
+  by `flock()`, so we can easily detect stale PID files.
+
+Example
+-------
+
+	#include <ucw/lib.h>
+	#include <ucw/daemon.h>
+
+	void daemon_body(struct daemon_params *dp)
+	{
+		// ... daemon's code ...
+		// When we are done, release the PID file and exit:
+		daemon_exit(dp);
+	}
+
+	int main(int argc, char **argv)
+	{
+		struct daemon_params dp = { .pid_file = "/var/run/example.pid" };
+		// ... parse arguments ...
+		daemon_init(&dp);
+		// ... initialize everything ...
+		// Let us fork off the daemon:
+		daemon_run(daemon_body);
+		// Here continues the parent process
+		return 0;
+	}
+
+Daemon control
+--------------
+
+Daemons using the LibUCW helpers can be controlled by traditional mechanisms present
+in most UNIX-like operating systems. These are usually based on PID files, but they
+are inherently racy, since they do not perform any locking. For example, attempts to
+start the daemon, while another process is trying to stop it often lead to undefined
+states. Also, detection of running daemons fails when the daemon dies and its PID
+is recycled. Checking of process name and similar tricks do not avoid the problem,
+since there can be multiple instances of the daemon running simultaneously.
+
+We therefore recommend the following daemon control protocol, which prevents all such
+race conditions. Its implementation is available in form of the @daemon_control() library
+function or the `ucw-daemon-control` stand-alone utility.
+
+* There exist two files:
+** PID file (usually `/var/run/daemon.pid`), which contains the PID of the daemon
+   process and when the daemon runs, it keeps the file locked by `flock()`.
+** Guard file (usually `/var/run/daemon.lock`), which is locked (again by `flock()`)
+   whenever we want to perform an action on the daemon.
+* When we want to start the daemon:
+** Lock the guard file, creating it if it did not exist.
+** Try to lock the PID file. If it fails, the daemon is already running, so we are done.
+** Unlock the PID file.
+** Run the daemon. The daemon locks the PID file and when it has everything initialized,
+   it forks and the parent process writes the child's PID and exits.
+** Unlock the guard file.
+* When we want to stop it:
+** Lock the guard file, creating it if it did not exist.
+** Try to lock the PID file. If it succeeds, the daemon is not running, so we are done.
+** Read the PID from the PID file.
+** Send a signal to the process. [This is the only place when we can race. The daemon could
+   have exited in the meantime and its PID could have been recycled. Hopefully, the time window
+   between checking the lock and sending the signal will be short enough. Using 32-bit PIDs
+   is advisable anyway.]
+** Lock the PID file. This will wait until the daemon finishes and releases the lock.
+** Unlock the guard file.
+* When we want to query the daemon's status:
+** Lock the guard file, creating it if it did not exist.
+** Try to lock the PID file. If it succeeds, the daemon was not running.
+** Unlock everything.
+
+ucw/daemon.h
+------------
+
+!!ucw/daemon.h
diff --git a/libucw/ucw/doc/def_index.txt b/libucw/ucw/doc/def_index.txt
new file mode 100644
index 0000000..786c1ef
--- /dev/null
+++ b/libucw/ucw/doc/def_index.txt
@@ -0,0 +1,9 @@
+All definitions in libucw
+=========================
+
+- <<enum,Enumerations>>
+- <<struct,Structures>>
+- <<type,Types>>
+- <<fun,Functions>>
+- <<var,Variables>>
+- <<def,Preprocessor definitions>>
diff --git a/libucw/ucw/doc/docsys.txt b/libucw/ucw/doc/docsys.txt
new file mode 100644
index 0000000..b855749
--- /dev/null
+++ b/libucw/ucw/doc/docsys.txt
@@ -0,0 +1,168 @@
+The documentation system
+========================
+
+////
+Warning: if you read this file in plain-text, keep in mind the markup
+had to be escaped to show in the result as the thing you should type.
+You should ignore all backslashes here, or better, read the html
+version.
+////
+
+The ucw documentation system is based on the
+http://www.methods.co.nz/asciidoc/[ASCIIDOC] documentation formatter.
+It supports all it's markup, but it was extended slightly.
+
+- <<markup,Markup extensions>>
+  * <<xrefs,Cross referencing>>
+  * <<symbols,Symbol formatting>>
+- <<extract,Header extraction>>
+  * <<scomm,Stand-alone comments>>
+  * <<defcomm,Definition comments>>
+- <<generics,Macro generics>>
+  * <<geext,Generics extraction>>
+  * <<gelink,Links to generics>>
+
+[[markup]]
+Markup extensions
+-----------------
+
+[[xrefs]]
+Cross referencing
+~~~~~~~~~~~~~~~~~
+ASCIIDOC supports creating anchors with `\[[anchor-name]]` and links
+to them with `\<<anchor,caption>>`. The extension supports links to
+anchor in other files (`\\<<filename:anchor,caption>>`) or to other
+files (`\\<<filename:,caption>>`). The `filename` is without any suffix
+like `.txt` or `.html`, it is added to the link automatically. The caption
+is optional, if you omit it, some reasonable one will be guessed from
+the anchor name.
+
+The links support linking to function descriptions (the anchors for
+them are generated automatically by <<extract,header extraction>>).
+Just write `\<<function(),caption>>` or
+`\\<<filename:function(),caption>>`.
+
+[[symbols]]
+Symbol formatting
+~~~~~~~~~~~~~~~~~
+If you talk about function parameter, prefix its name with `@`. It
+will be typeset in monospace italic font to mark it visually, like
+this: @parameter.
+
+If a word is suffixed by parenthesis without a space (eg. word()), it
+is considered to be a function name and is typeset in monospace font.
+
+You can prefix a function name by `@`, which makes it a link to that
+function (`\@function()` is equivalent to `\<<function()>>`).
+
+If you write NULL anywhere, it is recognized and typeset in monospace.
+
+[[extract]]
+Header extraction
+-----------------
+Line starting with two exclamation marks, followed by a filename, is a
+command to process source file. Special comments and commented
+declarations are extracted and included in the place of the command.
+
+The command looks like this:
+
+  !!filename
+
+[[scomm]]
+Stand-alone comments
+~~~~~~~~~~~~~~~~~~~~
+C comments with tripled asterisks are extracted, the left side
+asterisk decoration is removed and the rest is put trough verbatim.
+
+Single-line version looks like
+
+ /*** This will be put into documentation. ***/
+
+If you need more than one line, use the same type of comment.
+
+ /***
+  * This is part of documentation too.
+  * But the asterisks on the left side aren't.
+  ***/
+
+[[defcomm]]
+Definition comments
+~~~~~~~~~~~~~~~~~~~
+You can write comments documenting specific definition. Definition
+comment has the asterisks doubled. The multi-line version must be
+directly above the definition, the single-line on the same line right
+of the definition or on a line before.
+
+ void function(int parameter);  /** This is a function. **/
+
+or
+
+ /** This is a function. **/
+ void function(int parameter);
+
+or
+
+ /**
+  * This is a complicated function.
+  * It takes multiple lines to describe how useful it is.
+  **/
+ void function(int parameter);
+
+Each such commented definition is taken and formatted, with the
+description attached. It also generates an anchor for the symbol name.
+The anchors look like `symboltype_symbolname`. The symbol types are
+these:
+
+- `fun` for functions
+- `def` for preprocessor macro
+- `var` for variable
+- `struct` for structure
+- `enum` for enumeration
+- `type` for a type definition
+
+There is a support for building a page with list of all symbols with
+links to them. Look into `ucw/doc/Makefile` to see how to request that.
+
+[[generics]]
+Support for macro generics
+--------------------------
+
+Some of the headers contain <<generic:,macro generics>>. Since the
+preprocessor macros look somewhat weird, the documentation extractor
+needs some help to understand them.
+
+[[geext]]
+Extraction of generics
+~~~~~~~~~~~~~~~~~~~~~~
+
+When extracting info from some header, the extractor needs to know,
+which prefix macros are used in the source file, to distinguish them
+from function calls. To inform it about them, append a comma separated
+list of such macros to the extraction command, like this:
+
+  !!filename PREFIX_MACRO_ONE,PREFIX_MACRO_TWO
+
+Then this will be correctly identified as a structure:
+
+  struct PREFIX_MACRO_ONE(struct_name) {
+    content;
+  };
+
+[[gelink]]
+Links to generics
+~~~~~~~~~~~~~~~~~
+
+Since the anchors for them are generated in a complicated manner and
+typing them in plain-text would convert them back to the original,
+with real parenthesis, there is a special pattern to create the
+symbolname part of the anchor. It looks like:
+
+  _GENERIC_LINK_|PREFIX_MACRO|symbol_name|
+
+So link to the above structure would look like:
+
+  <<struct__GENERIC_LINK_|PREFIX_MACRO_ONE|struct_name|,link text>>
+
+However, this is implemented only in the included header files (if it
+is needed, it will be implemented in the top-level documentation files
+too).
diff --git a/libucw/ucw/doc/eltpool.txt b/libucw/ucw/doc/eltpool.txt
new file mode 100644
index 0000000..0e68143
--- /dev/null
+++ b/libucw/ucw/doc/eltpool.txt
@@ -0,0 +1,12 @@
+Fixed-sized allocators
+======================
+
+You can use them for efficient allocation of large amount of small
+fixed-sized memory blocks and to free them all at once.
+If you need more features, see more complex <<mempool:,memory pools>>.
+
+* <<defs,Definitions>>
+* <<basic,Basic manipulation>>
+* <<alloc,Allocation routines>>
+
+!!ucw/eltpool.h
diff --git a/libucw/ucw/doc/fastbuf.txt b/libucw/ucw/doc/fastbuf.txt
new file mode 100644
index 0000000..57c827d
--- /dev/null
+++ b/libucw/ucw/doc/fastbuf.txt
@@ -0,0 +1,96 @@
+Fastbufs
+========
+
+A *fastbuf* is a stream (or file) abstraction optimized for both speed
+and flexibility.
+
+Fastbufs can represent many different kinds of objects: regular files, network
+sockets, file descriptors in general, or various memory buffers. These objects
+are handled by different fastbuf *back-ends.*
+
+Once you have a fastbuf, you can access it by functions similar to those of
+`stdio.h`, or you can use a variety of fastbuf *front-ends* providing various
+formatted operations.
+
+There are also fastbuf *wrappers*, which serve as both back-ends and front-ends,
+taking one stream and converting it to another on the fly.
+
+Please keep in mind that fastbufs do not allow arbitrary mixing of reads and
+writes on the same stream. If you need to mix them, you have to call @bflush()
+inbetween and remember that the file position reported by @btell() points after
+the flushed buffer, which is not necessarily the same as after the data you've
+really read.
+
+Fastbufs can also participate in the libucw resource management system.
+You can tie a fastbuf to a resource in the current resource pool by @fb_tie().
+When the pool gets cleaned up, the fastbuf is automatically closed. If you call
+@bclose() explicitly, the resource is removed, too.
+
+.Back-ends:
+- <<fbparam,Files (parametrized)>>
+- <<fbfile,Regular files>>
+- <<fbtemp,Temporary files>>
+- <<fblim,File fragments>>
+- <<fbmem,In-memory streams>>
+- <<fbbuf,Buffers>>
+- <<fbgrow,Growing buffers>>
+- <<fbpool,Memory pools>>
+- <<fbatomic,Atomic files>>
+
+.Front-ends:
+- <<ffbasic,Basic functions>>
+
+.Wrappers:
+- <<fwhex,Hexadecimal wrapper>>
+
+.Other reading:
+- <<internal,Internal structure>>
+- <<bconfig,Configuring streams>>
+- <<fbexc,Exceptions>>
+
+ucw/fastbuf.h
+-------------
+
+!!ucw/fastbuf.h
+
+ucw/fb-socket.h
+---------------
+
+Fastbufs on network sockets with timeouts.
+
+!!ucw/fb-socket.h
+
+ucw/ff-unicode.h
+----------------
+
+Reading and writing of unicode characters.
+
+Invalid codes are replaced by `UNI_REPLACEMENT` when reading.
+
+!!ucw/ff-unicode.h
+
+ucw/ff-binary.h
+---------------
+
+!!ucw/ff-binary.h
+
+ucw/fw-hex.h [[fwhex]]
+----------------------
+
+!!ucw/fw-hex.h
+
+Exceptions [[fbexc]]
+--------------------
+
+All standard back-ends and front-ends raise exceptions on errors if the fastbuf
+is tied to a resource pool by @fb_tie().
+All such exceptions live in the `ucw.fb` subtree. The following exceptions are defined:
+
+`ucw.fb.eof`:: Unexpected end of file (e.g., when the @FB_DIE_ON_EOF flag is set)
+`ucw.fb.mmap`:: Memory mapping failed (e.g., the `mmap` syscall has failed)
+`ucw.fb.open`:: Opening failed (file does not exist and similar problems)
+`ucw.fb.read`:: Read error (e.g., the `read` syscall has failed or the stream is write-only)
+`ucw.fb.seek`:: Seek error (e.g., file not seekable, or a seek behind EOF)
+`ucw.fb.tmp`:: Creation of temporary file failed
+`ucw.fb.toolong`:: Object (typically a line) is too long
+`ucw.fb.write`:: Write error (e.g., the `write` syscall has failed or the stream is read-only)
diff --git a/libucw/ucw/doc/gary.txt b/libucw/ucw/doc/gary.txt
new file mode 100644
index 0000000..e7c78a1
--- /dev/null
+++ b/libucw/ucw/doc/gary.txt
@@ -0,0 +1,18 @@
+Growing arrays
+==============
+
+This module provides growing arrays with items of an arbitrary type.
+(Alternatively, you might want to use <<mempool:gbuf,growing mempool buffers>>,
+or the somewhat obsolete <<growbuf:,growing buffers>>.)
+
+From the user's point of view, the array is represented as a pointer to
+its first element, so it can be indexed by the usual `[]` operator. Please
+keep in mind that this pointer can change, whenever the array is resized.
+
+Additional book-keeping information is stored before the first element
+and it can be accessed using the macros below.
+
+ucw/gary.h
+----------
+
+!!ucw/gary.h
diff --git a/libucw/ucw/doc/generic.txt b/libucw/ucw/doc/generic.txt
new file mode 100644
index 0000000..5e627d6
--- /dev/null
+++ b/libucw/ucw/doc/generic.txt
@@ -0,0 +1,105 @@
+Generic data structures and algorithms
+======================================
+
+The C preprocessor is a very powerful tool. One handy way to use it
+can be generating generic data structures and algorithms. Here you can
+find some conventions that are used in all such generic structures in
+libUCW, and also hints for use of these structures.
+
+- <<idea,General idea>>
+- <<use,How to use them>>
+- <<implement,How it is implemented>>
+- Modules with generics
+  * <<growbuf:gbuf,`gbuf.h`>>
+  * <<sort:,Sorting>>
+  * <<binheap:,`binheap.h`>>
+  * <<hashtable:,`hashtable.h`>>
+
+// TODO The module list
+
+[[idea]]
+General idea
+------------
+
+The idea is simple. If you have some code, you can customize it a
+little by preprocessor macros. You can change constants, data types it
+operates on, whole expressions, or you can compile parts of the code
+conditionally. You can generate new function names using macros.
+
+So if you provide few macros for data types, function names and
+parameters and include some code using them, it gets modified by it
+and a code for a specific data type is created. Then you can provide
+new macros and include it again, to get another version of the code,
+with different function names and types.
+
+[[use]]
+How to use them
+---------------
+
+The use is best explained with an example, so we will suppose there
+is a header file `array.h`, which contains a generic array data type
+and an indexing function, which returns a pointer to n'th element.
+
+To get an array of integers, we need to provide macro for used data
+type and macro that will provide prefixes for identifier names. Then
+we include the file. Then we could get another array with unsigned
+integers, so we will do the same:
+
+  #define ARRAY_TYPE int
+  #define ARRAY_PREFIX(name) intarray_##name
+  #include <array.h>
+
+  #define ARRAY_TYPE uint
+  #define ARRAY_PREFIX(name) uintarray_##name
+  #include <array.h>
+
+This will generate the data types (presumably `intarray_t` and
+`uintarray_t`) and the index functions (`intarray_index` and
+`uintarray_index`). We can use them like anything else.
+
+Maybe the `ARRAY_PREFIX` deserves some attention. When the header file
+wants to generate an identifier, it uses this macro with
+some name. Then the macro takes the name, adds a prefix to it and
+returns the new identifier, so `ARRAY_PREFIX(t)` will generate
+`intarray_t` in the first case and `uintarray_t` in the second. This
+allows having more than one instance of the same data structure or
+algorithm, because it generates different identifiers for them.
+
+A similar macro is needed for every generic header in libUCW.
+
+[[implement]]
+How it is implemented
+---------------------
+
+For those who want to write their own or are just interested, how it
+works, here is the `array.h` header and some description to it.
+
+  #define ARRAY_A_TYPE ARRAY_PREFIX(t)
+  typedef ARRAY_TYPE *ARRAY_A_TYPE
+
+  static ARRAY_TYPE *ARRAY_PREFIX(index)(ARRAY_A_TYPE array, uint index)
+  {
+    return array + index;
+  }
+
+  #undef ARRAY_A_TYPE
+  #undef ARRAY_TYPE
+  #undef ARRAY_PREFIX
+
+There are few things that are worth noticing. The first two lines
+define the data type. The macro (`ARRAY_A_TYPE`) is only for
+convenience inside the header, since such type names can be used quite
+often inside the header (if it is large).
+
+Then there is the function with its name generated (do not get scared
+by the double parenthesis, ones will be eaten by the macro, the second
+ones are real function parameters). The function is static, since more
+than one `.c` file might want to use the same header with the same
+prefix -- each one generates it's own instance.
+
+And the end just undefines all the macros, so user may define them
+again and get another instance of the data structure.
+
+Also note it is not protected against multiple inclusion in the usual
+way (eg. `#ifndef ARRAY_H` ...), since multiple inclusion is desired
+-- it generates multiple versions of the data structure.
diff --git a/libucw/ucw/doc/growbuf.txt b/libucw/ucw/doc/growbuf.txt
new file mode 100644
index 0000000..c59c10b
--- /dev/null
+++ b/libucw/ucw/doc/growbuf.txt
@@ -0,0 +1,40 @@
+Growing buffers
+===============
+
+*This module is obsolete. Please use <<gary:,growing arrays>> instead.*
+
+It is quite usual situation when you need an array of items and you
+don not know how large it will be in the time you allocate it. Then
+you need some kind of dynamically growing buffer.
+
+- <<gbuf,Generic growing buffers>>
+- <<bbuf,Growing buffers for byte-sized items>>
+
+[[gbuf]]
+Generic growing buffers
+-----------------------
+
+The generic buffers are in `ucw/gbuf.h`. They are <<generic:,generics
+generated by preprocessor>>. To use them, you need to define:
+
+- `GBUF_PREFIX(name)` -- the identifier generating macro.
+- `GBUF_TYPE` -- the data type they operate with.
+
+You may define `GBUF_TRACE(\...)` macro. If you do, it will be used to
+log the growing of the buffer. The macro should act like printf() --
+the first parameter will be format, the rest variables for it.
+
+!!ucw/gbuf.h GBUF_PREFIX
+
+[[bbuf]]
+Growing buffers for byte-sized items
+------------------------------------
+
+It is often needed to allocate the buffer by bytes (if you handle some
+anonymous data) or characters (strings of unknown length).
+
+With the `ucw/bbuf.h` header, you get an instance of growing buffers
+with type `byte` and prefix `bb_`. Aside from that, you get few
+functions to manipulate strings in the buffers.
+
+!!ucw/bbuf.h
diff --git a/libucw/ucw/doc/hash.txt b/libucw/ucw/doc/hash.txt
new file mode 100644
index 0000000..319e386
--- /dev/null
+++ b/libucw/ucw/doc/hash.txt
@@ -0,0 +1,102 @@
+Hashing routines
+================
+
+LibUCW contains implementations of several hash algorithms.
+
+<<crypto,Cryptographic hashes>>:
+
+- <<md5,MD5>> (RFC 1321)
+- <<sha1,SHA1>> (RFC 3174)
+- <<hash:sha1_hmac(),SHA1_HMAC message authentication>> (RFC 2104)
+- <<usage,Common usage>>
+
+<<checksum,Checksums>>:
+
+- <<crypto:adler,Adler-32>>
+- <<crc,CRC>>
+
+<<nocrypto,Non-cryptographic hashes>>:
+
+- <<strhash,String & block hashes>>
+- <<inthash,Integer hashes>>
+
+[[crypto]]
+Cryptographic hashes
+--------------------
+
+[[md5]]
+MD5
+~~~
+!!ucw/md5.h
+
+[[sha1]]
+SHA1
+~~~~
+!!ucw/sha1.h
+
+[[usage]]
+Common usage
+~~~~~~~~~~~~
+
+There are two ways you can use the hashing routines.
+
+- Single-shot interface. If you have an in-memory buffer of the whole
+  message you want to hash, you can use this.
+
+  char *message = "Hello world";
+  byte output[MD5_SIZE];
+  md5_hash_buffer(output, message, strlen(message));
+
+- Multi-shot interface. If you have the message scattered in many
+  buffers or you get it by parts, you do not need to concatenate the
+  parts together.
+
+  byte buffer[MAX_BUFFER];
+  uint buffer_len;
+  md5_context c;
+  md5_init(&c);
+  while(buffer_len = get_chunk(buffer, MAX_BUFFER)) {
+    md5_update(&c, buffer, buffer_len);
+  }
+  byte output[MD5_SIZE];
+  memcpy(output, md5_final(&c), MD5_SIZE);
+
+SHA1 has the same interface, so the same two ways apply.
+
+See also <<string:mem_to_hex()>>.
+
+[[checksum]]
+Checksums
+---------
+
+Their purpose is checking against random data changes, hardware
+failures and alike. They are not to be used against aimed attacks.
+
+Adler-32
+~~~~~~~~
+
+The <<compress:adler,Adler-32 checksum>> is documented in the
+<<compress:,compression capter>>.
+
+CRC-32
+~~~~~~
+
+32-bit Cyclic Redundancy Check with the polynomial suggested by
+Castagnoli et al.: Optimization of Cyclic Redundancy-Check Codes
+with 24 and 32 Parity Bits", IEEE Trans. on Communications, Vol. 41,
+No. 6, 1993.
+
+The interface is similar to the one we use for the cryptographic hashes.
+
+!!ucw/crc.h
+
+[[nocrypto]]
+Non-cryptographic hashes
+------------------------
+
+They are usually used to identify values in hash tables.
+
+All these functions expect to be moduled by the size of a hash table.
+The size should be a prime number (it gives better distribution).
+
+!!ucw/hashfunc.h
diff --git a/libucw/ucw/doc/hashtable.txt b/libucw/ucw/doc/hashtable.txt
new file mode 100644
index 0000000..630b1aa
--- /dev/null
+++ b/libucw/ucw/doc/hashtable.txt
@@ -0,0 +1,199 @@
+Hash tables
+===========
+
+A hash table is very universal data structure. It does most of it's
+operations in O(1) average time. The library contains a header to
+generate hash tables suiting your needs.
+
+They are <<generic:,generic data structures>>.
+
+- <<mandatory,Mandatory macros>>
+- <<functions,Optional function switches>>
+- <<params,Optional parameters>>
+- <<wants,Functionality switches>>
+- <<generated,Generated functions>>
+- <<iterator,Iterator>>
+
+[[mandatory]]
+Mandatory macros
+----------------
+
+- `HASH_NODE` -- a data type where a node dwells. It is usually a
+  structure.
+- `HASH_PREFIX(x)` -- the name generating macro.
+- Key type and name. Must be one of following.
+  [[key_atomic]]
+  * `HASH_KEY_ATOMIC` -- the key (`node\->HASH_KEY_ATOMIC`) is an
+    atomic type which can be compared using `==`.
+  [[key_string]]
+  * `HASH_KEY_STRING` -- the key is a zero-terminated string,
+    allocated separately from the rest of the node.
+  [[key_endstring]]
+  * `HASH_KEY_ENDSTRING` -- a zero-terminated string which lives at
+    the end of node (it is allocated together with the node). It
+    should be declared as `char key[1]`.
+  * `HASH_KEY_MEMORY` -- the `node\->HASH_KEY_MEMORY` is to be compared
+    using memcmp() function. In this case, you need to provide
+    `HASH_KEY_SIZE` macro as well, to specify the length of the key.
+  [[key_complex]]
+  * `HASH_KEY_COMPLEX(x)` -- the key is compound of more than one
+    component. The macro should expand to `x key1, x key2, ..., x kn`.
+    Furthermore, you need to provide a `HASH_KEY_DECL` macro. It is
+    used to define function parameters. Therefore it should expand to
+    `type1 key1, type2 key2, ..., typen keyn`. And
+    <<give_hashfn,`HASH_GIVE_HASHFN`>> and <<give_eq,`HASH_GIVE_EQ`>>
+    are mandatory for this key type.
+
+[[functions]]
+Optional function switches
+--------------------------
+
+You can define any of these macros and provide corresponding functions
+to customize the behaviour. The macros are:
+
+[[give_hashfn]]
+- `HASH_GIVE_HASHFN` -- the table will use `uint
+  HASH_PREFIX(hash)(key)` to calculate hash of `key`.
+  There is a sensible default for integers and strings.
+  In the case of <<key_complex,`HASH_KEY_COMPLEX`>>, it is mandatory
+  to provide this macro and function.
+[[give_eq]]
+- `HASH_GIVE_EQ` -- tells the table to use `int HASH_PREFIX(eq)(key1,
+  key2)` function to decide if `key1` and `key2` are equal. Default
+  for atomic types is `==` and strcmp() or strcasecmp() for strings
+  (depends on <<nocase,`HASH_NOCASE`>> switch).
+  It is mandatory when you use <<key_complex,`HASH_KEY_COMPLEX`>>.
+- `HASH_GIVE_EXTRA_SIZE` -- function `int HASH_PREFIX(extra_size)(key)`
+  returns how many bytes after the node should be allocated. It
+  defaults to `0` or to length of key in case of
+  <<key_endstring,`HASH_KEY_ENDSTRING`>>.
+- `HASH_GIVE_INIT_KEY` -- function
+  `void HASH_PREFIX(init_key)(node *, key)` is used to initialize key
+  in newly created node. The default is assignment for atomic keys and
+  static strings (<<key_atomic,`HASH_KEY_ATOMIC`>>,
+  <<key_string,`HASH_KEY_STRING`>>) and strcpy() for
+  <<key_endstr,`HASH_KEY_ENDSTRING`>>.
+[[give_init_data]]
+- `HASH_GIVE_INIT_DATA` -- function `void HASH_PREFIX(init_data)(node
+  *)` is used to initialize the rest of node. Useful if you use
+  <<fun_HASH_PREFIX_OPEN_PAREN_lookup_CLOSE_PAREN_,`HASH_PREFIX(lookup())`>>
+- `HASH_GIVE_ALLOC` -- you need to provide `void
+  \*HASH_PREFIX(alloc)(uint size` and `void HASH_PREFIX(free)(void \*)`
+  to allocate and deallocate the nodes. Default uses
+  <<basics:xmalloc()>> and <<basics:xfree()>>, <<mempool:mempool
+  routines>> or <<eltpool:eltpool routines>>, depending on
+  <<use_pool,`HASH_USE_POOL`>>, <<auto_pool,`HASH_AUTO_POOL`>>,
+  <<use_eltpool,`HASH_USE_ELTPOOL`>> and <<auto_eltpool,`HASH_AUTO_ELTPOOL`>> switches.
+- <<table_alloc:`HASH_GIVE_TABLE_ALLOC`>> -- you need to provide `void
+  \*HASH_PREFIX(table_alloc)(uint size` and `void HASH_PREFIX(table_free)(void \*)`
+  to allocate and deallocate the table itself. Default uses
+  <<basics:xmalloc()>> and <<basics:xfree()>> or the functions
+  from `HASH_GIVE_ALLOC` depending on <<table_alloc:`HASH_TABLE_ALLOC`>> switch.
+
+[[params]]
+Optional parameters
+-------------------
+
+You can customize the hash table a little more by these macros:
+
+[[nocase]]
+- `HASH_NOCASE` -- use case-insensitive comparison for strings.
+- `HASH_DEFAULT_SIZE` -- use approximately this many elements when
+  creating the hash table.
+- `HASH_CONSERVE_SPACE` -- use as little space as possible.
+- `HASH_FN_BITS` -- the hash function only provides this many
+  significants bits.
+- `HASH_ATOMIC_TYPE` -- the type of atomic key
+  (<<key_atomic,`HASH_KEY_ATOMIC`>>) is not `int`, but this type.
+[[use_pool]]
+- `HASH_USE_POOL` -- tells to use <<mempool:,mempool allocation>> to
+  allocate the nodes. You should define it to the name of mempool
+  variable to be used for this purpose.
+[[auto_pool]]
+- `HASH_AUTO_POOL` -- like above, but it creates it's own mempool.
+  Define it to the block size of the pool.
+[[use_eltpool]]
+- `HASH_USE_ELTPOOL` -- tells to use <<eltpool:,eltpool allocation>> to
+  allocate the nodes. You should define it to the name of eltpool
+  variable to be used for this purpose.
+[[auto_eltpool]]
+- `HASH_AUTO_ELTPOOL` -- like above, but it creates it's own mempool.
+  Define it to the number of preallocated nodes in each chunk of memory.
+- `HASH_ZERO_FILL` -- initialize new nodes to all zeroes.
+[[table-alloc]]
+- `HASH_TABLE_ALLOC` -- allocate the table the same way as nodes. If
+  not provided, <<basics:xmalloc()>> is used.
+- `HASH_TABLE_GROWING` -- never decrease the size of allocated table of nodes.
+[[table_dynamic]]
+- `HASH_TABLE_DYNAMIC` -- By default, only one global hash table is
+  used. With this macro defined, all functions gain new first
+  parameter of type `HASH_PREFIX(table) *` to allow them work with
+  multiple hash tables.
+- `HASH_TABLE_VARS` -- extra variables to be defined at head
+  of `HASH_PREFIX(table) *` structure. It can be useful in combination
+  with <<table_dynamic:`HASH_TABLE_DYNAMIC`>> to access per-table custom variables
+  from macros or function switches before you include the generator.
+[[lookup_detect_new]]
+- `HASH_LOOKUP_DETECT_NEW` -- the prototype for lookup is changed to `node *lookup(key, int *new_item)`,
+ `new_item` must not be NULL and returns 1 whether lookup just created a new item in the hashtable
+ or 0 otherwise.
+
+[[wants]]
+Functionality switches
+----------------------
+
+Each of these macros enables some of the functionality the table has.
+
+[[want_cleanup]]
+- `HASH_WANT_CLEANUP` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_cleanup_CLOSE_PAREN_,`HASH_PREFIX((cleanup()`>>
+[[want_find]]
+- `HASH_WANT_FIND` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_find_CLOSE_PAREN_,`HASH_PREFIX((find()`>>
+[[want_find_next]]
+- `HASH_WANT_FIND_NEXT` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_find_next_CLOSE_PAREN_,`HASH_PREFIX((find_next()`>>
+[[want_new]]
+- `HASH_WANT_NEW` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_new_CLOSE_PAREN_,`HASH_PREFIX((new()`>>
+[[want_lookup]]
+- `HASH_WANT_LOOKUP` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_lookup_CLOSE_PAREN_,`HASH_PREFIX((lookup()`>>
+[[want_delete]]
+- `HASH_WANT_DELETE` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_delete_CLOSE_PAREN_,`HASH_PREFIX((delete()`>>
+[[want_remove]]
+- `HASH_WANT_REMOVE` --
+  <<fun_HASH_PREFIX_OPEN_PAREN_remove_CLOSE_PAREN_,`HASH_PREFIX((remove()`>>
+
+[[generated]]
+Generated functions
+-------------------
+
+These are the function that the header file generates for you. The
+strange first parameter of each function is a place where the
+`HASH_PREFIX(table) *` resides when you define
+<<table_dynamic,`HASH_TABLE_DYNAMIC`>>. If you do not, the parameter
+is empty.
+
+!!ucw/hashtable.h HASH_PREFIX
+
+[[iterator]]
+Iterator
+--------
+
+You can use the `HASH_FOR_ALL` iterator macro to run trough all the
+nodes. Lets say your `HASH_PREFIX(x)` macro is defined as
+`prefix_##x`. Then you would do something like:
+
+  HASH_FOR_ALL(prefix, node_variable)
+  {
+     do_something_with_node(node_variable);
+  }
+  HASH_END_FOR;
+
+If you use <<table_dynamic,`HASH_TABLE_DYNAMIC`>>, use
+`HASH_FOR_ALL_DYNAMIC(prefix, table, node_variable)` instead.
+
+You may not modify the table inside the block. Use `HASH_BREAK` and
+`HASH_CONTINUE` instead of `break` and `continue` statements.
diff --git a/libucw/ucw/doc/heap.txt b/libucw/ucw/doc/heap.txt
new file mode 100644
index 0000000..df4f753
--- /dev/null
+++ b/libucw/ucw/doc/heap.txt
@@ -0,0 +1,36 @@
+Binary heaps
+============
+
+* <<intro,Introduction>>
+* <<macros,Macros>>
+* <<example,Example>>
+
+!!ucw/heap.h
+
+[[example]]
+Example
+-------
+
+  static uint n;
+  static int heap[4];
+
+  // Create an empty heap
+  n = 0;
+  #define MY_CMP(x, y) ((x) < (y))
+
+  // Insert 20, 10, 30
+  HEAP_INSERT(int, heap, n, MY_CMP, HEAP_SWAP, 20);
+  HEAP_INSERT(int, heap, n, MY_CMP, HEAP_SWAP, 10);
+  HEAP_INSERT(int, heap, n, MY_CMP, HEAP_SWAP, 30);
+
+  // Remove the minimum (10)
+  HEAP_DELETE_MIN(int, heap, n, MY_CMP, HEAP_SWAP);
+
+  // Print the new minimum (20)
+  printf("%d", heap[1]);
+
+  // Increase the minimum to 40
+  HEAP_INCREASE(int, heap, n, MY_CMP, HEAP_SWAP, 1, 40);
+
+  // Print the new minimum (30)
+  printf("%d", heap[1]);
diff --git a/libucw/ucw/doc/index.txt b/libucw/ucw/doc/index.txt
new file mode 100644
index 0000000..766ce25
--- /dev/null
+++ b/libucw/ucw/doc/index.txt
@@ -0,0 +1,121 @@
+The UCW library
+===============
+
+The UCW library aims to provide a set general purpose tools for programming
+in the C language. It contains generic data structures (lists, trees, hash
+tables etc.), fast memory allocators optimized for various usage patterns,
+abstract I/O streams and optimized implementations of some common algorithms
+(e.g., sorting of arrays and files).
+
+Please note that this documentation is not yet complete. Many modules are
+not described, so you might need to look into the source code.
+
+You can see the index of <<def_index:,documented definitions>>.
+
+For news and incompatible changes in this version, see the <<relnotes:,Release notes>>.
+
+Modules
+-------
+- <<basics:,Basics>>
+- <<log:,Logging>>
+- <<fastbuf:,Fastbufs>>
+- <<basecode:,Base64 and Base224 encoding>>
+- <<hash:,Hashing routines>>
+- <<conf:,Configuration and command line parser>>
+- <<mempool:,Memory pools>>
+- <<eltpool:,Fixed-sized allocators>>
+- <<alloc:,Generic allocators>>
+- <<mainloop:,Mainloop>>
+- <<unaligned:,Unaligned data>>
+- <<lists:,Linked lists>>
+- <<gary:,Growing arrays>>
+- <<heap:,Binary heaps>>
+- <<binheap:,Binomial heaps>>
+- <<hashtable:,Hash tables>>
+- <<growbuf:,Growing buffers>> (obsolete)
+- <<chartype:,Single-byte characters>>
+- <<unicode:,Multi-byte characters>>
+- <<varint:,Encoding of integers>>
+- <<prime:,Prime numbers>>
+- <<sort:,Sorting>>
+- <<binsearch:,Binary search>>
+- <<compress:,Compression>>
+- <<trans:,Transactions and resource tracking>>
+- <<string:,String operations>>
+- <<time:,Time and timers>>
+- <<daemon:,Daemon helpers>>
+- <<signal:,Signal helpers>>
+- <<opt:,Command line parser>>
+- <<table:,Table printer>> and its <<ucw-tableprinter.5:,options>>
+- <<xtypes:,Extended data types>>
+
+Other features
+--------------
+- <<configure:,Compile time configuration>>
+- <<config:,Configuration file syntax>>
+- <<docsys:,Documentation system>>
+- <<generic:,Macro-generated generics>>
+
+Yet undocumented modules
+------------------------
+- Trie
+  * `trie.h`
+- Red-black trees
+  * `redblack.h`
+- Bit manipulation
+  * `bitarray.h`
+  * `bitops.h`
+  * `bitsig.h`
+- String manipulation
+  * `kmp.h`
+  * `kmp-search.h`
+  * `regex.h`
+  * `stkstring.h`
+  * `strtonum.h`
+  * `wildmatch.h`
+- File manipulation
+  * `asio.h`
+  * `io.h`
+  * `partmap.h`
+- Address manipulation
+  * `url.h`
+  * `ipaccess.h`
+- Threads
+  * `semaphore.h`
+  * `threads.h`
+  * `workqueue.h`
+- Miscellaneous
+  * `sighandler.h`
+  * `process.h`
+
+Companion libraries
+-------------------
+- <<../ucw-json/index:,LibUCW-JSON>> -- a JSON parser and formatter
+- <<../ucw-xml/index:,LibUCW-XML>> -- a XML parser
+- LibUCW-charset -- character set conversion (undocumented)
+- LibUCW-images -- loading and conversion of images (undocumented)
+
+License
+-------
+The UCW library is copyrighted by its authors.
+
+It can be freely distributed and used according to the terms of
+the GNU Lesser General Public License, either version 2 or any later
+version.
+
+Authors
+-------
+Primary authors and maintainers are:
+
+- Pavel Charvát <mailto:pchar\@ucw.cz[]>
+- Martin Mareš <mailto:mj\@ucw.cz[]>
+- Robert Å palek <mailto:robert\@ucw.cz[]>
+
+Several modules have been contributed by:
+
+- Daniel Fiala <mailto:danfiala\@ucw.cz[]> (strtonum)
+- Tomáš Gaven�iak <mailto:gavento\@ucw.cz[]> (logging system)
+- Robert Kessl <mailto:robert.kessl\@economia.cz[]> (table printer)
+- Maria Matejka <mailto:mq\@ucw.cz[]> (option parser, fb-multi)
+- Tomáš Valla <mailto:tom\@ucw.cz[]> (varint)
+- Michal Vaner <mailto:vorner\@ucw.cz[]> (documentation system)
diff --git a/libucw/ucw/doc/install.txt b/libucw/ucw/doc/install.txt
new file mode 100644
index 0000000..d3bce64
--- /dev/null
+++ b/libucw/ucw/doc/install.txt
@@ -0,0 +1,39 @@
+Installation of libucw
+======================
+
+Prerequisities
+--------------
+To build and run, you need:
+
+  -  The GNU toolchain (gcc 4.0 or newer is required)
+  -  GNU bash 2.0 or newer
+  -  Perl (any reasonably new version; 5.6.1 works for me)
+  -  pkg-config
+  -  Linux (porting to other systems should be easy)
+  -  Libjpeg, libpng and libungif to support all image formats
+     (jpeg, png and gif). These libraries can be replaced by libgif (gif)
+     and GraphicsMagick >= 1.1 (jpeg, png, gif and possible more formats).
+     See default.cfg for related configuration switches.
+
+Compiling
+---------
+First of all, you need to run the `configure` script to set up compile-time
+options. If you want to compile the library with the default feature set,
+just use:
+
+	./configure
+
+If you need to set anything unusual, please consult <<configure:>> for details.
+
+The defaults determined by the configure script should be correct on Linux/i386,
+on other architectures you will probably need to tweak the CPU detection section
+in `ucw/perl/UCW/Configure/C.pm` and possibly also the typedefs in `ucw/config.h`.
+
+Then run:
+
+	make
+
+It compiles the package. You need to install it (unless you specified
+a <<configure:local_build,local build>>). To do so, execute:
+
+	make install
diff --git a/libucw/ucw/doc/lists.txt b/libucw/ucw/doc/lists.txt
new file mode 100644
index 0000000..68deff6
--- /dev/null
+++ b/libucw/ucw/doc/lists.txt
@@ -0,0 +1,29 @@
+Linked lists
+============
+
+Ucwlib defines two basic linked list structures: single-linked lists and circular linked lists.
+Both of them support insertion of any number of nodes, removal of nodes and various searches.
+Single-linked lists are a bit simplier (they especially requires smaller nodes)
+but some operations need assymptoticaly more time.
+
+Linked lists can be used very simply. We define a structure as list's handle and
+a common header in all inserted nodes. All routines then accept and return pointers
+to this handle and node headers.
+
+[[slists]]
+Single-linked lists
+-------------------
+
+!!ucw/slists.h
+
+[[clists]]
+Circular linked lists
+---------------------
+
+!!ucw/clists.h
+
+[[simple_lists]]
+Circular linked lists of simple items
+-------------------------------------
+
+!!ucw/simple-lists.h
diff --git a/libucw/ucw/doc/log.txt b/libucw/ucw/doc/log.txt
new file mode 100644
index 0000000..61e443e
--- /dev/null
+++ b/libucw/ucw/doc/log.txt
@@ -0,0 +1,154 @@
+Logging
+=======
+
+LibUCW contains a powerful system for logging of messages. Depending on your
+needs, it can be used either as a very simple logger which writes all messages
+to stderr or to a single file, or as a multi-stream logger in which different
+messages can be directed to different streams and the streams can be combined
+in various ways.
+
+Simple logging
+--------------
+The basic logging functions are defined in <<basics:logging,lib.h>>.
+
+To log a message, call `msg(L_xxx,@fmt,@args)`, where `L_xxx` is a category of the log
+message (`L_INFO`, `L_WARN`, `L_ERR` etc.), @fmt is a format string as for printf,
+and @args are additional arguments to be substituted to the format string.
+A newline character is automatically appended; the message should not contain
+any control characters.
+
+The first argument of `msg` can be OR'ed with additional flags. Most notably, you can
+add `L_SIGHANDLER` if you wish to log a message from a signal handler (see below
+for discussion on signals and reentrancy in general).
+
+By default, all messages are logged to stderr. If you wish to use a log file,
+call `log_file(@name)`. All subsequent logging will use this file and stderr
+will be redirected there, too.
+
+Names of log files can contain strftime() escapes, which are expanded on the fly.
+This makes it easy to start a new log file every day.
+
+Example
+~~~~~~~
+	#include <ucw/lib.h>
+
+	int main(int argc, char **argv)
+	{
+	  log_init(argv[0]);
+	  log_file("/var/log/utterances");
+	  msg(L_INFO, "This program does nothing, but successfully.");
+	  return 0;
+	}
+
+Log streams
+-----------
+More generally, the logger can use multiple log streams. Each stream can be directed
+to a logging back-end (log file, syslog, ...) and equipped with a filter which
+selects a subset of the messages received. A stream can also have substreams
+attached, which are passed a copy of all log messages sent to the parent stream.
+
+Streams are identified by <<struct_log_stream,struct log_stream>> and also by
+their registration number. Messages can be directed to a stream by OR'ing the
+registration number to the first argument of msg().
+
+When a log stream receives a message, it is processed as follows:
+
+  1. If the log level of the message does not match the set of accepted
+     levels of the stream (@levels), the message is dropped.
+  2. The filter hook of the stream is consulted and if it returns a non-zero
+     value, the message is dropped.
+  3. The message is passed to all substreams of the stream.
+  4. The message is formatted according to the formatting flags (@msgfmt) of the stream.
+  5. The handler hook of the stream is called (if it exists).
+
+When no stream is explicitly selected, msg() uses the default stream, which
+has registration number 0 and which is also returned by log_default_stream().
+This stream has no explicit destination, but it can have substreams. (When
+a program starts, the default stream is connected to stderr. A call to log_file()
+establishes a file logging stream and links it as the only substream of the
+default stream. If you want to do that with any other log stream, call log_set_default_stream().)
+
+Streams are reference-counted. When a stream is created, it gets reference count 1.
+When it is linked as a substream of another stream, its reference count is incremented.
+Closing the stream by log_close_stream(), unlinking it or closing a parent stream
+(which causes an unlink) decrements the reference count and when it drops to zero,
+the stream is removed and all its substreams unlinked.
+
+Example
+~~~~~~~
+	#include <ucw/lib.h>
+	#include <ucw/log.h>
+
+	int main(int argc, char **argv)
+	{
+	  log_init(argv[0]);
+	  struct log_stream *ls = log_new_file("/var/log/utterances", 0);
+	  msg(L_INFO | ls->regnum, "Aye captain, we have a log file");
+	  msg(L_INFO, "Alas, stderr still works");
+	  return 0;
+	}
+
+Message types
+-------------
+Messages can also have types, which can be used for further filtering inside streams.
+By default, there is only the default message type. To obtain an identifier of a new
+type (again to be OR'ed to the log level when calling <<msg()>>), use <<log_register_type()>>.
+The number of types is currently limited to 32.
+
+If you want non-default types to be visible, enable the `LSFMT_TYPE` format flag.
+
+Processes, threads and signals
+------------------------------
+When you fork a new process, it automatically inherits all currently configured log
+streams. You should however call <<log_fork()>> to update the logger's notion
+of the current PID (at least when you use PID's in your log messages). Also, if you
+plan to exec() a process after fork(), do not forget to call <<log_close_all()>>,
+so that all file descriptors used for log files (except for stderr) are closed.
+
+The <<basics:msg()>> function itself can be called from multiple threads in parallel
+and it is atomic by design. The functions for setting up the logging machinery
+are however not reentrant (they follow our general rule about functions that
+affect global state).
+
+Logging from signal handlers is problematic, as is doing almost anything in signal
+handlers, because almost all libc functions are not signal-safe. Most importantly,
+functions for converting time to a human-readable representation aren't safe.
+LibUCW therefore offers only limited logging services in such situations and
+you must use the `L_SIGHANDLER` flag to request it. Otherwise, deadlocks get
+ready to happen.
+
+Messages logged with `L_SIGHANDLER` set are written directly to stderr (which
+is usually an alias for the main log file, at least if you use <<log_file()>>)
+and they do not carry a timestamp. Logging of sighandler messages to general
+log streams or to syslog is therefore not supported.
+
+ucw/log.h
+---------
+!!ucw/log.h
+
+Limiting rate: ucw/tbf.h
+------------------------
+
+LibUCW also offers simple means of limiting the rate of log messages (or of any other
+events) by means of a so called 'Token Bucket Filter.' The idea behind this filter is
+simple: To log a message, we need a token. The available tokens are accumulated in
+a bucket which has a fixed 'filling rate' (the number of tokens arriving in the bucket
+per second, which may be a fractional number) and fixed 'maximum capacity.' The
+bucket receives the tokens continuously with the given rate and when it reaches
+the maximum capacity, the extra tokens are dropped on the floor. When a message
+has to be sent, we take a single token from the bucket and if there wasn't any,
+we drop the message.
+
+The filling rate therefore describes the maximum sustained rate of messages,
+while the bucket capacity tells the filter the maximum length of a short burst,
+which can temporarily exceed the rate.
+
+A general bucket filter is available in `ucw/tbf.h`. The usual way of using it
+to limit logging is to set up a filter hook of a stream which asks the TBF for
+every message. (Remember, though, that if your program is multithreaded, the
+filter hook can be run in multiple threads in parallel, so it has to guard the
+TBF by a lock.) The configuration interface for log streams described above
+is able to attach rate limiters to streams per user's request, so you usually
+need not take any extra care.
+
+!!ucw/tbf.h
diff --git a/libucw/ucw/doc/mainloop.txt b/libucw/ucw/doc/mainloop.txt
new file mode 100644
index 0000000..9f80f13
--- /dev/null
+++ b/libucw/ucw/doc/mainloop.txt
@@ -0,0 +1,107 @@
+Mainloop
+========
+
+Not every program is strictly sequential. Sometimes, an event-driven
+model is much easier to grasp. A fine example of such a program could
+be a railway server. It has a separate connection to each station
+and also to each train, so that it knows where each of them is (and
+that neither a train nor a station have got missing). So it has to wait
+for events coming from these connections and handle them appropriately.
+It also processes other events that it has itself generated -- for
+example various timers telling that a train is scheduled to depart
+from some station.
+
+The mainloop module takes care of the low-level part of event-driven
+programs: it provides an event loop (often called a main loop), which
+watches for events requested by the rest of the program and calls
+a supplied callback when an event happens.
+
+More precisely, for each type of an event (file descriptor activity,
+timer etc.), there is a +handler structure+, which contains the description
+of the event (e.g., the time where the timer should fire), a pointer to
+a +handler function+ (the event callback) and data for use by the handler
+function. The handler is then registered with the main loop.
+
+- <<simple,Simple use>>
+- <<contexts,Using multiple contexts>>
+- <<threads,Forking and threading>>
+- <<basic,Basic operations>>
+- <<time,Time and timers>>
+- <<hooks,Loop hooks>>
+- <<file,Activity on file descriptors>>
+- <<blockio,Asynchronous block I/O>>
+- <<recordio,Asynchronous record I/O>>
+- <<process,Child processes>>
+- <<signal,Synchronous delivery of signals>>
+
+[[contexts]]
+Simple use
+----------
+
+Simple programs usually employ the main loop in a straightforward way:
+
+- Call @main_init() to initialize the main loop machinery.
+- Add an initial set of event handers (@file_add(), @timer_add(), etc.).
+- Enter the event loop by calling @main_loop(). This function runs for
+  the rest of the lifetime of the program. It watches for events and
+  handles them by calling the appropriate handler functions. These functions
+  can of course add new events or modify/delete the existing ones.
+- When the program decides it wants to stop, it calls @main_shut_down(),
+  or alternatively it returns <<enum_main_hook_return,`HOOK_SHUTDOWN`>> from some hook functions.
+  Soon after that, @main_loop() returns.
+- Remove all event hooks and call @main_cleanup().
+
+The event structures (like <<struct_main_file,`struct main_file`>>) are
+always allocated by the user, but please touch only the fields marked
+in this documentation with `[*]`. The other fields are used internally;
+you should initialize them to zeroes before adding the event and avoid
+accessing them afterwards.
+
+[[contexts]]
+Using multiple contexts
+-----------------------
+
+In a more complex program, it can be useful to keep several sets of events
+and run a separate instance of the event loop for each such set. A typical
+example would be a multi-threaded program or a function which needs to
+communicate with a network server locally, ignoring all other events
+before the operation is finished.
+
+For such cases, you can create multiple instances of <<struct_main_context,`struct main_context`>>
+by calling @main_new(). Each thread then keeps its own current context,
+which can be changed by @main_switch_context(). All mainloop functions
+then either take an explicit pointer to a context or (more typically)
+they operate on the current context. When you no longer need the context, you
+can delete it by @main_delete().
+
+It is even possible to use nested main loops: in a hook called by the
+top-level instance of @main_loop(), you can switch to a different context,
+call @main_loop() recursively and when you are done, switch back and return
+to the top-level loop.
+
+*CAVEAT:* In the present implementation, only a single context per process
+can handle process exit events. If you use @process_add() in multiple contexts,
+it can happen that the current context catches the `SIGCHLD` signal and obtains
+information about a child process associated with another context, which it does
+not know how to handle. If you ever need this, please let us know.
+
+[[threads]]
+Forking and threading
+---------------------
+
+Using the event loop in a multi-threaded or multi-process program is possible,
+but it should be done very carefully.
+
+Multiple threads can use the main loop, but each of them must use a separate
+context (or contexts).
+
+When you fork() a child process, either the parent or the child must give up
+use of each main loop context. The @main_teardown() and @main_destroy() functions
+can be useful for that. (The reason is that some parts of the main loop context,
+like file descriptors used internally, become shared between the processes, so
+the processes could influence each other in crazy ways. You do not want to hunt
+for such bugs.)
+
+
+
+!!ucw/mainloop.h
diff --git a/libucw/ucw/doc/mempool.txt b/libucw/ucw/doc/mempool.txt
new file mode 100644
index 0000000..5aa33dd
--- /dev/null
+++ b/libucw/ucw/doc/mempool.txt
@@ -0,0 +1,123 @@
+Memory pools
+============
+
+You can use them for efficient allocation of large amount of small
+memory blocks. You can use them to allocate many blocks and free them
+all at once. They allow storing and restoring state of what is
+allocated, growing and shrinking the last block and other tricks.
+
+* <<defs,Definitions>>
+* <<basic,Basic manipulation>>
+* <<alloc,Allocation routines>>
+* <<gbuf,Growing buffers>>
+* <<store,Storing and restoring state>>
+* <<string,String operations>>
+* <<format,Formatted output>>
+* <<examples,Examples>>
+  - <<ex_trie,String trie>>
+  - <<ex_try,Action which may fail>>
+  - <<ex_stdin,Load all data from stdin>>
+
+!!ucw/mempool.h
+
+[[examples]]
+Examples
+--------
+
+You can find few examples of mempools use. But their actual use is
+limited only by your fantasy.
+
+[[ex_trie]]
+String trie
+~~~~~~~~~~~
+
+There are two advantages for a trie to use a mempool. One, it has less
+overhead than malloc (with the cost you can not free the blocks one by
+one as you allocated them). Second is freeing the whole trie, you do
+not need to walk trough it and free each node, you just
+<<mp_flush(),flush>> the whole mempool.
+
+  struct trie_node {
+    struct trie_node *subs[256];
+    bool present;
+  };
+
+  struct trie {
+    struct trie_node root;
+    struct mempool *pool;
+  };
+
+  struct trie *trie_new(void) {
+    struct mempool *pool = mn_new(4096);
+    struct trie *result = mp_alloc_zero(pool, sizeof(*result));
+    result->pool = pool;
+    return result;
+  }
+
+  void trie_insert_internal(struct trie_node *where, struct mempool *pool, const char *string) {
+    if(*string) {
+      if(!where->subs[*string])
+        where->subs[*string] = mp_alloc_zero(pool, sizeof(*where->subs[*string]));
+      trie_insert_internal(where->subs[*string], pool, string + 1);
+    } else {
+      where->present = 1;
+    }
+  }
+
+  void trie_insert(struct trie *trie, const char *string) {
+    trie_insert_internal(&trie->root, trie->pool, string);
+  }
+
+  void trie_delete(struct trie *trie) {
+    mp_delete(trie->pool);      //Free everything, including the trie structure
+  }
+
+[[ex_try]]
+Action which may fail
+~~~~~~~~~~~~~~~~~~~~~
+
+Imagine a situation where you want to load information from few files.
+Loading of each file consists of list of actions, each can allocate
+some memory and each can fail. If an action fails, the whole file is
+considered invalid, you want to ignore that file and keep loading the
+others.
+
+The problem with memory is you want to return the already allocated
+amount for the file which failed. You can use <<store,storing>> of
+mempool state.
+
+  void load_file(struct mempool *pool, const char *file) {
+    struct mempool_state state;
+    mp_save(pool, &state);              // Store the current state
+    struct file_data *data = mp_alloc_zero(pool, sizeof(*data));
+    if(!(
+        file_open(file, data, pool) &&  // Load the file
+        header_load(data, pool) &&
+        part1_load(data, pool) &&
+        part2_load(data, pool) &&
+        file_close(data) &&
+        data_link(data, pool)))         // Link the loaded data into global state
+      mp_restore(pool, &state);         // Failed -> return all used memory
+  }
+
+[[ex_stdin]]
+Load all data from stdin
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+You may want to load all data from stdin into a memory buffer. But
+there is the problem you do not know how many of them there is. You
+may use mempool and it's <<gbuf,growing buffer>> feature.
+
+This example uses libucw's own IO system, <<fastbuf:,fastbufs>>.
+
+  void *stdin_data(struct mempool *pool) {
+    struct fastbuf *fb = bopen_fd(0, NULL);     // Read from stdin
+    size_t amount;
+    char *ptr = mp_start(pool, 1024);
+    while(amount = bread(fb, ptr, 1024)) {      // Read a block
+      ptr += amount;                            // Move after it
+      ptr = mp_spread(pool, ptr, 1024);         // Get space for the next block
+    }
+    bclose(fb);
+    return mp_end(pool, ptr);
+  }
diff --git a/libucw/ucw/doc/opt.txt b/libucw/ucw/doc/opt.txt
new file mode 100644
index 0000000..e920d64
--- /dev/null
+++ b/libucw/ucw/doc/opt.txt
@@ -0,0 +1,88 @@
+Option parser
+=============
+
+Libucw contains a parser of command-line options, more versatile and
+easier to use than the usual `getopt()` and `getopt_long()`. It follows the
+traditional UNIX conventions of option syntax, but the options are defined in
+a declarative way, similar in spirit to our <<conf:,configuration file
+parser>>.
+
+- <<example,Example>>
+- <<anatomy,Anatomy of options>>
+- <<opt_h,ucw/opt.h>>
+  * <<classes,Option classes>>
+  * <<opt_item,Option definitions>>
+  * <<flags,Option flags>>
+  * <<macros,Macros for declaration of options>>
+  * <<positional,Positional arguments>>
+  * <<func,Functions>>
+  * <<conf,Cooperating with configuration file parser>>
+  * <<hooks,Hooks>>
+
+[[example]]
+Example
+-------
+Let us start with a simple example: a program with several options and
+one mandatory positional argument.
+
+  #include <ucw/lib.h>
+  #include <ucw/opt.h>
+  
+  int english;
+  int sugar;
+  int verbose;
+  char *tea_name;
+  
+  static struct opt_section options = {
+    OPT_ITEMS {
+      OPT_HELP("A simple tea boiling console."),
+      OPT_HELP("Usage: teapot [options] name-of-the-tea"),
+      OPT_HELP(""),
+      OPT_HELP("Options:"),
+      OPT_HELP_OPTION,
+      OPT_BOOL('e', "english-style", english, 0, "\tEnglish style (with milk)"),
+      OPT_INT('s', "sugar", sugar, OPT_REQUIRED_VALUE, "<spoons>\tAmount of sugar (in teaspoons)"),
+      OPT_INC('v', "verbose", verbose, 0, "\tVerbose (the more -v, the more verbose)"),
+      OPT_STRING(OPT_POSITIONAL(1), NULL, tea_name, OPT_REQUIRED, ""),
+      OPT_END
+    }
+  };
+  
+  int main(int argc, char **argv)
+  {
+    opt_parse(&options, argv+1);
+    return 0;
+  }
+
+[[anatomy]]
+Anatomy of options
+------------------
+Most options have the following properties:
+
+- <<classes,Option class>> defining overall behavior of the option
+- Short name: one character. Set to 0 if the option has no short form.
+  Alternatively, the short name can refer to a <<positional,positional argument>>.
+- Long name: an arbitrary string. Set to NULL if the option has no long form.
+- Variable, where the value of the option shall be stored, together with
+  its <<conf:enum_cf_type,data type>>. The type is either one of the conventional
+  types (`int`, `uint`, etc.), an extended type providing its own parser
+  function via <<xtypes:struct_xtype,`xtype`>>, or an obsolete user-type
+  defined by <<conf:struct_cf_user_type,`cf_user_type`>>.
+- <<flags,Flags>> further specifying behavior of the option (whether it is mandatory,
+  whether it carries a value, whether it can be set repeatedly, etc.).
+- Help text, from which the help displayed to the user is constructed.
+- Extra data specific for the particular class.
+
+The help is generated in a three-column format. The first column contains the
+short names, then come the long names, and finally option descriptions.
+The help text starts in column 2 (where it can describe the option's argument);
+you can use the tab character to advance to the next column. When a newline
+character appears, the text continues on the next line in column 1.
+
+[[opt_h]]
+ucw/opt.h
+---------
+
+This header file contains the public interface of the option parser module.
+
+!!ucw/opt.h
diff --git a/libucw/ucw/doc/prime.txt b/libucw/ucw/doc/prime.txt
new file mode 100644
index 0000000..2666de9
--- /dev/null
+++ b/libucw/ucw/doc/prime.txt
@@ -0,0 +1,7 @@
+Prime numbers
+=============
+
+The library defines some simple functions to generate prime numbers.
+They are useful for example in hash tables.
+
+!!ucw/prime.h
diff --git a/libucw/ucw/doc/relnotes.txt b/libucw/ucw/doc/relnotes.txt
new file mode 100644
index 0000000..2b6a029
--- /dev/null
+++ b/libucw/ucw/doc/relnotes.txt
@@ -0,0 +1,210 @@
+Release notes
+=============
+
+6.5 (2015-07-17)
+----------------
+* Added companion library <<../ucw-json/index:,LibUCW-JSON>> for parsing
+  and formatting JSON.
+* Fastbufs have a new wrapper for parsing and generating hex-dumps.
+  Useful primarily for debugging.
+* Unicode functions are now more strict and they reject denormalized
+  UTF-8 sequences. Also, it is now possible to append UTF-8 characters
+  to a memory pool.
+* The naming of memory pool functions mp_append_printf() and mp_append_vprintf()
+  turned out to be unfortunate as they have differently from all other functions
+  operating on growing buffers. They have been renamed to mp_printf_append()
+  and mp_vprintf_append() with the old names kept as aliases for backward
+  compatibility.
+
+6.4 (2015-04-08)
+----------------
+* Fixed several minor bugs in the <<mainloop:,mainloop>> module.
+
+6.3 (2015-02-14)
+----------------
+* Cleaned up and documented the <<../ucw-xml/index:,LibUCW-XML>> companion
+  library -- a lightning fast standards-complient XML parser.
+* Solved problems with closing of stderr in daemons: see the new function
+  <<log:log_drop_stderr()>>.
+
+6.2 (2015-01-16)
+----------------
+* Fixed race conditions in <<daemon:,daemon helpers>>.
+* The <<xtypes:,extended types>> have been documented and integrated
+  in the table printer, command-line option parser, and configuration parser.
+* The <<ucw-tableprinter.5:,table printer options>> have been documented.
+
+6.1 (2014-08-09)
+----------------
+
+Incompatible changes
+~~~~~~~~~~~~~~~~~~~~
+* Major changes of the table printer module. Finally, its interface can be
+  considered stable now.
+
+Minor changes
+~~~~~~~~~~~~~
+* The <<opt:,command-line option parser>> gained `OPT_BREAK` class and
+  `OPT_HELP_COLUMNS` flag.
+* The strtonum module supports more types.
+
+6.0 (2014-06-20)
+----------------
+
+Incompatible changes
+~~~~~~~~~~~~~~~~~~~~
+* *Incompatible:* It turned out that almost all users of the <<gary:,growing array>>
+  module push/pop individual elements. Therefore, we have removed the second
+  argument (item count) of `GARY_PUSH` and `GARY_POP`. If you want to push/pop
+  multiple elements at once, use `GARY_PUSH_MULTI` and `GARY_POP_MULTI`.
+* *Incompatible:* The interface of the <<heap:,heap>> module was cleaned up
+  to remove non-systematic side-effects. The `HEAP_INSERT` operation is now
+  a proper insert (previously, it was just cleanup after insertion performed
+  by the caller), similarly `HEAP_INCREASE` and `HEAP_DECREASE`. The `HEAP_DELMIN`
+  operation was renamed to `HEAP_DELETE_MIN`. New operations `HEAP_REPLACE` and
+  `HEAP_REPLACE_MIN` have been added. If you need to track positions of elements
+  in the heap, please check the notes at individual functions.
+* The <<conf:,configuration file parser>> has been improved:
+** Multiple instances of the configuration parser are supported.
+** *Incompatible:* As there may be more instances, we can no longer use
+   global variables to control the configuration system. In particular,
+   `cf_need_journal` and `cf_pool` variables have been replaced by
+   functions <<conf:cf_set_journalling()>> and <<conf:cf_get_pool()>>.
+** *Incompatible:* Loading of configuration files has been decoupled from
+   the getopt wrapper, so you might need to include `conf.h` for functions
+   which were previously declared in `getopt.h`.
+** New functions have been added:
+   <<conf:cf_open_group()>>, <<conf:cf_close_group()>>, and <<conf:cf_revert()>>.
+** *Incompatible:* Dynamic configuration arrays have been re-implemented in
+   terms of our generic <<gary:,growing arrays>>. This makes them easier to
+   use and most of the interface has been preserved. The only exception is
+   static allocation via the DARY_ALLOC() macro, which is no longer available.
+* *Incompatible:* The `UCW::CGI` Perl module has its custom error handlers
+  (which override default Perl error handlers) split off to a separate module
+  `UCW::CGI::ErrorHandler`.
+
+New modules
+~~~~~~~~~~~
+* <<daemon:,Daemon helpers>> have been added including a new `daemon-control`
+  utility. The old `daemon-helper` utility has been obsoleted and it is not
+  compiled by default.
+* <<signal:,Signal helpers>> for translation between signal names and numbers
+  have been added.
+* The fastbuf I/O layer received a new back-end <<fastbuf:fbmulti,fb_multi>>,
+  which concatenates several fastbuf streams to form a single virtual stream.
+* Added <<varint:,varint>> module for efficient UTF-8-like encoding of 64-bit
+  integers to byte sequences.
+* Added <<table:,table printer>> module for configurable formatting of
+  2-dimensional tables in both user-friendly and machine-friendly ways.
+* A <<opt:,parser of command-line options>> has been added, similar in spirit to
+  our <<conf:,configuration file parser>>. The <<conf:getopt_h,getopt>> module
+  has been obsoleted
+* <<alloc:,Generic allocators>> have been introduced, providing an abstract
+  way of memory allocation. <<gary:,Growing arrays>> are now based on such
+  allocators, which allows for example growing arrays in memory pools.
+
+Cleanups
+~~~~~~~~
+* Libucw finally has a clean ABI, which does not pollute namespace, risking
+  collisions with other libraries. However, we did not want to abandon our
+  nicely and simply named functions, so the header files define macros,
+  which translate names of all externally visible symbols to start with `ucw_`.
+  If you don't like this, configure libucw with `CONFIG_UCW_CLEAN_ABI` turned off.
+* All helper utilities are now installed with names starting with `ucw-` to
+  prevent collisions.
+* The auxiliary libraries have been renamed to `libucw-charset`, `libucw-images`,
+  `libucw-xml`. The clean ABI promise does not extend to them yet.
+* The alias `uns` for `unsigned int` has been replaced by a more common `uint`.
+  The old name is still maintained for backward compatibility.
+* Several functions now accept `size_t` instead of `unsigned int` for size arguments.
+
+Minor changes
+~~~~~~~~~~~~~
+* `<stdbool.h>` is automatically included by `<ucw/lib.h>`.
+
+5.0 (2012-02-21)
+----------------
+
+* *Incompatible:* The `timestamp_t` type has been decoupled from wall clock time.
+  It now specifies the number of milliseconds from an unspecified origin, so that
+  it can for example refer to the system monotonic clock. The `ucw_time_t` type
+  has been removed.
+
+* The <<mainloop:,mainloop>> module has been rewritten:
+** Multiple instances of the main loop are supported (to be used in different
+   threads or locally within a library function).
+** The new implementation is more efficient: it uses heaps for timers,
+   epoll() for file descriptors (when available).
+** The return value of <<mainloop:struct_main_file,`main_file`>> handlers has been
+   changed to <<mainloop:enum_main_hook_return,`HOOK_IDLE`>> and <<mainloop:enum_main_hook_return,`HOOK_RETRY`>>.
+   However, the numerical values are equal, so old code should keep working.
+** *Incompatible:* The main loop time (`main_now`) has been decoupled from wall clock time
+   and moved to a field in the `main_context` structure. It can be accessed either directly
+   or via <<mainloop:main_get_now()>>. The `main_now_seconds` variable has
+   been removed, `main_idle_time` has become a structure field.
+** *Incompatible:* The interface for asynchronous reading and writing
+   (file_read() and friends) has been separated from the core of the main loop.
+   Use <<mainloop:struct_main_block_io,`struct main_block_io`>> and related functions instead.
+** *Incompatible:* file_close_all() is gone. You have to call <<mainloop:main_teardown()>>
+   or <<mainloop:main_destroy()>> to clean up properly after fork().
+** Added support for <<mainloop:signal,synchronous delivery of signals>>.
+** Added relative timers: <<mainloop:timer_add_rel()>>.
+** Modification of events from a running event handler is always safe.
+** Deleting an already deleted event is always safe.
+** For any event type, it is possible to ask whether it is active (added to the mainloop) or not: <<mainloop:hook_is_active()>> and friends.
+** A new mainloop front-end for asynchronous <<mainloop:recordio,record-based I/O>> has been added.
+
+* Added support for <<trans:,resource pools and transactions>>, which is a general
+  mechanism for tracking resources and reporting errors. It is still considered
+  experimental, so the API can change in future releases.
+
+* Added a <<gary:,growing array>> module `gary.h`, similar to `gbuf.h`, but with
+  a much more convenient interface.
+
+* The <<lists:,Circular linked lists>> can recognize unlinked nodes,
+  see <<lists:clist_unlink()>>.
+
+* Added `strtonum.h` -- a module for precise parsing of numbers.
+
+* When compiled by a recent enough GCC, `__thread` is used for thread-local variables,
+  which is more efficient than the POSIX per-thread storage.
+** *Incompatible:* `ucwlib_context->thread_id` is no longer available directly,
+  please use <<thread:ucwlib_thread_id()>> instead.
+
+* *Incompatible:* Several modules have been declared obsolete and removed:
+** `sighandler` -- generic signal handling (it still exists internally)
+** `qache` -- a mmap-based shared cache
+** `prefetch` -- an interface to memory prefetch instructions; superseded by GCC `__builtin_prefetch`
+** `randomkey` -- a generator of cryptographically strong pseudo-random tokens; will be replaced
+   by something more generic soon
+** `profile` -- a profiling hack
+
+* *Incompatible:* Several modules now have their own header files:
+** `process.h` -- all functions related to processes, previously declared in `lib.h`
+** `io.h` -- functions related to files from `lib.h` and `lfs.h`
+** `time.h` -- timestamps and interval timers, previously in `lib.h`
+
+* *Incompatible:* Several configuration options were renamed or removed:
+** `CONFIG_FAKE_ELTPOOL` &rarr; `CONFIG_UCW_FAKE_ELTPOOL`
+** `CONFIG_LARGE_FILES` &rarr; `CONFIG_UCW_LARGE_FILES`
+** `CONFIG_OWN_GETOPT` &rarr; `CONFIG_UCW_OWN_GETOPT`
+** `CONFIG_DIRECT_IO` &rarr; `CONFIG_UCW_DIRECT_IO`
+** `DEFAULT_CONFIG` &rarr; `CONFIG_UCW_DEFAULT_CONFIG`
+** `ENV_VAR_CONFIG` &rarr; `CONFIG_UCW_ENV_VAR_CONFIG`
+** `CONFIG_LFS` was removed
+** `CONFIG_URL_ESCAPE_COMPAT` was removed
+
+* `UCW::Configure` supports running of test programs.
+
+* `UCW::CGI` support multiple argument tables and UTF-8 mode. Also, it uses the
+  proper HTTP status codes when reporting errors.
+
+* Implementation details of <<fastbuf:,fastbufs>> have changed. The new code checks
+  invariants more carefully, so it is possible that custom fastbuf back-ends which
+  are buggy now fail, although they previously seemed to work.
+
+
+4.0 (2009-04-13)
+----------------
+This was the first stand-alone release of LibUCW. Before that, LibUCW was developed
+as a part of the http://www.ucw.cz/holmes/[Sherlock Holmes project].
diff --git a/libucw/ucw/doc/signal.txt b/libucw/ucw/doc/signal.txt
new file mode 100644
index 0000000..b78f065
--- /dev/null
+++ b/libucw/ucw/doc/signal.txt
@@ -0,0 +1,7 @@
+Signal helpers
+==============
+
+ucw/signames.h
+--------------
+
+!!ucw/signames.h
diff --git a/libucw/ucw/doc/sort.txt b/libucw/ucw/doc/sort.txt
new file mode 100644
index 0000000..8a9e0f4
--- /dev/null
+++ b/libucw/ucw/doc/sort.txt
@@ -0,0 +1,320 @@
+Sorting
+=======
+
+A very common need is sorting data. Therefore libUCW contains few
+routines to accomplish that task. They are much more universal than
+qsort(), since they allow you to sort structures indexed by a macro,
+sort data externally, if they do not fit into memory, merge data with
+the same keys and sort data of variable length.
+
+All routines described below are <<generic:,generic algorithms>>.
+
+- <<array-simple,Simple array sorting>>
+  * <<mandatory-simple,Mandatory macros>>
+  * <<optional-simple,Optional macros>>
+  * <<example-simple,Example>>
+- <<array,Huge array sorting>>
+  * <<mandatory-array,Mandatory macros>>
+  * <<optional-array,Optional macros>>
+- <<external,External sorting>>
+  * <<basic-external,Basic macros>>
+  * <<callback-external,Callbacks>>
+  * <<integer-external,Integer sorting>>
+  * <<hash-external,Hashing>>
+  * <<merge-external,Merging>>
+  * <<input-external,Input>>
+  * <<output-external,Output>>
+  * <<other-external,Other switches>>
+  * <<function-external,Generated function>>
+
+[[array-simple]]
+Simple array sorting
+--------------------
+
+If you want to sort some data in memory and you aren't too picky about
+setting how, you just use the routine defined in
+`sorter/array-simple.h`. It is an optimised hybrid
+quick-sort/insert-sort algorithm (quick-sort is used to split the
+input into small parts, each is then sorted by insert-sort). It is
+more than 2 times faster than stdlib's qsort(), mostly because of
+inlining.
+
+You need to define few macros and include the header. You get a
+sorting function in return. It will be called
+<<fun__GENERIC_LINK_|ASORT_PREFIX|sort|,`ASORT_PREFIX(sort)`>>.
+
+[[mandatory-simple]]
+Mandatory macros
+~~~~~~~~~~~~~~~~
+- `ASORT_PREFIX(name)` -- The identifier generating macro.
+- `ASORT_KEY_TYPE` -- Data type of a single array entry key.
+
+[[optional-simple]]
+Optional macros
+~~~~~~~~~~~~~~~
+- `ASORT_ELT(i)` -- Indexing macro. Returns the key of the
+  corresponding entry. If not provided, usual array with sequential
+  indexing is assumed.
+- `ASORT_LT(x,y)` -- Comparing macro. If not provided, compares by the
+  `<` operator.
+- `ASORT_SWAP(i,j)` -- Swap elements with indices `i` and `j`. If not
+  provided, it assumes `ASORT_ELT` is l-value and it just swaps keys.
+- `ASORT_THRESHOLD` -- Sequences of at least this amount of elements are
+  sorted by quick-sort, smaller are sorted by insert-sort. Defaults to
+  `8` (result of experimentation).
+- `ASORT_EXTRA_ARGS` -- Pass some extra arguments to the function.
+  They are visible from all the macros. Must start with a comma.
+
+!!ucw/sorter/array-simple.h ASORT_PREFIX
+
+[[example-simple]]
+Example
+~~~~~~~
+
+Let's sort an array of integers, in the usual way.
+
+  #define ASORT_PREFIX(X) intarr_##X
+  #define ASORT_KEY_TYPE int
+  #include <ucw/sorter/array-simple.h>
+
+This generates an intarr_sort(int *array, uint array_size) function that
+can be used the obvious way.
+
+A more complicated example could be sorting a structure, where items
+with odd indices are stored in one array, even in another. Each item
+could be a structure containing a string and an integer. We would like
+to sort them by the strings.
+
+  struct elem {
+    char *string;
+    int integer;
+  };
+
+  #include <string.h>	// Because of strcmp
+  #define ASORT_PREFIX(X) complicated_##X
+  #define ASORT_KEY_TYPE struct elem
+  #define ASORT_ELT(i) ((i % 2 ? even_array : odd_array)[i / 2])
+  #define ASORT_LT(x, y) (strcmp((x).string, (y).string) < 0)
+  #define ASORT_EXTRA_ARGS , struct elem *odd_array, struct elem *even_array
+  #include <ucw/sorter/array-simple.h>
+
+Now we got a complicated_sort(uint array_size, struct elem *odd_array,
+struct *even_array) function to perform our sorting.
+
+[[array]]
+Huge array sorting
+------------------
+
+This one is very similar to the simple array sorter, but it is
+optimised for huge arrays. It is used mostly by the
+<<external,external sorter>> machinery described below, but you can
+use it directly.
+
+It is in the `sorter/array.h` header.
+
+It differs in few details:
+- It supports only continuous arrays, no indexing macro can be
+  provided.
+- It is able to sort in parallel on SMP systems. It assumes all
+  callbacks you provide are thread-safe.
+- If you provide a monotone hash function (if `hash(x) < hash(y)`, then
+  `x < y`, but `x` and `y` may differ when `hash(x) == hash(y)`), it
+  will use it to gain some more speed by radix-sort.
+
+[[mandatory-array]]
+Mandatory macros
+~~~~~~~~~~~~~~~~
+
+- `ASORT_PREFIX(x)` -- The identifier generating macro.
+- `ASORT_KEY_TYPE` -- Type of elements in the array.
+
+[[optional-array]]
+Optional macros
+~~~~~~~~~~~~~~~
+
+- `ASORT_LT(x,y)` -- Comparing macro. Uses the `<` operator if not
+  provided.
+- `ASORT_HASH(x)` -- A monotone hash function (or macro). Should
+  return `uint`.
+- `ASORT_LONG_HASH(x)` -- Like `ASORT_HASH(x)`, but returns 64-bit
+  number instead of 32-bit.
+- `ASORT_THRESHOLD` -- How small should a chunk of data be to be sorted
+  by insert-sort? Defaults to `8` elements.
+- `ASORT_RADIX_BITS` -- How many bits of the hash function should be
+  used at once for radix-sort? The default is guessed from your
+  architecture.
+
+!!ucw/sorter/array.h ASORT_PREFIX
+
+[[external]]
+External sorting
+----------------
+
+If you have too much data to fit into memory, you need to employ
+external sorting. This external sorter operates on
+<<fastbuf:,fastbufs>> containing sequences of items. Each item
+consists of a key, optionally followed by data. Both the keys and data
+may be of variable length, but the keys must be represented by
+fixed-size type in memory. The length of data must be computable from
+the key. Data are just copied verbatim, unless you use the merging
+mode, in which data with the same keys get merged together.
+
+All callbacks must be thread safe.
+
+The sorter resides in the `sorter/sorter.h` header file.
+
+[[basic-external]]
+Basic macros
+~~~~~~~~~~~~
+
+You need to provide some basic macros. Some of them are optional.
+
+- `SORT_PREFIX(x)` -- Identifier generating macro. This one is
+  mandatory.
+- `SORT_KEY` -- Data structure holding the key of item in memory. The
+  representation on disk may be different. Either this one or
+  `SORT_KEY_REGULAR` must be provided.
+- `SORT_KEY_REGULAR` -- You may use this instead of `SORT_KEY`, when
+  the keys have the same representation both in memory and on disk.
+  Then the sorter uses <<fastbuf:bread()>> and <<fastbuf:bwrite()>> to
+  load and store them. It also assumes the keys are not very long.
+- `SORT_KEY_SIZE(key)` -- Returns the real size of the key. The sorter
+  can use this to save space and truncate the key to the given number
+  of bytes, when the keys have variable lengths. If the keys have
+  fixed sizes, there is no need for this macro.
+- `SORT_DATA_SIZE(key)` -- Returns the amount of data following this
+  key. If you do not provide this one, the sorter assumes there are
+  only keys and no data.
+
+[[callback-external]]
+Callbacks
+~~~~~~~~~
+
+Furthermore, you need to provide these callback functions (make sure
+they are thread safe):
+
+- `int SORT_PREFIX(compare)(SORT_KEY *a, SORT_KEY *b)` -- Comparing
+  function. It should act like strcmp(). Mandatory unless provided by
+  <<integer-external,integer sorting>>.
+- `int SORT_PREFIX(read_key)(struct fastbuf *f, SORT_KEY *k)` --
+  Should read a key from the provided <<fastbuf:,fastbuf>> @f and
+  store it into @k. Returns nonzero when ok and zero when an `EOF` was
+  met. Mandatory unless `SORT_KEY_REGULAR` is defined.
+- `void SORT_PREFIX(write_key)(struct fastbuf *f, SORT_KEY *k)` --
+  Should store key @k into @f. Mandatory unless `SORT_KEY_REGULAR` is
+  defined.
+
+[[integer-external]]
+Integer sorting
+~~~~~~~~~~~~~~~
+
+If you sort by an integer value (either computed or available from
+the key), you can use this to save yourself some functions. It also
+activates the <<hash-external,hashing>> automatically.
+
+- `SORT_INT(key)` -- This macro returns the integer to sort by. When
+  you provide it, the compare function is automatically provided for
+  you and the sorting function gets another parameter specifying the
+  range of the integers. The better the range fits, the faster the
+  sorting runs.
+- `SORT_INT64(key)` -- The same, but with 64-bit integers.
+
+[[hash-external]]
+Hashing
+~~~~~~~
+
+If you have a monotone hash function for your keys, you may speed the
+sorting up by providing it. Monotone hashing function must satisfy if
+`hash(x) < hash(y)`, then `x < y`. It should be approximately
+uniformly distributed.
+
+When you want to use it, define `SORT_HASH_BITS` and set it to the
+number of significant bits the hashing function provides. Then provide
+a callback function `uint SORT_PREFIX(hash)(SORT_KEY *key)`.
+
+[[merge-external]]
+Merging items with identical keys
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The sorter is able to merge items with the same keys (the compare
+function returns `0` for them). To use it, define `SORT_UNIFY` macro
+and provide these functions:
+
+- `void SORT_PREFIX(write_merged)(struct fastbuf \*dest, SORT_KEY
+  \*\*keys, void \*\*data, uint n, void *buf)`
+  -- This function takes @n records in memory and writes a single
+  record into the @dest <<fastbuf:,fastbuf>>. The @keys and @data are
+  just the records. The @buf parameter points to a workspace memory.
+  It is guaranteed to hold at last the sum of `SUM_UNIFY_WORKSPACE()`
+  macro over all the keys. The function is allowed to modify all its
+  parameters.
+- `void SORT_PREFIX(copy_merged)(SORT_KEY \*\*keys, struct fastbuf
+\*\*data, uint n, struct fastbuf \*dest)`
+  -- This one is similar to the above one, but the data are still in
+  the <<fastbuf:,fastbufs>> @data and no workspace is provided. This
+  is only used when `SORT_DATA_SIZE` or `SORT_UNIFY_WORKSPACE` is
+  provided.
+- `SORT_UNIFY_WORKSPACE(key)` -- Returns the amount of workspace
+  needed when merging this record. Defaults to `0`.
+
+[[input-external]]
+Specifying input
+~~~~~~~~~~~~~~~~
+
+To tell the sorter where is the input, you specify one of these
+macros:
+
+- `SORT_INPUT_FILE` -- The function takes a filename.
+- `SORT_INPUT_FB` -- The input is a seekable fastbuf stream.
+- `SORT_INPUT_PIPE` -- The input is a non-seekable fastbuf stream.
+- `SORT_INPUT_PRESORT` -- The input is a custom presorter. In this
+  case, you need to write a presorting function `int
+  SORT_PREFIX(presort)(struct fastbuf *dest, void *buf, size_t
+  bufsize)`. The function gets a buffer @buf of size @buf_size to
+  presort in and is supposed to write presorted bunch of data into the
+  @dest buffer. Should return `1` on success or `0` on `EOF` (all it
+  could was already written, no more data). In this case, you can
+  safely pass NULL as the input parameter. The function may be used to
+  generate the data on the fly. The function does not have to be
+  thread safe (it can access global variables).
+
+If you define `SORT_DELETE_INPUT` and it evaluates to true (nonzero),
+the input files are deleted as soon as possible.
+
+[[output-external]]
+Specifying output
+~~~~~~~~~~~~~~~~~
+
+You can configure the output in a similar way. Define one of macros:
+
+- `SORT_OUTPUT_FILE` -- The function takes a filename.
+- `SORT_OUTPUT_FB` -- The function should be provided with NULL and
+  the fastbuf with data is returned.
+- `SORT_THIS_FB` -- A fastbuf is provided to the function and it
+  writes into it. It can already contain some data.
+
+[[other-external]]
+Other switches
+~~~~~~~~~~~~~~
+
+You may define the `SORT_UNIQUE` macro if all keys are distinct. It is
+checked in debug mode.
+
+[[function-external]]
+The generated function
+~~~~~~~~~~~~~~~~~~~~~~
+
+A `SORT_PREFIX(sort)()` function is generated after you include the
+`sorter/sorter.h` header. It has up to three parameters:
+
+- Input. It is either a string (a filename) if you use
+  `SORT_INPUT_FILE` or a fastbuf (otherwise). It should be set to NULL
+  if you use the `SORT_INPUT_PRESORT` input.
+- Output. It is either a string (a filename) if you defined the
+  `SORT_OUTPUT_FILE` or a fastbuf. It must be NULL if you defined
+  `SORT_OUTPUT_FB`.
+- Integer range. The maximum value of integers that are used in the
+  <<integer-external,integer sorting>>. This parameter is  here only
+  if you defined `SORT_INT` or `SORT_INT64`.
+
+The function returns a fastbuf you can read the data from.
diff --git a/libucw/ucw/doc/string.txt b/libucw/ucw/doc/string.txt
new file mode 100644
index 0000000..fe5b97d
--- /dev/null
+++ b/libucw/ucw/doc/string.txt
@@ -0,0 +1,11 @@
+String operations
+=================
+
+LibUCW contains a rich set of functions for manipulating strings.
+
+So far, only a small subset is documented.
+
+ucw/string.h
+------------
+
+!!ucw/string.h
diff --git a/libucw/ucw/doc/table.txt b/libucw/ucw/doc/table.txt
new file mode 100644
index 0000000..94d9101
--- /dev/null
+++ b/libucw/ucw/doc/table.txt
@@ -0,0 +1,106 @@
+Table printer
+=============
+
+The table printer module provides formatting of 2-dimensional tables
+in various ways.
+
+Each table print-out consists of a number of 'rows', which are processed
+one after another. All rows have the same number of 'columns', each intersection
+of a row with a column is called a 'cell'. Each cell holds data, represented
+using the <<xtypes:,extended types>> (a.k.a. 'xtypes'). The table printer
+checks that the cells are filled by values of the appropriate types;
+additionally, a string value is allowed in any cell (for example,
+this allows a numeric cell to be set to "--" or "unknown").
+
+Once a table is defined, it can be printed using a variety of 'formatters'
+(human-readable, tab-separated values, etc.) and its cells can be formatted
+using at least three different formats: pretty (or human-readable), raw,
+default. Formatting of cells is handled by the xtype module.
+
+The order of columns can be modified, columns can be omitted, or even printed
+multiple times with different formatting options. We therefore distinguish
+between columns (according to the definition of the table) and 'column
+instances' (in the specific print-out).
+
+Example
+-------
+
+Let us construct a simple table of music recordings:
+
+First, we define an enum with column indices (the values are automatically
+numbered starting from 0):
+
+  enum table_columns {
+     TBL_REC_ID,
+     TBL_REC_ALBUM_NAME,
+     TBL_REC_ARTIST,
+     TBL_REC_YEAR
+  };
+
+Then we create a structure with the definition of our table.
+The table columns are defined using the `TBL_COL_`'type' and `TBL_COL_`'type'`_FMT`
+macros. Each macro gets the name of the column and its default width
+in characters. The `_FMT` version adds an explicit format
+string for `printf` used for this column. Moreover, various flags can
+be OR-ed to the width of the column, for example `CELL_ALIGN_LEFT` prescribes
+that the cell should be aligned to the left.
+
+To define the column order, we can create an array of struct table_col_info
+using the following macros: TBL_COL, TBL_COL_FMT, TBL_COL_TYPE. An example
+follows:
+
+  struct table_col_info column_order[] = { TBL_COL(TBL_REC_ID), TBL_COL(TBL_REC_ALBUM_NAME) };
+
+The column order is supplied in the struct table_template using the TBL_COL_ORDER macro.
+
+  struct table_template recording_table_template = {
+    TBL_COLUMNS {
+       [TBL_REC_ID] = TBL_COL_UINT("id", 16),
+       [TBL_REC_ALBUM_NAME] = TBL_COL_STR_FMT("album-name", 20 | CELL_ALIGN_LEFT, "%s"),
+       [TBL_REC_ARTIST] = TBL_COL_STR("artist", 20),
+       [TBL_REC_YEAR] = TBL_COL_UINT("year", 10),
+       TBL_COL_END
+    },
+    TBL_COL_ORDER(column_order)
+  };
+
+
+Each table definition has to be created from a template before use by @table_init():
+
+  struct table *rec_table = table_init(&recording_table_template);
+
+Once it is initialized, we can use it for printing multiple tables.
+At the start of each table, we should obtain a <<fastbuf:,fastbuf>> where the output
+should be sent, store it in the table structure and call @table_start():
+
+  struct fastbuf *out = bfdopen_shared(1, 4096);
+  table_start(&rec_table, out);
+
+Then we can fill the rows one after another. Each row is ended by
+@table_end_row():
+
+  table_col_uint(&rec_table, TBL_REC_ID, 0);
+  table_col_str(&rec_table, TBL_REC_ALBUM_NAME, "The Wall");
+  table_col_str(&rec_table, TBL_REC_ARTIST, "Pink Floyd");
+  table_col_uint(&rec_table, TBL_REC_YEAR, 1979);
+  table_end_row(&rec_table);
+
+  table_col_uint(&rec_table, TBL_REC_ID, 1);
+  table_col_str(&rec_table, TBL_REC_ALBUM_NAME, "Rio Grande Mud");
+  table_col_str(&rec_table, TBL_REC_ARTIST, "ZZ Top");
+  table_col_uint(&rec_table, TBL_REC_YEAR, 1972);
+  table_end_row(&rec_table);
+
+Finally, we should close the table by calling @table_end():
+
+  table_end(&rec_table);
+
+At this moment, the table structure is ready to be used again. When
+you do not need it any longer, you can dispose of it by @table_cleanup():
+
+  table_cleanup(&rec_table);
+
+ucw/table.h
+-----------
+
+!!ucw/table.h
diff --git a/libucw/ucw/doc/time.txt b/libucw/ucw/doc/time.txt
new file mode 100644
index 0000000..c8ab36c
--- /dev/null
+++ b/libucw/ucw/doc/time.txt
@@ -0,0 +1,6 @@
+Time and timers
+===============
+
+ucw/time.h
+----------
+!!ucw/time.h
diff --git a/libucw/ucw/doc/trans.txt b/libucw/ucw/doc/trans.txt
new file mode 100644
index 0000000..c1c1391
--- /dev/null
+++ b/libucw/ucw/doc/trans.txt
@@ -0,0 +1,145 @@
+Transactions and resource tracking
+==================================
+
+LibUCW is equipped with a general system for keeping track of resources
+(allocated memory, open files, ...) and freeing them when requested to.
+
+The resource tracker can be used either separately (in the form of explicitly
+managed resource pools) or within a transactional layer, which offers
+exceptions similar to those in higher-level languages. An exception
+then rolls back the transaction, freeing all temporary resources allocated
+within the transaction.
+
+- <<respools,Resource pools>>
+- <<trans,Transactions>>
+- <<exc,Exceptions>>
+- <<excnames,Exception names>>
+
+Resource pools: ucw/resource.h [[respools]]
+-------------------------------------------
+
+A resource pool contains a stack of resources. When a new resource
+is created, it is pushed onto the stack. When freeing the pool, the
+resources are freed in the opposite order, which allows a resource
+refer to data of previously created resources.
+
+A resource can be also freed separately (which unlinks it from the pool),
+or *detached* from the pool (which keeps the real resource, but forgets
+its meta-data, so the resource is no longer tracked).
+
+In many cases, a combination of both methods is needed: some resources
+are marked as temporary, while some others are permanent. When the
+an operation is completed successfully (and @rp_commit() is called),
+all temporary resources are freed and the permanent ones detached.
+When the operation fails, @rp_delete() deletes all resources. By default,
+all resources are created as temporary. You can make a resource permanent
+by calling @res_permanent(), or change the default in `resource->default_res_flags`.
+
+For each thread, LibUCW remembers the currently active resource pool.
+One pool can be used for at most one thread at a time. All functions
+which create resources do so in the active pool. All other functions
+operating on resources work on both active and in-active pools.
+
+!!ucw/resource.h
+
+Transactions: ucw/trans.h [[trans]]
+-----------------------------------
+
+Upon the resource pools, a transactional mechanism is built. A transaction
+consists of a piece of code and a resource pool for temporary objects created
+by the code. Whenever the transaction is running, this pool is set as current.
+You are allowed to switch to a different pool, but please do so carefully.
+
+When a transaction ends, the pool is destroyed and the previous active
+pool is popped off the transaction stack. The fate of the resources
+inside the pool depends on the operation used to end the transaction:
+
+* *commit* -- permanent resources are detached from the pool, temporary
+  resources are freed
+* *rollback* -- all resources are freed
+* *fold* -- instead of destroying the pool, it is added as a subpool
+  to the parent transaction (which must exist)
+
+A transaction is tied to a thread which has created it. A transaction
+can create a sub-transaction, so every thread keeps a stack of running
+transactions in its per-thread data. Calling @trans_init() is optional,
+but @trans_cleanup() should be used before a thread exits in order to
+free resources used by transaction system.
+
+Each transaction also includes a memory pool, from which all temporary
+structures (including all resources created by the transaction) are
+allocated. Feel free to allocate your temporary data from this pool, too;
+they will be freed when the transaction is committed or rolled back.
+When the transaction ends with a fold, this pool gets included inside
+the parent transaction's pool.
+
+(More precisely, there is actually a shared transaction pool per thread
+and the transaction logic uses @mp_push() and @mp_pop() to keep a stack
+of per-transaction data.)
+
+=== Exceptions [[exc]] ===
+
+Transactions are commonly used together with exceptions (which are similar
+to how exceptions work in other languages, but they differ in subtle details,
+so please read carefully). When a failure condition of some kind is detected,
+an exception is *raised* ("*thrown*" is also sometimes used). It involves
+creating an exception object and jumping out of the transaction by
+a `longjmp()`. The exception object (`struct exception`) contains an
+identification of the error and possibly additional data.
+
+Usually, creation of an transaction and handling of exceptions is done
+using *helper macros* (it is not strictly necessary, but highly recommended):
+
+	TRANS_TRY
+	  {
+	    // Code that runs inside the transaction.
+	  }
+	TRANS_CATCH(x)
+	  {
+	    // When an exception is raised, execution continues here.
+	  }
+	TRANS_END;
+
+The code inside the transaction ends with an implicit @trans_commit().
+If you want to end the transaction in a different way, you can do so,
+but you need to use a `break` statement to skip the implicit commit.
+
+The exception handling code gets a local variable `x` pointing to the
+exception object. When the exception is handled (for example, an error
+message is logged), @trans_caught() is called automatically, which rolls
+back the transaction and frees all its resources. Again, you can use the
+`break` statement to skip this.
+
+Alternatively, when you are in a *nested transaction*, you can throw a different
+exception or re-throw the original one. This raises an exception in the
+context of the parent transaction. In this case, the child transaction is
+not rolled back, but its pools are folded as sub-pools of the parent transaction
+and kept until @trans_caught() is called finally.
+
+When an exception is thrown *outside a transaction*, it is converted to
+a plain @die().
+
+*Memory management* and lifetime of various objects and pools deserve special
+attention, as usually when non-local jumps are taking place. When an exception
+is raised, the exception structure is allocated from the memory pool of the
+current transaction. When the exception is propagated through the stack of
+transactions, no transaction is ever rolled back -- all of them are folded
+and their pools remain accessible until @trans_caught() is called at the end.
+Therefore exceptions can carry pointers to the objects which have failed
+without a risk of the object becoming invalid. However, you need to avoid
+pointing to on-stack data like local variables of functions, because these
+are of course destroyed during the `longjmp()`.
+
+=== Functions and structures ===
+
+!!ucw/trans.h
+
+== Exception names [[excnames]] ==
+
+Exception identifiers form a hierarchy. Each identifier consists of dot-separated
+components with the most general component at the beginning.
+
+All exceptions raised by LibUCW reside in the `ucw` subtree. So far, the
+following exception types are defined:
+
+`ucw.fb`:: <<fastbuf:fbexc,Fastbufs>>
diff --git a/libucw/ucw/doc/ucw-tableprinter.5.txt b/libucw/ucw/doc/ucw-tableprinter.5.txt
new file mode 100644
index 0000000..5928abc
--- /dev/null
+++ b/libucw/ucw/doc/ucw-tableprinter.5.txt
@@ -0,0 +1,88 @@
+UCW-TABLEPRINTER(5)
+===================
+
+NAME
+----
+
+ucw-tableprinter - a program module for customizable printing of tables.
+
+DESCRIPTION
+-----------
+The table printer module is a part of the LibUCW library. It provides formatting
+of 2-dimensional tables in various ways. Users seldom interact with the table
+printer itself, but programs using it often provide means for customizing table
+output by passing options.
+
+This manual page describes the overall logic of the table printer and its
+options.
+
+Each table print-out consists of a number of rows, which are processed
+one after another. All rows have the same number of columns. Once a
+table is defined, it can be printed using a variety of formatters
+(block-line, human-readable, machine-readable, etc.).
+
+The table definition consists of various column definitions, each
+column definition is a pair consisting of a name and a type. Name of
+each column must be unique in the whole table. Each column definition
+can be instantiated (printed) in its own format, e.g., a size column
+can be printed three times: first in bytes, then in gigabytes, and
+finally in a human-readable form.
+
+The table can be controlled using various options:
+
+[options="header"]
+|===============================================================================================================
+| option      | argument                    | meaning
+| `header`    | 0 or 1                      | set whether a table header should be printed
+| `noheader`  | 'none'                      | equivalent to `header:0`
+| `cols`      | comma-separated column list | set order of columns and per-column options (see below)
+| `fmt`	      | `human`/`machine`/`block`   | set table formatter to one of the built-in formatters (see below)
+| `col-delim` | string                      | set column delimiter
+| `cells`     | string                      | set column cell format mode, possibilities are: `default`, `raw`, `pretty`
+| `raw`	      | 'none'                      | set column cell format to raw data, equivalent to `cells:raw`
+| `pretty`    | 'none'                      | set column cell format to pretty-printing, equivalent to `cells:pretty`
+|===============================================================================================================
+
+Table formats
+-------------
+The `fmt` option sets the overall format of the table. Currently,
+the following formats are available:
+
+* 'human-readable' (`human`): prints columns separated by a single space, rows
+separated by a newline character (ASCII 0x0a).
+
+* 'machine-readable' (`machine`): prints columns separated by a tab character (ASCII 0x09),
+rows separated by a newline character.
+
+* 'block-line' (`block`): prints each column on one line, rows separated by a single
+blank line. That is, the column separator is set to the newline character
+and an extra newline is printed at the end of each row.
+
+Column definitions
+------------------
+The `cols` option allows to specify a list of table columns and their options.
+For instance, you can use `name,size[raw],size[pretty]` to request a table with three columns:
+name, size as a raw value, and the same size pretty-printed.
+
+Formally, the argument of the `cols` option follows this grammar:
+
+  <col-order-string> := <col-def>[,<col-def>]*
+  <col-def> := <col-name> [ '[' <col-opts> ']' ]
+  <col-name> contains no commas nor square brackets
+  <col-opts> := <col-opt> [ ',' <col-opt> ]
+  <col-opt> contains no commas nor square brackets
+
+Column options
+--------------
+All column types accept these standard formatting modes:
+
+* `default`: human-readable, but not hostile to machine parsing
+* `raw`: raw data with no frills
+* `pretty`: tries to please humans (e.g., like `ls -h`)
+
+There are also formatting modes specific for particular column types:
+
+* Sizes can be given a unit (`KB`, `MB`, `GB`, `TB`, or `auto`; case-insensitive).
+* Timestamps can be formatted as `timestamp` or `epoch` (both are seconds since the
+  Unix epoch), or `datetime` (corresponds to date(1) format `"%F %T"`. Currently,
+  `raw` is an alias for `timestamp` and `pretty` is the same as `datetime`.
diff --git a/libucw/ucw/doc/unaligned.txt b/libucw/ucw/doc/unaligned.txt
new file mode 100644
index 0000000..b68a040
--- /dev/null
+++ b/libucw/ucw/doc/unaligned.txt
@@ -0,0 +1,8 @@
+Fast access to unaligned data
+=============================
+
+Sometimes it is useful to access values which are not correctly aligned.
+To avoid slow copying to aligned buffers, we define several optimized read/write
+functions for accessing such integer values.
+
+!!ucw/unaligned.h
diff --git a/libucw/ucw/doc/unicode.txt b/libucw/ucw/doc/unicode.txt
new file mode 100644
index 0000000..c58eeaa
--- /dev/null
+++ b/libucw/ucw/doc/unicode.txt
@@ -0,0 +1,4 @@
+Multi-byte characters
+=====================
+
+!!ucw/unicode.h
diff --git a/libucw/ucw/doc/varint.txt b/libucw/ucw/doc/varint.txt
new file mode 100644
index 0000000..85687bf
--- /dev/null
+++ b/libucw/ucw/doc/varint.txt
@@ -0,0 +1,4 @@
+Efficient encoding of u64 to byte sequence
+==========================================
+
+!!ucw/varint.h
diff --git a/libucw/ucw/doc/xtypes.txt b/libucw/ucw/doc/xtypes.txt
new file mode 100644
index 0000000..69077f8
--- /dev/null
+++ b/libucw/ucw/doc/xtypes.txt
@@ -0,0 +1,22 @@
+Extended types
+==============
+
+Extended types ('xtypes') are user-defined data types equipped with mechanisms
+for parsing and printing.
+
+Each xtype is described by a <<struct_xtype,`struct xtype`>>, which contains properties of the type
+and several pointers to callback functions.
+
+Xtypes are currently supported by the following modules:
+
+* <<table:,Table printer>>
+* <<opt:,Command-line option parser>>
+* <<conf:,Configuration parser>>
+
+ucw/xtypes.h
+------------
+!!ucw/xtypes.h
+
+ucw/xtypes-extra.h
+------------------
+!!ucw/xtypes-extra.h
diff --git a/libucw/ucw/eltpool.c b/libucw/ucw/eltpool.c
new file mode 100644
index 0000000..5312f21
--- /dev/null
+++ b/libucw/ucw/eltpool.c
@@ -0,0 +1,107 @@
+/*
+ *	UCW Library -- Fast Allocator for Fixed-Size Elements
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This allocator is optimized for intensive allocation and freeing of small
+ *  blocks of identical sizes. System memory is allocated by multiples of the
+ *  page size and it is returned back only when the whole eltpool is deleted.
+ *
+ *  In the future, we can add returning of memory to the system and also cache
+ *  coloring like in the SLAB allocator used in the Linux kernel.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/eltpool.h>
+
+struct eltpool *
+ep_new(uint elt_size, uint elts_per_chunk)
+{
+  struct eltpool *pool = xmalloc_zero(sizeof(*pool));
+  pool->elt_size = ALIGN_TO(MAX(elt_size, sizeof(struct eltpool_free)), CPU_STRUCT_ALIGN);
+  pool->chunk_size = CPU_PAGE_SIZE;
+  while (pool->elt_size * elts_per_chunk + sizeof(struct eltpool_chunk) > pool->chunk_size)
+    pool->chunk_size *= 2;
+  pool->elts_per_chunk = (pool->chunk_size - sizeof(struct eltpool_chunk)) / pool->elt_size;
+  DBG("ep_new(): got elt_size=%d, epc=%d; used chunk_size=%d, epc=%d", elt_size, elts_per_chunk, pool->chunk_size, pool->elts_per_chunk);
+  return pool;
+}
+
+void
+ep_delete(struct eltpool *pool)
+{
+  struct eltpool_chunk *ch;
+  while (ch = pool->first_chunk)
+    {
+      pool->first_chunk = ch->next;
+      page_free(ch, pool->chunk_size);
+    }
+  xfree(pool);
+}
+
+void *
+ep_alloc_slow(struct eltpool *pool)
+{
+  struct eltpool_chunk *ch = page_alloc(pool->chunk_size);
+  void *p = (void *)(ch+1);
+  for (uint i=1; i<pool->elts_per_chunk; i++)
+    {
+      struct eltpool_free *f = p;
+      f->next = pool->first_free;
+      pool->first_free = f;
+      p += pool->elt_size;
+    }
+  ch->next = pool->first_chunk;
+  pool->first_chunk = ch;
+  pool->num_chunks++;
+  return p;
+}
+
+u64
+ep_total_size(struct eltpool *pool)
+{
+  return (u64)pool->num_chunks * pool->chunk_size + sizeof(*pool);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <ucw/clists.h>
+
+struct argh {
+  cnode n;
+  byte x[1];
+} PACKED;
+
+int main(void)
+{
+  struct eltpool *ep = ep_new(sizeof(struct argh), 64);
+  clist l;
+  clist_init(&l);
+  for (uint i=0; i<65536; i++)
+    {
+      struct argh *a = ep_alloc(ep);
+      if (i % 3)
+	clist_add_tail(&l, &a->n);
+      else
+	clist_add_head(&l, &a->n);
+      if (!(i % 5))
+	{
+	  a = clist_head(&l);
+	  clist_remove(&a->n);
+	  ep_free(ep, a);
+	}
+    }
+  ep_delete(ep);
+  puts("OK");
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/eltpool.h b/libucw/ucw/eltpool.h
new file mode 100644
index 0000000..0f65186
--- /dev/null
+++ b/libucw/ucw/eltpool.h
@@ -0,0 +1,121 @@
+/*
+ *	UCW Library -- Fast Allocator for Fixed-Size Elements
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_ELTPOOL_H
+#define _UCW_ELTPOOL_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define ep_alloc_slow ucw_ep_alloc_slow
+#define ep_delete ucw_ep_delete
+#define ep_new ucw_ep_new
+#define ep_total_size ucw_ep_total_size
+#endif
+
+/***
+ * [[defs]]
+ * Definitions
+ * -----------
+ ***/
+
+/**
+ * Memory pool of fixed-sized elements.
+ * You should use this one as an opaque handle only, the insides are internal.
+ **/
+struct eltpool {
+  struct eltpool_chunk *first_chunk;
+  struct eltpool_free *first_free;
+  uint elt_size;
+  uint chunk_size;
+  uint elts_per_chunk;
+  uint num_allocated;		// Just for debugging
+  uint num_chunks;
+};
+
+struct eltpool_chunk {
+  struct eltpool_chunk *next;
+  /* Chunk data continue here */
+};
+
+struct eltpool_free {
+  struct eltpool_free *next;
+};
+
+/***
+ * [[basic]]
+ * Basic manipulation
+ * ------------------
+ ***/
+
+/**
+ * Create a new memory pool for elements of @elt_size bytes.
+ * The pool will allocate chunks of at least @elts_per_chunk elements.
+ * Higher numbers lead to better allocation times but also to bigger
+ * unused memory blocks. Call @ep_delete() to free all pool's resources.
+ *
+ * Element pools can be treated as <<trans:respools,resources>>, see <<trans:res_eltpool()>>.
+ **/
+struct eltpool *ep_new(uint elt_size, uint elts_per_chunk);
+
+/**
+ * Release a memory pool created by @ep_new() including all
+ * elements allocated from that pool.
+ **/
+void ep_delete(struct eltpool *pool);
+
+/**
+ * Return the total number of bytes allocated by a given
+ * memory pool including all internals.
+ **/
+u64 ep_total_size(struct eltpool *pool);
+
+/***
+ * [[alloc]]
+ * Allocation routines
+ * -------------------
+ ***/
+
+void *ep_alloc_slow(struct eltpool *pool); /* Internal. Do not call directly. */
+/**
+ * Allocate a new element on a given memory pool.
+ * The results is always aligned to a multiple of the element's size.
+ **/
+static inline void *ep_alloc(struct eltpool *pool)
+{
+  pool->num_allocated++;
+#ifdef CONFIG_UCW_FAKE_ELTPOOL
+  return xmalloc(pool->elt_size);
+#else
+  struct eltpool_free *elt;
+  if (elt = pool->first_free)
+    pool->first_free = elt->next;
+  else
+    elt = ep_alloc_slow(pool);
+  return elt;
+#endif
+}
+
+/**
+ * Release an element previously allocated by @ep_alloc().
+ * Note thet the memory is not really freed (until @mp_delete()),
+ * but it can be reused by future @ep_alloc()'s.
+ **/
+static inline void ep_free(struct eltpool *pool, void *p)
+{
+  pool->num_allocated--;
+#ifdef CONFIG_UCW_FAKE_ELTPOOL
+  (void) pool;
+  xfree(p);
+#else
+  struct eltpool_free *elt = p;
+  elt->next = pool->first_free;
+  pool->first_free = elt;
+#endif
+}
+
+#endif
diff --git a/libucw/ucw/eltpool.t b/libucw/ucw/eltpool.t
new file mode 100644
index 0000000..7f08626
--- /dev/null
+++ b/libucw/ucw/eltpool.t
@@ -0,0 +1,4 @@
+# Tests for eltpools
+
+Run:	../obj/ucw/eltpool-t
+Out:	OK
diff --git a/libucw/ucw/exitstatus.c b/libucw/ucw/exitstatus.c
new file mode 100644
index 0000000..7ce1ff5
--- /dev/null
+++ b/libucw/ucw/exitstatus.c
@@ -0,0 +1,42 @@
+/*
+ *	UCW Library -- Formatting of Process Exit Status
+ *
+ *	(c) 2004--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/process.h>
+#include <ucw/signames.h>
+
+#include <stdio.h>
+#include <sys/wait.h>
+#include <errno.h>
+
+int
+format_exit_status(char *msg, int stat)
+{
+  if (stat < 0)
+    sprintf(msg, "failed to fork (err=%d)", errno);
+  else if (WIFEXITED(stat) && WEXITSTATUS(stat) < 256)
+    {
+      if (WEXITSTATUS(stat))
+	sprintf(msg, "died with exit code %d", WEXITSTATUS(stat));
+      else
+	{
+	  msg[0] = 0;
+	  return 0;
+	}
+    }
+  else if (WIFSIGNALED(stat))
+    {
+      int sig = WTERMSIG(stat);
+      const char *sn = sig_number_to_name(sig);
+      sprintf(msg, "died on signal %d (%s)", sig, (sn ? : "unknown"));
+    }
+  else
+    sprintf(msg, "died with status %x", stat);
+  return 1;
+}
diff --git a/libucw/ucw/fastbuf.c b/libucw/ucw/fastbuf.c
new file mode 100644
index 0000000..476221a
--- /dev/null
+++ b/libucw/ucw/fastbuf.c
@@ -0,0 +1,319 @@
+/*
+ *	UCW Library -- Fast Buffered I/O
+ *
+ *	(c) 1997--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/resource.h>
+#include <ucw/trans.h>
+#include <ucw/stkstring.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void bclose(struct fastbuf *f)
+{
+  if (f)
+    {
+      bflush(f);
+      res_detach(f->res);
+      DBG("FB: closing");
+      if (f->close)
+	f->close(f); /* Should always free all internal resources, even if it throws an exception */
+    }
+}
+
+void NONRET bthrow(struct fastbuf *f, const char *id, const char *fmt, ...)
+{
+  char full_id[16];
+  snprintf(full_id, sizeof(full_id), "ucw.fb.%s", id);
+  DBG("FB: throwing %s", full_id);
+  ASSERT(!(f->flags & FB_DEAD)); /* Only one bthrow() is allowed before bclose() */
+  va_list args;
+  va_start(args, fmt);
+  if (!f->res)
+    die("Fastbuf %s error: %s", f->name ? : "<fb>", stk_vprintf(fmt, args));
+  f->flags |= FB_DEAD;
+  f->bptr = f->bstop = f->bufend; /* Reset the buffer to guard consecutive seek/read/write */
+  trans_vthrow(full_id, f, fmt, args);
+}
+
+int brefill(struct fastbuf *f, int allow_eof)
+{
+  DBG("FB: refill");
+  ASSERT(!(f->flags & FB_DEAD) && f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
+  if (!f->refill)
+    bthrow(f, "read", "Stream not readable");
+  if (f->refill(f))
+    {
+      ASSERT(f->buffer <= f->bptr && f->bptr < f->bstop && f->bstop <= f->bufend);
+      return 1;
+    }
+  else
+    {
+      ASSERT(f->buffer <= f->bptr && f->bptr == f->bstop && f->bstop <= f->bufend);
+      if (!allow_eof && (f->flags & FB_DIE_ON_EOF))
+	bthrow(f, "eof", "Unexpected EOF");
+      return 0;
+    }
+}
+
+static void do_spout(struct fastbuf *f)
+{
+  DBG("FB: spout");
+  ASSERT(!(f->flags & FB_DEAD) && f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend); /* Check write mode possibly with unflushed data */
+  if (!f->spout)
+    bthrow(f, "write", "Stream not writeable");
+  f->spout(f);
+  ASSERT(f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
+}
+
+void bspout(struct fastbuf *f)
+{
+  do_spout(f);
+  if (f->bstop == f->bufend)
+    {
+      do_spout(f);
+      ASSERT(f->bstop < f->bufend);
+    }
+}
+
+void bflush(struct fastbuf *f)
+{
+  if (f->bptr > f->bstop)
+    do_spout(f);
+  else
+    f->bptr = f->bstop; /* XXX: Skip the rest of the reading buffer ==> it breaks the position of the FE cursor */
+  DBG("FB: flushed");
+}
+
+static void do_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  bflush(f);
+  DBG("FB: seeking to pos=%lld whence=%d %p %p %p %p", (long long)pos, whence, f->buffer, f->bstop, f->bptr, f->bufend);
+  if (!f->seek || !f->seek(f, pos, whence))
+    bthrow(f, "seek", "Stream not seekable");
+  DBG("FB: seeked %p %p %p %p", f->buffer, f->bstop, f->bptr, f->bufend);
+  ASSERT(f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
+  if (whence == SEEK_SET)
+    ASSERT(pos == btell(f));
+  else
+    ASSERT(btell(f) >= 0);
+}
+
+void bsetpos(struct fastbuf *f, ucw_off_t pos)
+{
+  /* We can optimize seeks only when reading */
+  if (f->bptr < f->bstop && pos <= f->pos && pos >= f->pos - (f->bstop - f->buffer)) /* If bptr == bstop, then [buffer, bstop] may be undefined */
+    f->bptr = f->bstop + (pos - f->pos);
+  else if (pos != btell(f))
+    {
+      if (pos < 0)
+	bthrow(f, "seek", "Seek out of range");
+      do_seek(f, pos, SEEK_SET);
+    }
+}
+
+void bseek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  switch (whence)
+    {
+    case SEEK_SET:
+      bsetpos(f, pos);
+      break;
+    case SEEK_CUR:
+      bsetpos(f, btell(f) + pos); /* btell() is non-negative, so an overflow will always throw "Seek out of range" in bsetpos() */
+      break;
+    case SEEK_END:
+      if (pos > 0)
+	bthrow(f, "seek", "Seek out of range");
+      do_seek(f, pos, SEEK_END);
+      break;
+    default:
+      die("bseek: invalid whence=%d", whence);
+    }
+}
+
+int bgetc_slow(struct fastbuf *f)
+{
+  if (f->bptr < f->bstop)
+    return *f->bptr++;
+  if (!brefill(f, 0))
+    return -1;
+  return *f->bptr++;
+}
+
+int bpeekc_slow(struct fastbuf *f)
+{
+  if (f->bptr < f->bstop)
+    return *f->bptr;
+  if (!brefill(f, 0))
+    return -1;
+  return *f->bptr;
+}
+
+int beof_slow(struct fastbuf *f)
+{
+  return f->bptr >= f->bstop && !brefill(f, 1);
+}
+
+void bputc_slow(struct fastbuf *f, uint c)
+{
+  if (f->bptr >= f->bufend)
+    bspout(f);
+  *f->bptr++ = c;
+}
+
+uint bread_slow(struct fastbuf *f, void *b, uint l, uint check)
+{
+  uint total = 0;
+  while (l)
+    {
+      uint k = f->bstop - f->bptr;
+
+      if (!k)
+	{
+	  brefill(f, check);
+	  k = f->bstop - f->bptr;
+	  if (!k)
+	    break;
+	}
+      if (k > l)
+	k = l;
+      memcpy(b, f->bptr, k);
+      f->bptr += k;
+      b = (byte *)b + k;
+      l -= k;
+      total += k;
+    }
+  if (check && total && l)
+    bthrow(f, "eof", "breadb: short read");
+  return total;
+}
+
+void bwrite_slow(struct fastbuf *f, const void *b, uint l)
+{
+  while (l)
+    {
+      uint k = f->bufend - f->bptr;
+
+      if (!k)
+	{
+	  bspout(f);
+	  k = f->bufend - f->bptr;
+	}
+      if (k > l)
+	k = l;
+      memcpy(f->bptr, b, k);
+      f->bptr += k;
+      b = (byte *)b + k;
+      l -= k;
+    }
+}
+
+void bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uint l)
+{
+  while (l)
+    {
+      byte *fptr, *tptr;
+      uint favail, tavail, n;
+
+      favail = bdirect_read_prepare(f, &fptr);
+      if (!favail)
+	{
+	  if (l == ~0U)
+	    return;
+	  bthrow(f, "eof", "bbcopy: source exhausted");
+	}
+      tavail = bdirect_write_prepare(t, &tptr);
+      n = MIN(l, favail);
+      n = MIN(n, tavail);
+      memcpy(tptr, fptr, n);
+      bdirect_read_commit(f, fptr + n);
+      bdirect_write_commit(t, tptr + n);
+      if (l != ~0U)
+	l -= n;
+    }
+}
+
+int bconfig(struct fastbuf *f, uint item, int value)
+{
+  return (f->config && !(f->flags & FB_DEAD)) ? f->config(f, item, value) : -1;
+}
+
+void brewind(struct fastbuf *f)
+{
+  bflush(f);
+  bsetpos(f, 0);
+}
+
+int bskip_slow(struct fastbuf *f, uint len)
+{
+  while (len)
+    {
+      byte *buf;
+      uint l = bdirect_read_prepare(f, &buf);
+      if (!l)
+	return 0;
+      l = MIN(l, len);
+      bdirect_read_commit(f, buf+l);
+      len -= l;
+    }
+  return 1;
+}
+
+ucw_off_t bfilesize(struct fastbuf *f)
+{
+  if (!f)
+    return 0;
+  if (!f->seek)
+    return -1;
+  ucw_off_t pos = btell(f);
+  bflush(f);
+  if (!f->seek(f, 0, SEEK_END))
+    return -1;
+  ucw_off_t len = btell(f);
+  bsetpos(f, pos);
+  return len;
+}
+
+/* Resources */
+
+static void fb_res_detach(struct resource *r)
+{
+  struct fastbuf *f = r->priv;
+  f->res = NULL;
+}
+
+static void fb_res_free(struct resource *r)
+{
+  struct fastbuf *f = r->priv;
+  f->res = NULL;
+  bclose(f);
+}
+
+static void fb_res_dump(struct resource *r, uint indent UNUSED)
+{
+  struct fastbuf *f = r->priv;
+  printf(" name=%s\n", f->name);
+}
+
+static const struct res_class fb_res_class = {
+  .name = "fastbuf",
+  .detach = fb_res_detach,
+  .dump = fb_res_dump,
+  .free = fb_res_free,
+};
+
+struct fastbuf *fb_tie(struct fastbuf *f)
+{
+  f->res = res_new(&fb_res_class, f);
+  return f;
+}
diff --git a/libucw/ucw/fastbuf.h b/libucw/ucw/fastbuf.h
new file mode 100644
index 0000000..0a04176
--- /dev/null
+++ b/libucw/ucw/fastbuf.h
@@ -0,0 +1,912 @@
+/*
+ *	UCW Library -- Fast Buffered I/O
+ *
+ *	(c) 1997--2011 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FASTBUF_H
+#define _UCW_FASTBUF_H
+
+#include <string.h>
+#include <alloca.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bbcopy_slow ucw_bbcopy_slow
+#define bclose ucw_bclose
+#define bclose_file_helper ucw_bclose_file_helper
+#define bconfig ucw_bconfig
+#define beof_slow ucw_beof_slow
+#define bfdopen ucw_bfdopen
+#define bfdopen_internal ucw_bfdopen_internal
+#define bfdopen_shared ucw_bfdopen_shared
+#define bfilesize ucw_bfilesize
+#define bfilesync ucw_bfilesync
+#define bfix_tmp_file ucw_bfix_tmp_file
+#define bflush ucw_bflush
+#define bfmmopen_internal ucw_bfmmopen_internal
+#define bgetc_slow ucw_bgetc_slow
+#define bgets ucw_bgets
+#define bgets0 ucw_bgets0
+#define bgets_bb ucw_bgets_bb
+#define bgets_mp ucw_bgets_mp
+#define bgets_nodie ucw_bgets_nodie
+#define bgets_stk_init ucw_bgets_stk_init
+#define bgets_stk_step ucw_bgets_stk_step
+#define bopen ucw_bopen
+#define bopen_fd_name ucw_bopen_fd_name
+#define bopen_file ucw_bopen_file
+#define bopen_file_try ucw_bopen_file_try
+#define bopen_limited_fd ucw_bopen_limited_fd
+#define bopen_tmp ucw_bopen_tmp
+#define bopen_tmp_file ucw_bopen_tmp_file
+#define bopen_try ucw_bopen_try
+#define bpeekc_slow ucw_bpeekc_slow
+#define bprintf ucw_bprintf
+#define bputc_slow ucw_bputc_slow
+#define bread_slow ucw_bread_slow
+#define brefill ucw_brefill
+#define brewind ucw_brewind
+#define bseek ucw_bseek
+#define bsetpos ucw_bsetpos
+#define bskip_slow ucw_bskip_slow
+#define bspout ucw_bspout
+#define bthrow ucw_bthrow
+#define bwrite_slow ucw_bwrite_slow
+#define fb_tie ucw_fb_tie
+#define fbatomic_internal_write ucw_fbatomic_internal_write
+#define fbatomic_open ucw_fbatomic_open
+#define fbbuf_init_read ucw_fbbuf_init_read
+#define fbbuf_init_write ucw_fbbuf_init_write
+#define fbdir_cheat ucw_fbdir_cheat
+#define fbdir_open_fd_internal ucw_fbdir_open_fd_internal
+#define fbgrow_create ucw_fbgrow_create
+#define fbgrow_create_mp ucw_fbgrow_create_mp
+#define fbgrow_get_buf ucw_fbgrow_get_buf
+#define fbgrow_reset ucw_fbgrow_reset
+#define fbgrow_rewind ucw_fbgrow_rewind
+#define fbmem_clone_read ucw_fbmem_clone_read
+#define fbmem_create ucw_fbmem_create
+#define fbmulti_append ucw_fbmulti_append
+#define fbmulti_create ucw_fbmulti_create
+#define fbmulti_remove ucw_fbmulti_remove
+#define fbnull_open ucw_fbnull_open
+#define fbnull_start ucw_fbnull_start
+#define fbnull_test ucw_fbnull_test
+#define fbpar_cf ucw_fbpar_cf
+#define fbpar_def ucw_fbpar_def
+#define fbpool_end ucw_fbpool_end
+#define fbpool_init ucw_fbpool_init
+#define fbpool_start ucw_fbpool_start
+#define open_tmp ucw_open_tmp
+#define temp_file_name ucw_temp_file_name
+#define vbprintf ucw_vbprintf
+#endif
+
+/***
+ * === Internal structure [[internal]]
+ *
+ * Generally speaking, a fastbuf consists of a buffer and a set of callbacks.
+ * All front-end functions operate on the buffer and if the buffer becomes
+ * empty or fills up, they ask the corresponding callback to handle the
+ * situation. Back-ends then differ just in the definition of the callbacks.
+ *
+ * The state of the fastbuf is represented by a <<struct_fastbuf,`struct fastbuf`>>,
+ * which is a simple structure describing the state of the buffer (the pointers
+ * `buffer`, `bufend`), the front-end cursor (`bptr`), the back-end cursor (`bstop`),
+ * position of the back-end cursor in the file (`pos`), some flags (`flags`)
+ * and pointers to the callback functions.
+ *
+ * The buffer can be in one of the following states:
+ *
+ * 1. Flushed:
+ *
+ *    +------------------------------------+---------------------------+
+ *    | unused                             | free space                |
+ *    +------------------------------------+---------------------------+
+ *    ^              ^                     ^                           ^
+ *    buffer      <= bstop (BE pos)     <= bptr (FE pos)            <= bufend
+ *
+ *   * This schema describes a fastbuf after its initialization or @bflush().
+ *   * There is no cached data and we are ready for any read or write operation
+ *     (well, only if the back-end supports it).
+ *   * The interval `[bptr, bufend]` can be used by front-ends
+ *     for writing. If it is empty, the `spout` callback gets called
+ *     upon the first write attempt to allocate a new buffer. Otherwise
+ *     the fastbuf silently comes to the writing mode.
+ *   * When a front-end needs to read something, it calls the `refill` callback.
+ *   * The pointers can be either all non-`NULL` or all NULL.
+ *   * `bstop == bptr` in most back-ends, but it is not necessary. Some
+ *     in-memory streams take advantage of this.
+ *
+ * 2. Reading:
+ *
+ *    +------------------------------------+---------------------------+
+ *    | read data                          | unused                    |
+ *    +------------------------------------+---------------------------+
+ *    ^               ^                    ^                           ^
+ *    buffer       <= bptr (FE pos)     <= bstop (BE pos)           <= bufend
+ *
+ *   * If we try to read something, we get to the reading mode.
+ *   * No writing is allowed until a flush operation. But note that @bflush()
+ *     will simply set `bptr` to `bstop` before `spout`
+ *     and it breaks the position of the front-end's cursor,
+ *     so the user should seek afwards.
+ *   * The interval `[buffer, bstop]` contains a block of data read by the back-end.
+ *     `bptr` is the front-end's cursor which points to the next character to be read.
+ *     After the last character is read, `bptr == bstop` and the `refill` callback
+ *     gets called upon the next read attempt to bring further data.
+ *     This gives us an easy way how to implement @bungetc().
+ *
+ * 3. Writing:
+ *
+ *    +-----------------------+----------------+-----------------------+
+ *    | unused                | written data   | free space            |
+ *    +-----------------------+----------------+-----------------------+
+ *    ^            ^                           ^                       ^
+ *    buffer    <= bstop (BE pos)            < bptr (FE pos)        <= bufend
+ *
+ *   * This schema corresponds to the situation after a write attempt.
+ *   * No reading is allowed until a flush operation.
+ *   * The `bptr` points at the position where the next character
+ *     will be written to. When we want to write, but `bptr == bufend`, we call
+ *     the `spout` hook to flush the witten data and get an empty buffer.
+ *   * `bstop` usually points at the beginning of the written data,
+ *     but it is not necessary.
+ *
+ *
+ * Rules for back-ends:
+ *
+ *   - Front-ends are only allowed to change the value of `bptr`, some flags
+ *     and if a fatal error occurs, then also `bstop`. Back-ends can rely on it.
+ *   - `buffer <= bstop <= bufend` and `buffer <= bptr <= bufend`.
+ *   - `pos` should be the real position in the file corresponding to the location of `bstop` in the buffer.
+ *     It can be modified by any back-end's callback, but the position of `bptr` (`pos + (bptr - bstop)`)
+ *     must stay unchanged after `refill` or `spout`.
+ *   - Failed callbacks (except `close`) should use @bthrow().
+ *   - Any callback pointer may be NULL in case the callback is not implemented.
+ *   - Callbacks can change not only `bptr` and `bstop`, but also the location and size of the buffer;
+ *     the fb-mem back-end takes advantage of it.
+ *
+ *   - Initialization:
+ *     * out: `buffer <= bstop <= bptr <= bufend` (flushed).
+ *     * @fb_tie() should be called on the newly created fastbuf.
+ *
+ *   - `refill`:
+ *     * in: `buffer <= bstop <= bptr <= bufend` (reading or flushed).
+ *     * out: `buffer <= bptr <= bstop <= bufend` (reading).
+ *     * Resulting `bptr == bstop` signals the end of file.
+ *       The next reading attempt will again call `refill` which can succeed this time.
+ *     * The callback must also return zero on EOF (iff `bptr == bstop`).
+ *
+ *   - `spout`:
+ *     * in: `buffer <= bstop <= bptr <= bufend` (writing or flushed).
+ *     * out: `buffer <= bstop <= bptr < bufend` (flushed).
+ *
+ *   - `seek`:
+ *     * in: `buffer <= bstop <= bptr <= bufend` (flushed).
+ *     * in: `(ofs >= 0 && whence == SEEK_SET) || (ofs <= 0 && whence == SEEK_END)`.
+ *     * out: `buffer <= bstop <= bptr <= bufend` (flushed).
+ *
+ *   - `close`:
+ *     * in: `buffer <= bstop <= bptr <= bufend` (flushed or after @bthrow()).
+ *     * `close` must always free all internal structures, even when it throws an exception.
+ ***/
+
+/**
+ * This structure contains the state of the fastbuf. See the discussion above
+ * for how it works.
+ **/
+struct fastbuf {
+  byte *bptr, *bstop;				/* State of the buffer */
+  byte *buffer, *bufend;			/* Start and end of the buffer */
+  char *name;					/* File name (used for error messages) */
+  ucw_off_t pos;				/* Position of bstop in the file */
+  uint flags;					/* See enum fb_flags */
+  int (*refill)(struct fastbuf *);		/* Get a buffer with new data, returns 0 on EOF */
+  void (*spout)(struct fastbuf *);		/* Write buffer data to the file */
+  int (*seek)(struct fastbuf *, ucw_off_t, int);/* Slow path for @bseek(), buffer already flushed; returns success */
+  void (*close)(struct fastbuf *);		/* Close the stream */
+  int (*config)(struct fastbuf *, uint, int);	/* Configure the stream */
+  int can_overwrite_buffer;			/* Can the buffer be altered? 0=never, 1=temporarily, 2=permanently */
+  struct resource *res;				/* The fastbuf can be tied to a resource pool */
+};
+
+/**
+ * Fastbuf flags
+ */
+enum fb_flags {
+  FB_DEAD = 0x1,				/* Some fastbuf's method has thrown an exception */
+  FB_DIE_ON_EOF = 0x2,				/* Most of read operations throw "fb.eof" on EOF */
+};
+
+/** Tie a fastbuf to a resource in the current resource pool. Returns the pointer to the same fastbuf. **/
+struct fastbuf *fb_tie(struct fastbuf *b);	/* Tie fastbuf to a resource if there is an active pool */
+
+/***
+ * === Fastbuf on files [[fbparam]]
+ *
+ * If you want to use fastbufs to access files, you can choose one of several
+ * back-ends and set their parameters.
+ ***/
+
+/**
+ * Back-end types
+ */
+enum fb_type {
+  FB_STD,				/* Standard buffered I/O */
+  FB_DIRECT,				/* Direct I/O bypassing system caches (see fb-direct.c for a description) */
+  FB_MMAP				/* Memory mapped files */
+};
+
+/**
+ * When you open a file fastbuf, you can use this structure to select a back-end
+ * and set its parameters. If you want just an "ordinary" file stream, you can
+ * happily pass NULL instead and the defaults from the configuration file (or
+ * hard-wired defaults if no config file has been read) will be used.
+ */
+struct fb_params {
+  enum fb_type type;			/* The chosen back-end */
+  uint buffer_size;			/* 0 for default size */
+  uint keep_back_buf;			/* FB_STD: optimize for bi-directional access */
+  uint read_ahead;			/* FB_DIRECT options */
+  uint write_back;
+  struct asio_queue *asio;
+};
+
+struct cf_section;
+extern struct cf_section fbpar_cf;	/** Configuration section with which you can fill the `fb_params` **/
+extern struct fb_params fbpar_def;	/** The default `fb_params` **/
+
+/**
+ * Opens a file with file mode @mode (see the man page of open()).
+ * Use @params to select the fastbuf back-end and its parameters or
+ * pass NULL if you are fine with defaults.
+ *
+ * Raises `ucw.fb.open` if the file does not exist.
+ **/
+struct fastbuf *bopen_file(const char *name, int mode, struct fb_params *params);
+struct fastbuf *bopen_file_try(const char *name, int mode, struct fb_params *params); /** Like @bopen_file(), but returns NULL on failure. **/
+
+/**
+ * Opens a temporary file.
+ * It is placed with other temp files and it is deleted when closed.
+ * Again, use NULL for @params if you want the defaults.
+ **/
+struct fastbuf *bopen_tmp_file(struct fb_params *params);
+
+/**
+ * Creates a fastbuf from a file descriptor @fd and sets its filename
+ * to @name (the name is used only in error messages).
+ * When the fastbuf is closed, the fd is closed as well. You can override
+ * this behavior by calling @bconfig().
+ */
+struct fastbuf *bopen_fd_name(int fd, struct fb_params *params, const char *name);
+static inline struct fastbuf *bopen_fd(int fd, struct fb_params *params) /** Same as above, but with an auto-generated filename. **/
+{
+  return bopen_fd_name(fd, params, NULL);
+}
+
+/**
+ * Flushes all buffers and makes sure that they are written to the disk.
+ **/
+void bfilesync(struct fastbuf *b);
+
+/***
+ * === Fastbufs on regular files [[fbfile]]
+ *
+ * If you want to use the `FB_STD` back-end and not worry about setting
+ * up any parameters, there is a couple of shortcuts.
+ ***/
+
+struct fastbuf *bopen(const char *name, uint mode, uint buflen);	/** Equivalent to @bopen_file() with `FB_STD` back-end. **/
+struct fastbuf *bopen_try(const char *name, uint mode, uint buflen);	/** Equivalent to @bopen_file_try() with `FB_STD` back-end. **/
+struct fastbuf *bopen_tmp(uint buflen);					/** Equivalent to @bopen_tmp_file() with `FB_STD` back-end. **/
+struct fastbuf *bfdopen(int fd, uint buflen);				/** Equivalent to @bopen_fd() with `FB_STD` back-end. **/
+struct fastbuf *bfdopen_shared(int fd, uint buflen);			/** Like @bfdopen(), but it does not close the @fd on @bclose(). **/
+
+/***
+ * === Temporary files [[fbtemp]]
+ *
+ * Usually, @bopen_tmp_file() is the best way how to come to a temporary file.
+ * However, in some specific cases you can need more, so there is also a set
+ * of more general functions.
+ ***/
+
+#define TEMP_FILE_NAME_LEN 256
+
+/**
+ * Generates a temporary filename and stores it to the @name_buf (of size
+ * at least * `TEMP_FILE_NAME_LEN`). If @open_flags are not NULL, flags that
+ * should be OR-ed with other flags to open() will be stored there.
+ *
+ * The location and style of temporary files is controlled by the configuration.
+ * By default, the system temp directory (`$TMPDIR` or `/tmp`) is used.
+ *
+ * If the location is a publicly writeable directory (like `/tmp`), the
+ * generated filename cannot be guaranteed to be unique, so @open_flags
+ * will include `O_EXCL` and you have to check the result of open() and
+ * iterate if needed.
+ *
+ * This function is not specific to fastbufs, it can be used separately.
+ **/
+void temp_file_name(char *name_buf, int *open_flags);
+
+/**
+ * Opens a temporary file and returns its file descriptor.
+ * You specify the file @mode and @open_flags passed to open().
+ *
+ * If the @name_buf (of at last `TEMP_FILE_NAME_LEN` chars) is not NULL,
+ * the filename is also stored in it.
+ *
+ * This function is not specific to fastbufs, it can be used separately.
+ */
+int open_tmp(char *name_buf, int open_flags, int mode);
+
+/**
+ * Sometimes, a file is created as temporary and then moved to a stable
+ * location. This function takes a fastbuf created by @bopen_tmp_file()
+ * or @bopen_tmp(), marks it as permanent, closes it and renames it to
+ * @name.
+ *
+ * Please note that it assumes that the temporary file and the @name
+ * are on the same volume (otherwise, rename() fails), so you might
+ * want to configure a special location for the temporary files
+ * beforehand.
+ */
+void bfix_tmp_file(struct fastbuf *fb, const char *name);
+
+/* Internal functions of some file back-ends */
+
+struct fastbuf *bfdopen_internal(int fd, const char *name, uint buflen);
+struct fastbuf *bfmmopen_internal(int fd, const char *name, uint mode);
+
+#ifdef CONFIG_UCW_FB_DIRECT
+extern uint fbdir_cheat;
+struct asio_queue;
+struct fastbuf *fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *io_queue, uint buffer_size, uint read_ahead, uint write_back);
+#endif
+
+void bclose_file_helper(struct fastbuf *f, int fd, int is_temp_file);
+
+/***
+ * === Fastbufs on file fragments [[fblim]]
+ *
+ * The `fblim` back-end reads from a file handle, but at most a given
+ * number of bytes. This is frequently used for reading from sockets.
+ ***/
+
+struct fastbuf *bopen_limited_fd(int fd, uint bufsize, uint limit); /** Create a fastbuf which reads at most @limit bytes from @fd. **/
+
+/***
+ * === Fastbufs on in-memory streams [[fbmem]]
+ *
+ * The `fbmem` back-end keeps the whole contents of the stream
+ * in memory (as a linked list of memory blocks, so address space
+ * fragmentation is avoided).
+ *
+ * First, you use @fbmem_create() to create the stream and the fastbuf
+ * used for writing to it. Then you can call @fbmem_clone_read() to get
+ * an arbitrary number of fastbuf for reading from the stream.
+ ***/
+
+struct fastbuf *fbmem_create(uint blocksize);		/** Create stream and return its writing fastbuf. **/
+struct fastbuf *fbmem_clone_read(struct fastbuf *f);	/** Given a writing fastbuf, create a new reading fastbuf. **/
+
+/***
+ * === Fastbufs on static buffers [[fbbuf]]
+ *
+ * The `fbbuf` back-end stores the stream in a given block of memory.
+ * This is useful for parsing and generating of complex data structures.
+ ***/
+
+/**
+ * Creates a read-only fastbuf that takes its data from a given buffer.
+ * The fastbuf structure is allocated by the caller and pointed to by @f.
+ * The @buffer and @size specify the location and size of the buffer.
+ *
+ * In some cases, the front-ends can take advantage of rewriting the contents
+ * of the buffer temporarily. In this case, set @can_overwrite as described
+ * in <<internal,Internals>>. If you do not care, keep @can_overwrite zero.
+ *
+ * A @bclose() on this fastbuf is allowed and it does nothing.
+ */
+void fbbuf_init_read(struct fastbuf *f, byte *buffer, uint size, uint can_overwrite);
+
+/**
+ * Creates a write-only fastbuf which writes into a provided memory buffer.
+ * The fastbuf structure is allocated by the caller and pointed to by @f.
+ * An attempt to write behind the end of the buffer causes the `ucw.fb.write` exception.
+ *
+ * Data are written directly into the buffer, so it is not necessary to call @bflush()
+ * at any moment.
+ *
+ * A @bclose() on this fastbuf is allowed and it does nothing.
+ */
+void fbbuf_init_write(struct fastbuf *f, byte *buffer, uint size);
+
+static inline uint fbbuf_count_written(struct fastbuf *f) /** Calculates, how many bytes were already written into the buffer. **/
+{
+  return f->bptr - f->bstop;
+}
+
+/***
+ * === Fastbuf on recyclable growing buffers [[fbgrow]]
+ *
+ * The `fbgrow` back-end keeps the stream in a contiguous buffer stored in the
+ * main memory, but unlike <<fbmem,`fbmem`>>, the buffer does not have a fixed
+ * size and it is expanded to accomodate all data.
+ *
+ * At every moment, you can use `fastbuf->buffer` to gain access to the stream.
+ ***/
+
+struct mempool;
+
+struct fastbuf *fbgrow_create(uint basic_size);		/** Create the growing buffer pre-allocated to @basic_size bytes. **/
+struct fastbuf *fbgrow_create_mp(struct mempool *mp, uint basic_size); /** Create the growing buffer pre-allocated to @basic_size bytes. **/
+void fbgrow_reset(struct fastbuf *b);			/** Reset stream and prepare for writing. **/
+void fbgrow_rewind(struct fastbuf *b);			/** Prepare for reading (of already written data). **/
+
+/**
+ * Can be used in any state of @b (for example when writing or after
+ * @fbgrow_rewind()) to return the pointer to internal buffer and its length in
+ * bytes. The returned buffer can be invalidated by further requests.
+ **/
+uint fbgrow_get_buf(struct fastbuf *b, byte **buf);
+
+/***
+ * === Fastbuf on memory pools [[fbpool]]
+ *
+ * The write-only `fbpool` back-end also keeps the stream in a contiguous
+ * buffer, but this time the buffer is allocated from within a memory pool.
+ ***/
+
+struct fbpool { /** Structure for fastbufs & mempools. **/
+  struct fastbuf fb;
+  struct mempool *mp;
+};
+
+/**
+ * Initialize a new `fbpool`. The structure is allocated by the caller.
+ * Calling @bclose() is optional.
+ **/
+void fbpool_init(struct fbpool *fb);	/** Initialize a new mempool fastbuf. **/
+/**
+ * Start a new continuous block and prepare for writing (see <<mempool:mp_start()>>).
+ * Provide the memory pool you want to use for this block as @mp.
+ **/
+void fbpool_start(struct fbpool *fb, struct mempool *mp, size_t init_size);
+/**
+ * Close the block and return the address of its start (see <<mempool:mp_end()>>).
+ * The length can be determined by calling <<mempool:mp_size(mp, ptr)>>.
+ **/
+void *fbpool_end(struct fbpool *fb);
+
+/***
+ * === Atomic files for multi-threaded programs [[fbatomic]]
+ *
+ * This fastbuf backend is designed for cases when several threads
+ * of a single program append records to a common file and while the
+ * record can mix in an arbitrary way, the bytes inside a single
+ * record must remain uninterrupted.
+ *
+ * In case of files with fixed record size, we just allocate the
+ * buffer to hold a whole number of records and take advantage
+ * of the atomicity of the write() system call.
+ *
+ * With variable-sized records, we need another solution: when
+ * writing a record, we keep the fastbuf in a locked state, which
+ * prevents buffer flushing (and if the buffer becomes full, we extend it),
+ * and we wait for an explicit commit operation which write()s the buffer
+ * if the free space in the buffer falls below the expected maximum record
+ * length.
+ *
+ * Please note that initialization of the clones is not thread-safe,
+ * so you have to serialize it yourself.
+ ***/
+
+struct fb_atomic {
+  struct fastbuf fb;
+  struct fb_atomic_file *af;
+  byte *expected_max_bptr;
+  uint slack_size;
+};
+
+/**
+ * Open an atomic fastbuf.
+ * If @master is NULL, the file @name is opened. If it is non-null,
+ * a new clone of an existing atomic fastbuf is created.
+ *
+ * If the file has fixed record length, just set @record_len to it.
+ * Otherwise set @record_len to the expected maximum record length
+ * with a negative sign (you need not fit in this length, but as long
+ * as you do, the fastbuf is more efficient) and call @fbatomic_commit()
+ * after each record.
+ *
+ * You can specify @record_len, if it is known (for optimisations).
+ *
+ * The file is closed when all fastbufs using it are closed.
+ **/
+struct fastbuf *fbatomic_open(const char *name, struct fastbuf *master, uint bufsize, int record_len);
+void fbatomic_internal_write(struct fastbuf *b);
+
+/**
+ * Declare that you have finished writing a record. This is required only
+ * if a fixed record size was not specified.
+ **/
+static inline void fbatomic_commit(struct fastbuf *b)
+{
+  if (b->bptr >= ((struct fb_atomic *)b)->expected_max_bptr)
+    fbatomic_internal_write(b);
+}
+
+/*** === Null fastbufs ***/
+
+/**
+ * Creates a new "/dev/null"-like  fastbuf.
+ * Any read attempt returns an EOF, any write attempt is silently ignored.
+ **/
+struct fastbuf *fbnull_open(uint bufsize);
+
+/**
+ * Can be used by any back-end to switch it to the null mode.
+ * You need to provide at least one byte long buffer for writing.
+ **/
+void fbnull_start(struct fastbuf *b, byte *buf, uint bufsize);
+
+/**
+ * Checks whether a fastbuf has been switched to the null mode.
+ **/
+bool fbnull_test(struct fastbuf *b);
+
+/***
+ * === Fastbufs atop other fastbufs [[fbmulti]]
+ *
+ * Imagine some code which does massive string processing. It takes an input
+ * buffer, writes a part of it into an output buffer, then some other string
+ * and then the remaining part of the input buffer. Or anything else where you
+ * copy all the data at each stage of the complicated process.
+ *
+ * This backend takes multiple fastbufs and concatenates them formally into
+ * one. You may then read them consecutively as they were one fastbuf at all.
+ *
+ * This backend is read-only.
+ *
+ * This backend is seekable iff all of the supplied fastbufs are seekable.
+ *
+ * You aren't allowed to do anything with the underlying buffers while these
+ * are connected into fbmulti.
+ *
+ * The fbmulti is inited by @fbmulti_create(). It returns an empty fbmulti.
+ * Then you call @fbmulti_append() for each fbmulti.
+ *
+ * If @bclose() is called on fbmulti, all the underlying buffers get closed
+ * recursively.
+ *
+ * If you want to keep an underlying fastbuf open after @bclose, just remove it
+ * by @fbmulti_remove where the second parameter is a pointer to the removed
+ * fastbuf. If you pass NULL, all the underlying fastbufs are removed.
+ *
+ * After @fbmulti_remove, the state of the fbmulti is undefined. The only allowed
+ * operation is either another @fbmulti_remove or @bclose on the fbmulti.
+ ***/
+
+/**
+ * Create an empty fbmulti
+ **/
+struct fastbuf *fbmulti_create(void);
+
+/**
+ * Append a fb to fbmulti
+ **/
+void fbmulti_append(struct fastbuf *f, struct fastbuf *fb);
+
+/**
+ * Remove a fb from fbmulti
+ **/
+void fbmulti_remove(struct fastbuf *f, struct fastbuf *fb);
+
+/*** === Configuring stream parameters [[bconfig]] ***/
+
+enum bconfig_type {			/** Parameters that could be configured. **/
+  BCONFIG_IS_TEMP_FILE,			/* 0=normal file, 1=temporary file, 2=shared fd */
+  BCONFIG_KEEP_BACK_BUF,		/* Optimize for bi-directional access */
+};
+
+int bconfig(struct fastbuf *f, uint type, int data); /** Configure a fastbuf. Returns previous value. **/
+
+/*** === Universal functions working on all fastbuf's [[ffbasic]] ***/
+
+/**
+ * Close and free fastbuf.
+ * Some kinds of fastbufs are allocated by the caller (e.g., in @fbbuf_init_read());
+ * in such cases, @bclose() does not free any memory.
+ */
+void bclose(struct fastbuf *f);
+void bthrow(struct fastbuf *f, const char *id, const char *fmt, ...) FORMAT_CHECK(printf,3,4) NONRET;	/** Throw exception on a given fastbuf **/
+int brefill(struct fastbuf *f, int allow_eof);
+void bspout(struct fastbuf *f);
+void bflush(struct fastbuf *f);					/** Write data (if it makes any sense, do not use for in-memory buffers). **/
+void bseek(struct fastbuf *f, ucw_off_t pos, int whence);	/** Seek in the buffer. See `man fseek` for description of @whence. Only for seekable fastbufs. **/
+void bsetpos(struct fastbuf *f, ucw_off_t pos);			/** Set position to @pos bytes from beginning. Only for seekable fastbufs. **/
+void brewind(struct fastbuf *f);				/** Go to the beginning of the fastbuf. Only for seekable ones. **/
+ucw_off_t bfilesize(struct fastbuf *f);				/** How large is the file? -1 if not seekable. **/
+
+static inline ucw_off_t btell(struct fastbuf *f)		/** Where am I (from the beginning)? **/
+{
+  return f->pos + (f->bptr - f->bstop);
+}
+
+int bgetc_slow(struct fastbuf *f);
+static inline int bgetc(struct fastbuf *f)			/** Return next character from the buffer. **/
+{
+  return (f->bptr < f->bstop) ? (int) *f->bptr++ : bgetc_slow(f);
+}
+
+int bpeekc_slow(struct fastbuf *f);
+static inline int bpeekc(struct fastbuf *f)			/** Return next character from the buffer, but keep the current position. **/
+{
+  return (f->bptr < f->bstop) ? (int) *f->bptr : bpeekc_slow(f);
+}
+
+int beof_slow(struct fastbuf *f);
+static inline int beof(struct fastbuf *f)			/** Have I reached EOF? **/
+{
+  return (f->bptr < f->bstop) ? 0 : beof_slow(f);
+}
+
+static inline void bungetc(struct fastbuf *f)			/** Return last read character back. Only one back is guaranteed to work. **/
+{
+  f->bptr--;
+}
+
+void bputc_slow(struct fastbuf *f, uint c);
+static inline void bputc(struct fastbuf *f, uint c)		/** Write a single character. **/
+{
+  if (f->bptr < f->bufend)
+    *f->bptr++ = c;
+  else
+    bputc_slow(f, c);
+}
+
+static inline uint bavailr(struct fastbuf *f)			/** Return the length of the cached data to be read. Do not use directly. **/
+{
+  return f->bstop - f->bptr;
+}
+
+static inline uint bavailw(struct fastbuf *f)			/** Return the length of the buffer available for writing. Do not use directly. **/
+{
+  return f->bufend - f->bptr;
+}
+
+uint bread_slow(struct fastbuf *f, void *b, uint l, uint check);
+/**
+ * Read at most @l bytes of data into @b.
+ * Returns number of bytes read.
+ * 0 means end of file.
+ */
+static inline uint bread(struct fastbuf *f, void *b, uint l)
+{
+  if (bavailr(f) >= l)
+    {
+      memcpy(b, f->bptr, l);
+      f->bptr += l;
+      return l;
+    }
+  else
+    return bread_slow(f, b, l, 0);
+}
+
+/**
+ * Reads exactly @l bytes of data into @b.
+ * If at the end of file, it returns 0.
+ * If there are data, but less than @l, it raises `ucw.fb.eof`.
+ */
+static inline uint breadb(struct fastbuf *f, void *b, uint l)
+{
+  if (bavailr(f) >= l)
+    {
+      memcpy(b, f->bptr, l);
+      f->bptr += l;
+      return l;
+    }
+  else
+    return bread_slow(f, b, l, 1);
+}
+
+void bwrite_slow(struct fastbuf *f, const void *b, uint l);
+static inline void bwrite(struct fastbuf *f, const void *b, uint l) /** Writes buffer @b of length @l into fastbuf. **/
+{
+  if (bavailw(f) >= l)
+    {
+      memcpy(f->bptr, b, l);
+      f->bptr += l;
+    }
+  else
+    bwrite_slow(f, b, l);
+}
+
+/**
+ * Reads a line into @b and strips trailing `\n`.
+ * Returns pointer to the terminating 0 or NULL on `EOF`.
+ * Raises `ucw.fb.toolong` if the line is longer than @l.
+ **/
+char *bgets(struct fastbuf *f, char *b, uint l);
+char *bgets0(struct fastbuf *f, char *b, uint l);	/** The same as @bgets(), but for 0-terminated strings. **/
+/**
+ * Returns either length of read string (excluding the terminator) or -1 if it is too long.
+ * In such cases exactly @l bytes are read.
+ */
+int bgets_nodie(struct fastbuf *f, char *b, uint l);
+
+struct mempool;
+struct bb_t;
+/**
+ * Read a string, strip the trailing `\n` and store it into growing buffer @b.
+ * Raises `ucw.fb.toolong` if the line is longer than @limit.
+ **/
+uint bgets_bb(struct fastbuf *f, struct bb_t *b, uint limit);
+/**
+ * Read a string, strip the trailing `\n` and store it into buffer allocated from a memory pool.
+ **/
+char *bgets_mp(struct fastbuf *f, struct mempool *mp);
+
+struct bgets_stk_struct {
+  struct fastbuf *f;
+  byte *old_buf, *cur_buf, *src;
+  uint old_len, cur_len, src_len;
+};
+void bgets_stk_init(struct bgets_stk_struct *s);
+void bgets_stk_step(struct bgets_stk_struct *s);
+
+/**
+ * Read a string, strip the trailing `\n` and store it on the stack (allocated using alloca()).
+ **/
+#define bgets_stk(fb) \
+  ({ struct bgets_stk_struct _s; _s.f = (fb); for (bgets_stk_init(&_s); _s.cur_len; _s.cur_buf = alloca(_s.cur_len), bgets_stk_step(&_s)); _s.cur_buf; })
+
+/**
+ * Write a string, without 0 or `\n` at the end.
+ **/
+static inline void bputs(struct fastbuf *f, const char *b)
+{
+  bwrite(f, b, strlen(b));
+}
+
+/**
+ * Write string, including terminating 0.
+ **/
+static inline void bputs0(struct fastbuf *f, const char *b)
+{
+  bwrite(f, b, strlen(b)+1);
+}
+
+/**
+ * Write string and append a newline to the end.
+ **/
+static inline void bputsn(struct fastbuf *f, const char *b)
+{
+  bputs(f, b);
+  bputc(f, '\n');
+}
+
+void bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uint l);
+/**
+ * Copy @l bytes of data from fastbuf @f to fastbuf @t.
+ * `UINT_MAX` (`~0U`) means all data, even if more than `UINT_MAX` bytes remain.
+ **/
+static inline void bbcopy(struct fastbuf *f, struct fastbuf *t, uint l)
+{
+  if (bavailr(f) >= l && bavailw(t) >= l)
+    {
+      memcpy(t->bptr, f->bptr, l);
+      t->bptr += l;
+      f->bptr += l;
+    }
+  else
+    bbcopy_slow(f, t, l);
+}
+
+int bskip_slow(struct fastbuf *f, uint len);
+static inline int bskip(struct fastbuf *f, uint len) /** Skip @len bytes without reading them. **/
+{
+  if (bavailr(f) >= len)
+    {
+      f->bptr += len;
+      return 1;
+    }
+  else
+    return bskip_slow(f, len);
+}
+
+/*** === Direct I/O on buffers ***/
+
+/**
+ * Begin direct reading from fastbuf's internal buffer to avoid unnecessary copying.
+ * The function returns a buffer @buf together with its length in bytes (zero means EOF)
+ * with cached data to be read.
+ *
+ * Some back-ends allow the user to modify the data in the returned buffer to avoid unnecessary.
+ * If the back-end allows such modifications, it can set `f->can_overwrite_buffer` accordingly:
+ *
+ *   - 0 if no modification is allowed,
+ *   - 1 if the user can modify the buffer on the condition that
+ *       the modifications will be undone before calling the next
+ *       fastbuf operation
+ *   - 2 if the user is allowed to overwrite the data in the buffer
+ *       if @bdirect_read_commit_modified() is called afterwards.
+ *       In this case, the back-end must be prepared for trimming
+ *       of the buffer which is done by the commit function.
+ *
+ * The reading must be ended by @bdirect_read_commit() or @bdirect_read_commit_modified(),
+ * unless the user did not read or modify anything.
+ **/
+static inline uint bdirect_read_prepare(struct fastbuf *f, byte **buf)
+{
+  if (f->bptr == f->bstop && !f->refill(f))
+    {
+      *buf = NULL;  // This is not needed, but it helps to get rid of spurious warnings
+      return 0;
+    }
+  *buf = f->bptr;
+  return bavailr(f);
+}
+
+/**
+ * End direct reading started by @bdirect_read_prepare() and move the cursor at @pos.
+ * Data in the returned buffer must be same as after @bdirect_read_prepare() and
+ * @pos must point somewhere inside the buffer.
+ **/
+static inline void bdirect_read_commit(struct fastbuf *f, byte *pos)
+{
+  f->bptr = pos;
+}
+
+/**
+ * Similar to @bdirect_read_commit(), but accepts also modified data before @pos.
+ * Note that such modifications are supported only if `f->can_overwrite_buffer == 2`.
+ **/
+static inline void bdirect_read_commit_modified(struct fastbuf *f, byte *pos)
+{
+  f->bptr = pos;
+  f->buffer = pos;	/* Avoid seeking backwards in the buffer */
+}
+
+/**
+ * Start direct writing to fastbuf's internal buffer to avoid copy overhead.
+ * The function returns the length of the buffer in @buf (at least one byte)
+ * where we can write to. The operation must be ended by @bdirect_write_commit(),
+ * unless nothing is written.
+ **/
+static inline uint bdirect_write_prepare(struct fastbuf *f, byte **buf)
+{
+  if (f->bptr == f->bufend)
+    f->spout(f);
+  *buf = f->bptr;
+  return bavailw(f);
+}
+
+/**
+ * Commit the data written to the buffer returned by @bdirect_write_prepare().
+ * The length is specified by @pos which must point just after the written data.
+ * Also moves the cursor to @pos.
+ **/
+static inline void bdirect_write_commit(struct fastbuf *f, byte *pos)
+{
+  f->bptr = pos;
+}
+
+/*** === Formatted output ***/
+
+/**
+ * printf into a fastbuf.
+ **/
+int bprintf(struct fastbuf *b, const char *msg, ...)
+  FORMAT_CHECK(printf,2,3);
+int vbprintf(struct fastbuf *b, const char *msg, va_list args); /** vprintf into a fastbuf. **/
+
+#endif
diff --git a/libucw/ucw/fb-atomic.c b/libucw/ucw/fb-atomic.c
new file mode 100644
index 0000000..a29e758
--- /dev/null
+++ b/libucw/ucw/fb-atomic.c
@@ -0,0 +1,172 @@
+/*
+ *	UCW Library -- Atomic Buffered Write to Files
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/conf.h>
+#include <ucw/trans.h>
+
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+static uint trace;
+
+#ifndef TEST
+
+static struct cf_section fbatomic_config = {
+  CF_ITEMS {
+    CF_UINT("Trace", &trace),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR fbatomic_init_config(void)
+{
+  cf_declare_section("FBAtomic", &fbatomic_config, 1);
+}
+
+#endif
+
+#define FB_ATOMIC(f) ((struct fb_atomic *)(f))
+#define TRACE(m...) do { if(trace) msg(L_DEBUG, "FB_ATOMIC: " m); } while(0)
+
+struct fb_atomic_file {
+  int fd;
+  int use_count;
+  int record_len;
+  uint locked;
+  byte name[1];
+};
+
+void
+fbatomic_internal_write(struct fastbuf *f)
+{
+  struct fb_atomic_file *af = FB_ATOMIC(f)->af;
+  int size = f->bptr - f->buffer;
+  if (size)
+    {
+      ASSERT(af->record_len < 0 || !(size % af->record_len));
+      int res = write(af->fd, f->buffer, size);
+      if (res < 0)
+	bthrow(f, "write", "Error writing %s: %m", f->name);
+      if (res != size)
+	bthrow(f, "write", "Unexpected partial write to %s: written only %d bytes of %d", f->name, res, size);
+      f->bptr = f->buffer;
+    }
+}
+
+static void
+fbatomic_spout(struct fastbuf *f)
+{
+  if (f->bptr < f->bufend)		/* Explicit flushes should be ignored */
+    return;
+
+  struct fb_atomic *F = FB_ATOMIC(f);
+  if (F->af->locked)
+    {
+      uint written = f->bptr - f->buffer;
+      uint size = f->bufend - f->buffer + F->slack_size;
+      F->slack_size *= 2;
+      TRACE("Reallocating buffer for atomic file %s with slack %d", f->name, F->slack_size);
+      f->buffer = xrealloc(f->buffer, size);
+      f->bufend = f->buffer + size;
+      f->bptr = f->buffer + written;
+      f->bstop = f->buffer;
+      F->expected_max_bptr = f->bufend - F->slack_size;
+    }
+  else
+    fbatomic_internal_write(f);
+}
+
+static void
+fbatomic_close(struct fastbuf *f)
+{
+  struct fb_atomic_file *af = FB_ATOMIC(f)->af;
+  if (!(f->flags & FB_DEAD))
+    fbatomic_internal_write(f);	/* Need to flush explicitly, because the file can be locked */
+  if (!--af->use_count)
+    {
+      close(af->fd);
+      xfree(af);
+    }
+  xfree(f);
+}
+
+struct fastbuf *
+fbatomic_open(const char *name, struct fastbuf *master, uint bufsize, int record_len)
+{
+  struct fb_atomic *F = xmalloc_zero(sizeof(*F));
+  struct fastbuf *f = &F->fb;
+  struct fb_atomic_file *af;
+  if (master)
+    {
+      af = FB_ATOMIC(master)->af;
+      af->use_count++;
+      ASSERT(af->record_len == record_len);
+    }
+  else
+    {
+      int fd = ucw_open(name, O_WRONLY | O_CREAT | O_TRUNC | O_APPEND, 0666);
+      if (fd < 0)
+	trans_throw("ucw.fb.open", NULL, "Cannot create %s: %m", name);
+      af = xmalloc_zero(sizeof(*af) + strlen(name));
+      af->fd = fd;
+      af->use_count = 1;
+      af->record_len = record_len;
+      af->locked = (record_len < 0);
+      strcpy(af->name, name);
+    }
+  F->af = af;
+  if (record_len > 0 && bufsize % record_len)
+    bufsize += record_len - (bufsize % record_len);
+  f->buffer = xmalloc(bufsize);
+  f->bufend = f->buffer + bufsize;
+  F->slack_size = (record_len < 0) ? -record_len : 0;
+  ASSERT(bufsize > F->slack_size);
+  F->expected_max_bptr = f->bufend - F->slack_size;
+  f->bptr = f->bstop = f->buffer;
+  f->name = af->name;
+  f->spout = fbatomic_spout;
+  f->close = fbatomic_close;
+  return f;
+}
+
+#ifdef TEST
+
+int main(int argc UNUSED, char **argv UNUSED)
+{
+  struct fastbuf *f, *g;
+
+  // Always trace in the test
+  trace = 1;
+
+  msg(L_INFO, "Testing block writes");
+  f = fbatomic_open("test", NULL, 16, 4);
+  for (u32 i=0; i<17; i++)
+    bwrite(f, &i, 4);
+  bclose(f);
+
+  msg(L_INFO, "Testing interleaved var-size writes");
+  f = fbatomic_open("test2", NULL, 23, -5);
+  g = fbatomic_open("test2", f, 23, -5);
+  for (int i=0; i<100; i++)
+    {
+      struct fastbuf *x = (i%2) ? g : f;
+      bprintf(x, "%c<%d>\n", "fg"[i%2], ((259309*i) % 1000000) >> (i % 8));
+      fbatomic_commit(x);
+    }
+  bclose(f);
+  bclose(g);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-atomic.t b/libucw/ucw/fb-atomic.t
new file mode 100644
index 0000000..6db6c06
--- /dev/null
+++ b/libucw/ucw/fb-atomic.t
@@ -0,0 +1,7 @@
+# Test for fb-atomic
+
+Run:	../obj/ucw/fb-atomic-t 2>&1 | sed -e 's/^\(.\) [^ ]* [^ ]* /\1 /'
+Out:	I Testing block writes
+	I Testing interleaved var-size writes
+	D FB_ATOMIC: Reallocating buffer for atomic file test2 with slack 10
+	D FB_ATOMIC: Reallocating buffer for atomic file test2 with slack 10
diff --git a/libucw/ucw/fb-buffer.c b/libucw/ucw/fb-buffer.c
new file mode 100644
index 0000000..55a92f7
--- /dev/null
+++ b/libucw/ucw/fb-buffer.c
@@ -0,0 +1,120 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Static Buffers
+ *
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static int
+fbbuf_refill(struct fastbuf *f)
+{
+  f->bstop = f->bufend;
+  f->pos = f->bstop - f->buffer;
+  return f->bptr < f->bstop;
+}
+
+static int
+fbbuf_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  /* Somebody might want to seek to the end of buffer, try to be nice to him. */
+  ucw_off_t len = f->bufend - f->buffer;
+  if (whence == SEEK_END)
+    pos += len;
+  if (pos < 0 || pos > len)
+    bthrow(f, "seek", "Seek out of range");
+  f->bstop = f->bptr = f->buffer + pos;
+  f->pos = pos;
+  return 1;
+}
+
+void
+fbbuf_init_read(struct fastbuf *f, byte *buf, uint size, uint can_overwrite)
+{
+  *f = (struct fastbuf) {
+    .buffer = buf,
+    .bptr = buf,
+    .bstop = buf + size,
+    .bufend = buf + size,
+    .name = "fbbuf-read",
+    .pos = size,
+    .refill = fbbuf_refill,
+    .seek = fbbuf_seek,
+    .can_overwrite_buffer = can_overwrite
+  };
+}
+
+static void
+fbbuf_spout(struct fastbuf *f)
+{
+  if (f->bptr >= f->bufend)
+    bthrow(f, "write", "fbbuf: buffer overflow on write");
+}
+
+void
+fbbuf_init_write(struct fastbuf *f, byte *buf, uint size)
+{
+  *f = (struct fastbuf) {
+    .buffer = buf,
+    .bstop = buf,
+    .bptr = buf,
+    .bufend = buf + size,
+    .name = "fbbuf-write",
+    .spout = fbbuf_spout,
+  };
+}
+
+#ifdef TEST
+
+int main(int argc, char *argv[])
+{
+  if (argc < 2)
+    {
+      fprintf(stderr, "You must specify a test (r, w, o)\n");
+      return 1;
+    }
+  switch (*argv[1])
+    {
+      case 'r':
+        {
+          struct fastbuf fb;
+          char *data = "Two\nlines\n";
+          fbbuf_init_read(&fb, data, strlen(data), 0);
+          char buffer[10];
+          while (bgets(&fb, buffer, 10))
+            puts(buffer);
+          bclose(&fb);
+          break;
+        }
+      case 'w':
+        {
+          struct fastbuf fb;
+          char buff[20];
+          fbbuf_init_write(&fb, buff, 20);
+          bputs(&fb, "Hello world\n");
+          bputc(&fb, 0);
+          fputs(buff, stdout);
+          break;
+        }
+      case 'o':
+        {
+          struct fastbuf fb;
+          char buff[4];
+          fbbuf_init_write(&fb, buff, 4);
+          bputs(&fb, "Hello");
+          bputc(&fb, 0);
+          fputs(buff, stdout);
+          break;
+        }
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-buffer.t b/libucw/ucw/fb-buffer.t
new file mode 100644
index 0000000..38a50d7
--- /dev/null
+++ b/libucw/ucw/fb-buffer.t
@@ -0,0 +1,13 @@
+# Tests for fb-buffer.c
+
+Name:	Read
+Run:	../obj/ucw/fb-buffer-t r
+Out:	Two
+	lines
+
+Name:	Write
+Run:	../obj/ucw/fb-buffer-t w
+Out:	Hello world
+
+Name:	Overflow
+Run:	../obj/ucw/fb-buffer-t o 2>&1 | grep 'buffer overflow on write'
diff --git a/libucw/ucw/fb-direct.c b/libucw/ucw/fb-direct.c
new file mode 100644
index 0000000..d875fb0
--- /dev/null
+++ b/libucw/ucw/fb-direct.c
@@ -0,0 +1,346 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on O_DIRECT Files
+ *
+ *	(c) 2006--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *	This is a fastbuf backend for fast streaming I/O using O_DIRECT and
+ *	the asynchronous I/O module. It's designed for use on large files
+ *	which don't fit in the disk cache.
+ *
+ *	CAVEATS:
+ *
+ *	  - All operations with a single fbdirect handle must be done
+ *	    within a single thread, unless you provide a custom I/O queue
+ *	    and take care of locking.
+ *
+ *	FIXME: what if the OS doesn't support O_DIRECT?
+ *	FIXME: unaligned seeks and partial writes?
+ *	FIXME: append to unaligned file
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/asio.h>
+#include <ucw/conf.h>
+#include <ucw/threads.h>
+
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#define FBDIR_ALIGN 512
+
+enum fbdir_mode {				// Current operating mode
+    M_NULL,
+    M_READ,
+    M_WRITE
+};
+
+struct fb_direct {
+  struct fastbuf fb;
+  int fd;					// File descriptor
+  int is_temp_file;
+  struct asio_queue *io_queue;			// I/O queue to use
+  struct asio_queue *user_queue;		// If io_queue was supplied by the user
+  struct asio_request *pending_read;
+  struct asio_request *done_read;
+  struct asio_request *active_buffer;
+  enum fbdir_mode mode;
+  byte name[0];
+};
+#define FB_DIRECT(f) ((struct fb_direct *)(f))
+
+#ifndef TEST
+uint fbdir_cheat;
+
+static struct cf_section fbdir_cf = {
+  CF_ITEMS {
+    CF_UINT("Cheat", &fbdir_cheat),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR
+fbdir_global_init(void)
+{
+  cf_declare_section("FBDirect", &fbdir_cf, 0);
+}
+#endif
+
+static void
+fbdir_read_sync(struct fb_direct *F)
+{
+  while (F->pending_read)
+    {
+      struct asio_request *r = asio_wait(F->io_queue);
+      ASSERT(r);
+      struct fb_direct *G = r->user_data;
+      ASSERT(G);
+      ASSERT(G->pending_read == r && !G->done_read);
+      G->pending_read = NULL;
+      G->done_read = r;
+    }
+}
+
+static void
+fbdir_change_mode(struct fb_direct *F, enum fbdir_mode mode)
+{
+  if (F->mode == mode)
+    return;
+  DBG("FB-DIRECT: Switching mode to %d", mode);
+  switch (F->mode)
+    {
+    case M_NULL:
+      break;
+    case M_READ:
+      fbdir_read_sync(F);			// Wait for read-ahead requests to finish
+      if (F->done_read)				// Return read-ahead requests if any
+	{
+	  asio_put(F->done_read);
+	  F->done_read = NULL;
+	}
+      break;
+    case M_WRITE:
+      asio_sync(F->io_queue);			// Wait for pending writebacks
+      break;
+    }
+  if (F->active_buffer)
+    {
+      asio_put(F->active_buffer);
+      F->active_buffer = NULL;
+    }
+  F->mode = mode;
+}
+
+static void
+fbdir_submit_read(struct fb_direct *F)
+{
+  struct asio_request *r = asio_get(F->io_queue);
+  r->fd = F->fd;
+  r->op = ASIO_READ;
+  r->len = F->io_queue->buffer_size;
+  r->user_data = F;
+  asio_submit(r);
+  F->pending_read = r;
+}
+
+static int
+fbdir_refill(struct fastbuf *f)
+{
+  struct fb_direct *F = FB_DIRECT(f);
+
+  DBG("FB-DIRECT: Refill");
+
+  if (!F->done_read)
+    {
+      if (!F->pending_read)
+	{
+	  fbdir_change_mode(F, M_READ);
+	  fbdir_submit_read(F);
+	}
+      fbdir_read_sync(F);
+      ASSERT(F->done_read);
+    }
+
+  struct asio_request *r = F->done_read;
+  F->done_read = NULL;
+  if (F->active_buffer)
+    asio_put(F->active_buffer);
+  F->active_buffer = r;
+  if (!r->status)
+    return 0;
+  if (r->status < 0)
+    bthrow(f, "read", "Error reading %s: %s", f->name, strerror(r->returned_errno));
+  f->bptr = f->buffer = r->buffer;
+  f->bstop = f->bufend = f->buffer + r->status;
+  f->pos += r->status;
+
+  fbdir_submit_read(F);				// Read-ahead the next block
+
+  return r->status;
+}
+
+static void
+fbdir_spout(struct fastbuf *f)
+{
+  struct fb_direct *F = FB_DIRECT(f);
+  struct asio_request *r;
+
+  DBG("FB-DIRECT: Spout");
+
+  fbdir_change_mode(F, M_WRITE);
+  r = F->active_buffer;
+  if (r && f->bptr > f->bstop)
+    {
+      r->op = ASIO_WRITE_BACK;
+      r->fd = F->fd;
+      r->len = f->bptr - f->bstop;
+      ASSERT(!(f->pos % FBDIR_ALIGN) || fbdir_cheat);
+      f->pos += r->len;
+      if (!fbdir_cheat && r->len % FBDIR_ALIGN)			// Have to simulate incomplete writes
+	{
+	  r->len = ALIGN_TO(r->len, FBDIR_ALIGN);
+	  asio_submit(r);
+	  asio_sync(F->io_queue);
+	  DBG("FB-DIRECT: Truncating at %llu", (long long)f->pos);
+	  if (ucw_ftruncate(F->fd, f->pos) < 0)
+	    bthrow(f, "write", "Error truncating %s: %m", f->name);
+	}
+      else
+	asio_submit(r);
+      r = NULL;
+    }
+  if (!r)
+    r = asio_get(F->io_queue);
+  f->bstop = f->bptr = f->buffer = r->buffer;
+  f->bufend = f->buffer + F->io_queue->buffer_size;
+  F->active_buffer = r;
+}
+
+static int
+fbdir_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  DBG("FB-DIRECT: Seek %llu %d", (long long)pos, whence);
+
+  if (whence == SEEK_SET && pos == f->pos)
+    return 1;
+
+  fbdir_change_mode(FB_DIRECT(f), M_NULL);			// Wait for all async requests to finish
+  ucw_off_t l = ucw_seek(FB_DIRECT(f)->fd, pos, whence);
+  if (l < 0)
+    return 0;
+  f->pos = l;
+  return 1;
+}
+
+static struct asio_queue *
+fbdir_get_io_queue(uint buffer_size, uint write_back)
+{
+  struct ucwlib_context *ctx = ucwlib_thread_context();
+  struct asio_queue *q = ctx->io_queue;
+  if (!q)
+    {
+      q = xmalloc_zero(sizeof(struct asio_queue));
+      q->buffer_size = buffer_size;
+      q->max_writebacks = write_back;
+      asio_init_queue(q);
+      ctx->io_queue = q;
+    }
+  q->use_count++;
+  DBG("FB-DIRECT: Got I/O queue, uc=%d", q->use_count);
+  return q;
+}
+
+static void
+fbdir_put_io_queue(void)
+{
+  struct ucwlib_context *ctx = ucwlib_thread_context();
+  struct asio_queue *q = ctx->io_queue;
+  ASSERT(q);
+  DBG("FB-DIRECT: Put I/O queue, uc=%d", q->use_count);
+  if (!--q->use_count)
+    {
+      asio_cleanup_queue(q);
+      xfree(q);
+      ctx->io_queue = NULL;
+    }
+}
+
+static void
+fbdir_close(struct fastbuf *f)
+{
+  struct fb_direct *F = FB_DIRECT(f);
+
+  DBG("FB-DIRECT: Close");
+
+  fbdir_change_mode(F, M_NULL);
+  if (!F->user_queue)
+    fbdir_put_io_queue();
+
+  bclose_file_helper(f, F->fd, F->is_temp_file);
+  xfree(f);
+}
+
+static int
+fbdir_config(struct fastbuf *f, uint item, int value)
+{
+  int orig;
+
+  switch (item)
+    {
+    case BCONFIG_IS_TEMP_FILE:
+      orig = FB_DIRECT(f)->is_temp_file;
+      FB_DIRECT(f)->is_temp_file = value;
+      return orig;
+    default:
+      return -1;
+    }
+}
+
+struct fastbuf *
+fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uint buffer_size, uint read_ahead UNUSED, uint write_back)
+{
+  int namelen = strlen(name) + 1;
+  struct fb_direct *F = xmalloc(sizeof(struct fb_direct) + namelen);
+  struct fastbuf *f = &F->fb;
+
+  DBG("FB-DIRECT: Open");
+  bzero(F, sizeof(*F));
+  f->name = F->name;
+  memcpy(f->name, name, namelen);
+  F->fd = fd;
+  if (q)
+    F->io_queue = F->user_queue = q;
+  else
+    F->io_queue = fbdir_get_io_queue(buffer_size, write_back);
+  f->refill = fbdir_refill;
+  f->spout = fbdir_spout;
+  f->seek = fbdir_seek;
+  f->close = fbdir_close;
+  f->config = fbdir_config;
+  f->can_overwrite_buffer = 2;
+  return f;
+}
+
+#ifdef TEST
+
+#include <ucw/getopt.h>
+
+int main(int argc, char **argv)
+{
+  struct fb_params par = { .type = FB_DIRECT };
+  struct fastbuf *f, *t;
+
+  log_init(NULL);
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0)
+    die("Hey, whaddya want?");
+  f = (optind < argc) ? bopen_file(argv[optind++], O_RDONLY, &par) : bopen_fd(0, &par);
+  t = (optind < argc) ? bopen_file(argv[optind++], O_RDWR | O_CREAT | O_TRUNC, &par) : bopen_fd(1, &par);
+
+  bbcopy(f, t, ~0U);
+  ASSERT(btell(f) == btell(t));
+
+#if 0		// This triggers unaligned write
+  bflush(t);
+  bputc(t, '\n');
+#endif
+
+  brewind(t);
+  bgetc(t);
+  ASSERT(btell(t) == 1);
+
+  bclose(f);
+  bclose(t);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-file.c b/libucw/ucw/fb-file.c
new file mode 100644
index 0000000..d45ee0e
--- /dev/null
+++ b/libucw/ucw/fb-file.c
@@ -0,0 +1,270 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Files
+ *
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+struct fb_file {
+  struct fastbuf fb;
+  int fd;				/* File descriptor */
+  int is_temp_file;
+  int keep_back_buf;			/* Optimize for backwards reading */
+  ucw_off_t wpos;			/* Real file position */
+  uint wlen;				/* Window size */
+};
+#define FB_FILE(f) ((struct fb_file *)(f))
+#define FB_BUFFER(f) (byte *)(FB_FILE(f) + 1)
+
+static int
+bfd_refill(struct fastbuf *f)
+{
+  struct fb_file *F = FB_FILE(f);
+  byte *read_ptr = (f->buffer = FB_BUFFER(f));
+  uint blen = f->bufend - f->buffer, back = F->keep_back_buf ? blen >> 2 : 0, read_len = blen;
+  /* Forward or no seek */
+  if (F->wpos <= f->pos)
+    {
+      ucw_off_t diff = f->pos - F->wpos;
+      /* Formula for long forward seeks (prefer lseek()) */
+      if (diff > ((ucw_off_t)blen << 2))
+        {
+long_seek:
+	  f->bptr = f->buffer + back;
+	  f->bstop = f->buffer + blen;
+	  goto seek;
+	}
+      /* Short forward seek (prefer read() to skip data )*/
+      else if ((uint)diff >= back)
+        {
+	  uint skip = diff - back;
+	  F->wpos += skip;
+	  while (skip)
+	    {
+	      int l = read(F->fd, f->buffer, MIN(skip, blen));
+	      if (unlikely(l <= 0))
+		if (l < 0)
+		  bthrow(f, "read", "Error reading %s: %m", f->name);
+		else
+		  {
+		    F->wpos -= skip;
+		    goto eof;
+		  }
+	      skip -= l;
+	    }
+	}
+      /* Reuse part of the previous window and append new data (also F->wpos == f->pos) */
+      else
+        {
+	  uint keep = back - (uint)diff;
+	  if (keep >= F->wlen)
+	    back = diff + (keep = F->wlen);
+	  else
+	    memmove(f->buffer, f->buffer + F->wlen - keep, keep);
+	  read_len -= keep;
+	  read_ptr += keep;
+	}
+      f->bptr = f->buffer + back;
+      f->bstop = f->buffer + blen;
+    }
+  /* Backwards seek */
+  else
+    {
+      ucw_off_t diff = F->wpos - f->pos;
+      /* Formula for long backwards seeks (keep smaller backbuffer than for shorter seeks ) */
+      if (diff > ((ucw_off_t)blen << 1))
+        {
+	  if ((ucw_off_t)back > f->pos)
+	    back = f->pos;
+	  goto long_seek;
+	}
+      /* Seek into previous window (do nothing... for example brewind) */
+      else if ((uint)diff <= F->wlen)
+        {
+	  f->bstop = f->buffer + F->wlen;
+	  f->bptr = f->bstop - diff;
+	  f->pos = F->wpos;
+	  return 1;
+	}
+      back *= 3;
+      if ((ucw_off_t)back > f->pos)
+	back = f->pos;
+      f->bptr = f->buffer + back;
+      read_len = blen;
+      f->bstop = f->buffer + read_len;
+      /* Reuse part of previous window */
+      if (F->wlen && read_len <= back + diff && read_len > back + diff - F->wlen)
+        {
+	  uint keep = read_len + F->wlen - back - diff;
+	  memmove(f->buffer + read_len - keep, f->buffer, keep);
+	}
+seek:
+      /* Do lseek() */
+      F->wpos = f->pos + (f->buffer - f->bptr);
+      if (ucw_seek(F->fd, F->wpos, SEEK_SET) < 0)
+	bthrow(f, "read", "Error seeking %s: %m", f->name);
+    }
+  /* Read (part of) buffer */
+  do
+    {
+      int l = read(F->fd, read_ptr, read_len);
+      if (unlikely(l < 0))
+	bthrow(f, "read", "Error reading %s: %m", f->name);
+      if (!l)
+	if (unlikely(read_ptr < f->bptr))
+	  goto eof;
+	else
+	  break; /* Incomplete read because of EOF */
+      read_ptr += l;
+      read_len -= l;
+      F->wpos += l;
+    }
+  while (read_ptr <= f->bptr);
+  if (read_len)
+    f->bstop = read_ptr;
+  f->pos += f->bstop - f->bptr;
+  F->wlen = f->bstop - f->buffer;
+  return f->bstop - f->bptr;
+eof:
+  /* Seeked behind EOF */
+  f->bptr = f->bstop = f->buffer;
+  F->wlen = 0;
+  return 0;
+}
+
+static void
+bfd_spout(struct fastbuf *f)
+{
+  /* Do delayed lseek() if needed */
+  if (FB_FILE(f)->wpos != f->pos && ucw_seek(FB_FILE(f)->fd, f->pos, SEEK_SET) < 0)
+    bthrow(f, "write", "Error seeking %s: %m", f->name);
+
+  int l = f->bptr - f->buffer;
+  byte *c = f->buffer;
+
+  /* Write the buffer */
+  FB_FILE(f)->wpos = (f->pos += l);
+  FB_FILE(f)->wlen = 0;
+  while (l)
+    {
+      int z = write(FB_FILE(f)->fd, c, l);
+      if (z <= 0)
+	bthrow(f, "write", "Error writing %s: %m", f->name);
+      l -= z;
+      c += z;
+    }
+  f->bptr = f->bstop = f->buffer = FB_BUFFER(f);
+}
+
+static int
+bfd_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  ASSERT(f->bptr == f->bstop);
+  /* Delay the seek for the next refill() or spout() call (if whence != SEEK_END). */
+  switch (whence)
+    {
+      case SEEK_SET:
+	f->pos = pos;
+	return 1;
+      case SEEK_END: ;
+	ucw_off_t l = ucw_seek(FB_FILE(f)->fd, pos, SEEK_END);
+	if (l < 0)
+	  bthrow(f, "seek", "Error seeking %s: %m", f->name);
+	FB_FILE(f)->wpos = f->pos = l;
+	FB_FILE(f)->wlen = 0;
+	return 1;
+      default:
+	ASSERT(0);
+    }
+}
+
+static void
+bfd_close(struct fastbuf *f)
+{
+  bclose_file_helper(f, FB_FILE(f)->fd, FB_FILE(f)->is_temp_file);
+  xfree(f);
+}
+
+static int
+bfd_config(struct fastbuf *f, uint item, int value)
+{
+  int orig;
+
+  switch (item)
+    {
+      case BCONFIG_IS_TEMP_FILE:
+	orig = FB_FILE(f)->is_temp_file;
+	FB_FILE(f)->is_temp_file = value;
+	return orig;
+      case BCONFIG_KEEP_BACK_BUF:
+        orig = FB_FILE(f)->keep_back_buf;
+	FB_FILE(f)->keep_back_buf = value;
+	return orig;
+      default:
+	return -1;
+    }
+}
+
+struct fastbuf *
+bfdopen_internal(int fd, const char *name, uint buflen)
+{
+  ASSERT(buflen);
+  int namelen = strlen(name) + 1;
+  struct fb_file *F = xmalloc_zero(sizeof(struct fb_file) + buflen + namelen);
+  struct fastbuf *f = &F->fb;
+
+  bzero(F, sizeof(*F));
+  f->buffer = (byte *)(F+1);
+  f->bptr = f->bstop = f->buffer;
+  f->bufend = f->buffer + buflen;
+  f->name = f->bufend;
+  memcpy(f->name, name, namelen);
+  F->fd = fd;
+  f->refill = bfd_refill;
+  f->spout = bfd_spout;
+  f->seek = bfd_seek;
+  f->close = bfd_close;
+  f->config = bfd_config;
+  f->can_overwrite_buffer = 2;
+  return f;
+}
+
+void
+bfilesync(struct fastbuf *b)
+{
+  bflush(b);
+  if (fsync(FB_FILE(b)->fd) < 0)
+    msg(L_ERROR, "fsync(%s) failed: %m", b->name);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct fastbuf *f, *t;
+  f = bopen_tmp(16);
+  t = bfdopen_shared(1, 13);
+  for (uint i = 0; i < 16; i++)
+    bwrite(f, "<hello>", 7);
+  bprintf(t, "%d\n", (int)btell(f));
+  brewind(f);
+  bbcopy(f, t, ~0U);
+  bprintf(t, "\n%d %d\n", (int)btell(f), (int)btell(t));
+  bclose(f);
+  bclose(t);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-file.t b/libucw/ucw/fb-file.t
new file mode 100644
index 0000000..7a0c21d
--- /dev/null
+++ b/libucw/ucw/fb-file.t
@@ -0,0 +1,7 @@
+#Tests for fb-file
+
+Run:	../obj/ucw/fb-file-t
+Out:	112
+	<hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello><hello>
+	112 116
+
diff --git a/libucw/ucw/fb-grow.c b/libucw/ucw/fb-grow.c
new file mode 100644
index 0000000..2c458e8
--- /dev/null
+++ b/libucw/ucw/fb-grow.c
@@ -0,0 +1,156 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Growing Buffers
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+struct fb_gbuf {
+  struct fastbuf fb;
+  struct mempool *mp;
+  byte *end;
+};
+#define FB_GBUF(f) ((struct fb_gbuf *)(f))
+
+static int fbgrow_refill(struct fastbuf *b)
+{
+  b->bstop = FB_GBUF(b)->end;
+  b->pos = b->bstop - b->buffer;
+  return b->bstop > b->bptr;
+}
+
+static void fbgrow_spout(struct fastbuf *b)
+{
+  if (b->bptr == b->bufend)
+    {
+      uint len = b->bufend - b->buffer;
+      if (FB_GBUF(b)->mp)
+	{
+	  byte *old = b->buffer;
+	  b->buffer = mp_alloc(FB_GBUF(b)->mp, 2 * len);
+	  memcpy(b->buffer, old, len);
+	}
+      else
+        b->buffer = xrealloc(b->buffer, 2 * len);
+      b->bufend = b->buffer + 2 * len;
+      FB_GBUF(b)->end = b->bptr = b->buffer + len;
+    }
+  else if (FB_GBUF(b)->end < b->bptr)
+    FB_GBUF(b)->end = b->bptr;
+  b->bstop = b->buffer;
+  b->pos = 0;
+}
+
+static int fbgrow_seek(struct fastbuf *b, ucw_off_t pos, int whence)
+{
+  ucw_off_t len = FB_GBUF(b)->end - b->buffer;
+  if (whence == SEEK_END)
+    pos += len;
+  if (pos < 0 || pos > len)
+    bthrow(b, "seek", "Seek out of range");
+  b->bptr = b->buffer + pos;
+  b->bstop = b->buffer;
+  b->pos = 0;
+  return 1;
+}
+
+static void fbgrow_close(struct fastbuf *b)
+{
+  xfree(b->buffer);
+  xfree(b);
+}
+
+struct fastbuf *fbgrow_create_mp(struct mempool *mp, uint basic_size)
+{
+  ASSERT(basic_size);
+  struct fastbuf *b;
+  if (mp)
+    {
+      b = mp_alloc_zero(mp, sizeof(struct fb_gbuf));
+      b->buffer = mp_alloc(mp, basic_size);
+      FB_GBUF(b)->mp = mp;
+    }
+  else
+    {
+      b = xmalloc_zero(sizeof(struct fb_gbuf));
+      b->buffer = xmalloc(basic_size);
+      b->close = fbgrow_close;
+    }
+  b->bufend = b->buffer + basic_size;
+  b->bptr = b->bstop = b->buffer;
+  FB_GBUF(b)->end = b->buffer;
+  b->name = "<fbgbuf>";
+  b->refill = fbgrow_refill;
+  b->spout = fbgrow_spout;
+  b->seek = fbgrow_seek;
+  b->can_overwrite_buffer = 1;
+  return b;
+}
+
+struct fastbuf *fbgrow_create(uint basic_size)
+{
+  return fbgrow_create_mp(NULL, basic_size);
+}
+
+void fbgrow_reset(struct fastbuf *b)
+{
+  FB_GBUF(b)->end = b->bptr = b->bstop = b->buffer;
+  b->pos = 0;
+}
+
+void fbgrow_rewind(struct fastbuf *b)
+{
+  brewind(b);
+}
+
+uint fbgrow_get_buf(struct fastbuf *b, byte **buf)
+{
+  byte *end = FB_GBUF(b)->end;
+  end = MAX(end, b->bptr);
+  if (buf)
+    *buf = b->buffer;
+  return end - b->buffer;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct fastbuf *f;
+  uint t;
+
+  f = fbgrow_create(3);
+  for (uint i=0; i<5; i++)
+    {
+      fbgrow_reset(f);
+      bwrite(f, "12345", 5);
+      bwrite(f, "12345", 5);
+      printf("<%d>", (int)btell(f));
+      bflush(f);
+      printf("<%d>", (int)btell(f));
+      fbgrow_rewind(f);
+      printf("<%d>", (int)btell(f));
+      while ((t = bgetc(f)) != ~0U)
+	putchar(t);
+      printf("<%d>", (int)btell(f));
+      fbgrow_rewind(f);
+      bseek(f, -1, SEEK_END);
+      printf("<%d>", (int)btell(f));
+      while ((t = bgetc(f)) != ~0U)
+	putchar(t);
+      printf("<%d>\n", (int)btell(f));
+    }
+  bclose(f);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-grow.t b/libucw/ucw/fb-grow.t
new file mode 100644
index 0000000..8b88418
--- /dev/null
+++ b/libucw/ucw/fb-grow.t
@@ -0,0 +1,9 @@
+# Tests for fb-grow.c
+
+Run:	../obj/ucw/fb-grow-t
+Out:	<10><10><0>1234512345<10><9>5<10>
+	<10><10><0>1234512345<10><9>5<10>
+	<10><10><0>1234512345<10><9>5<10>
+	<10><10><0>1234512345<10><9>5<10>
+	<10><10><0>1234512345<10><9>5<10>
+
diff --git a/libucw/ucw/fb-limfd.c b/libucw/ucw/fb-limfd.c
new file mode 100644
index 0000000..426f57f
--- /dev/null
+++ b/libucw/ucw/fb-limfd.c
@@ -0,0 +1,75 @@
+/*
+ *	UCW Library -- Fast Buffered Input on Limited File Descriptors
+ *
+ *	(c) 2003--2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+#include <unistd.h>
+
+struct fb_limfd {
+  struct fastbuf fb;
+  int fd;				/* File descriptor */
+  int limit;
+};
+#define FB_LIMFD(f) ((struct fb_limfd *)(f))
+#define FB_BUFFER(f) (byte *)(FB_LIMFD(f) + 1)
+
+static int
+bfl_refill(struct fastbuf *f)
+{
+  f->bptr = f->buffer = FB_BUFFER(f);
+  int max = MIN(FB_LIMFD(f)->limit - f->pos, f->bufend - f->buffer);
+  int l = read(FB_LIMFD(f)->fd, f->buffer, max);
+  if (l < 0)
+    bthrow(f, "read", "Error reading %s: %m", f->name);
+  f->bstop = f->buffer + l;
+  f->pos += l;
+  return l;
+}
+
+static void
+bfl_close(struct fastbuf *f)
+{
+  xfree(f);
+}
+
+struct fastbuf *
+bopen_limited_fd(int fd, uint buflen, uint limit)
+{
+  struct fb_limfd *F = xmalloc(sizeof(struct fb_limfd) + buflen);
+  struct fastbuf *f = &F->fb;
+
+  bzero(F, sizeof(*F));
+  f->buffer = (char *)(F+1);
+  f->bptr = f->bstop = f->buffer;
+  f->bufend = f->buffer + buflen;
+  f->name = "limited-fd";
+  F->fd = fd;
+  F->limit = limit;
+  f->refill = bfl_refill;
+  f->close = bfl_close;
+  f->can_overwrite_buffer = 2;
+  return f;
+}
+
+#ifdef TEST
+
+int main(int UNUSED argc, char UNUSED **argv)
+{
+  struct fastbuf *f = bopen_limited_fd(0, 3, 13);
+  struct fastbuf *o = bfdopen_shared(1, 16);
+  int c;
+  while ((c = bgetc(f)) >= 0)
+    bputc(o, c);
+  bclose(o);
+  bclose(f);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-limfd.t b/libucw/ucw/fb-limfd.t
new file mode 100644
index 0000000..25fe12d
--- /dev/null
+++ b/libucw/ucw/fb-limfd.t
@@ -0,0 +1,6 @@
+# Tests for fb-limfd
+
+Run:	../obj/ucw/fb-limfd-t
+In:	123456789012
+	4567890
+Out:	123456789012
diff --git a/libucw/ucw/fb-mem.c b/libucw/ucw/fb-mem.c
new file mode 100644
index 0000000..77ad43d
--- /dev/null
+++ b/libucw/ucw/fb-mem.c
@@ -0,0 +1,222 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Memory Streams
+ *
+ *	(c) 1997--2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+
+struct memstream {
+  uint blocksize;
+  uint uc;
+  struct msblock *first;
+};
+
+struct msblock {
+  struct msblock *next;
+  ucw_off_t pos;
+  uint size;
+  byte data[0];
+};
+
+struct fb_mem {
+  struct fastbuf fb;
+  struct memstream *stream;
+  struct msblock *block;
+};
+#define FB_MEM(f) ((struct fb_mem *)(f))
+
+static int
+fbmem_refill(struct fastbuf *f)
+{
+  struct memstream *s = FB_MEM(f)->stream;
+  struct msblock *b = FB_MEM(f)->block;
+
+  if (!b)
+    {
+      b = s->first;
+      if (!b)
+	return 0;
+    }
+  else if (f->buffer == b->data && f->bstop < b->data + b->size)
+    {
+      f->bstop = b->data + b->size;
+      f->pos = b->pos + b->size;
+      return 1;
+    }
+  else if (!b->next)
+    return 0;
+  else
+    b = b->next;
+  if (!b->size)
+    return 0;
+  f->buffer = f->bptr = b->data;
+  f->bufend = f->bstop = b->data + b->size;
+  f->pos = b->pos + b->size;
+  FB_MEM(f)->block = b;
+  return 1;
+}
+
+static void
+fbmem_spout(struct fastbuf *f)
+{
+  struct memstream *s = FB_MEM(f)->stream;
+  struct msblock *b = FB_MEM(f)->block;
+  struct msblock *bb;
+
+  if (b)
+    {
+      b->size = f->bptr - b->data;
+      if (b->size < s->blocksize)
+	return;
+    }
+  bb = xmalloc(sizeof(struct msblock) + s->blocksize);
+  if (b)
+    {
+      b->next = bb;
+      bb->pos = b->pos + b->size;
+    }
+  else
+    {
+      s->first = bb;
+      bb->pos = 0;
+    }
+  bb->next = NULL;
+  bb->size = 0;
+  f->buffer = f->bptr = f->bstop = bb->data;
+  f->bufend = bb->data + s->blocksize;
+  f->pos = bb->pos;
+  FB_MEM(f)->block = bb;
+}
+
+static int
+fbmem_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  struct memstream *m = FB_MEM(f)->stream;
+  struct msblock *b;
+
+  ASSERT(whence == SEEK_SET || whence == SEEK_END);
+  if (whence == SEEK_END)
+    {
+      for (b=m->first; b; b=b->next)
+	pos += b->size;
+    }
+  /* Yes, this is linear. But considering the average number of buckets, it doesn't matter. */
+  for (b=m->first; b; b=b->next)
+    {
+      if (pos <= b->pos + (ucw_off_t)b->size) /* <=, because we need to be able to seek just after file end */
+	{
+	  f->buffer = f->bstop = b->data;
+	  f->bptr = b->data + (pos - b->pos);
+	  f->bufend = b->data + b->size;
+	  f->pos = b->pos;
+	  FB_MEM(f)->block = b;
+	  return 1;
+	}
+    }
+  if (!m->first && !pos)
+    {
+      /* Seeking to offset 0 in an empty file needs an exception */
+      f->buffer = f->bptr = f->bstop = f->bufend = NULL;
+      f->pos = 0;
+      FB_MEM(f)->block = NULL;
+      return 1;
+    }
+  bthrow(f, "seek", "fbmem_seek to an invalid offset");
+}
+
+static void
+fbmem_close(struct fastbuf *f)
+{
+  struct memstream *m = FB_MEM(f)->stream;
+  struct msblock *b;
+
+  if (!--m->uc)
+    {
+      while (b = m->first)
+	{
+	  m->first = b->next;
+	  xfree(b);
+	}
+      xfree(m);
+    }
+  xfree(f);
+}
+
+struct fastbuf *
+fbmem_create(uint blocksize)
+{
+  struct fastbuf *f = xmalloc_zero(sizeof(struct fb_mem));
+  struct memstream *s = xmalloc_zero(sizeof(struct memstream));
+
+  s->blocksize = blocksize;
+  s->uc = 1;
+
+  FB_MEM(f)->stream = s;
+  f->name = "<fbmem-write>";
+  f->spout = fbmem_spout;
+  f->close = fbmem_close;
+  return f;
+}
+
+struct fastbuf *
+fbmem_clone_read(struct fastbuf *b)
+{
+  struct fastbuf *f = xmalloc_zero(sizeof(struct fb_mem));
+  struct memstream *s = FB_MEM(b)->stream;
+
+  bflush(b);
+  s->uc++;
+
+  FB_MEM(f)->stream = s;
+  f->name = "<fbmem-read>";
+  f->refill = fbmem_refill;
+  f->seek = fbmem_seek;
+  f->close = fbmem_close;
+  f->can_overwrite_buffer = 1;
+  return f;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct fastbuf *w, *r;
+  int t;
+
+  w = fbmem_create(7);
+  r = fbmem_clone_read(w);
+  bwrite(w, "12345", 5);
+  bwrite(w, "12345", 5);
+  printf("<%d>", (int)btell(w));
+  bflush(w);
+  printf("<%d>", (int)btell(w));
+  printf("<%d>", (int)btell(r));
+  while ((t = bgetc(r)) >= 0)
+    putchar(t);
+  printf("<%d>", (int)btell(r));
+  bwrite(w, "12345", 5);
+  bwrite(w, "12345", 5);
+  printf("<%d>", (int)btell(w));
+  bclose(w);
+  bsetpos(r, 0);
+  printf("<!%d>", (int)btell(r));
+  while ((t = bgetc(r)) >= 0)
+    putchar(t);
+  bsetpos(r, 3);
+  printf("<!%d>", (int)btell(r));
+  while ((t = bgetc(r)) >= 0)
+    putchar(t);
+  putchar('\n');
+  fflush(stdout);
+  bclose(r);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-mem.t b/libucw/ucw/fb-mem.t
new file mode 100644
index 0000000..54b71c6
--- /dev/null
+++ b/libucw/ucw/fb-mem.t
@@ -0,0 +1,4 @@
+# Test for fb-mem.c
+
+Run:	../obj/ucw/fb-mem-t
+Out:	<10><10><0>1234512345<10><20><!0>12345123451234512345<!3>45123451234512345
diff --git a/libucw/ucw/fb-mmap.c b/libucw/ucw/fb-mmap.c
new file mode 100644
index 0000000..e3d7ba5
--- /dev/null
+++ b/libucw/ucw/fb-mmap.c
@@ -0,0 +1,233 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Memory-Mapped Files
+ *
+ *	(c) 2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/conf.h>
+
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+static uint mmap_window_size = 16*CPU_PAGE_SIZE;
+static uint mmap_extend_size = 4*CPU_PAGE_SIZE;
+
+#ifndef TEST
+static struct cf_section fbmm_config = {
+  CF_ITEMS {
+    CF_UINT("WindowSize", &mmap_window_size),
+    CF_UINT("ExtendSize", &mmap_extend_size),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR fbmm_init_config(void)
+{
+  cf_declare_section("FBMMap", &fbmm_config, 0);
+}
+#endif
+
+struct fb_mmap {
+  struct fastbuf fb;
+  int fd;
+  int is_temp_file;
+  ucw_off_t file_size;
+  ucw_off_t file_extend;
+  ucw_off_t window_pos;
+  uint window_size;
+  int mode;
+};
+#define FB_MMAP(f) ((struct fb_mmap *)(f))
+
+static void
+bfmm_map_window(struct fastbuf *f)
+{
+  struct fb_mmap *F = FB_MMAP(f);
+  ucw_off_t pos0 = f->pos & ~(ucw_off_t)(CPU_PAGE_SIZE-1);
+  int l = MIN((ucw_off_t)mmap_window_size, F->file_extend - pos0);
+  uint ll = ALIGN_TO(l, CPU_PAGE_SIZE);
+  int prot = ((F->mode & O_ACCMODE) == O_RDONLY) ? PROT_READ : (PROT_READ | PROT_WRITE);
+
+  DBG(" ... Mapping %x(%x)+%x(%x) len=%x extend=%x", (int)pos0, (int)f->pos, ll, l, (int)F->file_size, (int)F->file_extend);
+  if (ll != F->window_size && f->buffer)
+    {
+      munmap(f->buffer, F->window_size);
+      f->buffer = NULL;
+    }
+  F->window_size = ll;
+  if (!f->buffer)
+    f->buffer = ucw_mmap(NULL, ll, prot, MAP_SHARED, F->fd, pos0);
+  else
+    f->buffer = ucw_mmap(f->buffer, ll, prot, MAP_SHARED | MAP_FIXED, F->fd, pos0);
+  if (f->buffer == (byte *) MAP_FAILED)
+    {
+      f->buffer = NULL;
+      bthrow(f, "mmap", "mmap(%s): %m", f->name);
+    }
+#ifdef MADV_SEQUENTIAL
+  if (ll > CPU_PAGE_SIZE)
+    madvise(f->buffer, ll, MADV_SEQUENTIAL);
+#endif
+  f->bufend = f->buffer + l;
+  f->bptr = f->buffer + (f->pos - pos0);
+  F->window_pos = pos0;
+}
+
+static int
+bfmm_refill(struct fastbuf *f)
+{
+  struct fb_mmap *F = FB_MMAP(f);
+
+  DBG("Refill <- %p %p %p %p", f->buffer, f->bptr, f->bstop, f->bufend);
+  if (f->pos >= F->file_size)
+    return 0;
+  if (f->bstop >= f->bufend)
+    bfmm_map_window(f);
+  if (F->window_pos + (f->bufend - f->buffer) > F->file_size)
+    f->bstop = f->buffer + (F->file_size - F->window_pos);
+  else
+    f->bstop = f->bufend;
+  f->pos = F->window_pos + (f->bstop - f->buffer);
+  DBG(" -> %p %p %p(%x) %p", f->buffer, f->bptr, f->bstop, (int)f->pos, f->bufend);
+  return 1;
+}
+
+static void
+bfmm_spout(struct fastbuf *f)
+{
+  struct fb_mmap *F = FB_MMAP(f);
+  ucw_off_t end = f->pos + (f->bptr - f->bstop);
+
+  DBG("Spout <- %p %p %p %p", f->buffer, f->bptr, f->bstop, f->bufend);
+  if (end > F->file_size)
+    F->file_size = end;
+  if (f->bptr < f->bufend)
+    return;
+  f->pos = end;
+  if (f->pos >= F->file_extend)
+    {
+      F->file_extend = ALIGN_TO(F->file_extend + mmap_extend_size, (ucw_off_t)CPU_PAGE_SIZE);
+      if (ucw_ftruncate(F->fd, F->file_extend))
+	bthrow(f, "write", "ftruncate(%s): %m", f->name);
+    }
+  bfmm_map_window(f);
+  f->bstop = f->bptr;
+  DBG(" -> %p %p %p(%x) %p", f->buffer, f->bptr, f->bstop, (int)f->pos, f->bufend);
+}
+
+static int
+bfmm_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  if (whence == SEEK_END)
+    pos += FB_MMAP(f)->file_size;
+  else
+    ASSERT(whence == SEEK_SET);
+  ASSERT(pos >= 0 && pos <= FB_MMAP(f)->file_size);
+  f->pos = pos;
+  f->bptr = f->bstop = f->bufend = f->buffer;	/* force refill/spout call */
+  DBG("Seek -> %p %p %p(%x) %p", f->buffer, f->bptr, f->bstop, (int)f->pos, f->bufend);
+  return 1;
+}
+
+static void
+bfmm_close(struct fastbuf *f)
+{
+  struct fb_mmap *F = FB_MMAP(f);
+  if (f->buffer)
+    munmap(f->buffer, F->window_size);
+  if (!(f->flags & FB_DEAD) &&
+      F->file_extend > F->file_size &&
+      ucw_ftruncate(F->fd, F->file_size))
+    bthrow(f, "write", "ftruncate(%s): %m", f->name);
+  bclose_file_helper(f, F->fd, F->is_temp_file);
+  xfree(f);
+}
+
+static int
+bfmm_config(struct fastbuf *f, uint item, int value)
+{
+  int orig;
+
+  switch (item)
+    {
+    case BCONFIG_IS_TEMP_FILE:
+      orig = FB_MMAP(f)->is_temp_file;
+      FB_MMAP(f)->is_temp_file = value;
+      return orig;
+    default:
+      return -1;
+    }
+}
+
+struct fastbuf *
+bfmmopen_internal(int fd, const char *name, uint mode)
+{
+  int namelen = strlen(name) + 1;
+  struct fb_mmap *F = xmalloc(sizeof(struct fb_mmap) + namelen);
+  struct fastbuf *f = &F->fb;
+
+  bzero(F, sizeof(*F));
+  f->name = (byte *)(F+1);
+  memcpy(f->name, name, namelen);
+  F->fd = fd;
+  F->file_extend = F->file_size = ucw_seek(fd, 0, SEEK_END);
+  if (F->file_size < 0)
+    bthrow(f, "open", "fb-mmap: Cannot detect size of %s -- is it seekable?", name);
+  if (mode & O_APPEND)
+    f->pos = F->file_size;
+  F->mode = mode;
+
+  f->refill = bfmm_refill;
+  f->spout = bfmm_spout;
+  f->seek = bfmm_seek;
+  f->close = bfmm_close;
+  f->config = bfmm_config;
+  return f;
+}
+
+#ifdef TEST
+
+int main(int UNUSED argc, char **argv)
+{
+  struct fb_params par = { .type = FB_MMAP };
+  struct fastbuf *f = bopen_file(argv[1], O_RDONLY, &par);
+  struct fastbuf *g = bopen_file(argv[2], O_RDWR | O_CREAT | O_TRUNC, &par);
+  int c;
+
+  DBG("Copying");
+  while ((c = bgetc(f)) >= 0)
+    bputc(g, c);
+  bclose(f);
+  DBG("Seek inside last block");
+  bsetpos(g, btell(g)-1333);
+  bputc(g, 13);
+  DBG("Seek to the beginning & write");
+  bsetpos(g, 1333);
+  bputc(g, 13);
+  DBG("flush");
+  bflush(g);
+  bputc(g, 13);
+  bflush(g);
+  DBG("Seek nearby & read");
+  bsetpos(g, 133);
+  bgetc(g);
+  DBG("Seek far & read");
+  bsetpos(g, 133333);
+  bgetc(g);
+  DBG("Closing");
+  bclose(g);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-mmap.t b/libucw/ucw/fb-mmap.t
new file mode 100644
index 0000000..9c5168c
--- /dev/null
+++ b/libucw/ucw/fb-mmap.t
@@ -0,0 +1,3 @@
+# Test for fb-mmap.c
+
+Run:	dd bs=1024 count=1024 if=/dev/zero of=mmap.in 2>/dev/null && ../obj/ucw/fb-mmap-t mmap.in mmap.out && rm mmap.in mmap.out
diff --git a/libucw/ucw/fb-multi.c b/libucw/ucw/fb-multi.c
new file mode 100644
index 0000000..9c3191c
--- /dev/null
+++ b/libucw/ucw/fb-multi.c
@@ -0,0 +1,369 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on itself
+ *
+ *	(c) 2012 Maria Matejka <mq@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/clists.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
+#define FB_MULTI_NAME "<multi>"
+
+struct fb_multi {
+  struct fastbuf fb;
+  struct mempool *mp;
+  struct subbuf *cur;
+  ucw_off_t len;
+  clist subbufs;
+};
+
+#define FB_MULTI(f) ((struct fb_multi *)(f))
+
+struct subbuf {
+  cnode n;
+  ucw_off_t begin, end, offset;
+  struct fastbuf *fb;
+};
+
+static void
+fbmulti_get_ptrs(struct fastbuf *f)
+{
+  struct subbuf *sb = FB_MULTI(f)->cur;
+  struct fastbuf *ff = sb->fb;
+
+  f->buffer = ff->buffer;
+  f->bptr = ff->bptr;
+  f->bstop = ff->bstop;
+  f->bufend = ff->bufend;
+  f->pos = sb->begin + (ff->pos - sb->offset);
+}
+
+static void
+fbmulti_set_ptrs(struct fastbuf *f)
+{
+  FB_MULTI(f)->cur->fb->bptr = f->bptr;
+}
+
+static int
+fbmulti_subbuf_next(struct fastbuf *f)
+{
+  struct subbuf *cur = FB_MULTI(f)->cur;
+  struct subbuf *next = clist_next(&FB_MULTI(f)->subbufs, &cur->n);
+  if (!next)
+    return 0;
+
+  // Get the end of current buf if not known yet
+  if (!f->seek && !next->begin)
+    next->begin = cur->end = f->pos;
+
+  // Set the beginning of the next buf
+  if (next->fb->seek)
+    {
+      bsetpos(next->fb, 0);
+      next->offset = 0;
+    }
+  else
+    {
+      ASSERT(!f->seek);
+      next->offset = btell(next->fb);
+    }
+
+  // Set the pointers
+  FB_MULTI(f)->cur = next;
+  fbmulti_get_ptrs(f);
+
+  return 1;
+}
+
+static int
+fbmulti_subbuf_prev(struct fastbuf *f)
+{
+  // Called only when seeking, assuming everything seekable
+  struct subbuf *prev = clist_prev(&FB_MULTI(f)->subbufs, &FB_MULTI(f)->cur->n);
+  ASSERT(prev);
+
+  // Set pos to beginning, flush offset
+  bsetpos(prev->fb, 0);
+  prev->offset = 0;
+
+  // Set the pointers
+  FB_MULTI(f)->cur = prev;
+  fbmulti_get_ptrs(f);
+
+  return 1;
+}
+
+static int
+fbmulti_refill(struct fastbuf *f)
+{
+  fbmulti_set_ptrs(f);
+
+  // Refill the subbuf
+  uint len = FB_MULTI(f)->cur->fb->refill(FB_MULTI(f)->cur->fb);
+  if (len)
+    {
+      fbmulti_get_ptrs(f);
+      return len;
+    }
+
+  // Current buf returned EOF
+  // Take the next one if exists and redo
+  if (fbmulti_subbuf_next(f))
+    return fbmulti_refill(f);
+  else
+    return 0;
+}
+
+static int
+fbmulti_seek(struct fastbuf *f, ucw_off_t pos, int whence)
+{
+  fbmulti_set_ptrs(f);
+  switch(whence)
+    {
+    case SEEK_SET:
+      if (pos > FB_MULTI(f)->len)
+	bthrow(f, "seek", "Seek out of range");
+
+      while (pos > FB_MULTI(f)->cur->end) // Moving forward
+	{
+	  int r = fbmulti_subbuf_next(f);
+	  ASSERT(r);
+	}
+
+      while (pos < FB_MULTI(f)->cur->begin) // Moving backwards
+	{
+	  int r = fbmulti_subbuf_prev(f);
+	  ASSERT(r);
+	}
+
+      // Now cur is the right buffer.
+      FB_MULTI(f)->cur->fb->seek(FB_MULTI(f)->cur->fb, (pos - FB_MULTI(f)->cur->begin), SEEK_SET);
+
+      fbmulti_get_ptrs(f);
+      return 1;
+
+    case SEEK_END:
+      return fbmulti_seek(f, FB_MULTI(f)->len + pos, SEEK_SET);
+
+    default:
+      ASSERT(0);
+    }
+}
+
+static void
+fbmulti_close(struct fastbuf *f)
+{
+  CLIST_FOR_EACH(struct subbuf *, n, FB_MULTI(f)->subbufs)
+    bclose(n->fb);
+
+  mp_delete(FB_MULTI(f)->mp);
+}
+
+struct fastbuf *
+fbmulti_create(void)
+{
+  struct mempool *mp = mp_new(1024);
+  struct fastbuf *fb_out = mp_alloc_zero(mp, sizeof(struct fb_multi));
+  struct fb_multi *fbm = FB_MULTI(fb_out);
+
+  fbm->mp = mp;
+  fbm->len = 0;
+
+  clist_init(&fbm->subbufs);
+
+  fb_out->name = FB_MULTI_NAME;
+  fb_out->refill = fbmulti_refill;
+  fb_out->seek = fbmulti_seek;
+  fb_out->close = fbmulti_close;
+
+  return fb_out;
+}
+
+void
+fbmulti_append(struct fastbuf *f, struct fastbuf *fb)
+{
+  struct subbuf *last = clist_tail(&FB_MULTI(f)->subbufs);
+
+  struct subbuf *sb = mp_alloc(FB_MULTI(f)->mp, sizeof(*sb));
+  sb->fb = fb;
+  clist_add_tail(&FB_MULTI(f)->subbufs, &(sb->n));
+
+  ASSERT(fb->refill);
+
+  if (fb->seek)
+    {
+      if (f->seek)
+	{
+	  sb->begin = last ? last->end : 0;
+	  bseek(fb, 0, SEEK_END);
+	  FB_MULTI(f)->len = sb->end = sb->begin + btell(fb);
+	}
+
+      bsetpos(fb, 0);
+    }
+
+  else
+    {
+      f->seek = NULL;
+      sb->offset = btell(fb);
+      sb->begin = 0;
+      sb->end = 0;
+    }
+
+  if (!last)
+    {
+      FB_MULTI(f)->cur = sb;
+      fbmulti_get_ptrs(f);
+    }
+}
+
+void
+fbmulti_remove(struct fastbuf *f, struct fastbuf *fb)
+{
+  bflush(f);
+  if (fb)
+    {
+      CLIST_FOR_EACH(struct subbuf *, n, FB_MULTI(f)->subbufs)
+	if (fb == n->fb)
+	  {
+	    clist_remove(&(n->n));
+	    return;
+	  }
+
+      die("Given fastbuf %p not in given fbmulti %p", fb, f);
+    }
+  else
+    clist_init(&FB_MULTI(f)->subbufs);
+}
+
+#ifdef TEST
+
+int main(int argc, char **argv)
+{
+  if (argc < 2)
+    {
+      fprintf(stderr, "You must specify a test (r, m, i, n)\n");
+      return 1;
+    }
+  switch (*argv[1])
+    {
+      case 'r':
+        {
+	  char *data[] = { "One\nLine", "Two\nLines", "Th\nreeLi\nnes\n" };
+	  struct fastbuf fb[ARRAY_SIZE(data)];
+	  for (uint i=0;i<ARRAY_SIZE(data);i++)
+	    fbbuf_init_read(&fb[i], data[i], strlen(data[i]), 0);
+
+	  struct fastbuf *f = fbmulti_create();
+	  fbmulti_append(f, &fb[0]);
+	  fbmulti_append(f, &fb[1]);
+	  fbmulti_append(f, &fb[2]);
+
+	  char buffer[9];
+	  while (bgets(f, buffer, 9))
+	    puts(buffer);
+
+	  bclose(f);
+	  break;
+        }
+      case 'm':
+	{
+	  char *data[] = { "Mnl", "ige" };
+	  struct fastbuf fb[ARRAY_SIZE(data)];
+	  for (uint i=0;i<ARRAY_SIZE(data);i++)
+	    fbbuf_init_read(&fb[i], data[i], strlen(data[i]), 0);
+
+	  struct fastbuf *f = fbmulti_create();
+	  fbmulti_append(f, &fb[0]);
+	  fbmulti_append(f, &fb[1]);
+
+	  int pos[] = {0, 3, 1, 4, 2, 5};
+
+	  for (uint i=0;i<ARRAY_SIZE(pos);i++)
+	    {
+	      bsetpos(f, pos[i]);
+	      putchar(bgetc(f));
+	    }
+
+	  bclose(f);
+	  break;
+	}
+      case 'i':
+	{
+	  char *data = "Insae";
+	  struct fastbuf fb[4];
+	  fbbuf_init_read(&fb[0], data, 1, 0);
+	  fbbuf_init_read(&fb[1], data + 1, 1, 0);
+	  fbbuf_init_read(&fb[2], data + 2, 2, 0);
+	  fbbuf_init_read(&fb[3], data + 4, 1, 0);
+
+	  struct fastbuf *f = fbmulti_create();
+	  fbmulti_append(f, &fb[0]);
+	  fbmulti_append(f, &fb[1]);
+	  fbmulti_append(f, &fb[2]);
+	  fbmulti_append(f, &fb[1]);
+	  fbmulti_append(f, &fb[3]);
+
+	  char buffer[9];
+	  while(bgets(f, buffer, 9))
+	    puts(buffer);
+
+	  bclose(f);
+	  break;
+	}
+      case 'n':
+	{
+	  char *data[] = { "Nested", "Data", "As", "In", "Real", "Usage", };
+	  struct fastbuf fb[ARRAY_SIZE(data)];
+	  for (uint i=0;i<ARRAY_SIZE(data);i++)
+	    fbbuf_init_read(&fb[i], data[i], strlen(data[i]), 0);
+
+	  struct fastbuf sp;
+	  fbbuf_init_read(&sp, " ", 1, 0);
+
+	  struct fastbuf nl;
+	  fbbuf_init_read(&nl, "\n", 1, 0);
+
+	  struct fastbuf *f = fbmulti_create();
+	  struct fastbuf *ff;
+
+	  ff = fbmulti_create();
+	  fbmulti_append(ff, &fb[0]);
+	  fbmulti_append(ff, &sp);
+	  fbmulti_append(ff, &fb[1]);
+	  fbmulti_append(f, ff);
+	  fbmulti_append(f, &nl);
+
+	  ff = fbmulti_create();
+	  fbmulti_append(ff, &fb[2]);
+	  fbmulti_append(ff, &sp);
+	  fbmulti_append(ff, &fb[3]);
+	  fbmulti_append(f, ff);
+	  fbmulti_append(f, &nl);
+
+	  ff = fbmulti_create();
+	  fbmulti_append(ff, &fb[4]);
+	  fbmulti_append(ff, &sp);
+	  fbmulti_append(ff, &fb[5]);
+	  fbmulti_append(f, ff);
+	  fbmulti_append(f, &nl);
+
+	  char buffer[20];
+	  while (bgets(f, buffer, 20))
+	    puts(buffer);
+
+	  bclose(f);
+	  break;
+	}
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-multi.t b/libucw/ucw/fb-multi.t
new file mode 100644
index 0000000..4946f65
--- /dev/null
+++ b/libucw/ucw/fb-multi.t
@@ -0,0 +1,23 @@
+# Tests for fb-multi.c
+
+Name:	Read Simple
+Run:	../obj/ucw/fb-multi-t r
+Out:	One
+	LineTwo
+	LinesTh
+	reeLi
+	nes
+
+Name:	Read Mingle
+Run:	../obj/ucw/fb-multi-t m
+Out:	Mingle
+
+Name:	Read Insane
+Run:	../obj/ucw/fb-multi-t i
+Out:	Insane
+
+Name:	Read Nested
+Run:	../obj/ucw/fb-multi-t n
+Out:	Nested Data
+	As In
+	Real Usage
diff --git a/libucw/ucw/fb-null.c b/libucw/ucw/fb-null.c
new file mode 100644
index 0000000..5d16492
--- /dev/null
+++ b/libucw/ucw/fb-null.c
@@ -0,0 +1,85 @@
+/*
+ *	UCW Library -- Null fastbuf
+ *
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+
+static void fbnull_close(struct fastbuf *b)
+{
+  xfree(b);
+}
+
+struct fastbuf *fbnull_open(uint bufsize)
+{
+  struct fastbuf *b = xmalloc(sizeof(*b) + bufsize);
+  bzero(b, sizeof(*b));
+  b->name = "<fbnull>";
+  b->close = fbnull_close;
+  fbnull_start(b, (byte *)(b + 1), bufsize);
+  return b;
+}
+
+static int fbnull_refill(struct fastbuf *b UNUSED)
+{
+  return 0;
+}
+
+static void fbnull_spout(struct fastbuf *b)
+{
+  b->pos += b->bptr - b->bstop;
+  b->bptr = b->bstop;
+}
+
+static int fbnull_seek(struct fastbuf *b, ucw_off_t pos, int whence)
+{
+  b->pos = (whence == SEEK_END) ? 0 : pos;
+  b->bptr = b->bstop;
+  return 1;
+}
+
+void fbnull_start(struct fastbuf *b, byte *buf, uint bufsize)
+{
+  ASSERT(buf && bufsize);
+  b->pos = btell(b);
+  b->buffer = b->bptr = b->bstop = buf;
+  b->bufend = buf + bufsize;
+  b->refill = fbnull_refill;
+  b->spout = fbnull_spout;
+  b->seek = fbnull_seek;
+  b->can_overwrite_buffer = 2;
+}
+
+bool fbnull_test(struct fastbuf *b)
+{
+  return b->refill == fbnull_refill;
+}
+
+#ifdef TEST
+int main(void)
+{
+  struct fastbuf *b = fbnull_open(7);
+  for (uint i = 0; i < 100; i++)
+    {
+      if (btell(b) != i * 10)
+	ASSERT(0);
+      if (bgetc(b) >= 0)
+        ASSERT(0);
+      bputs(b, "0123456789");
+      bflush(b);
+    }
+  if (bfilesize(b) != 0)
+    ASSERT(0);
+  if (btell(b) != 100 * 10)
+    ASSERT(0);
+  bclose(b);
+  return 0;
+}
+#endif
diff --git a/libucw/ucw/fb-null.t b/libucw/ucw/fb-null.t
new file mode 100644
index 0000000..c5be156
--- /dev/null
+++ b/libucw/ucw/fb-null.t
@@ -0,0 +1,3 @@
+# Tests for fb-null.c
+
+Run:	../obj/ucw/fb-null-t
diff --git a/libucw/ucw/fb-param.c b/libucw/ucw/fb-param.c
new file mode 100644
index 0000000..3aa2021
--- /dev/null
+++ b/libucw/ucw/fb-param.c
@@ -0,0 +1,197 @@
+/*
+ *	UCW Library -- FastIO on files with run-time parametrization
+ *
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/io.h>
+#include <ucw/fastbuf.h>
+#include <ucw/trans.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+
+struct fb_params fbpar_def = {
+  .buffer_size = 65536,
+  .read_ahead = 1,
+  .write_back = 1,
+};
+
+static char *
+fbpar_cf_commit(struct fb_params *p UNUSED)
+{
+  if (p->type == FB_DIRECT)
+    {
+#ifndef CONFIG_UCW_THREADS
+      return "Direct I/O is supported only with CONFIG_UCW_THREADS";
+#endif
+#ifdef CONFIG_DARWIN
+      return "Direct I/O is not supported on darwin";
+#endif
+#ifndef CONFIG_UCW_DIRECT_IO
+      return "Direct I/O disabled by configure switch -CONFIG_UCW_DIRECT_IO";
+#endif
+#ifndef CONFIG_UCW_FB_DIRECT
+      return "Direct I/O disabled by configure switch -CONFIG_UCW_FB_DIRECT";
+#endif
+    }
+  return NULL;
+}
+
+struct cf_section fbpar_cf = {
+# define F(x) PTR_TO(struct fb_params, x)
+  CF_TYPE(struct fb_params),
+  CF_COMMIT(fbpar_cf_commit),
+  CF_ITEMS {
+    CF_LOOKUP("Type", (int *)F(type), ((const char * const []){"std", "direct", "mmap", NULL})),
+    CF_UINT("BufSize", F(buffer_size)),
+    CF_UINT("KeepBackBuf", F(keep_back_buf)),
+    CF_UINT("ReadAhead", F(read_ahead)),
+    CF_UINT("WriteBack", F(write_back)),
+    CF_END
+  }
+# undef F
+};
+
+static struct cf_section fbpar_global_cf = {
+  CF_ITEMS {
+    CF_SECTION("Defaults", &fbpar_def, &fbpar_cf),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR
+fbpar_global_init(void)
+{
+  cf_declare_section("FBParam", &fbpar_global_cf, 0);
+}
+
+static struct fastbuf *
+bopen_fd_internal(int fd, struct fb_params *params, uint mode, const char *name)
+{
+  char buf[32];
+  if (!name)
+    {
+      sprintf(buf, "fd%d", fd);
+      name = buf;
+    }
+  struct fastbuf *fb;
+  switch (params->type)
+    {
+#ifdef CONFIG_UCW_FB_DIRECT
+      case FB_DIRECT:
+	fb = fbdir_open_fd_internal(fd, name, params->asio,
+	    params->buffer_size ? : fbpar_def.buffer_size,
+	    params->read_ahead ? : fbpar_def.read_ahead,
+	    params->write_back ? : fbpar_def.write_back);
+	if (!~mode && !fbdir_cheat && ((int)(mode = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, mode | O_DIRECT) < 0))
+          msg(L_WARN, "Cannot set O_DIRECT on fd %d: %m", fd);
+	return fb;
+#endif
+      case FB_STD:
+	fb = bfdopen_internal(fd, name,
+	    params->buffer_size ? : fbpar_def.buffer_size);
+	if (params->keep_back_buf)
+	  bconfig(fb, BCONFIG_KEEP_BACK_BUF, 1);
+	return fb;
+      case FB_MMAP:
+	if (!~mode && (int)(mode = fcntl(fd, F_GETFL)) < 0)
+          trans_throw("ucw.fb.open", NULL, "Cannot get flags of fd %d: %m", fd);
+	return bfmmopen_internal(fd, name, mode);
+      default:
+	ASSERT(0);
+    }
+}
+
+static struct fastbuf *
+bopen_file_internal(const char *name, int mode, struct fb_params *params, int try)
+{
+  if (!params)
+    params = &fbpar_def;
+#ifdef CONFIG_UCW_FB_DIRECT
+  if (params->type == FB_DIRECT && !fbdir_cheat)
+    mode |= O_DIRECT;
+#endif
+  if (params->type == FB_MMAP && (mode & O_ACCMODE) == O_WRONLY)
+    mode = (mode & ~O_ACCMODE) | O_RDWR;
+  int fd = ucw_open(name, mode, 0666);
+  if (fd < 0)
+    if (try)
+      return NULL;
+    else
+      trans_throw("ucw.fb.open", NULL, "Unable to %s file %s: %m", (mode & O_CREAT) ? "create" : "open", name);
+  struct fastbuf *fb = bopen_fd_internal(fd, params, mode, name);
+  ASSERT(fb);
+  if (mode & O_APPEND)
+    bseek(fb, 0, SEEK_END);
+  return fb;
+}
+
+struct fastbuf *
+bopen_file(const char *name, int mode, struct fb_params *params)
+{
+  return bopen_file_internal(name, mode, params, 0);
+}
+
+struct fastbuf *
+bopen_file_try(const char *name, int mode, struct fb_params *params)
+{
+  return bopen_file_internal(name, mode, params, 1);
+}
+
+struct fastbuf *
+bopen_fd_name(int fd, struct fb_params *params, const char *name)
+{
+  return bopen_fd_internal(fd, params ? : &fbpar_def, ~0U, name);
+}
+
+/* Function for use by individual file back-ends */
+
+void
+bclose_file_helper(struct fastbuf *f, int fd, int is_temp_file)
+{
+  switch (is_temp_file)
+    {
+    case 1:
+      if (unlink(f->name) < 0)
+	msg(L_ERROR, "unlink(%s): %m", f->name);
+      /* fall-thru */
+    case 0:
+      if (close(fd))
+	msg(L_ERROR, "close(%s): %m", f->name);
+    }
+}
+
+/* Compatibility wrappers */
+
+struct fastbuf *
+bopen_try(const char *name, uint mode, uint buflen)
+{
+  return bopen_file_try(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+struct fastbuf *
+bopen(const char *name, uint mode, uint buflen)
+{
+  return bopen_file(name, mode, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+struct fastbuf *
+bfdopen(int fd, uint buflen)
+{
+  return bopen_fd(fd, &(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+struct fastbuf *
+bfdopen_shared(int fd, uint buflen)
+{
+  struct fastbuf *f = bfdopen(fd, buflen);
+  bconfig(f, BCONFIG_IS_TEMP_FILE, 2);
+  return f;
+}
diff --git a/libucw/ucw/fb-pool.c b/libucw/ucw/fb-pool.c
new file mode 100644
index 0000000..01ce344
--- /dev/null
+++ b/libucw/ucw/fb-pool.c
@@ -0,0 +1,80 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Memory Pools
+ *
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FB_POOL(f) ((struct fbpool *)(f))
+
+static void
+fbpool_spout(struct fastbuf *b)
+{
+  if (b->bptr == b->bufend)
+    {
+      uint len = b->bufend - b->buffer;
+      b->bstop = b->buffer = mp_expand(FB_POOL(b)->mp);
+      b->bufend = b->buffer + mp_avail(FB_POOL(b)->mp);
+      b->bptr = b->buffer + len;
+    }
+}
+
+void
+fbpool_start(struct fbpool *b, struct mempool *mp, size_t init_size)
+{
+  b->mp = mp;
+  b->fb.buffer = b->fb.bstop = b->fb.bptr = mp_start(mp, init_size);
+  b->fb.bufend = b->fb.buffer + mp_avail(mp);
+}
+
+void *
+fbpool_end(struct fbpool *b)
+{
+  return mp_end(b->mp, b->fb.bptr);
+}
+
+void
+fbpool_init(struct fbpool *b)
+{
+  bzero(b, sizeof(*b));
+  b->fb.name = "<fbpool>";
+  b->fb.spout = fbpool_spout;
+  b->fb.can_overwrite_buffer = 1;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct mempool *mp;
+  struct fbpool fb;
+  byte *p;
+  uint l;
+
+  mp = mp_new(64);
+  fbpool_init(&fb);
+  fbpool_start(&fb, mp, 16);
+  for (uint i = 0; i < 1024; i++)
+    bprintf(&fb.fb, "<hello>");
+  p = fbpool_end(&fb);
+  l = mp_size(mp, p);
+  if (l != 1024 * 7)
+    ASSERT(0);
+  for (uint i = 0; i < 1024; i++)
+    if (memcmp(p + i * 7, "<hello>", 7))
+      ASSERT(0);
+  mp_delete(mp);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-pool.t b/libucw/ucw/fb-pool.t
new file mode 100644
index 0000000..0b87bf2
--- /dev/null
+++ b/libucw/ucw/fb-pool.t
@@ -0,0 +1,3 @@
+# Test for fb-tool.c
+
+Run:	../obj/ucw/fb-pool-t
diff --git a/libucw/ucw/fb-socket.c b/libucw/ucw/fb-socket.c
new file mode 100644
index 0000000..19f27bd
--- /dev/null
+++ b/libucw/ucw/fb-socket.c
@@ -0,0 +1,179 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Sockets with Timeouts
+ *
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *	(c) 2017 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/fb-socket.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <poll.h>
+#include <errno.h>
+
+struct fb_sock {
+  struct fastbuf fb;
+  struct fbsock_params par;
+  byte buf[0];
+};
+
+#define FB_SOCK(f) ((struct fb_sock *)(f))
+
+static int
+fbs_refill(struct fastbuf *f)
+{
+  struct fbsock_params *p = &FB_SOCK(f)->par;
+  struct pollfd pf = {
+      .fd = p->fd,
+      .events = POLLIN
+  };
+
+  for (;;)
+    {
+      int e = poll(&pf, 1, p->timeout_ms);
+      if (e < 0)
+	{
+	  p->err(p->data, FBSOCK_READ, "read error");
+	  return 0;
+	}
+      if (!e)
+	{
+	  p->err(p->data, FBSOCK_READ | FBSOCK_TIMEOUT, "read timeout");
+	  return 0;
+	}
+
+      f->bptr = f->buffer;
+      int l = read(p->fd, f->buffer, f->bufend-f->buffer);
+      if (l < 0)
+	{
+	  if (errno == EINTR || errno == EAGAIN)
+	    continue;
+	  p->err(p->data, FBSOCK_READ, "read error");
+	  return 0;
+	}
+      f->bstop = f->buffer + l;
+      f->pos += l;
+      return l;
+    }
+}
+
+static void
+fbs_spout(struct fastbuf *f)
+{
+  struct fbsock_params *p = &FB_SOCK(f)->par;
+  struct pollfd pf = {
+      .fd = p->fd,
+      .events = POLLOUT,
+  };
+
+  int l = f->bptr - f->bstop;
+  f->bptr = f->bstop;
+  f->pos += l;
+  char *buf = f->bstop;
+
+  while (l)
+    {
+      int e = poll(&pf, 1, p->timeout_ms);
+      if (e < 0)
+	{
+	  p->err(p->data, FBSOCK_WRITE, "write error");
+	  return;
+	}
+      if (!e)
+	{
+	  p->err(p->data, FBSOCK_WRITE | FBSOCK_TIMEOUT, "write timeout");
+	  return;
+	}
+
+      e = write(p->fd, buf, l);
+      if (e < 0)
+	{
+	  if (errno == EINTR || errno == EAGAIN)
+	    continue;
+	  p->err(p->data, FBSOCK_WRITE, "write error");
+	  return;
+	}
+      buf += e;
+      l -= e;
+    }
+}
+
+static void
+fbs_close(struct fastbuf *f)
+{
+  if (!FB_SOCK(f)->par.fd_is_shared)
+    close(FB_SOCK(f)->par.fd);
+  xfree(f);
+}
+
+struct fastbuf *
+fbsock_create(struct fbsock_params *p)
+{
+  struct fb_sock *F = xmalloc(sizeof(*F) + p->bufsize);
+  struct fastbuf *f = &F->fb;
+
+  bzero(F, sizeof(*F));
+  F->par = *p;
+  f->buffer = F->buf;
+  f->bptr = f->bstop = f->buffer;
+  f->bufend = f->buffer + p->bufsize;
+  f->name = "<socket>";
+  f->refill = fbs_refill;
+  f->spout = fbs_spout;
+  f->close = fbs_close;
+  f->can_overwrite_buffer = 1;
+  return f;
+}
+
+#ifdef TEST
+
+#include <stdlib.h>
+
+static void test_err(void *x UNUSED, uint flags, char *msg UNUSED)
+{
+  if (flags & FBSOCK_READ)
+    printf("READ");
+  else if (flags & FBSOCK_WRITE)
+    printf("WRITE");
+  if (flags & FBSOCK_TIMEOUT)
+    printf(" TIMEOUT\n");
+  else
+    printf(" ERROR\n");
+  exit(0);
+}
+
+int main(void)
+{
+  int fd[2];
+  if (pipe(fd) < 0)
+    ASSERT(0);
+
+  struct fbsock_params p = {
+      .fd = fd[0],
+      .bufsize = 16,
+      .timeout_ms = 100,
+      .err = test_err
+  };
+  struct fastbuf *f = fbsock_create(&p);
+
+  bputsn(f, "Oook!");		// This fits in PIPE_BUF
+  bflush(f);
+
+  char buf[256];
+  if (!bgets(f, buf, sizeof(buf)))
+    die("bgets failed");
+  if (strcmp(buf, "Oook!"))
+    die("Misread input");
+
+  bgets(f, buf, sizeof(buf));
+  puts("WRONG");
+  exit(0);
+}
+
+#endif
diff --git a/libucw/ucw/fb-socket.h b/libucw/ucw/fb-socket.h
new file mode 100644
index 0000000..87b5c62
--- /dev/null
+++ b/libucw/ucw/fb-socket.h
@@ -0,0 +1,40 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Sockets with Timeouts
+ *
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FB_SOCKET_H
+#define _UCW_FB_SOCKET_H
+
+#include <ucw/fastbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define fbsock_create ucw_fbsock_create
+#endif
+
+struct fbsock_params {	/** Configuration of socket fastbuf. **/
+  int fd;
+  int fd_is_shared;
+  uint bufsize;
+  uint timeout_ms;
+  void (*err)(void *data, uint flags, char *msg);
+  void *data;			// Passed to the err callback
+};
+
+enum fbsock_err_flags {	/** Description of a socket error **/
+  FBSOCK_READ = 1,		// Happened during read
+  FBSOCK_WRITE = 2,		// Happened during write
+  FBSOCK_TIMEOUT = 4,		// The error is a timeout
+};
+
+/**
+ * Create a new socket fastbuf.
+ * All information is passed by @par.
+ **/
+struct fastbuf *fbsock_create(struct fbsock_params *par);
+
+#endif
diff --git a/libucw/ucw/fb-socket.t b/libucw/ucw/fb-socket.t
new file mode 100644
index 0000000..91c8d5e
--- /dev/null
+++ b/libucw/ucw/fb-socket.t
@@ -0,0 +1,5 @@
+# Tests for the fb-socket module
+
+Name:	fb-socket
+Run:	../obj/ucw/fb-socket-t
+Out:	WRITE TIMEOUT
diff --git a/libucw/ucw/fb-temp.c b/libucw/ucw/fb-temp.c
new file mode 100644
index 0000000..3ffa08c
--- /dev/null
+++ b/libucw/ucw/fb-temp.c
@@ -0,0 +1,59 @@
+/*
+ *	UCW Library -- Temporary Fastbufs
+ *
+ *	(c) 2002--2008 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Michal Vaner <vorner@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+#include <fcntl.h>
+
+struct fastbuf *
+bopen_tmp_file(struct fb_params *params)
+{
+  char name[TEMP_FILE_NAME_LEN];
+  int fd = open_tmp(name, O_RDWR | O_CREAT | O_TRUNC, 0600);
+  struct fastbuf *fb = bopen_fd_name(fd, params, name);
+  bconfig(fb, BCONFIG_IS_TEMP_FILE, 1);
+  return fb;
+}
+
+struct fastbuf *
+bopen_tmp(uint buflen)
+{
+  return bopen_tmp_file(&(struct fb_params){ .type = FB_STD, .buffer_size = buflen });
+}
+
+void bfix_tmp_file(struct fastbuf *fb, const char *name)
+{
+  int was_temp = bconfig(fb, BCONFIG_IS_TEMP_FILE, 0);
+  ASSERT(was_temp == 1);
+  if (rename(fb->name, name))
+    bthrow(fb, "tmp", "Cannot rename %s to %s: %m", fb->name, name);
+  bclose(fb);
+}
+
+#ifdef TEST
+
+#include <ucw/getopt.h>
+
+int main(int argc, char **argv)
+{
+  log_init(NULL);
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0)
+    die("Hey, whaddya want?");
+
+  struct fastbuf *f = bopen_tmp(65536);
+  ASSERT(f && f->name);
+  bputsn(f, "Hello, world!");
+  bclose(f);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/fb-temp.t b/libucw/ucw/fb-temp.t
new file mode 100644
index 0000000..952d86d
--- /dev/null
+++ b/libucw/ucw/fb-temp.t
@@ -0,0 +1,3 @@
+# Test for fb-temp.c
+
+Run:	../obj/ucw/fb-temp-t
diff --git a/libucw/ucw/ff-binary.c b/libucw/ucw/ff-binary.c
new file mode 100644
index 0000000..688d6ae
--- /dev/null
+++ b/libucw/ucw/ff-binary.c
@@ -0,0 +1,34 @@
+/*
+ *	UCW Library -- Fast Buffered I/O: Binary Numbers
+ *
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-binary.h>
+
+#define GEN(type, name, size, endian)				\
+type bget##name##_##endian##_slow(struct fastbuf *f)		\
+{								\
+  byte buf[size/8];						\
+  if (bread(f, buf, sizeof(buf)) != sizeof(buf))		\
+    return ~(type)0;						\
+  return get_u##size##_##endian(buf);				\
+}								\
+void bput##name##_##endian##_##slow(struct fastbuf *f, type x)	\
+{								\
+  byte buf[size/8];						\
+  put_u##size##_##endian(buf, x);				\
+  bwrite_slow(f, buf, sizeof(buf));				\
+}
+
+#define FF_ALL(type, name, size) GEN(type,name,size,be) GEN(type,name,size,le)
+
+FF_ALL(int, w, 16)
+FF_ALL(uint, l, 32)
+FF_ALL(u64, q, 64)
+FF_ALL(u64, 5, 40)
diff --git a/libucw/ucw/ff-binary.h b/libucw/ucw/ff-binary.h
new file mode 100644
index 0000000..ce015a3
--- /dev/null
+++ b/libucw/ucw/ff-binary.h
@@ -0,0 +1,134 @@
+/*
+ *	UCW Library -- Fast Buffered I/O on Binary Values
+ *
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FF_BINARY_H
+#define _UCW_FF_BINARY_H
+
+#include <ucw/fastbuf.h>
+#include <ucw/unaligned.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bget5_be_slow ucw_bget5_be_slow
+#define bget5_le_slow ucw_bget5_le_slow
+#define bget5_slow ucw_bget5_slow
+#define bgetl_be_slow ucw_bgetl_be_slow
+#define bgetl_le_slow ucw_bgetl_le_slow
+#define bgetl_slow ucw_bgetl_slow
+#define bgetq_be_slow ucw_bgetq_be_slow
+#define bgetq_le_slow ucw_bgetq_le_slow
+#define bgetq_slow ucw_bgetq_slow
+#define bgetw_be_slow ucw_bgetw_be_slow
+#define bgetw_le_slow ucw_bgetw_le_slow
+#define bgetw_slow ucw_bgetw_slow
+#define bput5_be_slow ucw_bput5_be_slow
+#define bput5_le_slow ucw_bput5_le_slow
+#define bput5_slow ucw_bput5_slow
+#define bputl_be_slow ucw_bputl_be_slow
+#define bputl_le_slow ucw_bputl_le_slow
+#define bputl_slow ucw_bputl_slow
+#define bputq_be_slow ucw_bputq_be_slow
+#define bputq_le_slow ucw_bputq_le_slow
+#define bputq_slow ucw_bputq_slow
+#define bputw_be_slow ucw_bputw_be_slow
+#define bputw_le_slow ucw_bputw_le_slow
+#define bputw_slow ucw_bputw_slow
+#endif
+
+#ifdef CPU_BIG_ENDIAN
+#define FF_ENDIAN be
+#else
+#define FF_ENDIAN le
+#endif
+
+/***
+ *
+ * We define several functions to read or write binary integer values.
+ *
+ * The name patterns for such routines are:
+ *
+ * - `TYPE bget \#\# NAME \#\# ENDIAN(struct fastbuf *f);`
+ * - `void bput \#\# NAME \#\# ENDIAN(struct fastbuf *f, TYPE value);`
+ *
+ * where `NAME` together with `TYPE` can be:
+ *
+ * - `w` for 16-bit unsigned integers stored in sequences of 2 bytes, the `TYPE` is int
+ * - `l` for 32-bit unsigned integers stored in sequences of 4 bytes, the `TYPE` is uint
+ * - `5` for 40-bit unsigned integers stored in sequences of 5 bytes, the `TYPE` is u64
+ * - `q` for 64-bit unsigned integers stored in sequences of 8 bytes, the `TYPE` is u64
+ *
+ * and supported `ENDIAN` suffixes are:
+ *
+ * - empty for the default order of bytes (defined by CPU)
+ * - `_le` for little-endian
+ * - `_be` for big-endian
+ *
+ * If we fail to read enough bytes because of EOF, the reading function returns `(TYPE)-1`.
+ *
+ ***/
+
+#define GET_FUNC(type, name, bits, endian)			\
+  type bget##name##_##endian##_slow(struct fastbuf *f);		\
+  static inline type bget##name##_##endian(struct fastbuf *f)	\
+  {								\
+    if (bavailr(f) >= bits/8)					\
+      {								\
+	type w = get_u##bits##_##endian(f->bptr);		\
+	f->bptr += bits/8;					\
+	return w;						\
+      }								\
+    else							\
+      return bget##name##_##endian##_slow(f);			\
+  }
+
+#define PUT_FUNC(type, name, bits, endian)			\
+  void bput##name##_##endian##_slow(struct fastbuf *f, type x);	\
+  static inline void bput##name##_##endian(struct fastbuf *f, type x)	\
+  {								\
+    if (bavailw(f) >= bits/8)					\
+      {								\
+	put_u##bits##_##endian(f->bptr, x);			\
+	f->bptr += bits/8;					\
+      }								\
+    else							\
+      return bput##name##_##endian##_slow(f, x);		\
+  }
+
+#define FF_ALL_X(type, name, bits, defendian)			\
+  GET_FUNC(type, name, bits, be)				\
+  GET_FUNC(type, name, bits, le)				\
+  PUT_FUNC(type, name, bits, be)				\
+  PUT_FUNC(type, name, bits, le)				\
+  static inline type bget##name(struct fastbuf *f) { return bget##name##_##defendian(f); }		\
+  static inline void bput##name(struct fastbuf *f, type x) { bput##name##_##defendian(f, x); }
+
+#define FF_ALL(type, name, bits, defendian) FF_ALL_X(type, name, bits, defendian)
+
+FF_ALL(int, w, 16, FF_ENDIAN)
+FF_ALL(uint, l, 32, FF_ENDIAN)
+FF_ALL(u64, q, 64, FF_ENDIAN)
+FF_ALL(u64, 5, 40, FF_ENDIAN)
+
+#undef GET_FUNC
+#undef PUT_FUNC
+#undef FF_ENDIAN
+#undef FF_ALL_X
+#undef FF_ALL
+
+/* I/O on uintptr_t (only native endianity) */
+
+#ifdef CPU_64BIT_POINTERS
+#define bputa(x,p) bputq(x,p)
+#define bgeta(x) bgetq(x)
+#else
+#define bputa(x,p) bputl(x,p)
+#define bgeta(x) bgetl(x)
+#endif
+
+#endif
diff --git a/libucw/ucw/ff-printf.c b/libucw/ucw/ff-printf.c
new file mode 100644
index 0000000..f2ef8f3
--- /dev/null
+++ b/libucw/ucw/ff-printf.c
@@ -0,0 +1,87 @@
+/*
+ *	UCW Library -- Printf on Fastbuf Streams
+ *
+ *	(c) 2002--2013 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/resource.h>
+
+#include <stdio.h>
+#include <alloca.h>
+
+int
+vbprintf(struct fastbuf *b, const char *msg, va_list args)
+{
+  byte *buf;
+  int remains, len;
+  va_list args2;
+
+  va_copy(args2, args);
+  remains = bdirect_write_prepare(b, &buf);
+  len = vsnprintf(buf, remains, msg, args2);
+  va_end(args2);
+
+  if (len < remains)
+    {
+      bdirect_write_commit(b, buf + len);
+      return len;
+    }
+
+  /*
+   *  We need a temporary buffer. If it is small, let's use stack.
+   *  Otherwise, we malloc it, but we have to be careful, since we
+   *  might be running inside a transaction and bwrite() could
+   *  throw an exception.
+   *
+   *  FIXME: This deserves a more systematic solution, the same
+   *  problem is likely to happen at other places, too.
+   */
+  int bufsize = len + 1;
+  struct resource *res = NULL;
+  byte *extra_buffer = NULL;
+  if (bufsize <= 256)
+    buf = alloca(bufsize);
+  else if (rp_current())
+    buf = res_malloc(bufsize, &res);
+  else
+    buf = extra_buffer = xmalloc(bufsize);
+
+  vsnprintf(buf, bufsize, msg, args);
+  bwrite(b, buf, len);
+
+  if (res)
+    res_free(res);
+  else if (extra_buffer)
+    xfree(extra_buffer);
+  return len;
+}
+
+int
+bprintf(struct fastbuf *b, const char *msg, ...)
+{
+  va_list args;
+  int res;
+
+  va_start(args, msg);
+  res = vbprintf(b, msg, args);
+  va_end(args);
+  return res;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct fastbuf *b = bfdopen_shared(1, 65536);
+  for (int i=0; i<10000; i++)
+    bprintf(b, "13=%d str=<%s> msg=%m\n", 13, "str");
+  bclose(b);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/ff-stkstring.c b/libucw/ucw/ff-stkstring.c
new file mode 100644
index 0000000..986d873
--- /dev/null
+++ b/libucw/ucw/ff-stkstring.c
@@ -0,0 +1,80 @@
+/*
+ *	UCW Library -- Fast Buffered I/O: Strings on stack
+ *
+ *	(c) 2008 Michal Vaner <vorner@ucw.cz>
+ *
+ *	Code taken from ff-string.c by:
+ *
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+
+void
+bgets_stk_init(struct bgets_stk_struct *s)
+{
+  s->src_len = bdirect_read_prepare(s->f, &s->src);
+  if (!s->src_len)
+    {
+      s->cur_buf = NULL;
+      s->cur_len = 0;
+    }
+  else
+    {
+      s->old_buf = NULL;
+      s->cur_len = 256;
+    }
+}
+
+void
+bgets_stk_step(struct bgets_stk_struct *s)
+{
+  byte *buf = s->cur_buf;
+  uint buf_len = s->cur_len;
+  if (s->old_buf)
+    {
+      memcpy( s->cur_buf, s->old_buf, s->old_len);
+      buf += s->old_len;
+      buf_len -= s->old_len;
+    }
+  do
+    {
+      uint cnt = MIN(s->src_len, buf_len);
+      for (uint i = cnt; i--;)
+        {
+	  byte v = *s->src++;
+	  if (v == '\n')
+	    {
+              bdirect_read_commit(s->f, s->src);
+	      goto exit;
+	    }
+	  *buf++ = v;
+	}
+      if (cnt == s->src_len)
+        {
+	  bdirect_read_commit(s->f, s->src);
+	  s->src_len = bdirect_read_prepare(s->f, &s->src);
+	}
+      else
+	s->src_len -= cnt;
+      if (cnt == buf_len)
+        {
+	  s->old_len = s->cur_len;
+	  s->old_buf = s->cur_buf;
+	  s->cur_len *= 2;
+	  return;
+	}
+      else
+	buf_len -= cnt;
+    }
+  while (s->src_len);
+exit:
+  *buf = 0;
+  s->cur_len = 0;
+}
+
diff --git a/libucw/ucw/ff-string.c b/libucw/ucw/ff-string.c
new file mode 100644
index 0000000..d4dafed
--- /dev/null
+++ b/libucw/ucw/ff-string.c
@@ -0,0 +1,205 @@
+/*
+ *	UCW Library -- Fast Buffered I/O: Strings
+ *
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2006--2018 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+#include <ucw/bbuf.h>
+
+char *					/* Non-standard */
+bgets(struct fastbuf *f, char *b, uint l)
+{
+  ASSERT(l);
+  byte *src;
+  uint src_len = bdirect_read_prepare(f, &src);
+  if (!src_len)
+    return NULL;
+  do
+    {
+      uint cnt = MIN(l, src_len);
+      for (uint i = cnt; i--;)
+        {
+	  byte v = *src++;
+	  if (v == '\n')
+	    {
+              bdirect_read_commit(f, src);
+	      goto exit;
+	    }
+	  *b++ = v;
+	}
+      if (unlikely(cnt == l))
+        bthrow(f, "toolong", "%s: Line too long", f->name);
+      l -= cnt;
+      bdirect_read_commit(f, src);
+      src_len = bdirect_read_prepare(f, &src);
+    }
+  while (src_len);
+exit:
+  *b = 0;
+  return b;
+}
+
+int
+bgets_nodie(struct fastbuf *f, char *b, uint l)
+{
+  ASSERT(l);
+  byte *src, *start = b;
+  uint src_len = bdirect_read_prepare(f, &src);
+  if (!src_len)
+    return 0;
+  do
+    {
+      uint cnt = MIN(l, src_len);
+      for (uint i = cnt; i--;)
+        {
+	  byte v = *src++;
+	  if (v == '\n')
+	    {
+	      bdirect_read_commit(f, src);
+	      goto exit;
+	    }
+	  *b++ = v;
+	}
+      bdirect_read_commit(f, src);
+      if (cnt == l)
+        return -1;
+      l -= cnt;
+      src_len = bdirect_read_prepare(f, &src);
+    }
+  while (src_len);
+exit:
+  *b++ = 0;
+  return b - (char *)start;
+}
+
+uint
+bgets_bb(struct fastbuf *f, struct bb_t *bb, uint limit)
+{
+  ASSERT(limit);
+  byte *src;
+  uint src_len = bdirect_read_prepare(f, &src);
+  if (!src_len)
+    return 0;
+  bb_grow(bb, 1);
+  byte *buf = bb->ptr;
+  uint len = 0, buf_len = MIN(bb->len, limit);
+  do
+    {
+      uint cnt = MIN(src_len, buf_len);
+      for (uint i = cnt; i--;)
+        {
+	  byte v = *src++;
+	  if (v == '\n')
+	    {
+              bdirect_read_commit(f, src);
+	      goto exit;
+	    }
+	  *buf++ = v;
+	}
+      len += cnt;
+      if (cnt == src_len)
+        {
+	  bdirect_read_commit(f, src);
+	  src_len = bdirect_read_prepare(f, &src);
+	}
+      else
+	src_len -= cnt;
+      if (cnt == buf_len)
+        {
+	  if (unlikely(len == limit))
+            bthrow(f, "toolong", "%s: Line too long", f->name);
+	  bb_do_grow(bb, len + 1);
+	  buf = bb->ptr + len;
+	  buf_len = MIN(bb->len, limit) - len;
+	}
+      else
+	buf_len -= cnt;
+    }
+  while (src_len);
+exit:
+  *buf++ = 0;
+  return buf - bb->ptr;
+}
+
+char *
+bgets_mp(struct fastbuf *f, struct mempool *mp)
+{
+  byte *src;
+  uint src_len = bdirect_read_prepare(f, &src);
+  if (!src_len)
+    return NULL;
+  byte *buf = mp_start_noalign(mp, 1);
+  size_t buf_len = mp_avail(mp);
+  do
+    {
+      uint cnt = MIN(src_len, buf_len);
+      for (uint i = cnt; i--;)
+        {
+	  byte v = *src++;
+	  if (v == '\n')
+	    {
+              bdirect_read_commit(f, src);
+	      goto exit;
+	    }
+	  *buf++ = v;
+	}
+      if (cnt == src_len)
+        {
+	  bdirect_read_commit(f, src);
+	  src_len = bdirect_read_prepare(f, &src);
+	}
+      else
+	src_len -= cnt;
+      if (cnt == buf_len)
+        {
+	  buf = mp_spread(mp, buf, 1);
+	  buf_len = mp_avail(mp) - (buf - (byte *)mp_ptr(mp));
+	}
+      else
+	buf_len -= cnt;
+    }
+  while (src_len);
+exit:
+  buf = mp_spread(mp, buf, 1);
+  *buf++ = 0;
+  return mp_end(mp, buf);
+}
+
+char *
+bgets0(struct fastbuf *f, char *b, uint l)
+{
+  ASSERT(l);
+  byte *src;
+  uint src_len = bdirect_read_prepare(f, &src);
+  if (!src_len)
+    return NULL;
+  do
+    {
+      uint cnt = MIN(l, src_len);
+      for (uint i = cnt; i--;)
+        {
+	  *b = *src++;
+	  if (!*b)
+	    {
+              bdirect_read_commit(f, src);
+	      return b;
+	    }
+	  b++;
+	}
+      if (unlikely(cnt == l))
+        bthrow(f, "toolong", "%s: Line too long", f->name);
+      l -= cnt;
+      bdirect_read_commit(f, src);
+      src_len = bdirect_read_prepare(f, &src);
+    }
+  while (src_len);
+  *b = 0;
+  return b;
+}
diff --git a/libucw/ucw/ff-unicode.c b/libucw/ucw/ff-unicode.c
new file mode 100644
index 0000000..e0faa0c
--- /dev/null
+++ b/libucw/ucw/ff-unicode.c
@@ -0,0 +1,356 @@
+/*
+ *	UCW Library: Reading and writing of UTF-8 on Fastbuf Streams
+ *
+ *	(c) 2001--2015 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/unicode.h>
+#include <ucw/ff-unicode.h>
+#include <ucw/ff-binary.h>
+
+/*** UTF-8 ***/
+
+int
+bget_utf8_slow(struct fastbuf *b, uint repl)
+{
+  int c = bgetc(b);
+  int code;
+
+  if (c < 0x80)				/* Includes EOF */
+    return c;
+  if (c < 0xc0)				/* Incorrect combination */
+    return repl;
+  if (c >= 0xf0)			/* Too large, skip it */
+    {
+      while ((c = bgetc(b)) >= 0x80 && c < 0xc0)
+	;
+      goto wrong;
+    }
+  if (c >= 0xe0)			/* 3 bytes */
+    {
+      code = c & 0x0f;
+      if ((c = bgetc(b)) < 0x80 || c >= 0xc0)
+	goto wrong;
+      code = (code << 6) | (c & 0x3f);
+      if ((c = bgetc(b)) < 0x80 || c >= 0xc0)
+	goto wrong;
+      code = (code << 6) | (c & 0x3f);
+      if (code < 0x800)
+	goto wrong2;
+    }
+  else					/* 2 bytes */
+    {
+      code = c & 0x1f;
+      if ((c = bgetc(b)) < 0x80 || c >= 0xc0)
+	goto wrong;
+      code = (code << 6) | (c & 0x3f);
+      if (code < 0x80)
+	goto wrong2;
+    }
+  return code;
+
+wrong:
+  if (c >= 0)
+    bungetc(b);
+wrong2:
+  return repl;
+}
+
+int
+bget_utf8_32_slow(struct fastbuf *b, uint repl)
+{
+  int c = bgetc(b);
+  int code;
+  int nr;
+  int limit;
+
+  if (c < 0x80)				/* Includes EOF */
+    return c;
+  if (c < 0xc0)				/* Incorrect combination */
+    return repl;
+  if (c < 0xe0)
+    {
+      code = c & 0x1f;
+      nr = 1;
+      limit = 0x80;
+    }
+  else if (c < 0xf0)
+    {
+      code = c & 0x0f;
+      nr = 2;
+      limit = 0x800;
+    }
+  else if (c < 0xf8)
+    {
+      code = c & 0x07;
+      nr = 3;
+      limit = 1 << 16;
+    }
+  else if (c < 0xfc)
+    {
+      code = c & 0x03;
+      nr = 4;
+      limit = 1 << 21;
+    }
+  else if (c < 0xfe)
+    {
+      code = c & 0x01;
+      nr = 5;
+      limit = 1 << 26;
+    }
+  else					/* Too large */
+    goto wrong2;
+  while (nr-- > 0)
+    {
+      if ((c = bgetc(b)) < 0x80 || c >= 0xc0)
+	goto wrong;
+      code = (code << 6) | (c & 0x3f);
+    }
+  if (code < limit)
+    goto wrong2;
+  return code;
+
+wrong:
+  if (c >= 0)
+    bungetc(b);
+wrong2:
+  return repl;
+}
+
+void
+bput_utf8_slow(struct fastbuf *b, uint u)
+{
+  ASSERT(u < 65536);
+  if (u < 0x80)
+    bputc(b, u);
+  else
+    {
+      if (u < 0x800)
+	bputc(b, 0xc0 | (u >> 6));
+      else
+	{
+	  bputc(b, 0xe0 | (u >> 12));
+	  bputc(b, 0x80 | ((u >> 6) & 0x3f));
+	}
+      bputc(b, 0x80 | (u & 0x3f));
+    }
+}
+
+void
+bput_utf8_32_slow(struct fastbuf *b, uint u)
+{
+  ASSERT(u < (1U<<31));
+  if (u < 0x80)
+    bputc(b, u);
+  else
+    {
+      if (u < 0x800)
+	bputc(b, 0xc0 | (u >> 6));
+      else
+	{
+	  if (u < (1<<16))
+	    bputc(b, 0xe0 | (u >> 12));
+	  else
+	    {
+	      if (u < (1<<21))
+		bputc(b, 0xf0 | (u >> 18));
+	      else
+		{
+		  if (u < (1<<26))
+		    bputc(b, 0xf8 | (u >> 24));
+		  else
+		    {
+		      bputc(b, 0xfc | (u >> 30));
+		      bputc(b, 0x80 | ((u >> 24) & 0x3f));
+		    }
+		  bputc(b, 0x80 | ((u >> 18) & 0x3f));
+		}
+	      bputc(b, 0x80 | ((u >> 12) & 0x3f));
+	    }
+	  bputc(b, 0x80 | ((u >> 6) & 0x3f));
+	}
+      bputc(b, 0x80 | (u & 0x3f));
+    }
+}
+
+/*** UTF-16 ***/
+
+int
+bget_utf16_be_slow(struct fastbuf *b, uint repl)
+{
+  if (bpeekc(b) < 0)
+    return -1;
+  uint u = bgetw_be(b), x, y;
+  if ((int)u < 0)
+    return repl;
+  if ((x = u - 0xd800) >= 0x800)
+    return u;
+  if (x >= 0x400 || bpeekc(b) < 0 || (y = bgetw_be(b) - 0xdc00) >= 0x400)
+    return repl;
+  return 0x10000 + (x << 10) + y;
+}
+
+int
+bget_utf16_le_slow(struct fastbuf *b, uint repl)
+{
+  if (bpeekc(b) < 0)
+    return -1;
+  uint u = bgetw_le(b), x, y;
+  if ((int)u < 0)
+    return repl;
+  if ((x = u - 0xd800) >= 0x800)
+    return u;
+  if (x >= 0x400 || bpeekc(b) < 0 || (y = bgetw_le(b) - 0xdc00) >= 0x400)
+    return repl;
+  return 0x10000 + (x << 10) + y;
+}
+
+void
+bput_utf16_be_slow(struct fastbuf *b, uint u)
+{
+  if (u < 0xd800 || (u < 0x10000 && u >= 0xe000))
+    {
+      bputc(b, u >> 8);
+      bputc(b, u & 0xff);
+    }
+  else if ((u -= 0x10000) < 0x100000)
+    {
+      bputc(b, 0xd8 | (u >> 18));
+      bputc(b, (u >> 10) & 0xff);
+      bputc(b, 0xdc | ((u >> 8) & 0x3));
+      bputc(b, u & 0xff);
+    }
+  else
+    ASSERT(0);
+}
+
+void
+bput_utf16_le_slow(struct fastbuf *b, uint u)
+{
+  if (u < 0xd800 || (u < 0x10000 && u >= 0xe000))
+    {
+      bputc(b, u & 0xff);
+      bputc(b, u >> 8);
+    }
+  else if ((u -= 0x10000) < 0x100000)
+    {
+      bputc(b, (u >> 10) & 0xff);
+      bputc(b, 0xd8 | (u >> 18));
+      bputc(b, u & 0xff);
+      bputc(b, 0xdc | ((u >> 8) & 0x3));
+    }
+  else
+    ASSERT(0);
+}
+
+#ifdef TEST
+
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+#define FUNCS \
+  F(BGET_UTF8) F(BGET_UTF8_32) F(BGET_UTF16_BE) F(BGET_UTF16_LE) \
+  F(BPUT_UTF8) F(BPUT_UTF8_32) F(BPUT_UTF16_BE) F(BPUT_UTF16_LE)
+
+  enum {
+#define F(x) FUNC_##x,
+    FUNCS
+#undef F
+  };
+  char *names[] = {
+#define F(x) [FUNC_##x] = #x,
+    FUNCS
+#undef F
+  };
+
+  uint func = ~0U;
+  if (argc > 1)
+    for (uint i = 0; i < ARRAY_SIZE(names); i++)
+      if (!strcasecmp(names[i], argv[1]))
+	func = i;
+  if (!~func)
+    {
+      fprintf(stderr, "Invalid usage!\n");
+      return 1;
+    }
+
+  struct fastbuf *b = fbgrow_create(8);
+  if (func < FUNC_BPUT_UTF8)
+    {
+      uint u;
+      while (scanf("%x", &u) == 1)
+	bputc(b, u);
+      fbgrow_rewind(b);
+      while (bpeekc(b) >= 0)
+        {
+	  if (btell(b))
+	    putchar(' ');
+	  switch (func)
+	    {
+	      case FUNC_BGET_UTF8:
+		u = bget_utf8_slow(b, UNI_REPLACEMENT);
+		break;
+	      case FUNC_BGET_UTF8_32:
+		u = bget_utf8_32_slow(b, UNI_REPLACEMENT);
+		break;
+	      case FUNC_BGET_UTF16_BE:
+		u = bget_utf16_be_slow(b, UNI_REPLACEMENT);
+		break;
+	      case FUNC_BGET_UTF16_LE:
+		u = bget_utf16_le_slow(b, UNI_REPLACEMENT);
+		break;
+	      default:
+		ASSERT(0);
+	    }
+	  printf("%04x", u);
+	}
+      putchar('\n');
+    }
+  else
+    {
+      uint u, i = 0;
+      while (scanf("%x", &u) == 1)
+        {
+	  switch (func)
+	    {
+	      case FUNC_BPUT_UTF8:
+		bput_utf8_slow(b, u);
+		break;
+	      case FUNC_BPUT_UTF8_32:
+		bput_utf8_32_slow(b, u);
+		break;
+	      case FUNC_BPUT_UTF16_BE:
+                bput_utf16_be_slow(b, u);
+		break;
+	      case FUNC_BPUT_UTF16_LE:
+		bput_utf16_le_slow(b, u);
+		break;
+	      default:
+		ASSERT(0);
+	    }
+	  fbgrow_rewind(b);
+	  u = 0;
+	  while (bpeekc(b) >= 0)
+	    {
+	      if (i++)
+		putchar(' ');
+	      printf("%02x", bgetc(b));
+	    }
+	  fbgrow_reset(b);
+	}
+      putchar('\n');
+    }
+  bclose(b);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/ff-unicode.h b/libucw/ucw/ff-unicode.h
new file mode 100644
index 0000000..79a0c49
--- /dev/null
+++ b/libucw/ucw/ff-unicode.h
@@ -0,0 +1,159 @@
+/*
+ *	UCW Library: Reading and writing of UTF-8 and UTF-16 on Fastbuf Streams
+ *
+ *	(c) 2001--2015 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *	(c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FF_UNICODE_H
+#define _UCW_FF_UNICODE_H
+
+#include <ucw/fastbuf.h>
+#include <ucw/unicode.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bget_utf16_be_slow ucw_bget_utf16_be_slow
+#define bget_utf16_le_slow ucw_bget_utf16_le_slow
+#define bget_utf8_32_slow ucw_bget_utf8_32_slow
+#define bget_utf8_slow ucw_bget_utf8_slow
+#define bput_utf16_be_slow ucw_bput_utf16_be_slow
+#define bput_utf16_le_slow ucw_bput_utf16_le_slow
+#define bput_utf8_32_slow ucw_bput_utf8_32_slow
+#define bput_utf8_slow ucw_bput_utf8_slow
+#endif
+
+/* ** UTF-8 ** */
+
+int bget_utf8_slow(struct fastbuf *b, uint repl);
+int bget_utf8_32_slow(struct fastbuf *b, uint repl);
+void bput_utf8_slow(struct fastbuf *b, uint u);
+void bput_utf8_32_slow(struct fastbuf *b, uint u);
+
+static inline int bget_utf8_repl(struct fastbuf *b, uint repl)
+{
+  uint u;
+  if (bavailr(b) >= 3)
+    {
+      b->bptr = utf8_get_repl(b->bptr, &u, repl);
+      return u;
+    }
+  else
+    return bget_utf8_slow(b, repl);
+}
+
+static inline int bget_utf8_32_repl(struct fastbuf *b, uint repl)
+{
+  uint u;
+  if (bavailr(b) >= 6)
+    {
+      b->bptr = utf8_32_get_repl(b->bptr, &u, repl);
+      return u;
+    }
+  else
+    return bget_utf8_32_slow(b, repl);
+}
+
+static inline int bget_utf8(struct fastbuf *b) /** Read a single utf8 character from range [0, 0xffff]. **/
+{
+  return bget_utf8_repl(b, UNI_REPLACEMENT);
+}
+
+static inline int bget_utf8_32(struct fastbuf *b) /** Read a single utf8 character (from the whole unicode range). **/
+{
+  return bget_utf8_32_repl(b, UNI_REPLACEMENT);
+}
+
+static inline void bput_utf8(struct fastbuf *b, uint u) /** Write a single utf8 character from range [0, 0xffff]. **/
+{
+  if (bavailw(b) >= 3)
+    b->bptr = utf8_put(b->bptr, u);
+  else
+    bput_utf8_slow(b, u);
+}
+
+static inline void bput_utf8_32(struct fastbuf *b, uint u) /** Write a single utf8 character (from the whole unicode range). **/
+{
+  if (bavailw(b) >= 6)
+    b->bptr = utf8_32_put(b->bptr, u);
+  else
+    bput_utf8_32_slow(b, u);
+}
+
+/* ** UTF-16 ** */
+
+int bget_utf16_be_slow(struct fastbuf *b, uint repl);
+int bget_utf16_le_slow(struct fastbuf *b, uint repl);
+void bput_utf16_be_slow(struct fastbuf *b, uint u);
+void bput_utf16_le_slow(struct fastbuf *b, uint u);
+
+static inline int bget_utf16_be_repl(struct fastbuf *b, uint repl)
+{
+  uint u;
+  if (bavailr(b) >= 4)
+    {
+      b->bptr = utf16_be_get_repl(b->bptr, &u, repl);
+      return u;
+    }
+  else
+    return bget_utf16_be_slow(b, repl);
+}
+
+static inline int bget_utf16_le_repl(struct fastbuf *b, uint repl)
+{
+  uint u;
+  if (bavailr(b) >= 4)
+    {
+      b->bptr = utf16_le_get_repl(b->bptr, &u, repl);
+      return u;
+    }
+  else
+    return bget_utf16_le_slow(b, repl);
+}
+
+/**
+ * Read an utf16 character from fastbuf.
+ * Big endian version.
+ **/
+static inline int bget_utf16_be(struct fastbuf *b)
+{
+  return bget_utf16_be_repl(b, UNI_REPLACEMENT);
+}
+
+/**
+ * Read an utf16 character from fastbuf.
+ * Little endian version.
+ **/
+static inline int bget_utf16_le(struct fastbuf *b)
+{
+  return bget_utf16_le_repl(b, UNI_REPLACEMENT);
+}
+
+/**
+ * Write an utf16 character to fastbuf.
+ * Big endian version.
+ **/
+static inline void bput_utf16_be(struct fastbuf *b, uint u)
+{
+  if (bavailw(b) >= 4)
+    b->bptr = utf16_be_put(b->bptr, u);
+  else
+    bput_utf16_be_slow(b, u);
+}
+
+/**
+ * Write an utf16 character to fastbuf.
+ * Little endian version.
+ **/
+static inline void bput_utf16_le(struct fastbuf *b, uint u)
+{
+  if (bavailw(b) >= 4)
+    b->bptr = utf16_le_put(b->bptr, u);
+  else
+    bput_utf16_le_slow(b, u);
+}
+
+#endif
diff --git a/libucw/ucw/ff-unicode.t b/libucw/ucw/ff-unicode.t
new file mode 100644
index 0000000..82b8518
--- /dev/null
+++ b/libucw/ucw/ff-unicode.t
@@ -0,0 +1,75 @@
+# Tests for the Unicode module
+
+Name:	bput_utf8 ASCII
+Run:	../obj/ucw/ff-unicode-t bput_utf8
+In:	0041 0048 004f 004a
+Out:	41 48 4f 4a
+
+Name:	bput_utf8 BMP
+In:	00aa 01aa 02a5 05a5 0a5a 15a5 2a5a 5a5a a5a5
+Out:	c2 aa c6 aa ca a5 d6 a5 e0 a9 9a e1 96 a5 e2 a9 9a e5 a9 9a ea 96 a5
+
+Name:	bget_utf8 ASCII
+Run:	../obj/ucw/ff-unicode-t bget_utf8
+In:	41 48 4f 4a
+Out:	0041 0048 004f 004a
+
+Name:	bget_utf8 BMP
+In:	c2 aa c6 aa ca a5 d6 a5 e0 a9 9a e1 96 a5 e2 a9 9a e5 a9 9a ea 96 a5
+Out:	00aa 01aa 02a5 05a5 0a5a 15a5 2a5a 5a5a a5a5
+
+Name:	bget_utf8 garbage
+In:	84 ff f9 f8 c2 aa 41
+Out:	fffc fffc fffc fffc 00aa 0041
+
+Name:	bget_utf8 denormalized
+In:	c1 bf  e0 9f bf
+Out:	fffc fffc
+
+Name:	bput_utf8_32
+Run:	../obj/ucw/ff-unicode-t bput_utf8_32
+In:	15a5a 2a5a5 5a5a5 a5a5a 15a5a5 2a5a5a 5a5a5a a5a5a5 15a5a5a 2a5a5a5 5a5a5a5 a5a5a5a 15a5a5a5 2a5a5a5a 5a5a5a5a
+Out:	f0 95 a9 9a f0 aa 96 a5 f1 9a 96 a5 f2 a5 a9 9a f5 9a 96 a5 f8 8a a5 a9 9a f8 96 a5 a9 9a f8 a9 9a 96 a5 f9 96 a5 a9 9a fa a9 9a 96 a5 fc 85 a9 9a 96 a5 fc 8a 96 a5 a9 9a fc 95 a9 9a 96 a5 fc aa 96 a5 a9 9a fd 9a 96 a5 a9 9a
+
+Name:	bget_utf8_32
+Run:	../obj/ucw/ff-unicode-t bget_utf8_32
+In:	f0 95 a9 9a f0 aa 96 a5 f1 9a 96 a5 f2 a5 a9 9a f5 9a 96 a5 f8 8a a5 a9 9a f8 96 a5 a9 9a f8 a9 9a 96 a5 f9 96 a5 a9 9a fa a9 9a 96 a5 fc 85 a9 9a 96 a5 fc 8a 96 a5 a9 9a fc 95 a9 9a 96 a5 fc aa 96 a5 a9 9a fd 9a 96 a5 a9 9a
+Out:	15a5a 2a5a5 5a5a5 a5a5a 15a5a5 2a5a5a 5a5a5a a5a5a5 15a5a5a 2a5a5a5 5a5a5a5 a5a5a5a 15a5a5a5 2a5a5a5a 5a5a5a5a
+
+Name:	bget_utf8_32 garbage
+In:	fe 83 81
+Out:	fffc fffc fffc
+
+Name:	bget_utf8_32 denormalized
+In:	c1 bf  e0 9f bf  f0 8f bf bf  f8 87 bf bf bf  fc 83 bf bf bf
+Out:	fffc fffc fffc fffc fffc
+
+Name:   bput_utf16_be
+Run:    ../obj/ucw/ff-unicode-t bput_utf16_be
+In:     0041 004a 2a5f feff 0000 10ffff ffff 10000
+Out:    00 41 00 4a 2a 5f fe ff 00 00 db ff df ff ff ff d8 00 dc 00
+
+Name:   bput_utf16_le
+Run:    ../obj/ucw/ff-unicode-t bput_utf16_le
+In:     0041 004a 2a5f feff 0000 10ffff ffff 10000
+Out:    41 00 4a 00 5f 2a ff fe 00 00 ff db ff df ff ff 00 d8 00 dc
+
+Name:   bget_utf16_be
+Run:    ../obj/ucw/ff-unicode-t bget_utf16_be
+In:     00 41 00 4a 2a 5f fe ff 00 00 db ff df ff ff ff d8 00 dc 00
+Out:    0041 004a 2a5f feff 0000 10ffff ffff 10000
+
+Name:   bget_utf16_be bad surrogates
+Run:    ../obj/ucw/ff-unicode-t bget_utf16_be
+In:     dc 1a 2a 5f d8 01 d8 01 2a 5f d8 01
+Out:    fffc 2a5f fffc 2a5f fffc
+
+Name:   bget_utf16_le
+Run:    ../obj/ucw/ff-unicode-t bget_utf16_le
+In:     41 00 4a 00 5f 2a ff fe 00 00 ff db ff df ff ff 00 d8 00 dc
+Out:    0041 004a 2a5f feff 0000 10ffff ffff 10000
+
+Name:   bget_utf16_le bad surrogates
+Run:    ../obj/ucw/ff-unicode-t bget_utf16_le
+In:     1a dc 5f 2a 01 d8 01 d8 5f 2a 01 d8
+Out:    fffc 2a5f fffc 2a5f fffc
diff --git a/libucw/ucw/ff-varint.c b/libucw/ucw/ff-varint.c
new file mode 100644
index 0000000..6a0d5be
--- /dev/null
+++ b/libucw/ucw/ff-varint.c
@@ -0,0 +1,106 @@
+/*
+ *	UCW Library: Reading and writing Varints on Fastbuf Streams
+ *
+ *	(c) 2013 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/varint.h>
+#include <ucw/ff-varint.h>
+#include <ucw/ff-binary.h>
+
+
+u64 bget_varint_slow(struct fastbuf *b, u64 repl)
+{
+	uint h = bgetc(b);
+	uint l = varint_len(h);
+	byte buf[l];
+	buf[0] = h;
+	l--;
+	if (breadb(b, buf+1, l) < l)
+		return repl;
+	varint_get(buf, &repl);
+	return repl;
+}
+
+void bput_varint_slow(struct fastbuf *b, u64 u)
+{
+	byte buf[9];
+	uint l = varint_put(buf, u);
+	bwrite(b, buf, l);
+}
+
+#ifdef TEST
+
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+	#define FUNCS \
+		F(BGET_VARINT) F(BPUT_VARINT)
+
+	enum {
+		#define F(x) FUNC_##x,
+		FUNCS
+		#undef F
+	};
+	char *names[] = {
+		#define F(x) [FUNC_##x] = #x,
+		FUNCS
+		#undef F
+	};
+
+	uint func = ~0U;
+	if (argc > 1)
+		for (uint i = 0; i < ARRAY_SIZE(names); i++)
+			if (!strcasecmp(names[i], argv[1]))
+				func = i;
+	if (!~func) {
+		fprintf(stderr, "Invalid usage!\n");
+		return 1;
+	}
+
+	struct fastbuf *b = fbgrow_create(8);
+	switch (func) {
+		uint u;
+		uintmax_t r;
+		int i;
+		case FUNC_BGET_VARINT:
+			while (scanf("%x", &u) == 1)
+				bputc(b, u);
+			fbgrow_rewind(b);
+			while (bpeekc(b) >= 0) {
+				if (btell(b))
+					putchar(' ');
+				r = bget_varint_slow(b, ~0LLU);
+				printf("%jx", r);
+			}
+			putchar('\n');
+			break;
+
+		case FUNC_BPUT_VARINT:
+			i = 0;
+			while (scanf("%jx", &r) == 1)
+				bput_varint_slow(b, r);
+			fbgrow_rewind(b);
+			while (bpeekc(b) >= 0) {
+				if (i++)
+					putchar(' ');
+				printf("%02x", bgetc(b));
+			}
+			putchar('\n');
+			break;
+		default:
+			ASSERT(0);
+	}
+
+	bclose(b);
+	return 0;
+}
+
+#endif
diff --git a/libucw/ucw/ff-varint.h b/libucw/ucw/ff-varint.h
new file mode 100644
index 0000000..fad3985
--- /dev/null
+++ b/libucw/ucw/ff-varint.h
@@ -0,0 +1,61 @@
+/*
+ *	UCW Library: Reading and writing Varints on Fastbuf Streams
+ *
+ *	(c) 2013 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FF_VARINT_H
+#define _UCW_FF_VARINT_H
+
+#include <ucw/fastbuf.h>
+#include <ucw/varint.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bget_varint_slow ucw_bget_varint_slow
+#define bput_varint_slow ucw_bput_varint_slow
+#endif
+
+u64 bget_varint_slow(struct fastbuf *b, u64 repl);
+void bput_varint_slow(struct fastbuf *b, u64 u);
+
+/**
+ * Reads u64 encoded as varint from the fastbuf b.
+ * If the read is unsuccessful, returns repl.
+ **/
+static inline u64 bget_varint_repl(struct fastbuf *b, u64 repl)
+{
+	uint l;
+	if (bavailr(b) >= 1) {
+		l = varint_len(*b->bptr);
+		if (bavailr(b) >= l) {
+			varint_get(b->bptr, &repl);
+			b->bptr += l;
+			return repl;
+		}
+	}
+	return bget_varint_slow(b, repl);
+}
+
+/**
+ * Reads u64 encoded as varint from the fastbuf b.
+ * If the read is unsuccessful, returns ~0LLU.
+ **/
+static inline u64 bget_varint(struct fastbuf *b)
+{
+	return bget_varint_repl(b, ~0LLU);
+}
+
+/** Writes u64 u encoded as varint to the fastbuf b. **/
+static inline void bput_varint(struct fastbuf *b, u64 u)
+{
+	uint l = varint_space(u);
+	if (bavailw(b) >= l)
+		b->bptr += varint_put(b->bptr, u);
+	else
+		bput_varint_slow(b, u);
+}
+
+#endif
diff --git a/libucw/ucw/ff-varint.t b/libucw/ucw/ff-varint.t
new file mode 100644
index 0000000..685ae43
--- /dev/null
+++ b/libucw/ucw/ff-varint.t
@@ -0,0 +1,11 @@
+# Tests for the FF-Varint module
+
+Name:	bput_varint
+Run:	../obj/ucw/ff-varint-t bput_varint
+In:	deadbeef 2222 feeddeadbabebeef
+Out:	f0 ce 8d 7e 6f a1 a2 ff fd eb da a5 aa 9e 7e 6f
+
+Name:   bget_varint
+Run:    ../obj/ucw/ff-varint-t bget_varint
+In:     ff fd eb da a5 aa 9e 7e 6f f0 ce 8d 7e 6f a1 a2
+Out:    feeddeadbabebeef deadbeef 2222
diff --git a/libucw/ucw/fw-hex.c b/libucw/ucw/fw-hex.c
new file mode 100644
index 0000000..cd55be5
--- /dev/null
+++ b/libucw/ucw/fw-hex.c
@@ -0,0 +1,103 @@
+/*
+ *	UCW Library -- I/O Wrapper for Hexadecimal Escaped Debugging Output
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+#include <ucw/fastbuf.h>
+#include <ucw/fw-hex.h>
+
+#define HEX_BUFSIZE 1024
+
+struct fb_hex {
+  struct fastbuf fb;
+  struct fastbuf *orig;
+  byte buf[HEX_BUFSIZE];
+};
+#define FB_HEX(f) ((struct fb_hex *)(f))
+
+static void
+fb_hex_spout(struct fastbuf *f)
+{
+  struct fastbuf *orig = FB_HEX(f)->orig;
+
+  for (byte *p = f->buffer; p < f->bptr; p++)
+    {
+      uint c = *p;
+      if (c >= 0x21 && c <= 0x7e && c != '<' && c != '>')
+	bputc(orig, c);
+      else
+	bprintf(orig, "<%02x>", c);
+    }
+  f->bptr = f->buffer;
+}
+
+static int
+fb_hex_refill(struct fastbuf *f)
+{
+  struct fastbuf *orig = FB_HEX(f)->orig;
+
+  f->bptr = f->bstop = f->buffer;
+  while (f->bstop < f->bufend)
+    {
+      int c = bgetc(orig);
+      if (c < 0)
+	break;
+      if (c == '<')
+	{
+	  uint x = 0;
+	  for (int i=0; i<2; i++)
+	    {
+	      int d = bgetc(orig);
+	      if (!Cxdigit(d))
+		bthrow(f, "fbhex", "fb_hex: Malformed hexadecimal representation");
+	      x = (x << 4) | Cxvalue(d);
+	    }
+	  c = bgetc(orig);
+	  if (c != '>')
+	    bthrow(f, "fbhex", "fb_hex: Expecting '>'");
+	  *f->bstop++ = x;
+	}
+      else
+	*f->bstop++ = c;
+    }
+  return (f->bstop > f->bptr);
+}
+
+static void
+fb_hex_close(struct fastbuf *f)
+{
+  if (f->spout)
+    bputc(FB_HEX(f)->orig, '\n');
+  bflush(FB_HEX(f)->orig);
+  xfree(f);
+}
+
+struct fastbuf *fb_wrap_hex_out(struct fastbuf *f)
+{
+  struct fastbuf *g = xmalloc_zero(sizeof(struct fb_hex));
+  FB_HEX(g)->orig = f;
+  g->name = "<hex-out>";
+  g->spout = fb_hex_spout;
+  g->close = fb_hex_close;
+  g->buffer = g->bstop = g->bptr = FB_HEX(g)->buf;
+  g->bufend = g->buffer + HEX_BUFSIZE;
+  return g;
+}
+
+struct fastbuf *fb_wrap_hex_in(struct fastbuf *f)
+{
+  struct fastbuf *g = xmalloc_zero(sizeof(struct fb_hex));
+  FB_HEX(g)->orig = f;
+  g->name = "<hex-in>";
+  g->refill = fb_hex_refill;
+  g->close = fb_hex_close;
+  g->buffer = g->bstop = g->bptr = FB_HEX(g)->buf;
+  g->bufend = g->buffer + HEX_BUFSIZE;
+  return g;
+}
diff --git a/libucw/ucw/fw-hex.h b/libucw/ucw/fw-hex.h
new file mode 100644
index 0000000..c54d098
--- /dev/null
+++ b/libucw/ucw/fw-hex.h
@@ -0,0 +1,46 @@
+/*
+ *	UCW Library -- I/O Wrapper for Hexadecimal Escaped Debugging Output
+ *
+ *	(c) 2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FW_HEX_H
+#define _UCW_FW_HEX_H
+
+#include <ucw/fastbuf.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define fb_wrap_hex_in ucw_fb_wrap_hex_in
+#define fb_wrap_hex_out ucw_fb_wrap_hex_out
+#endif
+
+/***
+ * When debugging a program, you might wonder what strange characters
+ * are there in the output, or you might want to spice up the input
+ * with Unicode snowmen to make the program freeze.
+ *
+ * In such situations, you can wrap your input or output stream in
+ * the hex wrapper, which converts between strange characters and their
+ * hexadecimal representation.
+ ***/
+
+/**
+ * Creates an output hex wrapper for the given fastbuf. Printable ASCII
+ * characters written to the wrapper are copied verbatim to @f.
+ * Control characters, whitespace and everything outside ASCII
+ * are transcribed hexadecimally as `<XY>`. A newline is appended
+ * at the end of the output.
+ **/
+struct fastbuf *fb_wrap_hex_out(struct fastbuf *f);
+
+/**
+ * Creates an input hex wrapper for the given fastbuf. It reads characters
+ * from @f and translates hexadecimal sequences `<XY>`. All other characters
+ * are copied verbatim.
+ **/
+struct fastbuf *fb_wrap_hex_in(struct fastbuf *f);
+
+#endif
diff --git a/libucw/ucw/gary.c b/libucw/ucw/gary.c
new file mode 100644
index 0000000..8207de3
--- /dev/null
+++ b/libucw/ucw/gary.c
@@ -0,0 +1,113 @@
+/*
+ *	UCW Library -- A simple growing array of an arbitrary type
+ *
+ *	(c) 2010--2014 Martin Mares <mj@ucw.cz>
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/gary.h>
+
+#include <string.h>
+
+struct gary_hdr gary_empty_hdr;
+
+void *
+gary_init(size_t elt_size, size_t num_elts, struct ucw_allocator *allocator)
+{
+  DBG("GARY: Init to %zd elements", num_elts);
+  struct gary_hdr *h = allocator->alloc(allocator, GARY_HDR_SIZE + elt_size * num_elts);
+  h->num_elts = h->have_space = num_elts;
+  h->elt_size = elt_size;
+  h->allocator = allocator;
+  return GARY_BODY(h);
+}
+
+static struct gary_hdr *
+gary_realloc(struct gary_hdr *h, size_t n)
+{
+  size_t old_size = h->have_space;
+  if (n > 2*h->have_space)
+    h->have_space = n;
+  else
+    h->have_space *= 2;
+  DBG("GARY: Resize from %zd to %zd elements (need %zd)", old_size, h->have_space, n);
+  return h->allocator->realloc(h->allocator, h, GARY_HDR_SIZE + old_size * h->elt_size, GARY_HDR_SIZE + h->have_space * h->elt_size);
+}
+
+void *
+gary_set_size(void *array, size_t n)
+{
+  struct gary_hdr *h = GARY_HDR(array);
+  h->num_elts = n;
+  if (n <= h->have_space)
+    return array;
+
+  h = gary_realloc(h, n);
+  return GARY_BODY(h);
+}
+
+void *
+gary_push_helper(void *array, size_t n, byte **cptr)
+{
+  struct gary_hdr *h = GARY_HDR(array);
+  h = gary_realloc(h, h->num_elts);
+  *cptr = GARY_BODY(h) + (h->num_elts - n) * h->elt_size;
+  return GARY_BODY(h);
+}
+
+void *
+gary_fix(void *array)
+{
+  struct gary_hdr *h = GARY_HDR(array);
+  if (h->num_elts != h->have_space)
+    {
+      h = h->allocator->realloc(h->allocator, h, GARY_HDR_SIZE + h->have_space * h->elt_size, GARY_HDR_SIZE + h->num_elts * h->elt_size);
+      h->have_space = h->num_elts;
+    }
+  return GARY_BODY(h);
+}
+
+#ifdef TEST
+
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
+int main(int argc, char **argv UNUSED)
+{
+  int *a;
+  struct mempool *mp = NULL;
+
+  if (argc < 2)
+    GARY_INIT_ZERO(a, 5);
+  else
+    {
+      mp = mp_new(4096);
+      GARY_INIT_ALLOC(a, 5, mp_get_allocator(mp));
+    }
+
+  for (int i=0; i<5; i++)
+    {
+      ASSERT(!a[i] || mp);
+      a[i] = i+1;
+    }
+
+  GARY_PUSH(a);
+  *GARY_PUSH(a) = 10;
+  *GARY_PUSH(a) = 20;
+  *GARY_PUSH(a) = 30;
+  GARY_POP(a);
+  GARY_FIX(a);
+
+  for (int i=0; i<(int)GARY_SIZE(a); i++)
+    printf("%d\n", a[i]);
+
+  GARY_FREE(a);
+  if (mp)
+    mp_delete(mp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/gary.h b/libucw/ucw/gary.h
new file mode 100644
index 0000000..ffcabaf
--- /dev/null
+++ b/libucw/ucw/gary.h
@@ -0,0 +1,146 @@
+/*
+ *	UCW Library -- A simple growing array of an arbitrary type
+ *
+ *	(c) 2010--2014 Martin Mares <mj@ucw.cz>
+ */
+
+#ifndef _UCW_GARY_H
+#define _UCW_GARY_H
+
+#include <ucw/alloc.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define gary_empty_hdr ucw_gary_empty_hdr
+#define gary_fix ucw_gary_fix
+#define gary_init ucw_gary_init
+#define gary_push_helper ucw_gary_push_helper
+#define gary_set_size ucw_gary_set_size
+#endif
+
+struct gary_hdr {
+  size_t num_elts;
+  size_t have_space;
+  size_t elt_size;
+  struct ucw_allocator *allocator;
+};
+
+#define GARY_HDR_SIZE ALIGN_TO(sizeof(struct gary_hdr), CPU_STRUCT_ALIGN)
+#define GARY_HDR(ptr) ((struct gary_hdr *)((byte*)(ptr) - GARY_HDR_SIZE))
+#define GARY_BODY(ptr) ((byte *)(ptr) + GARY_HDR_SIZE)
+
+/**
+ * Create a new growing array, initially containing @n elements,
+ * and let @ptr point to its first element. The memory used by the
+ * array is allocated by <<basics:xmalloc()>>.
+ **/
+#define GARY_INIT(ptr, n) (ptr) = gary_init(sizeof(*(ptr)), (n), &ucw_allocator_std)
+
+/**
+ * Create a growing array like GARY_INIT() does, but all newly
+ * allocated elements will be automatically zeroed.
+ **/
+#define GARY_INIT_ZERO(ptr, n) (ptr) = gary_init(sizeof(*(ptr)), (n), &ucw_allocator_zeroed)
+
+/**
+ * Create a growing array like GARY_INIT() does, but based upon the given
+ * <<alloc:,generic allocator>>.
+ **/
+#define GARY_INIT_ALLOC(ptr, n, a) (ptr) = gary_init(sizeof(*(ptr)), (n), (a))
+
+/**
+ * Create a growing array, initially containing 0 elements, but with enough
+ * space to keep @n of them without needing reallocation. The @ptr variable
+ * will point to the first element of the array.
+ **/
+#define GARY_INIT_SPACE(ptr, n) do { GARY_INIT(ptr, n); (GARY_HDR(ptr))->num_elts = 0; } while (0)
+
+/** A combination of GARY_INIT_ZERO() and GARY_INIT_SPACE(). **/
+#define GARY_INIT_SPACE_ZERO(ptr, n) do { GARY_INIT_ZERO(ptr, n); (GARY_HDR(ptr))->num_elts = 0; } while (0)
+
+/** A combination of GARY_INIT_ALLOC() and GARY_INIT_SPACE(). **/
+#define GARY_INIT_SPACE_ALLOC(ptr, n, a) do { GARY_INIT_ALLOC(ptr, n, a); (GARY_HDR(ptr))->num_elts = 0; } while (0)
+
+/** Destroy a growing array and free memory used by it. If @ptr is NULL, nothing happens. **/
+#define GARY_FREE(ptr) gary_free(ptr)
+
+/** Return the current number elements of the given growing array. **/
+#define GARY_SIZE(ptr) (GARY_HDR(ptr)->num_elts)
+
+/**
+ * Resize the given growing array to @n elements.
+ * The @ptr can change, if the array has to be re-allocated.
+ **/
+#define GARY_RESIZE(ptr, n) ((ptr) = gary_set_size((ptr), (n)))
+
+/** Create a new growing array, or resize it if it already exists. **/
+#define GARY_INIT_OR_RESIZE(ptr, n) (ptr) = (ptr) ? gary_set_size((ptr), (n)) : gary_init(sizeof(*(ptr)), (n), &ucw_allocator_std)
+
+/**
+ * Push @n elements to a growing array. That is, make space for @n more elements
+ * at the end of the array and return a pointer to the first of these elements.
+ * The @ptr can change, if the array has to be re-allocated.
+ **/
+#define GARY_PUSH_MULTI(ptr, n) ({					\
+  struct gary_hdr *_h = GARY_HDR(ptr);					\
+  typeof(*(ptr)) *_c = &(ptr)[_h->num_elts];				\
+  size_t _n = n;							\
+  _h->num_elts += _n;							\
+  if (_h->num_elts > _h->have_space)					\
+    (ptr) = gary_push_helper((ptr), _n, (byte **) &_c);			\
+  _c; })
+
+/**
+ * Push a single element at the end of a growing array and return a pointer to it.
+ * The @ptr can change, if the array has to be re-allocated.
+ **/
+#define GARY_PUSH(ptr) GARY_PUSH_MULTI(ptr, 1)
+
+/**
+ * Pop @n elements from the end of a growing array.
+ * The @ptr can change, if the array has to be re-allocated.
+ **/
+#define GARY_POP_MULTI(ptr, n) GARY_HDR(ptr)->num_elts -= (n)
+
+/**
+ * Pop a single element from the end of a growing array.
+ * The @ptr can change, if the array has to be re-allocated.
+ **/
+#define GARY_POP(ptr) GARY_POP_MULTI(ptr, 1)
+
+/**
+ * Fix size of a growing array, returning all unused memory to the
+ * system (or more precisely, to the underlying allocator).
+ * The @ptr can change.
+ **/
+#define GARY_FIX(ptr) (ptr) = gary_fix((ptr))
+
+/* Internal functions */
+void *gary_init(size_t elt_size, size_t num_elts, struct ucw_allocator *allocator);
+void *gary_set_size(void *array, size_t n);
+void *gary_push_helper(void *array, size_t n, byte **cptr);
+void *gary_fix(void *array);
+
+static inline void gary_free(void *ptr)
+{
+  if (ptr)
+    {
+      struct gary_hdr *h = GARY_HDR(ptr);
+      h->allocator->free(h->allocator, h);
+    }
+}
+
+/* A forever empty gary. Used internally. */
+
+extern struct gary_hdr gary_empty_hdr;
+#define GARY_FOREVER_EMPTY GARY_BODY(&gary_empty_hdr)
+
+/* Type-agnostic interface. Currently it's recommended for internal use only. */
+
+#define GARY_PUSH_GENERIC(ptr) ({					\
+  struct gary_hdr *_h = GARY_HDR(ptr);					\
+  void *_c = (byte *)(ptr) + _h->num_elts++ * _h->elt_size;		\
+  if (_h->num_elts > _h->have_space)					\
+    (ptr) = gary_push_helper((ptr), 1, (byte **) &_c);			\
+  _c; })
+
+#endif
diff --git a/libucw/ucw/gary.t b/libucw/ucw/gary.t
new file mode 100644
index 0000000..08da6f1
--- /dev/null
+++ b/libucw/ucw/gary.t
@@ -0,0 +1,21 @@
+# Tests for gary module
+
+Run:	../obj/ucw/gary-t
+Out:	1
+	2
+	3
+	4
+	5
+	0
+	10
+	20
+
+Run:	../obj/ucw/gary-t pool
+Out:	1
+	2
+	3
+	4
+	5
+	0
+	10
+	20
diff --git a/libucw/ucw/gbuf.h b/libucw/ucw/gbuf.h
new file mode 100644
index 0000000..1f5e68f
--- /dev/null
+++ b/libucw/ucw/gbuf.h
@@ -0,0 +1,98 @@
+/*
+ *	UCW Library -- A simple growing buffer
+ *
+ *	(c) 2004, Robert Spalek <robert@ucw.cz>
+ *	(c) 2005, Martin Mares <mj@ucw.cz>
+ *
+ *	Define the following macros:
+ *
+ *	GBUF_TYPE	data type of records stored in the buffer
+ *	GBUF_PREFIX(x)	add a name prefix to all global symbols
+ *	GBUF_TRACE(msg...) log growing of buffer [optional]
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/**
+ * Type identifier of the buffer.
+ * The macro is not available outside the header file,
+ * but it is used in the definitions of functions.
+ **/
+#define	BUF_T	GBUF_PREFIX(t)
+
+/**
+ * The growing buffer.
+ * `ptr` holds the memory and `len` is the current
+ * length of available memory.
+ **/
+typedef struct BUF_T {
+  size_t len;
+  GBUF_TYPE *ptr;
+} BUF_T;
+
+/**
+ * Initializes an empty growing buffer in @b.
+ **/
+static inline void GBUF_PREFIX(init)(BUF_T *b)
+{
+  b->ptr = NULL;
+  b->len = 0;
+}
+
+/**
+ * Frees all memory in the buffer and returns it
+ * to an empty state.
+ **/
+static void UNUSED GBUF_PREFIX(done)(BUF_T *b)
+{
+  if (b->ptr)
+    xfree(b->ptr);
+  b->ptr = NULL;
+  b->len = 0;
+}
+
+/**
+ * Sets the length of the buffer @b to exactly @len.
+ * Do not use for the growing (you can use this at the end,
+ * when you know the exact size), it would be slow.
+ *
+ * Use <<fun__GENERIC_LINK_|GBUF_PREFIX|grow|,`GBUF_PREFIX(grow)()`>>
+ * for growing.
+ **/
+static void UNUSED GBUF_PREFIX(set_size)(BUF_T *b, size_t len)
+{
+  b->len = len;
+  b->ptr = xrealloc(b->ptr, len * sizeof(GBUF_TYPE));
+#ifdef GBUF_TRACE
+  GBUF_TRACE(STRINGIFY_EXPANDED(BUF_T) " growing to %zu items", len);
+#endif
+}
+
+static void UNUSED GBUF_PREFIX(do_grow)(BUF_T *b, size_t len)
+{
+  if (len < 2*b->len)			// to ensure logarithmic cost
+    len = 2*b->len;
+  GBUF_PREFIX(set_size)(b, len);
+}
+
+/**
+ * Sets the size of the buffer @b to at last @len.
+ * It grows in exponential manner, to ensure the total cost
+ * of reallocs is linear with the final size.
+ *
+ * You can tweak the final size (when you do not need to grow
+ * any more) by
+ * <<fun__GENERIC_LINK_|GBUF_PREFIX|set_size|,`GBUF_PREFIX(set_size)()`>>.
+ **/
+static inline GBUF_TYPE *GBUF_PREFIX(grow)(BUF_T *b, size_t len)
+{
+  if (unlikely(len > b->len))
+    GBUF_PREFIX(do_grow)(b, len);
+  return b->ptr;
+}
+
+#undef	GBUF_TYPE
+#undef	GBUF_PREFIX
+#undef  GBUF_TRACE
+#undef	BUF_T
diff --git a/libucw/ucw/getopt.c b/libucw/ucw/getopt.c
new file mode 100644
index 0000000..3311237
--- /dev/null
+++ b/libucw/ucw/getopt.c
@@ -0,0 +1,57 @@
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+
+void
+reset_getopt(void)
+{
+  // Should work on GNU libc
+  optind = 0;
+}
+
+#ifdef TEST
+#include <stdio.h>
+
+static void
+parse(int argc, char **argv)
+{
+  static struct option longopts[] = {
+    { "longa", 0, 0, 'a' },
+    { "longb", 0, 0, 'b' },
+    { "longc", 1, 0, 'c' },
+    { "longd", 1, 0, 'd' },
+    { 0, 0, 0, 0 }
+  };
+  int opt;
+  while ((opt = getopt_long(argc, argv, "abc:d:", longopts, NULL)) >= 0)
+    switch (opt)
+      {
+	case 'a':
+	case 'b':
+	  printf("option %c\n", opt);
+	  break;
+	case 'c':
+	case 'd':
+	  printf("option %c with value `%s'\n", opt, optarg);
+	  break;
+	case '?':
+	  printf("unknown option\n");
+	  break;
+	default:
+	  printf("getopt returned unexpected char 0x%02x\n", opt);
+	  break;
+      }
+  if (optind != argc)
+    printf("%d nonoption arguments\n", argc - optind);
+}
+
+int
+main(int argc, char **argv)
+{
+  opterr = 0;
+  parse(argc, argv);
+  printf("reset\n");
+  reset_getopt();
+  parse(argc, argv);
+  return 0;
+}
+#endif
diff --git a/libucw/ucw/getopt.h b/libucw/ucw/getopt.h
new file mode 100644
index 0000000..9ea498c
--- /dev/null
+++ b/libucw/ucw/getopt.h
@@ -0,0 +1,94 @@
+/*
+ *	UCW Library -- Parsing of configuration and command-line options
+ *
+ *	(c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2003--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef	_UCW_GETOPT_H
+#define	_UCW_GETOPT_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cf_def_file ucw_cf_def_file
+#define cf_env_file ucw_cf_env_file
+#define cf_getopt ucw_cf_getopt
+#define reset_getopt ucw_reset_getopt
+#endif
+
+#ifdef CONFIG_UCW_OWN_GETOPT
+#include <ucw/getopt/getopt-sh.h>
+#else
+#include <getopt.h>
+#endif
+
+/***
+ * [[conf_getopt]]
+ * Loading by @cf_getopt()
+ * ~~~~~~~~~~~~~~~~~~~~~~~
+ ***/
+
+/**
+ * The default config (as set by `CONFIG_UCW_DEFAULT_CONFIG`) or NULL if already loaded.
+ * You can set it to something else manually.
+ */
+extern char *cf_def_file;
+/**
+ * Name of environment variable that can override what configuration is loaded.
+ * Defaults to `CONFIG_UCW_ENV_VAR_CONFIG`.
+ **/
+extern char *cf_env_file;
+/**
+ * Short options for loading configuration by @cf_getopt().
+ * Prepend to your own options.
+ **/
+#define	CF_SHORT_OPTS	"C:S:"
+/**
+ * Long options for loading configuration by @cf_getopt().
+ * Prepend to your own options.
+ **/
+#define	CF_LONG_OPTS	{"config",	1, 0, 'C'}, {"set",		1, 0, 'S'}, CF_LONG_OPTS_DEBUG
+/**
+ * Use this constant as @long_opts parameter of @cf_getopt() if you do
+ * not have any long options in your program.
+ **/
+#define CF_NO_LONG_OPTS (const struct option []) { CF_LONG_OPTS { NULL, 0, 0, 0 } }
+#ifndef CF_USAGE_TAB
+#define CF_USAGE_TAB ""
+#endif
+/**
+ * This macro provides text describing usage of the configuration
+ * loading options. Concatenate with description of your options and
+ * write to the user, if he/she provides invalid options.
+ **/
+#define	CF_USAGE	\
+"-C, --config filename\t" CF_USAGE_TAB "Override the default configuration file\n\
+-S, --set sec.item=val\t" CF_USAGE_TAB "Manual setting of a configuration item\n" CF_USAGE_DEBUG
+
+#ifdef CONFIG_UCW_DEBUG
+#define CF_LONG_OPTS_DEBUG { "dumpconfig", 0, 0, 0x64436667 } ,
+#define CF_USAGE_DEBUG "    --dumpconfig\t" CF_USAGE_TAB "Dump program configuration\n"
+#else
+#define CF_LONG_OPTS_DEBUG
+#define CF_USAGE_DEBUG
+#endif
+
+/**
+ * Takes care of parsing the command-line arguments, loading the
+ * default configuration file (<<var_cf_def_file,`cf_def_file`>>) and processing
+ * configuration options. The calling convention is the same as with GNU getopt_long(),
+ * but you must prefix your own short/long options by the
+ * <<def_CF_LONG_OPTS,`CF_LONG_OPTS`>> or <<def_CF_SHORT_OPTS,`CF_SHORT_OPTS`>> or
+ * pass <<def_CF_NO_LONG_OPTS,`CF_NO_LONG_OPTS`>> if there are no long options.
+ *
+ * The default configuration file can be overwritten by the --config options,
+ * which must come first. During parsing of all other options, the configuration
+ * is already available.
+ **/
+int cf_getopt(int argc, char * const argv[], const char *short_opts, const struct option *long_opts, int *long_index);
+
+void reset_getopt(void);	/** If you want to start parsing of the arguments from the first one again. **/
+
+#endif
diff --git a/libucw/ucw/getopt.t b/libucw/ucw/getopt.t
new file mode 100644
index 0000000..1fd2c74
--- /dev/null
+++ b/libucw/ucw/getopt.t
@@ -0,0 +1,21 @@
+# Tests for getopt
+
+Run:	../obj/ucw/getopt-t -a -b --longc 2819 -d -a 1 2 3
+Out:	option a
+	option b
+	option c with value `2819'
+	option d with value `-a'
+	3 nonoption arguments
+	reset
+	option a
+	option b
+	option c with value `2819'
+	option d with value `-a'
+	3 nonoption arguments
+
+Run:	../obj/ucw/getopt-t -a -x
+Out:	option a
+	unknown option
+	reset
+	option a
+	unknown option
diff --git a/libucw/ucw/getopt/Makefile b/libucw/ucw/getopt/Makefile
new file mode 100644
index 0000000..bd5ab18
--- /dev/null
+++ b/libucw/ucw/getopt/Makefile
@@ -0,0 +1,5 @@
+# Makefile for the UCW GetOpt Library (c) 2007 Pavel Charvat <pchar@ucw.cz>
+
+DIRS+=ucw/getopt
+
+LIBUCW_MODS+=getopt/getopt-sh
diff --git a/libucw/ucw/getopt/README b/libucw/ucw/getopt/README
new file mode 100644
index 0000000..98692be
--- /dev/null
+++ b/libucw/ucw/getopt/README
@@ -0,0 +1,12 @@
+This directory contains getopt routines from the GNU libc 2.5.
+We need this as a fallback for our reset_getopt(), because there is
+no standardized interface for such instruction.
+
+They are distributed under the GNU LGPL.
+
+All files are exact copies of the original distribution with very
+few exceptions commented with `// UCW' prefix.
+I only provided my own getopt-sh.c, getopt-sh.h and Makefile.
+
+                                        Pavel Charvat, 2007
+
diff --git a/libucw/ucw/getopt/getopt-sh.c b/libucw/ucw/getopt/getopt-sh.c
new file mode 100644
index 0000000..0fe271b
--- /dev/null
+++ b/libucw/ucw/getopt/getopt-sh.c
@@ -0,0 +1,4 @@
+#include "getopt-sh.h"
+#include "getopt_int.h"
+#include "getopt.c"
+#include "getopt1.c"
diff --git a/libucw/ucw/getopt/getopt-sh.h b/libucw/ucw/getopt/getopt-sh.h
new file mode 100644
index 0000000..f296cd0
--- /dev/null
+++ b/libucw/ucw/getopt/getopt-sh.h
@@ -0,0 +1,14 @@
+#ifndef _UCW_GETOPT_GETOPT_SH_H
+#define _UCW_GETOPT_GETOPT_SH_H
+
+#define getopt ucw_getopt
+#define getopt_long ucw_getopt_long
+#define getopt_long_only ucw_getopt_longonly
+#define optarg ucw_optarg
+#define optind ucw_optind
+#define opterr ucw_opterr
+#define optopt ucw_optopt
+
+#include <ucw/getopt/getopt.h>
+
+#endif
diff --git a/libucw/ucw/getopt/getopt.c b/libucw/ucw/getopt/getopt.c
new file mode 100644
index 0000000..13c3170
--- /dev/null
+++ b/libucw/ucw/getopt/getopt.c
@@ -0,0 +1,1226 @@
+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
+   before changing it!
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
+   	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+   Ditto for AIX 3.2 and <stdlib.h>.  */
+#ifndef _NO_PROTO
+# define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+//#  define ELIDE_CODE   // UCW: disabled
+# endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef	__GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+   contain conflicting prototypes for getopt.  */
+# include <stdlib.h>
+# include <unistd.h>
+#endif	/* GNU C library.  */
+
+#include <string.h>
+
+#ifdef VMS
+# include <unixlib.h>
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+//# include "gettext.h"  // UCW: replaced by <libintl.h>
+# include <libintl.h>
+# define _(msgid) gettext (msgid)
+#endif
+
+#if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable POSIXLY_CORRECT disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt.h"
+#include "getopt_int.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Keep a global copy of all internal members of getopt_data.  */
+
+static struct _getopt_data getopt_data;
+
+
+#ifndef __GNU_LIBRARY__
+
+/* Avoid depending on library functions or files
+   whose names are inconsistent.  */
+
+#ifndef getenv
+extern char *getenv ();
+#endif
+
+#endif /* not __GNU_LIBRARY__ */
+
+#ifdef _LIBC
+/* Stored original parameters.
+   XXX This is no good solution.  We should rather copy the args so
+   that we can compare them later.  But we must not use malloc(3).  */
+extern int __libc_argc;
+extern char **__libc_argv;
+
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+# ifdef USE_NONOPTION_FLAGS
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+# endif
+
+# ifdef USE_NONOPTION_FLAGS
+#  define SWAP_FLAGS(ch1, ch2) \
+  if (d->__nonoption_flags_len > 0)					      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+# else
+#  define SWAP_FLAGS(ch1, ch2)
+# endif
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+static void
+exchange (char **argv, struct _getopt_data *d)
+{
+  int bottom = d->__first_nonopt;
+  int middle = d->__last_nonopt;
+  int top = d->optind;
+  char *tem;
+
+  /* Exchange the shorter segment with the far end of the longer segment.
+     That puts the shorter segment into the right place.
+     It leaves the longer segment in the right place overall,
+     but it consists of two parts that need to be swapped next.  */
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = malloc (top + 1);
+      if (new_str == NULL)
+	d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     d->__nonoption_flags_max_len),
+		  '\0', top + 1 - d->__nonoption_flags_max_len);
+	  d->__nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
+  while (top > middle && middle > bottom)
+    {
+      if (top - middle > middle - bottom)
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  register int i;
+
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
+      else
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  register int i;
+
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
+    }
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  d->__first_nonopt += (d->optind - d->__last_nonopt);
+  d->__last_nonopt = d->optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+static const char *
+_getopt_initialize (int argc, char *const *argv, const char *optstring,
+		    struct _getopt_data *d)
+{
+  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  d->__first_nonopt = d->__last_nonopt = d->optind;
+
+  d->__nextchar = NULL;
+
+  d->__posixly_correct = !!getenv ("POSIXLY_CORRECT");
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    {
+      d->__ordering = RETURN_IN_ORDER;
+      ++optstring;
+    }
+  else if (optstring[0] == '+')
+    {
+      d->__ordering = REQUIRE_ORDER;
+      ++optstring;
+    }
+  else if (d->__posixly_correct)
+    d->__ordering = REQUIRE_ORDER;
+  else
+    d->__ordering = PERMUTE;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  if (!d->__posixly_correct
+      && argc == __libc_argc && argv == __libc_argv)
+    {
+      if (d->__nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    d->__nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = d->__nonoption_flags_max_len = strlen (orig_str);
+	      if (d->__nonoption_flags_max_len < argc)
+		d->__nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (d->__nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		d->__nonoption_flags_max_len = -1;
+	      else
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', d->__nonoption_flags_max_len - len);
+	    }
+	}
+      d->__nonoption_flags_len = d->__nonoption_flags_max_len;
+    }
+  else
+    d->__nonoption_flags_len = 0;
+#endif
+
+  return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.  */
+
+int
+_getopt_internal_r (int argc, char *const *argv, const char *optstring,
+		    const struct option *longopts, int *longind,
+		    int long_only, struct _getopt_data *d)
+{
+  int print_errors = d->opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
+
+  d->optarg = NULL;
+
+  if (d->optind == 0 || !d->__initialized)
+    {
+      if (d->optind == 0)
+	d->optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring, d);
+      d->__initialized = 1;
+    }
+
+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
+		      || (d->optind < d->__nonoption_flags_len		      \
+			  && __getopt_nonoption_flags[d->optind] == '1'))
+#else
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
+#endif
+
+  if (d->__nextchar == NULL || *d->__nextchar == '\0')
+    {
+      /* Advance to the next ARGV-element.  */
+
+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (d->__last_nonopt > d->optind)
+	d->__last_nonopt = d->optind;
+      if (d->__first_nonopt > d->optind)
+	d->__first_nonopt = d->optind;
+
+      if (d->__ordering == PERMUTE)
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
+
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__last_nonopt != d->optind)
+	    d->__first_nonopt = d->optind;
+
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
+
+	  while (d->optind < argc && NONOPTION_P)
+	    d->optind++;
+	  d->__last_nonopt = d->optind;
+	}
+
+      /* The special ARGV-element `--' means premature end of options.
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
+
+      if (d->optind != argc && !strcmp (argv[d->optind], "--"))
+	{
+	  d->optind++;
+
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__first_nonopt == d->__last_nonopt)
+	    d->__first_nonopt = d->optind;
+	  d->__last_nonopt = argc;
+
+	  d->optind = argc;
+	}
+
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+
+      if (d->optind == argc)
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (d->__first_nonopt != d->__last_nonopt)
+	    d->optind = d->__first_nonopt;
+	  return -1;
+	}
+
+      /* If we have come to a non-option and did not permute it,
+	 either stop the scan or describe it to the caller and pass it by.  */
+
+      if (NONOPTION_P)
+	{
+	  if (d->__ordering == REQUIRE_ORDER)
+	    return -1;
+	  d->optarg = argv[d->optind++];
+	  return 1;
+	}
+
+      /* We have found another option-ARGV-element.
+	 Skip the initial punctuation.  */
+
+      d->__nextchar = (argv[d->optind] + 1
+		  + (longopts != NULL && argv[d->optind][1] == '-'));
+    }
+
+  /* Decode the current option-ARGV-element.  */
+
+  /* Check whether the ARGV-element is a long option.
+
+     If long_only and the ARGV-element has the form "-f", where f is
+     a valid short option, don't consider it an abbreviated form of
+     a long option that starts with f.  Otherwise there would be no
+     way to give the -f short option.
+
+     On the other hand, if there's a long option "fubar" and
+     the ARGV-element is "-fu", do consider that an abbreviation of
+     the long option, just like "--fu", and not "-f" with arg "u".
+
+     This distinction seems to be the most useful approach.  */
+
+  if (longopts != NULL
+      && (argv[d->optind][1] == '-'
+	  || (long_only && (argv[d->optind][2]
+			    || !strchr (optstring, argv[d->optind][1])))))
+    {
+      char *nameend;
+      const struct option *p;
+      const struct option *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = -1;
+      int option_index;
+
+      for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+	/* Do nothing.  */ ;
+
+      /* Test all long options for either exact match
+	 or abbreviated matches.  */
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+	  {
+	    if ((unsigned int) (nameend - d->__nextchar)
+		== (unsigned int) strlen (p->name))
+	      {
+		/* Exact match found.  */
+		pfound = p;
+		indfound = option_index;
+		exact = 1;
+		break;
+	      }
+	    else if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
+	      /* Second or later nonexact match found.  */
+	      ambig = 1;
+	  }
+
+      if (ambig && !exact)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+
+	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+			      argv[0], argv[d->optind]) >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  __fxprintf (NULL, "%s", buf);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#else
+	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		       argv[0], argv[d->optind]);
+#endif
+	    }
+	  d->__nextchar += strlen (d->__nextchar);
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+
+      if (pfound != NULL)
+	{
+	  option_index = indfound;
+	  d->optind++;
+	  if (*nameend)
+	    {
+	      /* Don't test has_arg with >, because some C compilers don't
+		 allow it to be used on enums.  */
+	      if (pfound->has_arg)
+		d->optarg = nameend + 1;
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+		      int n;
+#endif
+
+		      if (argv[d->optind - 1][1] == '-')
+			{
+			  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+					  argv[0], pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+				   argv[0], pfound->name);
+#endif
+			}
+		      else
+			{
+			  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+					  argv[0], argv[d->optind - 1][0],
+					  pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+				   argv[0], argv[d->optind - 1][0],
+				   pfound->name);
+#endif
+			}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+		      if (n >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  __fxprintf (NULL, "%s", buf);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#endif
+		    }
+
+		  d->__nextchar += strlen (d->__nextchar);
+
+		  d->optopt = pfound->val;
+		  return '?';
+		}
+	    }
+	  else if (pfound->has_arg == 1)
+	    {
+	      if (d->optind < argc)
+		d->optarg = argv[d->optind++];
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+
+		      if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+				      argv[0], argv[d->optind - 1]) >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  __fxprintf (NULL, "%s", buf);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#else
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[d->optind - 1]);
+#endif
+		    }
+		  d->__nextchar += strlen (d->__nextchar);
+		  d->optopt = pfound->val;
+		  return optstring[0] == ':' ? ':' : '?';
+		}
+	    }
+	  d->__nextchar += strlen (d->__nextchar);
+	  if (longind != NULL)
+	    *longind = option_index;
+	  if (pfound->flag)
+	    {
+	      *(pfound->flag) = pfound->val;
+	      return 0;
+	    }
+	  return pfound->val;
+	}
+
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short
+	 option, then it's an error.
+	 Otherwise interpret it as a short option.  */
+      if (!long_only || argv[d->optind][1] == '-'
+	  || strchr (optstring, *d->__nextchar) == NULL)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	      if (argv[d->optind][1] == '-')
+		{
+		  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+				  argv[0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			   argv[0], d->__nextchar);
+#endif
+		}
+	      else
+		{
+		  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+				  argv[0], argv[d->optind][0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			   argv[0], argv[d->optind][0], d->__nextchar);
+#endif
+		}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	      if (n >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  __fxprintf (NULL, "%s", buf);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#endif
+	    }
+	  d->__nextchar = (char *) "";
+	  d->optind++;
+	  d->optopt = 0;
+	  return '?';
+	}
+    }
+
+  /* Look at and handle the next short option-character.  */
+
+  {
+    char c = *d->__nextchar++;
+    char *temp = strchr (optstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*d->__nextchar == '\0')
+      ++d->optind;
+
+    if (temp == NULL || c == ':')
+      {
+	if (print_errors)
+	  {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	    if (d->__posixly_correct)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+#endif
+	      }
+	    else
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+#endif
+	      }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	    if (n >= 0)
+	      {
+		_IO_flockfile (stderr);
+
+		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		__fxprintf (NULL, "%s", buf);
+
+		((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		_IO_funlockfile (stderr);
+
+		free (buf);
+	      }
+#endif
+	  }
+	d->optopt = c;
+	return '?';
+      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*d->__nextchar != '\0')
+	  {
+	    d->optarg = d->__nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    d->optind++;
+	  }
+	else if (d->optind == argc)
+	  {
+	    if (print_errors)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf,
+				_("%s: option requires an argument -- %c\n"),
+				argv[0], c) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    __fxprintf (NULL, "%s", buf);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+#endif
+	      }
+	    d->optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `d->optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  d->optarg = argv[d->optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
+	     nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+	    {
+	      if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (print_errors)
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+				argv[0], argv[d->optind]) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    __fxprintf (NULL, "%s", buf);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+			 argv[0], argv[d->optind]);
+#endif
+	      }
+	    d->__nextchar += strlen (d->__nextchar);
+	    d->optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  d->optarg = nameend + 1;
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+					argv[0], pfound->name) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    __fxprintf (NULL, "%s", buf);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+#endif
+		      }
+
+		    d->__nextchar += strlen (d->__nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (d->optind < argc)
+		  d->optarg = argv[d->optind++];
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+					argv[0], argv[d->optind - 1]) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    __fxprintf (NULL, "%s", buf);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr,
+				 _("%s: option `%s' requires an argument\n"),
+				 argv[0], argv[d->optind - 1]);
+#endif
+		      }
+		    d->__nextchar += strlen (d->__nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    d->__nextchar += strlen (d->__nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  d->__nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
+    if (temp[1] == ':')
+      {
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		d->optind++;
+	      }
+	    else
+	      d->optarg = NULL;
+	    d->__nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*d->__nextchar != '\0')
+	      {
+		d->optarg = d->__nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		d->optind++;
+	      }
+	    else if (d->optind == argc)
+	      {
+		if (print_errors)
+		  {
+		    /* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		    char *buf;
+
+		    if (__asprintf (&buf, _("\
+%s: option requires an argument -- %c\n"),
+				    argv[0], c) >= 0)
+		      {
+			_IO_flockfile (stderr);
+
+			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+			__fxprintf (NULL, "%s", buf);
+
+			((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			_IO_funlockfile (stderr);
+
+			free (buf);
+		      }
+#else
+		    fprintf (stderr,
+			     _("%s: option requires an argument -- %c\n"),
+			     argv[0], c);
+#endif
+		  }
+		d->optopt = c;
+		if (optstring[0] == ':')
+		  c = ':';
+		else
+		  c = '?';
+	      }
+	    else
+	      /* We already incremented `optind' once;
+		 increment it again when taking next ARGV-elt as argument.  */
+	      d->optarg = argv[d->optind++];
+	    d->__nextchar = NULL;
+	  }
+      }
+    return c;
+  }
+}
+
+int
+_getopt_internal (int argc, char *const *argv, const char *optstring,
+		  const struct option *longopts, int *longind, int long_only)
+{
+  int result;
+
+  getopt_data.optind = optind;
+  getopt_data.opterr = opterr;
+
+  result = _getopt_internal_r (argc, argv, optstring, longopts,
+			       longind, long_only, &getopt_data);
+
+  optind = getopt_data.optind;
+  optarg = getopt_data.optarg;
+  optopt = getopt_data.optopt;
+
+  return result;
+}
+
+int
+getopt (int argc, char *const *argv, const char *optstring)
+{
+  return _getopt_internal (argc, argv, optstring,
+			   (const struct option *) 0,
+			   (int *) 0,
+			   0);
+}
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+   the above definition of `getopt'.  */
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+
+      c = getopt (argc, argv, "abc:d:0123456789");
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff --git a/libucw/ucw/getopt/getopt.h b/libucw/ucw/getopt/getopt.h
new file mode 100644
index 0000000..b7a026c
--- /dev/null
+++ b/libucw/ucw/getopt/getopt.h
@@ -0,0 +1,177 @@
+/* Declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW;
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW;
+extern int getopt_long_only (int ___argc, char *const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW;
+
+#endif
+
+#ifdef	__cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */
diff --git a/libucw/ucw/getopt/getopt1.c b/libucw/ucw/getopt/getopt1.c
new file mode 100644
index 0000000..ee0d6fa
--- /dev/null
+++ b/libucw/ucw/getopt/getopt1.c
@@ -0,0 +1,192 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
+     Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef _LIBC
+# include <getopt.h>
+#else
+# include "getopt.h"
+#endif
+#include "getopt_int.h"
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+//#define ELIDE_CODE // UCW: disabled
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef	NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (int argc, char *const *argv, const char *options,
+	     const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+}
+
+int
+_getopt_long_r (int argc, char *const *argv, const char *options,
+		const struct option *long_options, int *opt_index,
+		struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     0, d);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+   If an option that starts with '-' (not '--') doesn't match a long option,
+   but does match a short option, it is parsed as a short option
+   instead.  */
+
+int
+getopt_long_only (int argc, char *const *argv, const char *options,
+		  const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+}
+
+int
+_getopt_long_only_r (int argc, char *const *argv, const char *options,
+		     const struct option *long_options, int *opt_index,
+		     struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     1, d);
+}
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+      int option_index = 0;
+      static struct option long_options[] =
+      {
+	{"add", 1, 0, 0},
+	{"append", 0, 0, 0},
+	{"delete", 1, 0, 0},
+	{"verbose", 0, 0, 0},
+	{"create", 0, 0, 0},
+	{"file", 1, 0, 0},
+	{0, 0, 0, 0}
+      };
+
+      c = getopt_long (argc, argv, "abc:d:0123456789",
+		       long_options, &option_index);
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 0:
+	  printf ("option %s", long_options[option_index].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
+
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case 'd':
+	  printf ("option d with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff --git a/libucw/ucw/getopt/getopt_init.c b/libucw/ucw/getopt/getopt_init.c
new file mode 100644
index 0000000..d460098
--- /dev/null
+++ b/libucw/ucw/getopt/getopt_init.c
@@ -0,0 +1,75 @@
+/* Perform additional initialization for getopt functions in GNU libc.
+   Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifdef USE_NONOPTION_FLAGS
+/* Attention: this file is *not* necessary when the GNU getopt functions
+   are used outside the GNU libc.  Some additional functionality of the
+   getopt functions in GNU libc require this additional work.  */
+
+#include <getopt.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <stdio-common/_itoa.h>
+
+/* Variable to synchronize work.  */
+char *__getopt_nonoption_flags;
+
+
+/* Remove the environment variable "_<PID>_GNU_nonoption_argv_flags_" if
+   it is still available.  If the getopt functions are also used in the
+   application it does not exist anymore since it was saved for the use
+   in getopt.  */
+void
+__getopt_clean_environment (char **env)
+{
+  /* Bash 2.0 puts a special variable in the environment for each
+     command it runs, specifying which ARGV elements are the results
+     of file name wildcard expansion and therefore should not be
+     considered as options.  */
+  static const char envvar_tail[] = "_GNU_nonoption_argv_flags_=";
+  char var[50];
+  char *cp, **ep;
+  size_t len;
+
+  /* Construct the "_<PID>_GNU_nonoption_argv_flags_=" string.  We must
+     not use `sprintf'.  */
+  cp = memcpy (&var[sizeof (var) - sizeof (envvar_tail)], envvar_tail,
+	       sizeof (envvar_tail));
+  cp = _itoa_word (__getpid (), cp, 10, 0);
+  /* Note: we omit adding the leading '_' since we explicitly test for
+     it before calling strncmp.  */
+  len = (var + sizeof (var) - 1) - cp;
+
+  for (ep = env; *ep != NULL; ++ep)
+    if ((*ep)[0] == '_'
+	&& __builtin_expect (strncmp (*ep + 1, cp, len) == 0, 0))
+      {
+	/* Found it.  Store this pointer and move later ones back.  */
+	char **dp = ep;
+	__getopt_nonoption_flags = &(*ep)[len];
+	do
+	  dp[0] = dp[1];
+	while (*dp++);
+	/* Continue the loop in case the name appears again.  */
+      }
+}
+#endif	/* USE_NONOPTION_FLAGS */
diff --git a/libucw/ucw/getopt/getopt_int.h b/libucw/ucw/getopt/getopt_int.h
new file mode 100644
index 0000000..d982c72
--- /dev/null
+++ b/libucw/ucw/getopt/getopt_int.h
@@ -0,0 +1,130 @@
+/* Internal declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _GETOPT_INT_H
+#define _GETOPT_INT_H	1
+
+extern int _getopt_internal (int ___argc, char *const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);
+
+
+/* Reentrant versions which can handle parsing multiple argument
+   vectors at the same time.  */
+
+/* Data type for reentrant functions.  */
+struct _getopt_data
+{
+  /* These have exactly the same meaning as the corresponding global
+     variables, except that they are used for the reentrant
+     versions of getopt.  */
+  int optind;
+  int opterr;
+  int optopt;
+  char *optarg;
+
+  /* Internal members.  */
+
+  /* True if the internal members have been initialized.  */
+  int __initialized;
+
+  /* The next char to be scanned in the option-element
+     in which the last option character we returned was found.
+     This allows us to pick up the scan where we left off.
+
+     If this is zero, or a null string, it means resume the scan
+     by advancing to the next ARGV-element.  */
+  char *__nextchar;
+
+  /* Describe how to deal with options that follow non-option ARGV-elements.
+
+     If the caller did not specify anything,
+     the default is REQUIRE_ORDER if the environment variable
+     POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+     REQUIRE_ORDER means don't recognize them as options;
+     stop option processing when the first non-option is seen.
+     This is what Unix does.
+     This mode of operation is selected by either setting the environment
+     variable POSIXLY_CORRECT, or using `+' as the first character
+     of the list of option characters.
+
+     PERMUTE is the default.  We permute the contents of ARGV as we
+     scan, so that eventually all the non-options are at the end.
+     This allows options to be given in any order, even with programs
+     that were not written to expect this.
+
+     RETURN_IN_ORDER is an option available to programs that were
+     written to expect options and other ARGV-elements in any order
+     and that care about the ordering of the two.  We describe each
+     non-option ARGV-element as if it were the argument of an option
+     with character code 1.  Using `-' as the first character of the
+     list of option characters selects this mode of operation.
+
+     The special argument `--' forces an end of option-scanning regardless
+     of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+     `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+  enum
+    {
+      REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+    } __ordering;
+
+  /* If the POSIXLY_CORRECT environment variable is set.  */
+  int __posixly_correct;
+
+
+  /* Handle permutation of arguments.  */
+
+  /* Describe the part of ARGV that contains non-options that have
+     been skipped.  `first_nonopt' is the index in ARGV of the first
+     of them; `last_nonopt' is the index after the last of them.  */
+
+  int __first_nonopt;
+  int __last_nonopt;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  int __nonoption_flags_max_len;
+  int __nonoption_flags_len;
+# endif
+};
+
+/* The initializer is necessary to set OPTIND and OPTERR to their
+   default values and to clear the initialization flag.  */
+#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
+
+extern int _getopt_internal_r (int ___argc, char *const *___argv,
+			       const char *__shortopts,
+			       const struct option *__longopts, int *__longind,
+			       int __long_only, struct _getopt_data *__data);
+
+extern int _getopt_long_r (int ___argc, char *const *___argv,
+			   const char *__shortopts,
+			   const struct option *__longopts, int *__longind,
+			   struct _getopt_data *__data);
+
+extern int _getopt_long_only_r (int ___argc, char *const *___argv,
+				const char *__shortopts,
+				const struct option *__longopts,
+				int *__longind,
+				struct _getopt_data *__data);
+
+#endif /* getopt_int.h */
diff --git a/libucw/ucw/hash-test.c b/libucw/ucw/hash-test.c
new file mode 100644
index 0000000..349678b
--- /dev/null
+++ b/libucw/ucw/hash-test.c
@@ -0,0 +1,319 @@
+/* Tests for hash table routines */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* TEST 1: integers */
+
+struct node1 {
+  int key;
+  int data;
+};
+
+#define HASH_NODE struct node1
+#define HASH_PREFIX(x) test1_##x
+#define HASH_KEY_ATOMIC key
+#define HASH_ATOMIC_TYPE int
+#define HASH_ZERO_FILL
+
+#define HASH_GIVE_INIT_DATA
+static inline void test1_init_data(struct node1 *n)
+{
+  n->data = n->key + 123;
+}
+
+#define HASH_WANT_FIND
+#define HASH_WANT_LOOKUP
+#define HASH_WANT_REMOVE
+
+#include <ucw/hashtable.h>
+
+static void test1(void)
+{
+  int i;
+
+  test1_init();
+  for (i=0; i<1024; i++)
+    {
+      struct node1 *n = test1_lookup(i);
+      ASSERT(n->data == i+123);
+    }
+  for (i=1; i<1024; i+=2)
+    {
+      struct node1 *n = test1_lookup(i);
+      test1_remove(n);
+    }
+  for (i=0; i<1024; i++)
+    {
+      struct node1 *n = test1_find(i);
+      if ((!n) != (i&1) || (n && n->data != i+123))
+	die("Inconsistency at i=%d", i);
+    }
+  i=0;
+  HASH_FOR_ALL(test1, n)
+    {
+      i += 1 + n->key;
+    }
+  HASH_END_FOR;
+  ASSERT(i == 262144);
+  puts("OK");
+}
+
+/* TEST 2: external strings */
+
+struct node2 {
+  char *key;
+  int data;
+};
+
+#define HASH_NODE struct node2
+#define HASH_PREFIX(x) test2_##x
+#define HASH_KEY_STRING key
+#define HASH_NOCASE
+#define HASH_AUTO_POOL 4096
+
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+
+#include <ucw/hashtable.h>
+
+static void test2(void)
+{
+  int i;
+
+  test2_init();
+  for (i=0; i<1024; i+=2)
+    {
+      char x[32];
+      sprintf(x, "abc%d", i);
+      test2_new(xstrdup(x));
+    }
+  for (i=0; i<1024; i++)
+    {
+      char x[32];
+      struct node2 *n;
+      sprintf(x, "ABC%d", i);
+      n = test2_find(x);
+      if ((!n) != (i&1))
+	die("Inconsistency at i=%d", i);
+    }
+  puts("OK");
+}
+
+/* TEST 3: internal strings + pools */
+
+static struct mempool *pool3;
+
+struct node3 {
+  int data;
+  char key[1];
+};
+
+#define HASH_NODE struct node3
+#define HASH_PREFIX(x) test3_##x
+#define HASH_KEY_ENDSTRING key
+
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+
+#define HASH_USE_POOL pool3
+
+#include <ucw/hashtable.h>
+
+static void test3(void)
+{
+  int i;
+
+  pool3 = mp_new(16384);
+  test3_init();
+  for (i=0; i<1048576; i+=2)
+    {
+      char x[32];
+      sprintf(x, "abc%d", i);
+      test3_new(x);
+    }
+  for (i=0; i<1048576; i++)
+    {
+      char x[32];
+      struct node3 *n;
+      sprintf(x, "abc%d", i);
+      n = test3_find(x);
+      if ((!n) != (i&1))
+	die("Inconsistency at i=%d", i);
+    }
+  puts("OK");
+}
+
+/* TEST 4: complex keys */
+
+#include <ucw/hashfunc.h>
+
+struct node4 {
+  int port;
+  int data;
+  char host[1];
+};
+
+#define HASH_NODE struct node4
+#define HASH_PREFIX(x) test4_##x
+#define HASH_KEY_COMPLEX(x) x host, x port
+#define HASH_KEY_DECL char *host, int port
+
+#define HASH_WANT_CLEANUP
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_WANT_LOOKUP
+#define HASH_WANT_DELETE
+#define HASH_WANT_REMOVE
+
+#define HASH_GIVE_HASHFN
+static uint test4_hash(char *host, int port)
+{
+  return hash_string_nocase(host) ^ hash_u32(port);
+}
+
+#define HASH_GIVE_EQ
+static inline int test4_eq(char *host1, int port1, char *host2, int port2)
+{
+  return !strcasecmp(host1,host2) && port1 == port2;
+}
+
+#define HASH_GIVE_EXTRA_SIZE
+static inline uint test4_extra_size(char *host, int port UNUSED)
+{
+  return strlen(host);
+}
+
+#define HASH_GIVE_INIT_KEY
+static inline void test4_init_key(struct node4 *n, char *host, int port)
+{
+  strcpy(n->host, host);
+  n->port = port;
+}
+
+#include <ucw/hashtable.h>
+
+static void test4(void)
+{
+  int i;
+  char x[32];
+  struct node4 *n;
+
+  test4_init();
+  for (i=0; i<1024; i++)
+    if ((i % 3) == 0)
+      {
+	sprintf(x, "abc%d", i);
+	n = test4_new(x, i%10);
+	n->data = i;
+      }
+  for (i=0; i<1024; i++)
+    {
+      sprintf(x, "abc%d", i);
+      n = test4_lookup(x, i%10);
+      n->data = i;
+    }
+  for (i=0; i<1024; i++)
+    if (i % 2)
+      {
+	sprintf(x, "aBc%d", i);
+	if ((i % 7) < 3)
+	  {
+	    n = test4_find(x, i%10);
+	    ASSERT(n);
+	    test4_remove(n);
+	  }
+	else
+	  test4_delete(x, i%10);
+      }
+  for (i=0; i<1024; i++)
+    {
+      sprintf(x, "ABC%d", i);
+      n = test4_find(x, i%10);
+      if ((!n) != (i&1) || (n && n->data != i))
+	die("Inconsistency at i=%d", i);
+    }
+  test4_cleanup();
+  puts("OK");
+}
+
+/* TEST 5: integers again, but this time dynamically */
+
+struct node5 {
+  int key;
+  int data;
+};
+
+#define HASH_NODE struct node5
+#define HASH_PREFIX(x) test5_##x
+#define HASH_KEY_ATOMIC key
+#define HASH_ATOMIC_TYPE int
+#define HASH_TABLE_DYNAMIC
+
+struct test5_table;
+
+#define HASH_GIVE_INIT_DATA
+static inline void test5_init_data(struct test5_table *table UNUSED, struct node5 *n)
+{
+  n->data = n->key + 123;
+}
+
+#define HASH_WANT_FIND
+#define HASH_WANT_NEW
+#define HASH_WANT_DELETE
+
+#include <ucw/hashtable.h>
+
+static void test5(void)
+{
+  int i;
+  struct test5_table tab;
+
+  test5_init(&tab);
+  for (i=0; i<1024; i++)
+    {
+      struct node5 *n = test5_new(&tab, i);
+      ASSERT(n->data == i+123);
+    }
+  for (i=1; i<1024; i+=2)
+    test5_delete(&tab, i);
+  for (i=0; i<1024; i++)
+    {
+      struct node5 *n = test5_find(&tab, i);
+      if ((!n) != (i&1) || (n && n->data != i+123))
+	die("Inconsistency at i=%d", i);
+    }
+  i=0;
+  HASH_FOR_ALL_DYNAMIC(test5, &tab, n)
+    i += 1 + n->key;
+  HASH_END_FOR;
+  ASSERT(i == 262144);
+  puts("OK");
+}
+
+int
+main(int argc, char **argv)
+{
+  uint m = ~0U;
+  if (argc > 1)
+    {
+      m = 0;
+      for (int i=1; i<argc; i++)
+	m |= 1 << atol(argv[i]);
+    }
+  if (m & (1 << 1))
+    test1();
+  if (m & (1 << 2))
+    test2();
+  if (m & (1 << 3))
+    test3();
+  if (m & (1 << 4))
+    test4();
+  if (m & (1 << 5))
+    test5();
+  return 0;
+}
diff --git a/libucw/ucw/hash-test.t b/libucw/ucw/hash-test.t
new file mode 100644
index 0000000..ffa6a50
--- /dev/null
+++ b/libucw/ucw/hash-test.t
@@ -0,0 +1,13 @@
+# Tests for the hash table modules
+
+Run:	../obj/ucw/hash-test 1
+Out:	OK
+
+Run:	../obj/ucw/hash-test 2
+Out:	OK
+
+Run:	../obj/ucw/hash-test 3
+Out:	OK
+
+Run:	../obj/ucw/hash-test 4
+Out:	OK
diff --git a/libucw/ucw/hashfunc-test.c b/libucw/ucw/hashfunc-test.c
new file mode 100644
index 0000000..67e613c
--- /dev/null
+++ b/libucw/ucw/hashfunc-test.c
@@ -0,0 +1,132 @@
+/*
+ *	Checking the correctness of str_len() and hash_*() and proving, that
+ *	it is faster than the classical version ;-)
+ */
+
+#include <ucw/hashfunc.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+
+/* It will be divided by (10 + strlen()).  */
+#define TEST_TIME	1000000
+
+/* The shift of the string according to the alignment.  */
+static uint alignment = 0;
+
+static void
+random_string(byte *str, int len)
+{
+	int i;
+	for (i=0; i<len; i++)
+		str[i] = random() % 255 + 1;
+	str[len] = 0;
+}
+
+static uint
+elapsed_time(void)
+{
+	static struct timeval last_tv, tv;
+	uint elapsed;
+	gettimeofday(&tv, NULL);
+	elapsed = (tv.tv_sec - last_tv.tv_sec) * 1000000 + (tv.tv_usec - last_tv.tv_usec);
+	last_tv = tv;
+	return elapsed;
+}
+
+int
+main(int argc, char **argv)
+{
+	byte *strings[] = {
+		"",
+		"a",
+		"aa",
+		"aaa",
+		"aaaa",
+		"aaaaa",
+		"aaaaaa",
+		"aaaaaaa",
+		"aaaaaaaa",
+		"aaaaaaaaa",
+		"aaaaaaaaaa",
+		"AHOJ",
+		"\200aaaa",
+		"\200",
+		"\200\200",
+		"\200\200\200",
+		"\200\200\200\200",
+		"\200\200\200\200\200",
+		"kelapS treboR",
+		"Robert Spalek",
+		"uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu",
+		"********************************",
+		"****************************************************************",
+		NULL
+	};
+	int lengths[] = {
+		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+		11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+		30, 40, 50, 60, 70, 80, 90, 100,
+		200, 300, 400, 500, 600, 700, 800, 900, 1000,
+		2000, 4000, 8000, 16000, 32000, 64000,
+		-1
+	};
+	int i;
+	if (argc > 1)
+		alignment = atoi(argv[1]);
+	printf("Alignment set to %d\n", alignment);
+	for (i=0; strings[i]; i++)
+		if (strlen(strings[i]) != str_len(strings[i]))
+			die("Internal str_len() error on string %d", i);
+	printf("%d strings tested OK\n", i);
+	for (i=0; strings[i]; i++)
+	{
+		uint h1, h2;
+		h1 = hash_string(strings[i]);
+		h2 = hash_string_nocase(strings[i]);
+		if (h1 != hash_block(strings[i], str_len(strings[i])))
+			die("Internal hash_string() error on string %d", i);
+		printf("hash %2d = %08x %08x", i, h1, h2);
+		if (h1 == h2)
+			printf(" upper case?");
+		printf("\n");
+	}
+	for (i=0; lengths[i] >= 0; i++)
+	{
+		byte str[lengths[i] + 1 + alignment];
+		uint count = TEST_TIME / (lengths[i] + 10);
+		uint el1 = 0, el2 = 0, elh = 0, elhn = 0;
+		uint tot1 = 0, tot2 = 0, hash = 0, hashn = 0;
+		uint j;
+		for (j=0; j<count; j++)
+		{
+			random_string(str + alignment, lengths[i]);
+			elapsed_time();
+			/* Avoid "optimizing" by gcc, since the functions are
+			 * attributed PURE.  */
+			tot1 += strlen(str + alignment);
+			el1 += elapsed_time();
+			tot2 += str_len(str + alignment);
+			el2 += elapsed_time();
+			hash ^= hash_string(str + alignment);
+			elh += elapsed_time();
+			hashn ^= hash_string_nocase(str + alignment);
+			elhn += elapsed_time();
+		}
+		if (tot1 != tot2)
+			die("Internal error during test %d", i);
+		printf("Test %d: strlen = %d, passes = %d, classical = %d usec, speedup = %.4f\n",
+			i, lengths[i], count, el1, (el1 + 0.) / el2);
+		printf("\t\t total hash = %08x/%08x, hash time = %d/%d usec\n", hash, hashn, elh, elhn);
+	}
+/*
+	printf("test1: %d\n", hash_modify(10000000, 10000000, 99777555));
+	printf("test1: %d, %d\n", i, hash_modify(i, lengths[i-2], 99777333));
+	printf("test1: %d, %d\n", i, hash_modify(lengths[i-2], i, 99777333));
+	printf("test1: %d,%d,%d->%d\n", i, i*3-2, i*i, hash_modify(4587, i*3-2, i*i));
+	printf("test1: %d\n", hash_modify(lengths[5], 345, i));
+*/
+	return 0;
+}
diff --git a/libucw/ucw/hashfunc.c b/libucw/ucw/hashfunc.c
new file mode 100644
index 0000000..d92b681
--- /dev/null
+++ b/libucw/ucw/hashfunc.c
@@ -0,0 +1,213 @@
+/*
+ *	UCW Library -- Hyper-super-meta-alt-control-shift extra fast
+ *	str_len() and hash_*() routines
+ *
+ *	It is always at least as fast as the classical strlen() routine and for
+ *	strings longer than 100 characters, it is substantially faster.
+ *
+ *	(c) 2002, Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/hashfunc.h>
+#include <ucw/chartype.h>
+
+/* The number of bits the hash in the function hash_*() is rotated by after
+ * every pass.  It should be prime with the word size.  */
+#define	SHIFT_BITS	7
+
+/* A bit-mask which clears higher bytes than a given threshold.  */
+static uint mask_higher_bits[sizeof(uint)];
+
+static void CONSTRUCTOR
+hashfunc_init(void)
+{
+	uint i, j;
+	byte *str;
+	for (i=0; i<sizeof(uint); i++)
+	{
+		str = (byte *) (mask_higher_bits + i);
+		for (j=0; j<i; j++)
+			str[j] = -1;
+		for (j=i; j<sizeof(uint); j++)
+			str[j] = 0;
+	}
+}
+
+static inline uint CONST
+str_len_uint(uint x)
+{
+	const uint sub = ~0U / 0xff;
+	const uint and = sub * 0x80;
+	uint a, i;
+	byte *bytes;
+	a = ~x & (x - sub) & and;
+	/*
+	 * x_2 = x - 0x01010101;
+	 * x_3 = ~x & x_2;
+	 * a = x_3 & 0x80808080;
+	 *
+	 * If all bytes of x are nonzero, then the highest bit of each byte of
+	 * x_2 is lower or equal to the corresponding bit of x.  Hence x_3 has
+	 * all these highest bits cleared (the target bit is set iff the source
+	 * bit has changed from 0 to 1).  If a == 0, then we are sure there is
+	 * no zero byte in x.
+	 */
+	if (!a)
+		return sizeof(uint);
+	bytes = (byte *) &x;
+	for (i=0; i<sizeof(uint) && bytes[i]; i++);
+	return i;
+}
+
+inline uint
+str_len_aligned(const char *str)
+{
+	const uint *u = (const uint *) str;
+	uint len = 0;
+	while (1)
+	{
+		uint l = str_len_uint(*u++);
+		len += l;
+		if (l < sizeof(uint))
+			return len;
+	}
+}
+
+inline uint
+hash_string_aligned(const char *str)
+{
+	const uint *u = (const uint *) str;
+	uint hash = 0;
+	while (1)
+	{
+		uint last_len = str_len_uint(*u);
+		hash = ROL(hash, SHIFT_BITS);
+		if (last_len < sizeof(uint))
+		{
+			uint tmp = *u & mask_higher_bits[last_len];
+			hash ^= tmp;
+			return hash;
+		}
+		hash ^= *u++;
+	}
+}
+
+inline uint
+hash_block_aligned(const byte *buf, uint len)
+{
+	const uint *u = (const uint *) buf;
+	uint hash = 0;
+	while (len >= sizeof(uint))
+	{
+		hash = ROL(hash, SHIFT_BITS) ^ *u++;
+		len -= sizeof(uint);
+	}
+	hash = ROL(hash, SHIFT_BITS) ^ (*u & mask_higher_bits[len]);
+	return hash;
+}
+
+#ifndef	CPU_ALLOW_UNALIGNED
+uint
+str_len(const char *str)
+{
+	uint shift = UNALIGNED_PART(str, uint);
+	if (!shift)
+		return str_len_aligned(str);
+	else
+	{
+		uint i;
+		shift = sizeof(uint) - shift;
+		for (i=0; i<shift; i++)
+			if (!str[i])
+				return i;
+		return shift + str_len_aligned(str + shift);
+	}
+}
+
+uint
+hash_string(const char *str)
+{
+	const byte *s = str;
+	uint shift = UNALIGNED_PART(s, uint);
+	if (!shift)
+		return hash_string_aligned(s);
+	else
+	{
+		uint hash = 0;
+		uint i;
+		for (i=0; ; i++)
+		{
+			uint modulo = i % sizeof(uint);
+			uint shift;
+#ifdef	CPU_LITTLE_ENDIAN
+			shift = modulo;
+#else
+			shift = sizeof(uint) - 1 - modulo;
+#endif
+			if (!modulo)
+				hash = ROL(hash, SHIFT_BITS);
+			if (!s[i])
+				break;
+			hash ^= s[i] << (shift * 8);
+		}
+		return hash;
+	}
+}
+
+uint
+hash_block(const byte *buf, uint len)
+{
+	uint shift = UNALIGNED_PART(buf, uint);
+	if (!shift)
+		return hash_block_aligned(buf, len);
+	else
+	{
+		uint hash = 0;
+		uint i;
+		for (i=0; ; i++)
+		{
+			uint modulo = i % sizeof(uint);
+			uint shift;
+#ifdef	CPU_LITTLE_ENDIAN
+			shift = modulo;
+#else
+			shift = sizeof(uint) - 1 - modulo;
+#endif
+			if (!modulo)
+				hash = ROL(hash, SHIFT_BITS);
+			if (i >= len)
+				break;
+			hash ^= buf[i] << (shift * 8);
+		}
+		return hash;
+	}
+}
+#endif
+
+uint
+hash_string_nocase(const char *str)
+{
+	const byte *s = str;
+	uint hash = 0;
+	uint i;
+	for (i=0; ; i++)
+	{
+		uint modulo = i % sizeof(uint);
+		uint shift;
+#ifdef	CPU_LITTLE_ENDIAN
+		shift = modulo;
+#else
+		shift = sizeof(uint) - 1 - modulo;
+#endif
+		if (!modulo)
+			hash = ROL(hash, SHIFT_BITS);
+		if (!s[i])
+			break;
+		hash ^= Cupcase(s[i]) << (shift * 8);
+	}
+	return hash;
+}
diff --git a/libucw/ucw/hashfunc.h b/libucw/ucw/hashfunc.h
new file mode 100644
index 0000000..8d198e1
--- /dev/null
+++ b/libucw/ucw/hashfunc.h
@@ -0,0 +1,60 @@
+/*
+ *	UCW Library -- Hyper-super-meta-alt-control-shift extra fast
+ *	str_len() and hash_*() routines
+ *
+ *	(c) 2002, Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_HASHFUNC_H
+#define _UCW_HASHFUNC_H
+
+#include <ucw/lib.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define hash_block ucw_hash_block
+#define hash_block_aligned ucw_hash_block_aligned
+#define hash_string ucw_hash_string
+#define hash_string_aligned ucw_hash_string_aligned
+#define hash_string_nocase ucw_hash_string_nocase
+#define str_len ucw_str_len
+#define str_len_aligned ucw_str_len_aligned
+#endif
+
+/*** === String hashes [[strhash]] ***/
+
+/* The following functions need str to be aligned to sizeof(uint).  */
+uint str_len_aligned(const char *str) PURE; /** Get the string length (not a really useful hash function, but there is no better place for it). The string must be aligned to sizeof(uint). For unaligned see @str_len(). **/
+uint hash_string_aligned(const char *str) PURE; /** Hash the string. The string must be aligned to sizeof(uint). For unaligned see @hash_string(). **/
+uint hash_block_aligned(const byte *buf, uint len) PURE; /** Hash arbitrary data. They must be aligned to sizeof(uint). For unaligned see @hash_block(). **/
+
+#ifdef CPU_ALLOW_UNALIGNED
+#undef str_len
+#undef hash_string
+#undef hash_block
+#define	str_len(str)		str_len_aligned(str)
+#define	hash_string(str)	hash_string_aligned(str)
+#define	hash_block(str, len)	hash_block_aligned(str, len)
+#else
+uint str_len(const char *str) PURE; /** Get the string length. If you know it is aligned to sizeof(uint), you can use faster @str_len_aligned(). **/
+uint hash_string(const char *str) PURE; /** Hash the string. If it is aligned to sizeof(uint), you can use faster @hash_string_aligned(). **/
+uint hash_block(const byte *buf, uint len) PURE; /** Hash arbitrary data. If they are aligned to sizeof(uint), use faster @hash_block_aligned(). **/
+#endif
+
+uint hash_string_nocase(const char *str) PURE; /** Hash the string in a case insensitive way. Works only with ASCII characters. **/
+
+/*** === Integer hashes [[inthash]] ***/
+
+/***
+ * We hash integers by multiplying by a reasonably large prime with
+ * few ones in its binary form (to give the compiler the possibility
+ * of using shifts and adds on architectures where multiplication
+ * instructions are slow).
+ */
+static inline uint CONST hash_u32(uint x) { return 0x01008041*x; } /** Hash a 32 bit unsigned integer. **/
+static inline uint CONST hash_u64(u64 x) { return hash_u32((uint)x ^ (uint)(x >> 32)); } /** Hash a 64 bit unsigned integer. **/
+static inline uint CONST hash_pointer(void *x) { return ((sizeof(x) <= 4) ? hash_u32((uint)(uintptr_t)x) : hash_u64((u64)(uintptr_t)x)); } /** Hash a pointer. **/
+
+#endif
diff --git a/libucw/ucw/hashtable.h b/libucw/ucw/hashtable.h
new file mode 100644
index 0000000..2a645a1
--- /dev/null
+++ b/libucw/ucw/hashtable.h
@@ -0,0 +1,786 @@
+/*
+ *	UCW Library -- Universal Hash Table
+ *
+ *	(c) 2002--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2002--2005 Robert Spalek <robert@ucw.cz>
+ *	(c) 2010 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2012 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This is not a normal header file, it's a generator of hash tables.
+ *  Each time you include it with parameters set in the corresponding
+ *  preprocessor macros, it generates a hash table with the parameters
+ *  given.
+ *
+ *  You need to specify:
+ *
+ *  HASH_NODE		data type where a node dwells (usually a struct).
+ *  HASH_PREFIX(x)	macro to add a name prefix (used on all global names
+ *			defined by the hash table generator).
+ *
+ *  Then decide on type of keys:
+ *
+ *  HASH_KEY_ATOMIC=f	use node->f as a key of an atomic type (i.e.,
+ *			a type which can be compared using `==')
+ *			HASH_ATOMIC_TYPE (defaults to int).
+ *  | HASH_KEY_STRING=f	use node->f as a string key, allocated
+ *			separately from the rest of the node.
+ *  | HASH_KEY_ENDSTRING=f use node->f as a string key, allocated
+ *			automatically at the end of the node struct
+ *			(to be declared as "char f[1]" at the end).
+ *  | HASH_KEY_COMPLEX	use a multi-component key; as the name suggests,
+ *			the passing of parameters is a bit complex then.
+ *			The HASH_KEY_COMPLEX(x) macro should expand to
+ *			`x k1, x k2, ... x kn' and you should also define:
+ *    HASH_KEY_DECL	declaration of function parameters in which key
+ *			should be passed to all hash table operations.
+ *			That is, `type1 k1, type2 k2, ... typen kn'.
+ *			With complex keys, HASH_GIVE_HASHFN and HASH_GIVE_EQ
+ *			are mandatory.
+ *  | HASH_KEY_MEMORY=f	use node->f as a raw data key, compared using
+ *			memcmp
+ *    HASH_KEY_SIZE	the length of the key block
+ *
+ *  Then specify what operations you request (all names are automatically
+ *  prefixed by calling HASH_PREFIX):
+ *
+ *  <always defined>	init() -- initialize the hash table.
+ *  HASH_WANT_CLEANUP	cleanup() -- deallocate the hash table.
+ *  HASH_WANT_FIND	node *find(key) -- find first node with the specified
+ *			key, return NULL if no such node exists.
+ *  HASH_WANT_FIND_NEXT	node *find(node *start) -- find next node with the
+ *			specified key, return NULL if no such node exists.
+ *  HASH_WANT_NEW	node *new(key) -- create new node with given key.
+ *			Doesn't check whether it already exists.
+ *  HASH_WANT_LOOKUP	node *lookup(key) -- find node with given key,
+ *			if it doesn't exist, create it. Defining
+ *			HASH_GIVE_INIT_DATA is strongly recommended.
+ *			Use HASH_LOOKUP_DETECT_NEW if you want to know
+ *			whether the node was newly created or not.
+ *  HASH_WANT_DELETE	int delete(key) -- delete and deallocate node
+ *			with given key. Returns success.
+ *  HASH_WANT_REMOVE	remove(node *) -- delete and deallocate given node.
+ *
+ *  You can also supply several functions:
+ *
+ *  HASH_GIVE_HASHFN	uint hash(key) -- calculate hash value of key.
+ *			We have sensible default hash functions for strings
+ *			and integers.
+ *  HASH_GIVE_EQ	int eq(key1, key2) -- return whether keys are equal.
+ *			By default, we use == for atomic types and either
+ *			strcmp or strcasecmp for strings.
+ *  HASH_GIVE_EXTRA_SIZE int extra_size(key) -- returns how many bytes after the
+ *			node should be allocated for dynamic data. Default=0
+ *			or length of the string with HASH_KEY_ENDSTRING.
+ *  HASH_GIVE_INIT_KEY	void init_key(node *,key) -- initialize key in a newly
+ *			created node. Defaults: assignment for atomic keys
+ *			and static strings, strcpy for end-allocated strings.
+ *  HASH_GIVE_INIT_DATA	void init_data(node *) -- initialize data fields in a
+ *			newly created node. Very useful for lookup operations.
+ *  HASH_GIVE_ALLOC	void *alloc(uint size) -- allocate space for
+ *			a node. Default is xmalloc() or pooled allocation, depending
+ *			on HASH_USE_POOL, HASH_AUTO_POOL, HASH_USE_ELTPOOL
+ *			and HASH_AUTO_ELTPOOL switches.	void free(void *) -- the converse.
+ *  HASH_GIVE_TABLE_ALLOC void *table_alloc(uint size), void *table_free(void *)
+ *			Allocate or free space for the table itself. Default is xmalloc()
+ *			or the functions defined by HASH_GIVE_ALLOC if HASH_TABLE_ALLOC is set.
+ *
+ *  ... and a couple of extra parameters:
+ *
+ *  HASH_NOCASE		String comparisons should be case-insensitive.
+ *  HASH_DEFAULT_SIZE=n	Initially, use hash table of approx. `n' entries.
+ *  HASH_CONSERVE_SPACE	Use as little space as possible.
+ *  HASH_FN_BITS=n	The hash function gives only `n' significant bits.
+ *  HASH_ATOMIC_TYPE=t	Atomic values are of type `t' instead of int.
+ *  HASH_USE_POOL=pool	Allocate all nodes from given mempool. Note, however, that
+ *			deallocation is not supported by mempools, so delete/remove
+ *			will leak pool memory.
+ *  HASH_AUTO_POOL=size	Create a pool of the given block size automatically.
+ *  HASH_USE_ELTPOOL=pool Allocate all nodes from given eltpool.
+ *  HASH_AUTO_ELTPOOL=count Create an eltpool of the given number of elements in each chunk.
+ *  HASH_ZERO_FILL	New entries should be initialized to all zeroes.
+ *  HASH_TABLE_ALLOC	The hash table itself will be allocated and freed using
+ *			the same allocation functions as the nodes instead of
+ *			the default xmalloc().
+ *  HASH_TABLE_GROWING	Never decrease the size of the hash table itself
+ *  HASH_TABLE_DYNAMIC	Support multiple hash tables; the first parameter of all
+ *			hash table operations is struct HASH_PREFIX(table) *.
+ *  HASH_TABLE_VARS	Extra variables to be defined in table structure
+ *  HASH_LOOKUP_DETECT_NEW
+ *			the prototype for lookup is changed to node *lookup(key, int *new_item)
+ *			new_item must not be NULL and returns 1 whether lookup
+ *			just created a new item in the hashtable or 0 otherwise.
+ *
+ *  You also get a iterator macro at no extra charge:
+ *
+ *  HASH_FOR_ALL(hash_prefix, variable)
+ *    {
+ *      // node *variable gets declared automatically
+ *      do_something_with_node(variable);
+ *      // use HASH_BREAK and HASH_CONTINUE instead of break and continue
+ *	// you must not alter contents of the hash table here
+ *    }
+ *  HASH_END_FOR;
+ *
+ *  (For dynamic tables, use HASH_FOR_ALL_DYNAMIC(hash_prefix, hash_table, variable) instead.)
+ *
+ *  Then include <ucw/hashtable.h> and voila, you have a hash table
+ *  suiting all your needs (at least those which you've revealed :) ).
+ *
+ *  After including this file, all parameter macros are automatically
+ *  undef'd.
+ */
+
+#ifndef _UCW_HASHFUNC_H
+#include <ucw/hashfunc.h>
+#endif
+
+#include <ucw/prime.h>
+
+#include <string.h>
+
+/* Initial setup of parameters */
+
+#if !defined(HASH_NODE) || !defined(HASH_PREFIX)
+#error Some of the mandatory configuration macros are missing.
+#endif
+
+#if defined(HASH_KEY_ATOMIC) && !defined(HASH_CONSERVE_SPACE)
+#define HASH_CONSERVE_SPACE
+#endif
+
+#define P(x) HASH_PREFIX(x)
+
+/* Declare buckets and the hash table */
+
+typedef HASH_NODE P(node);
+
+typedef struct P(bucket) {
+  struct P(bucket) *next;
+#ifndef HASH_CONSERVE_SPACE
+  uint hash;
+#endif
+  P(node) n;
+} P(bucket);
+
+struct P(table) {
+#ifdef HASH_TABLE_VARS
+  HASH_TABLE_VARS
+#endif
+  uint hash_size;
+  uint hash_count, hash_max, hash_min, hash_hard_max;
+  P(bucket) **ht;
+#ifdef HASH_AUTO_POOL
+  struct mempool *pool;
+#endif
+#ifdef HASH_AUTO_ELTPOOL
+  struct eltpool *eltpool;
+#endif
+};
+
+#ifdef HASH_TABLE_DYNAMIC
+#define T (*table)
+#define TA struct P(table) *table
+#define TAC TA,
+#define TAU TA UNUSED
+#define TAUC TA UNUSED,
+#define TT table
+#define TTC table,
+#else
+struct P(table) P(table);
+#define T P(table)
+#define TA void
+#define TAC
+#define TAU void
+#define TAUC
+#define TT
+#define TTC
+#endif
+
+/* Preset parameters */
+
+#if defined(HASH_KEY_ATOMIC)
+
+#define HASH_KEY(x) x HASH_KEY_ATOMIC
+
+#ifndef HASH_ATOMIC_TYPE
+#  define HASH_ATOMIC_TYPE int
+#endif
+#define HASH_KEY_DECL HASH_ATOMIC_TYPE HASH_KEY( )
+
+#ifndef HASH_GIVE_HASHFN
+#  define HASH_GIVE_HASHFN
+   static inline int P(hash) (TAUC HASH_ATOMIC_TYPE x)
+   { return ((sizeof(x) <= 4) ? hash_u32(x) : hash_u64(x)); }
+#endif
+
+#ifndef HASH_GIVE_EQ
+#  define HASH_GIVE_EQ
+   static inline int P(eq) (TAUC HASH_ATOMIC_TYPE x, HASH_ATOMIC_TYPE y)
+   { return x == y; }
+#endif
+
+#ifndef HASH_GIVE_INIT_KEY
+#  define HASH_GIVE_INIT_KEY
+   static inline void P(init_key) (TAUC P(node) *n, HASH_ATOMIC_TYPE k)
+   { HASH_KEY(n->) = k; }
+#endif
+
+#elif defined(HASH_KEY_MEMORY)
+
+#define HASH_KEY(x) x HASH_KEY_MEMORY
+
+#define HASH_KEY_DECL byte HASH_KEY( )[HASH_KEY_SIZE]
+
+#ifndef HASH_GIVE_HASHFN
+#  define HASH_GIVE_HASHFN
+   static inline int P(hash) (TAUC byte *x)
+   { return hash_block(x, HASH_KEY_SIZE); }
+#endif
+
+#ifndef HASH_GIVE_EQ
+#  define HASH_GIVE_EQ
+   static inline int P(eq) (TAUC byte *x, byte *y)
+   { return !memcmp(x, y, HASH_KEY_SIZE); }
+#endif
+
+#ifndef HASH_GIVE_INIT_KEY
+#  define HASH_GIVE_INIT_KEY
+   static inline void P(init_key) (TAUC P(node) *n, byte *k)
+   { memcpy(HASH_KEY(n->), k, HASH_KEY_SIZE); }
+#endif
+
+#elif defined(HASH_KEY_STRING) || defined(HASH_KEY_ENDSTRING)
+
+#ifdef HASH_KEY_STRING
+#  define HASH_KEY(x) x HASH_KEY_STRING
+#  ifndef HASH_GIVE_INIT_KEY
+#    define HASH_GIVE_INIT_KEY
+     static inline void P(init_key) (TAUC P(node) *n, char *k)
+     { HASH_KEY(n->) = k; }
+#  endif
+#else
+#  define HASH_KEY(x) x HASH_KEY_ENDSTRING
+#  define HASH_GIVE_EXTRA_SIZE
+   static inline int P(extra_size) (TAUC char *k)
+   { return strlen(k); }
+#  ifndef HASH_GIVE_INIT_KEY
+#    define HASH_GIVE_INIT_KEY
+     static inline void P(init_key) (TAUC P(node) *n, char *k)
+     { strcpy(HASH_KEY(n->), k); }
+#  endif
+#endif
+#define HASH_KEY_DECL char *HASH_KEY( )
+
+#ifndef HASH_GIVE_HASHFN
+#define HASH_GIVE_HASHFN
+  static inline uint P(hash) (TAUC char *k)
+   {
+#    ifdef HASH_NOCASE
+       return hash_string_nocase(k);
+#    else
+       return hash_string(k);
+#    endif
+   }
+#endif
+
+#ifndef HASH_GIVE_EQ
+#  define HASH_GIVE_EQ
+   static inline int P(eq) (TAUC char *x, char *y)
+   {
+#    ifdef HASH_NOCASE
+       return !strcasecmp(x,y);
+#    else
+       return !strcmp(x,y);
+#    endif
+   }
+#endif
+
+#elif defined(HASH_KEY_COMPLEX)
+
+#define HASH_KEY(x) HASH_KEY_COMPLEX(x)
+
+#else
+#error You forgot to set the hash key type.
+#endif
+
+/* Defaults for missing parameters */
+
+#ifndef HASH_GIVE_HASHFN
+#error Unable to determine which hash function to use.
+#endif
+
+#ifndef HASH_GIVE_EQ
+#error Unable to determine how to compare two keys.
+#endif
+
+#ifdef HASH_GIVE_EXTRA_SIZE
+/* This trickery is needed to avoid `unused parameter' warnings */
+#define HASH_EXTRA_SIZE(x) P(extra_size)(TTC x)
+#else
+/*
+ *  Beware, C macros are expanded iteratively, not recursively,
+ *  hence we get only a _single_ argument, although the expansion
+ *  of HASH_KEY contains commas.
+ */
+#define HASH_EXTRA_SIZE(x) 0
+#endif
+
+#ifndef HASH_GIVE_INIT_KEY
+#error Unable to determine how to initialize keys.
+#endif
+
+#ifndef HASH_GIVE_INIT_DATA
+static inline void P(init_data) (TAUC P(node) *n UNUSED)
+{
+}
+#endif
+
+#ifdef HASH_GIVE_ALLOC
+/* If the caller has requested to use his own allocation functions, do so */
+static inline void P(init_alloc) (TAU) { }
+static inline void P(cleanup_alloc) (TAU) { }
+
+#elif defined(HASH_USE_POOL)
+/* If the caller has requested to use his mempool, do so */
+#include <ucw/mempool.h>
+static inline void * P(alloc) (TAUC uint size) { return mp_alloc_fast(HASH_USE_POOL, size); }
+static inline void P(free) (TAUC void *x UNUSED) { }
+static inline void P(init_alloc) (TAU) { }
+static inline void P(cleanup_alloc) (TAU) { }
+
+#elif defined(HASH_AUTO_POOL)
+/* Use our own pools */
+#include <ucw/mempool.h>
+static inline void * P(alloc) (TAUC uint size) { return mp_alloc_fast(T.pool, size); }
+static inline void P(free) (TAUC void *x UNUSED) { }
+static inline void P(init_alloc) (TAU) { T.pool = mp_new(HASH_AUTO_POOL); }
+static inline void P(cleanup_alloc) (TAU) { mp_delete(T.pool); }
+#define HASH_USE_POOL
+
+#elif defined(HASH_USE_ELTPOOL)
+/* If the caller has requested to use his eltpool, do so */
+#include <ucw/eltpool.h>
+static inline void * P(alloc) (TAUC uint size UNUSED) { ASSERT(size <= (HASH_USE_ELTPOOL)->elt_size); return ep_alloc(HASH_USE_ELTPOOL); }
+static inline void P(free) (TAUC void *x) { ep_free(HASH_USE_ELTPOOL, x); }
+static inline void P(init_alloc) (TAU) { }
+static inline void P(cleanup_alloc) (TAU) { }
+
+#elif defined(HASH_AUTO_ELTPOOL)
+/* Use our own eltpools */
+#include <ucw/eltpool.h>
+static inline void * P(alloc) (TAUC uint size UNUSED) { return ep_alloc(T.eltpool); }
+static inline void P(free) (TAUC void *x) { ep_free(T.eltpool, x); }
+static inline void P(init_alloc) (TAU) { T.eltpool = ep_new(sizeof(P(bucket)), HASH_AUTO_ELTPOOL); }
+static inline void P(cleanup_alloc) (TAU) { ep_delete(T.eltpool); }
+#define HASH_USE_ELTPOOL
+
+#else
+/* The default allocation method */
+static inline void * P(alloc) (TAUC uint size) { return xmalloc(size); }
+static inline void P(free) (TAUC void *x) { xfree(x); }
+static inline void P(init_alloc) (TAU) { }
+static inline void P(cleanup_alloc) (TAU) { }
+
+#endif
+
+#if defined(HASH_USE_ELTPOOL) && defined(HASH_GIVE_EXTRA_SIZE)
+#error Eltpools not supported in combination with variable-sized nodes
+#endif
+
+#ifdef HASH_GIVE_TABLE_ALLOC
+/* If the caller has requested to use his own allocation functions, do so */
+#elif defined(HASH_TABLE_ALLOC)
+#ifdef HASH_USE_ELTPOOL
+#error HASH_TABLE_ALLOC not supported in combination with eltpools
+#endif
+static inline void * P(table_alloc) (TAUC uint size) { return P(alloc)(TTC size); }
+static inline void P(table_free) (TAUC void *x) { P(free)(TTC x); }
+#else
+static inline void * P(table_alloc) (TAUC uint size) { return xmalloc(size); }
+static inline void P(table_free) (TAUC void *x) { xfree(x); }
+#endif
+
+#if defined(HASH_USE_POOL) && defined(HASH_TABLE_ALLOC) && !defined(HASH_TABLE_GROWING)
+#define HASH_TABLE_GROWING
+#endif
+
+#ifndef HASH_DEFAULT_SIZE
+#define HASH_DEFAULT_SIZE 32
+#endif
+
+#ifndef HASH_FN_BITS
+#define HASH_FN_BITS 32
+#endif
+
+#ifdef HASH_ZERO_FILL
+static inline void * P(new_bucket)(TAUC uint size)
+{
+  byte *buck = P(alloc)(TTC size);
+  bzero(buck, size);
+  return buck;
+}
+#else
+static inline void * P(new_bucket)(TAUC uint size) { return P(alloc)(TTC size); }
+#endif
+
+/* Now the operations */
+
+static void P(alloc_table) (TAU)
+{
+  T.hash_size = next_table_prime(T.hash_size);
+  T.ht = P(table_alloc)(TTC sizeof(void *) * T.hash_size);
+  bzero(T.ht, sizeof(void *) * T.hash_size);
+  if (2*T.hash_size < T.hash_hard_max)
+    T.hash_max = 2*T.hash_size;
+  else
+    T.hash_max = ~0U;
+#ifndef HASH_TABLE_GROWING
+  if (T.hash_size/2 > HASH_DEFAULT_SIZE)
+    T.hash_min = T.hash_size/4;
+  else
+#endif
+    T.hash_min = 0;
+}
+
+/**
+ * Initializes the hash table.
+ * This one is available no matter what `HASH_WANT_` macros you defined or not.
+ **/
+static void HASH_PREFIX(init)(TA)
+{
+  T.hash_count = 0;
+  T.hash_size = HASH_DEFAULT_SIZE;
+#if HASH_FN_BITS < 28
+  T.hash_hard_max = 1 << HASH_FN_BITS;
+#else
+  T.hash_hard_max = 1 << 28;
+#endif
+  P(init_alloc)(TT);
+  P(alloc_table)(TT);
+}
+
+#ifdef HASH_WANT_CLEANUP
+/**
+ * Deallocates the hash table, including the nodes.
+ * It is available if you defined <<want_cleanup,`HASH_WANT_CLEANUP`>>.
+ **/
+static void HASH_PREFIX(cleanup)(TA)
+{
+#ifndef HASH_USE_POOL
+  uint i;
+  P(bucket) *b, *bb;
+
+  for (i=0; i<T.hash_size; i++)
+    for (b=T.ht[i]; b; b=bb)
+      {
+	bb = b->next;
+	P(free)(TTC b);
+      }
+#endif
+  P(cleanup_alloc)(TT);
+  P(table_free)(TTC T.ht);
+}
+#endif
+
+static inline uint P(bucket_hash) (TAUC P(bucket) *b)
+{
+#ifdef HASH_CONSERVE_SPACE
+  return P(hash)(TTC HASH_KEY(b->n.));
+#else
+  return b->hash;
+#endif
+}
+
+static void P(rehash) (TAC uint size)
+{
+  P(bucket) *b, *nb;
+  P(bucket) **oldt = T.ht, **newt;
+  uint oldsize = T.hash_size;
+  uint i, h;
+
+  DBG("Rehashing %d->%d at count %d", oldsize, size, T.hash_count);
+  T.hash_size = size;
+  P(alloc_table)(TT);
+  newt = T.ht;
+  for (i=0; i<oldsize; i++)
+    {
+      b = oldt[i];
+      while (b)
+	{
+	  nb = b->next;
+	  h = P(bucket_hash)(TTC b) % T.hash_size;
+	  b->next = newt[h];
+	  newt[h] = b;
+	  b = nb;
+	}
+    }
+  P(table_free)(TTC oldt);
+}
+
+#ifdef HASH_WANT_FIND
+/**
+ * Finds a node with given key (specified in the @HAS_KEY_DECL parameter).
+ * If it does not exist, NULL is returned.
+ *
+ * Enabled by the <<want_find,`HASH_WANT_FIND`>> macro.
+ **/
+static HASH_NODE* HASH_PREFIX(find)(TAC HASH_KEY_DECL)
+{
+  uint h0 = P(hash) (TTC HASH_KEY( ));
+  uint h = h0 % T.hash_size;
+  P(bucket) *b;
+
+  for (b=T.ht[h]; b; b=b->next)
+    {
+      if (
+#ifndef HASH_CONSERVE_SPACE
+	  b->hash == h0 &&
+#endif
+	  P(eq)(TTC HASH_KEY( ), HASH_KEY(b->n.)))
+	return &b->n;
+    }
+  return NULL;
+}
+#endif
+
+#ifdef HASH_WANT_FIND_NEXT
+/**
+ * Finds next node with the same key. Returns NULL if it does not exist.
+ *
+ * Enabled by the <<want_find_next,`HASH_WANT_FIND_NEXT`>> macro.
+ **/
+static HASH_NODE* HASH_PREFIX(find_next)(TAC P(node) *start)
+{
+#ifndef HASH_CONSERVE_SPACE
+  uint h0 = P(hash) (TTC HASH_KEY(start->));
+#endif
+  P(bucket) *b = SKIP_BACK(P(bucket), n, start);
+
+  for (b=b->next; b; b=b->next)
+    {
+      if (
+#ifndef HASH_CONSERVE_SPACE
+	  b->hash == h0 &&
+#endif
+	  P(eq)(TTC HASH_KEY(start->), HASH_KEY(b->n.)))
+	return &b->n;
+    }
+  return NULL;
+}
+#endif
+
+#ifdef HASH_WANT_NEW
+/**
+ * Generates a new node with a given key.
+ *
+ * Enabled by the <<want_new,`HASH_WANT_NEW`>> macro.
+ **/
+static HASH_NODE * HASH_PREFIX(new)(TAC HASH_KEY_DECL)
+{
+  uint h0, h;
+  P(bucket) *b;
+
+  h0 = P(hash) (TTC HASH_KEY( ));
+  h = h0 % T.hash_size;
+  b = P(new_bucket) (TTC sizeof(struct P(bucket)) + HASH_EXTRA_SIZE(HASH_KEY( )));
+  b->next = T.ht[h];
+  T.ht[h] = b;
+#ifndef HASH_CONSERVE_SPACE
+  b->hash = h0;
+#endif
+  P(init_key)(TTC &b->n, HASH_KEY( ));
+  P(init_data)(TTC &b->n);
+  if (T.hash_count++ >= T.hash_max)
+    P(rehash)(TTC 2*T.hash_size);
+  return &b->n;
+}
+#endif
+
+#ifdef HASH_WANT_LOOKUP
+#ifdef HASH_LOOKUP_DETECT_NEW
+/**
+ * Finds a node with a given key. If it does not exist, a new one is created.
+ * It is strongly recommended to use <<give_init_data,`HASH_GIVE_INIT_DATA`>>.
+ *
+ * This one is enabled by the <<want_lookup,`HASH_WANT_LOOKUP`>> macro.
+ * The @new_item argument is available only if <<lookup_detect_new,`HASH_LOOKUP_DETECT_NEW`>> was given.
+ **/
+static HASH_NODE* HASH_PREFIX(lookup)(TAC HASH_KEY_DECL, int *new_item)
+#else
+static HASH_NODE* HASH_PREFIX(lookup)(TAC HASH_KEY_DECL)
+#endif
+{
+  uint h0 = P(hash) (TTC HASH_KEY( ));
+  uint h = h0 % T.hash_size;
+  P(bucket) *b;
+
+  for (b=T.ht[h]; b; b=b->next)
+    {
+      if (
+#ifndef HASH_CONSERVE_SPACE
+	  b->hash == h0 &&
+#endif
+	  P(eq)(TTC HASH_KEY( ), HASH_KEY(b->n.))) {
+#ifdef HASH_LOOKUP_DETECT_NEW
+	*new_item = 0;
+#endif
+	return &b->n;
+      }
+    }
+
+  b = P(new_bucket) (TTC sizeof(struct P(bucket)) + HASH_EXTRA_SIZE(HASH_KEY( )));
+  b->next = T.ht[h];
+  T.ht[h] = b;
+#ifndef HASH_CONSERVE_SPACE
+  b->hash = h0;
+#endif
+  P(init_key)(TTC &b->n, HASH_KEY( ));
+  P(init_data)(TTC &b->n);
+  if (T.hash_count++ >= T.hash_max)
+    P(rehash)(TTC 2*T.hash_size);
+#ifdef HASH_LOOKUP_DETECT_NEW
+  *new_item = 1;
+#endif
+  return &b->n;
+}
+#endif
+
+#ifdef HASH_WANT_DELETE
+/**
+ * Removes a node with the given key from hash table and deallocates it.
+ *
+ * Success is returned.
+ *
+ * This one is enabled by <<want_delete,`HASH_WANT_DELETE`>> macro.
+ **/
+static int HASH_PREFIX(delete)(TAC HASH_KEY_DECL)
+{
+  uint h0 = P(hash) (TTC HASH_KEY( ));
+  uint h = h0 % T.hash_size;
+  P(bucket) *b, **bb;
+
+  for (bb=&T.ht[h]; b=*bb; bb=&b->next)
+    {
+      if (
+#ifndef HASH_CONSERVE_SPACE
+	  b->hash == h0 &&
+#endif
+	  P(eq)(TTC HASH_KEY( ), HASH_KEY(b->n.)))
+	{
+	  *bb = b->next;
+	  P(free)(TTC b);
+	  T.hash_count--;
+#ifndef HASH_TABLE_GROWING
+	  if (T.hash_count < T.hash_min)
+	    P(rehash)(TTC T.hash_size/2);
+#endif
+	  return 1;
+	}
+    }
+  return 0;
+}
+#endif
+
+#ifdef HASH_WANT_REMOVE
+/**
+ * Removes a given node and deallocates it.
+ * It differs from <<fun__GENERIC_LINK|HASH_PREFIX|delete,`HASH_PREFIX(delete)()`>>
+ * in its type of parameter -- this one deletes a specific node, that one looks for it by a key.
+ *
+ * Enabled by <<want_remove,`HASH_WANT_REMOVE`>> macro.
+ **/
+static void HASH_PREFIX(remove)(TAC HASH_NODE *n)
+{
+  P(bucket) *x = SKIP_BACK(struct P(bucket), n, n);
+  uint h0 = P(bucket_hash)(TTC x);
+  uint h = h0 % T.hash_size;
+  P(bucket) *b, **bb;
+
+  for (bb=&T.ht[h]; (b=*bb) && b != x; bb=&b->next)
+    ;
+  ASSERT(b);
+  *bb = b->next;
+  P(free)(TTC b);
+  T.hash_count--;
+#ifndef HASH_TABLE_GROWING
+  if (T.hash_count < T.hash_min)
+    P(rehash)(TTC T.hash_size/2);
+#endif
+}
+#endif
+
+/* And the iterator */
+
+#ifndef HASH_FOR_ALL
+
+#define HASH_FOR_ALL_DYNAMIC(h_px, h_table, h_var)					\
+do {											\
+  uint h_slot;										\
+  struct GLUE_(h_px,bucket) *h_buck;							\
+  for (h_slot=0; h_slot < (h_table)->hash_size; h_slot++)				\
+    for (h_buck = (h_table)->ht[h_slot]; h_buck; h_buck = h_buck->next)			\
+      {											\
+	GLUE_(h_px,node) *h_var = &h_buck->n;
+#define HASH_FOR_ALL(h_px, h_var) HASH_FOR_ALL_DYNAMIC(h_px, &GLUE_(h_px,table), h_var)
+#define HASH_END_FOR } } while(0)
+#define HASH_BREAK
+#define HASH_CONTINUE continue
+
+#endif
+
+/* Finally, undefine all the parameters */
+
+#undef P
+#undef T
+#undef TA
+#undef TAC
+#undef TAU
+#undef TAUC
+#undef TT
+#undef TTC
+
+#undef HASH_ATOMIC_TYPE
+#undef HASH_CONSERVE_SPACE
+#undef HASH_DEFAULT_SIZE
+#undef HASH_EXTRA_SIZE
+#undef HASH_FN_BITS
+#undef HASH_GIVE_ALLOC
+#undef HASH_GIVE_TABLE_ALLOC
+#undef HASH_GIVE_EQ
+#undef HASH_GIVE_EXTRA_SIZE
+#undef HASH_GIVE_HASHFN
+#undef HASH_GIVE_INIT_DATA
+#undef HASH_GIVE_INIT_KEY
+#undef HASH_KEY
+#undef HASH_KEY_ATOMIC
+#undef HASH_KEY_COMPLEX
+#undef HASH_KEY_DECL
+#undef HASH_KEY_ENDSTRING
+#undef HASH_KEY_STRING
+#undef HASH_KEY_MEMORY
+#undef HASH_KEY_SIZE
+#undef HASH_NOCASE
+#undef HASH_NODE
+#undef HASH_PREFIX
+#undef HASH_USE_POOL
+#undef HASH_AUTO_POOL
+#undef HASH_USE_ELTPOOL
+#undef HASH_AUTO_ELTPOOL
+#undef HASH_WANT_CLEANUP
+#undef HASH_WANT_DELETE
+#undef HASH_WANT_FIND
+#undef HASH_WANT_FIND_NEXT
+#undef HASH_WANT_LOOKUP
+#undef HASH_WANT_NEW
+#undef HASH_WANT_REMOVE
+#undef HASH_TABLE_ALLOC
+#undef HASH_TABLE_GROWING
+#undef HASH_TABLE_DYNAMIC
+#undef HASH_TABLE_VARS
+#undef HASH_ZERO_FILL
+#undef HASH_LOOKUP_DETECT_NEW
diff --git a/libucw/ucw/heap.h b/libucw/ucw/heap.h
new file mode 100644
index 0000000..74fedae
--- /dev/null
+++ b/libucw/ucw/heap.h
@@ -0,0 +1,207 @@
+/*
+ *	UCW Library -- Universal Heap Macros
+ *
+ *	(c) 2001--2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2005--2012 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/***
+ * [[intro]]
+ * Introduction
+ * ------------
+ *
+ * Binary heap is a simple data structure, which for example supports efficient insertions, deletions
+ * and access to the minimal inserted item. We define several macros for such operations.
+ * Note that because of simplicity of heaps, we have decided to define direct macros instead
+ * of a <<generic:,macro generator>> as for several other data structures in the Libucw.
+ *
+ * A heap is represented by a number of elements and by an array of values. Beware that we
+ * index this array from one, not from zero as do the standard C arrays.
+ *
+ * Most macros use these parameters:
+ *
+ * - @type - the type of elements
+ * - @num - a variable (signed or unsigned integer) with the number of elements
+ * - @heap - a C array of type @type; the heap is stored in `heap[1] .. heap[num]`; `heap[0]` is unused
+ * - @less - a callback to compare two element values; `less(x, y)` shall return a non-zero value iff @x is lower than @y
+ * - @swap - a callback to swap two array elements; `swap(heap, i, j, t)` must swap `heap[i]` with `heap[j]` with possible help of temporary variable @t (type @type).
+ *
+ * A valid heap must follow these rules:
+ *
+ * - `num >= 0`
+ * - `heap[i] >= heap[i / 2]` for each `i` in `[2, num]`
+ *
+ * The first element `heap[1]` is always lower or equal to all other elements.
+ *
+ * Position tracking
+ * -----------------
+ *
+ * As a heap does not support efficient lookup of an element by value, all functions
+ * acting on existing heap elements need to obtain the position of the element in the
+ * heap. This position has to be tracked by the caller, usually in the supplied swap
+ * callback.
+ *
+ * However, there are some caveats noted in the descriptions of individual functions.
+ *
+ * [[macros]]
+ * Macros
+ * ------
+ ***/
+
+/* For internal use. */
+#define HEAP_BUBBLE_DOWN_J(heap,num,less,swap)						\
+  for (;;)										\
+    {											\
+      _l = 2*_j;									\
+      if (_l > num)									\
+	break;										\
+      if (less(heap[_j],heap[_l]) && (_l == num || less(heap[_j],heap[_l+1])))		\
+	break;										\
+      if (_l != num && less(heap[_l+1],heap[_l]))					\
+	_l++;										\
+      swap(heap,_j,_l,x);								\
+      _j = _l;										\
+    }
+
+/* For internal use. */
+#define HEAP_BUBBLE_UP_J(heap,num,less,swap)						\
+  while (_j > 1)									\
+    {											\
+      _u = _j/2;									\
+      if (less(heap[_u], heap[_j]))							\
+	break;										\
+      swap(heap,_u,_j,x);								\
+      _j = _u;										\
+    }
+
+/**
+ * Shuffle the items `heap[1]`, ..., `heap[num]` to get a valid heap.
+ * This operation takes linear time.
+ *
+ * Position tracking: Position of `heap[i]` must be initialized to `i` before calling.
+ **/
+#define HEAP_INIT(type,heap,num,less,swap)						\
+  do {											\
+    uint _i = num;									\
+    uint _j, _l;										\
+    type x;										\
+    while (_i >= 1)									\
+      {											\
+	_j = _i;									\
+        HEAP_BUBBLE_DOWN_J(heap,num,less,swap)						\
+	_i--;										\
+      }											\
+  } while(0)
+
+/**
+ * Delete the minimum element `heap[1]` in `O(log(n))` time. The @num variable is decremented.
+ * The removed value is moved just after the resulting heap (`heap[num + 1]`).
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_DELETE_MIN(type,heap,num,less,swap)					\
+  do {											\
+    uint _j, _l;										\
+    type x;										\
+    swap(heap,1,num,x);									\
+    num--;										\
+    _j = 1;										\
+    HEAP_BUBBLE_DOWN_J(heap,num,less,swap);						\
+  } while(0)
+
+/**
+ * Insert a new element @elt to the heap. The @num variable is incremented.
+ * This operation takes `O(log(n))` time.
+ *
+ * Position tracking: The position of the new element must be initialized to @num+1
+ * before calling this macro.
+ **/
+#define HEAP_INSERT(type,heap,num,less,swap,elt)					\
+  do {											\
+    uint _j, _u;										\
+    type x;										\
+    heap[++num] = elt;									\
+    _j = num;										\
+    HEAP_BUBBLE_UP_J(heap,num,less,swap);						\
+  } while(0)
+
+/**
+ * Increase `heap[pos]` to a new value @elt (greater or equal to the previous value).
+ * The time complexity is `O(log(n))`.
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_INCREASE(type,heap,num,less,swap,pos,elt)					\
+  do {											\
+    uint _j, _l;										\
+    type x;										\
+    heap[pos] = elt;									\
+    _j = pos;										\
+    HEAP_BUBBLE_DOWN_J(heap,num,less,swap);						\
+  } while(0)
+
+/**
+ * Decrease `heap[pos]` to a new value @elt (less or equal to the previous value).
+ * The time complexity is `O(log(n))`.
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_DECREASE(type,heap,num,less,swap,pos,elt)					\
+  do {											\
+    uint _j, _u;										\
+    type x;										\
+    heap[pos] = elt;									\
+    _j = pos;										\
+    HEAP_BUBBLE_UP_J(heap,num,less,swap);						\
+  } while(0)
+
+/**
+ * Change `heap[pos]` to a new value @elt. The time complexity is `O(log(n))`.
+ * If you know that the new value is always smaller or always greater, it is faster
+ * to use `HEAP_DECREASE` or `HEAP_INCREASE` respectively.
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_REPLACE(type,heap,num,less,swap,pos,elt)					\
+  do {											\
+    type _elt = elt;									\
+    if (less(heap[pos], _elt))								\
+      HEAP_INCREASE(type,heap,num,less,swap,pos,_elt);					\
+    else										\
+      HEAP_DECREASE(type,heap,num,less,swap,pos,_elt);					\
+  } while(0)
+
+/**
+ * Replace the minimum `heap[pos]` by a new value @elt. The time complexity is `O(log(n))`.
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_REPLACE_MIN(type,heap,num,less,swap,elt)					\
+  HEAP_INCREASE(type,heap,num,less,swap,1,elt)
+
+/**
+ * Delete an arbitrary element, given by its position. The @num variable is decremented.
+ * The operation takes `O(log(n))` time.
+ *
+ * Position tracking: Fully automatic.
+ **/
+#define HEAP_DELETE(type,heap,num,less,swap,pos)					\
+  do {											\
+    uint _j, _l, _u;									\
+    type x;										\
+    _j = pos;										\
+    swap(heap,_j,num,x);								\
+    num--;										\
+    if (less(heap[_j], heap[num+1]))							\
+      HEAP_BUBBLE_UP_J(heap,num,less,swap)						\
+    else										\
+      HEAP_BUBBLE_DOWN_J(heap,num,less,swap);						\
+  } while(0)
+
+/**
+ * Default swapping macro.
+ **/
+#define HEAP_SWAP(heap,a,b,t) (t=heap[a], heap[a]=heap[b], heap[b]=t)
diff --git a/libucw/ucw/io-careful.c b/libucw/ucw/io-careful.c
new file mode 100644
index 0000000..1bbb879
--- /dev/null
+++ b/libucw/ucw/io-careful.c
@@ -0,0 +1,62 @@
+/*
+ *	UCW Library -- Careful Read/Write
+ *
+ *	(c) 2004--2012 Martin Mares <mj@ucw.cz>
+ *	(c) 2020 Jan Filip Chadima <jfch@jagda.eu>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/io.h>
+
+#include <errno.h>
+#include <unistd.h>
+
+/*
+ *  Reads and writes on sockets and pipes can return partial results,
+ *  so we implement an iterated read/write call.
+ */
+
+int
+careful_read(int fd, void *buf, size_t len)
+{
+  byte *pos = buf;
+  while (len)
+    {
+      ssize_t l = read(fd, pos, len);
+      if (l < 0)
+	{
+	  if (errno == EINTR)
+	    continue;
+	  return -1;
+	}
+      if (!l)
+	return 0;
+      pos += l;
+      len -= l;
+    }
+  return 1;
+}
+
+int
+careful_write(int fd, const void *buf, size_t len)
+{
+  const byte *pos = buf;
+  while (len)
+    {
+      ssize_t l = write(fd, pos, len);
+      if (l < 0)
+	{
+	  if (errno == EINTR)
+	    continue;
+	  return -1;
+	}
+      if (!l)
+	return 0;
+      pos += l;
+      len -= l;
+    }
+  return 1;
+}
diff --git a/libucw/ucw/io-mmap.c b/libucw/ucw/io-mmap.c
new file mode 100644
index 0000000..1a3f143
--- /dev/null
+++ b/libucw/ucw/io-mmap.c
@@ -0,0 +1,50 @@
+/*
+ *	UCW Library -- Mapping of Files
+ *
+ *	(c) 1999--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/io.h>
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+void *
+mmap_file(const char *name, size_t *len, int writeable)
+{
+  int fd = ucw_open(name, writeable ? O_RDWR : O_RDONLY);
+  ucw_stat_t st;
+  void *x;
+
+  if (fd < 0)
+    die("open(%s): %m", name);
+  if (ucw_fstat(fd, &st) < 0)
+    die("fstat(%s): %m", name);
+  if ((uintmax_t)st.st_size > SIZE_MAX)
+    die("mmap(%s): File too large", name);
+  if (len)
+    *len = st.st_size;
+  if (st.st_size)
+    {
+      x = mmap(NULL, st.st_size, writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, fd, 0);
+      if (x == MAP_FAILED)
+	die("mmap(%s): %m", name);
+    }
+  else	/* For empty file, we can return any non-zero address */
+    x = "";
+  close(fd);
+  return x;
+}
+
+void
+munmap_file(void *start, size_t len)
+{
+  munmap(start, len);
+}
diff --git a/libucw/ucw/io-size.c b/libucw/ucw/io-size.c
new file mode 100644
index 0000000..35c8c51
--- /dev/null
+++ b/libucw/ucw/io-size.c
@@ -0,0 +1,21 @@
+/*
+ *	UCW Library -- File Sizes
+ *
+ *	(c) 1999--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/io.h>
+
+ucw_off_t ucw_file_size(const char *name)
+{
+  int fd = ucw_open(name, O_RDONLY);
+  if (fd < 0)
+    die("Cannot open %s: %m", name);
+  ucw_off_t len = ucw_seek(fd, 0, SEEK_END);
+  close(fd);
+  return len;
+}
diff --git a/libucw/ucw/io-sync.c b/libucw/ucw/io-sync.c
new file mode 100644
index 0000000..00a3b5f
--- /dev/null
+++ b/libucw/ucw/io-sync.c
@@ -0,0 +1,29 @@
+/*
+ *	UCW Library -- Syncing Directories
+ *
+ *	(c) 2004--2012 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/io.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+
+void
+sync_dir(const char *name)
+{
+  int fd = open(name, O_RDONLY
+#ifdef CONFIG_LINUX
+		| O_DIRECTORY
+#endif
+);
+  if (fd < 0)
+    goto err;
+  int err = fsync(fd);
+  close(fd);
+  if (err >= 0)
+    return;
+ err:
+  msg(L_ERROR, "Unable to sync directory %s: %m", name);
+}
diff --git a/libucw/ucw/io.h b/libucw/ucw/io.h
new file mode 100644
index 0000000..ac8c7ec
--- /dev/null
+++ b/libucw/ucw/io.h
@@ -0,0 +1,80 @@
+/*
+ *	UCW Library -- Large File Support
+ *
+ *	(c) 1999--2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_IO_H
+#define _UCW_IO_H
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define careful_read ucw_careful_read
+#define careful_write ucw_careful_write
+#define mmap_file ucw_mmap_file
+#define munmap_file ucw_munmap_file
+#define sync_dir ucw_sync_dir
+#endif
+
+#ifdef CONFIG_UCW_LARGE_FILES
+
+#define ucw_open open64
+#define ucw_seek lseek64
+#define ucw_pread pread64
+#define ucw_pwrite pwrite64
+#define ucw_ftruncate ftruncate64
+#define ucw_mmap(a,l,p,f,d,o) mmap64(a,l,p,f,d,o)
+#define ucw_pread pread64
+#define ucw_pwrite pwrite64
+#define ucw_stat stat64
+#define ucw_fstat fstat64
+typedef struct stat64 ucw_stat_t;
+
+#else	/* !CONFIG_UCW_LARGE_FILES */
+
+#define ucw_open open
+#define ucw_seek(f,o,w) lseek(f,o,w)
+#define ucw_ftruncate(f,o) ftruncate(f,o)
+#define ucw_mmap(a,l,p,f,d,o) mmap(a,l,p,f,d,o)
+#define ucw_pread pread
+#define ucw_pwrite pwrite
+#define ucw_stat stat
+#define ucw_fstat fstat
+typedef struct stat ucw_stat_t;
+
+#endif	/* !CONFIG_UCW_LARGE_FILES */
+
+#if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
+#define ucw_fdatasync fdatasync
+#else
+#define ucw_fdatasync fsync
+#endif
+
+#define HAVE_PREAD
+
+/* io-size.c */
+
+ucw_off_t ucw_file_size(const char *name);
+
+/* io-mmap.c */
+
+void *mmap_file(const char *name, size_t *len, int writeable);
+void munmap_file(void *start, size_t len);
+
+/* io-careful.c */
+
+int careful_read(int fd, void *buf, size_t len);
+int careful_write(int fd, const void *buf, size_t len);
+
+/* io-sync.c */
+
+void sync_dir(const char *name);
+
+#endif	/* !_UCW_IO_H */
diff --git a/libucw/ucw/ipaccess.c b/libucw/ucw/ipaccess.c
new file mode 100644
index 0000000..d9ff9ee
--- /dev/null
+++ b/libucw/ucw/ipaccess.c
@@ -0,0 +1,127 @@
+/*
+ *	UCW Library -- IP address access lists
+ *
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/clists.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ipaccess.h>
+
+#include <string.h>
+
+struct ipaccess_entry {
+  cnode n;
+  int allow;
+  struct ip_addrmask addr;
+};
+
+static char *
+addrmask_parser(char *c, void *ptr)
+{
+  /*
+   * This is tricky: addrmasks will be compared by memcmp(), so we must ensure
+   * that even the padding between structure members is zeroed out.
+   */
+  struct ip_addrmask *am = ptr;
+  bzero(am, sizeof(*am));
+
+  char *p = strchr(c, '/');
+  if (p)
+    *p++ = 0;
+  char *err = cf_parse_ip(c, &am->addr);
+  if (err)
+    return err;
+  if (p)
+    {
+      uint len;
+      if (!cf_parse_int(p, &len) && len <= 32)
+	am->mask = ~(len == 32 ? 0 : ~0U >> len);
+      else if (cf_parse_ip(p, &am->mask))
+	return "Invalid prefix length or netmask";
+    }
+  else
+    am->mask = ~0U;
+  return NULL;
+}
+
+static void
+addrmask_dumper(struct fastbuf *fb, void *ptr)
+{
+  struct ip_addrmask *am = ptr;
+  bprintf(fb, "%08x/%08x ", am->addr, am->mask);
+}
+
+struct cf_user_type ip_addrmask_type = {
+  .size = sizeof(struct ip_addrmask),
+  .name = "ip_addrmask",
+  .parser = addrmask_parser,
+  .dumper = addrmask_dumper
+};
+
+struct cf_section ipaccess_cf = {
+  CF_TYPE(struct ipaccess_entry),
+  CF_ITEMS {
+    CF_LOOKUP("Mode", PTR_TO(struct ipaccess_entry, allow), ((const char* const []) { "deny", "allow", NULL })),
+    CF_USER("IP", PTR_TO(struct ipaccess_entry, addr), &ip_addrmask_type),
+    CF_END
+  }
+};
+
+int ip_addrmask_match(struct ip_addrmask *am, u32 ip)
+{
+  return !((ip ^ am->addr) & am->mask);
+}
+
+int
+ipaccess_check(clist *l, u32 ip)
+{
+  CLIST_FOR_EACH(struct ipaccess_entry *, a, *l)
+    if (ip_addrmask_match(&a->addr, ip))
+      return a->allow;
+  return 0;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+static clist t;
+
+static struct cf_section test_cf = {
+  CF_ITEMS {
+    CF_LIST("A", &t, &ipaccess_cf),
+    CF_END
+  }
+};
+
+int main(int argc, char **argv)
+{
+  cf_declare_section("T", &test_cf, 0);
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) != -1)
+    die("Invalid arguments");
+
+  byte buf[256];
+  while (fgets(buf, sizeof(buf), stdin))
+    {
+      char *c = strchr(buf, '\n');
+      if (c)
+	*c = 0;
+      u32 ip;
+      if (cf_parse_ip(buf, &ip))
+	puts("Invalid IP address");
+      else if (ipaccess_check(&t, ip))
+	puts("Allowed");
+      else
+	puts("Denied");
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/ipaccess.h b/libucw/ucw/ipaccess.h
new file mode 100644
index 0000000..dff7234
--- /dev/null
+++ b/libucw/ucw/ipaccess.h
@@ -0,0 +1,35 @@
+/*
+ *	UCW Library -- IP address access lists
+ *
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_IPACCESS_H
+#define _UCW_IPACCESS_H
+
+#include <ucw/clists.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define ip_addrmask_match ucw_ip_addrmask_match
+#define ip_addrmask_type ucw_ip_addrmask_type
+#define ipaccess_cf ucw_ipaccess_cf
+#define ipaccess_check ucw_ipaccess_check
+#endif
+
+extern struct cf_section ipaccess_cf;
+int ipaccess_check(clist *l, u32 ip);
+
+/* Low-level handling of addresses and masks */
+
+struct ip_addrmask {
+  u32 addr;
+  u32 mask;
+};
+
+extern struct cf_user_type ip_addrmask_type;
+int ip_addrmask_match(struct ip_addrmask *am, u32 ip);
+
+#endif
diff --git a/libucw/ucw/kmp-search.h b/libucw/ucw/kmp-search.h
new file mode 100644
index 0000000..4fd764b
--- /dev/null
+++ b/libucw/ucw/kmp-search.h
@@ -0,0 +1,191 @@
+/*
+ *      Knuth-Morris-Pratt's Substring Search for N given strings
+ *
+ *      (c) 1999--2005, Robert Spalek <robert@ucw.cz>
+ *      (c) 2006, Pavel Charvat <pchar@ucw.cz>
+ *
+ *      (In fact, the algorithm is usually referred to as Aho-McCorasick,
+ *      but that's just an extension of KMP to multiple strings.)
+ */
+
+/*
+ *  This is not a normal header file, it's a generator of KMP algorithm.
+ *  Each time you include it with parameters set in the corresponding
+ *  preprocessor macros, it generates KMP structures and functions
+ *  with the parameters given. See ucw/kmp.h before reading this description.
+ *
+ *  This file defines:
+ *
+ *	struct search		structure with both the internal and the user-defined variables
+ *				used during the search and accessible from all macros
+ *
+ *	void search(kmp,search,src) executes the search; search structure is allocated by the caller (possible input/output)
+ *
+ *	void run(kmp,src)	the same, but automatically allocates search structre from the stack
+ *
+ *
+ *  Parameters to the generator (these marked with [*] are mandatory):
+ *
+ *  [*]	KMPS_PREFIX(x)		macro to add a name prefix (used on all global names
+ *				defined by the KMP search generator)
+ *  [*]	KMPS_KMP_PREFIX(x)	prefix used for ucw/kmp.h
+ *
+ *  KMPS_SOURCE			user-defined text source (together with KMPS_GET_CHAR);
+ *				if unset, the one from ucw/kmp.h is taken
+ *  KMPS_GET_CHAR(kmp,src,search) analogy to KMP_GET_CHAR, but it must store the next character to search->c
+ *
+ *  KMPS_ADD_CONTROLS		add control characters (see KMP_CONTROL_CHAR in kmp.h) at both ends of the input string
+ *  KMPS_MERGE_CONTROLS		merge adjacent control characters to a single one
+ *
+ *  KMPS_VARS			user-defined variables in struct search (in .u substructure to avoid collisions)
+ *
+ *  KMPS_INIT(kmp,src,search)	statement executed at the beginning of search()
+ *  KMPS_EXIT(kmp,src,search)	... at the end
+ *  KMPS_STEP(kmp,src,search)	... after each step (read of next character + current state update)
+ *				of the algorithm, but before KMPS_FOUND[_CHAIN]
+ *  KMPS_FOUND_CHAIN(kmp,src,search) ... for each state representing locally longest match
+ *				(stored in search->out - NOT necessary search->s!);
+ *				all matches form a NULL-terminated link list (search->out, search->out->next, ...)
+ *				in order of decreasing length
+ *  KMPS_FOUND(kmp,src,search)  ... called for every match (in search->out)
+ *  KMPS_WANT_BEST		algorithm computes globally longest match, which is available
+ *				in search->best in KMPS_EXIT; if there is no match, it points to the null state
+ */
+
+#define P(x) KMPS_PREFIX(x)
+#define KP(x) KMPS_KMP_PREFIX(x)
+
+#ifdef KMPS_SOURCE
+typedef KMPS_SOURCE P(search_source_t);
+#else
+typedef KP(source_t) P(search_source_t);
+#endif
+
+#ifndef KMPS_GET_CHAR
+#define KMPS_GET_CHAR(kmp,src,s) (KP(get_char)(kmp, &src, &s->c))
+#endif
+
+struct P(search) {
+  struct KP(state) *s;		/* current state */
+  struct KP(state) *out;	/* output state */
+# ifdef KMPS_WANT_BEST
+  struct KP(state) *best;	/* longest match */
+# endif
+  KP(char_t) c;			/* last character */
+# ifdef KMPS_ADD_CONTROLS
+  uint eof;
+# endif
+# ifdef KMPS_VARS
+  struct {
+    KMPS_VARS
+  } u;				/* user-defined */
+# endif
+};
+
+static void
+P(search) (struct KP(struct) *kmp, struct P(search) *s, P(search_source_t) src)
+{
+  s->s = &kmp->null;
+# ifdef KMPS_WANT_BEST
+  s->best = &kmp->null;
+# endif
+# ifdef KMPS_ADD_CONTROLS
+  s->c = KP(control)();
+  s->eof = 0;
+# else
+  s->c = 0;
+# endif
+# ifdef KMPS_INIT
+  { KMPS_INIT(kmp, src, s); }
+# endif
+# ifndef KMPS_ADD_CONTROLS
+  goto start_read;
+# endif
+  for (;;)
+  {
+    for (struct KP(state) *t = s->s; t && !(s->s = KP(hash_find)(&kmp->hash, t, s->c)); t = t->back);
+    s->s = s->s ? : &kmp->null;
+
+#   ifdef KMPS_STEP
+    { KMPS_STEP(kmp, src, s); }
+#   endif
+
+#   if defined(KMPS_FOUND) || defined(KMPS_FOUND_CHAIN) || defined(KMPS_WANT_BEST)
+    s->out = s->s->len ? s->s : s->s->next;
+    if (s->out)
+      {
+#	ifdef KMPS_WANT_BEST
+	if (s->out->len > s->best->len)
+	  s->best = s->out;
+#	endif
+#       ifdef KMPS_FOUND_CHAIN
+	{ KMPS_FOUND_CHAIN(kmp, src, s); }
+#       endif
+#       ifdef KMPS_FOUND
+	do
+          { KMPS_FOUND(kmp, src, s); }
+	while (s->out = s->out->next);
+#       endif
+      }
+#   endif
+
+#   ifdef KMPS_ADD_CONTROLS
+    if (s->eof)
+      break;
+#   endif
+
+#   ifndef KMPS_ADD_CONTROLS
+start_read: ;
+#   endif
+#   ifdef KMPS_MERGE_CONTROLS
+    KP(char_t) last_c = s->c;
+#   endif
+
+    do
+      {
+	if (!KMPS_GET_CHAR(kmp, src, s))
+	  {
+#           ifdef KMPS_ADD_CONTROLS
+	    if (!KP(is_control)(kmp, s->c))
+	      {
+                s->c = KP(control)();
+                s->eof = 1;
+		break;
+	      }
+#           endif
+	    goto exit;
+	  }
+      }
+    while (0
+#     ifdef KMPS_MERGE_CONTROLS
+      || (KP(is_control)(kmp, last_c) && KP(is_control)(kmp, s->c))
+#     endif
+      );
+  }
+exit: ;
+# ifdef KMPS_EXIT
+  { KMPS_EXIT(kmp, src, s); }
+# endif
+}
+
+static inline void
+P(run) (struct KP(struct) *kmp, P(search_source_t) src)
+{
+  struct P(search) search;
+  P(search)(kmp, &search, src);
+}
+
+#undef P
+#undef KMPS_PREFIX
+#undef KMPS_KMP_PREFIX
+#undef KMPS_SOURCE
+#undef KMPS_GET_CHAR
+#undef KMPS_ADD_CONTROLS
+#undef KMPS_MERGE_CONTROLS
+#undef KMPS_VARS
+#undef KMPS_INIT
+#undef KMPS_EXIT
+#undef KMPS_FOUND
+#undef KMPS_FOUND_CHAIN
+#undef KMPS_WANT_BEST
+#undef KMPS_STEP
diff --git a/libucw/ucw/kmp-test.c b/libucw/ucw/kmp-test.c
new file mode 100644
index 0000000..39d06cf
--- /dev/null
+++ b/libucw/ucw/kmp-test.c
@@ -0,0 +1,212 @@
+/*
+ *      Test of KMP search
+ *
+ *      (c) 2006, Pavel Charvat <pchar@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <string.h>
+
+#if 0
+#define TRACE(x...) do{msg(L_DEBUG, x);}while(0)
+#else
+#define TRACE(x...) do{}while(0)
+#endif
+
+/* TEST1 - multiple searches */
+
+#define KMP_PREFIX(x) kmp1_##x
+#define KMP_WANT_CLEANUP
+#include <ucw/kmp.h>
+#define KMPS_PREFIX(x) kmp1s1_##x
+#define KMPS_KMP_PREFIX(x) kmp1_##x
+#define KMPS_WANT_BEST
+#define KMPS_EXIT(kmp,src,s) TRACE("Best match has %d characters", s->best->len)
+#include <ucw/kmp-search.h>
+#define KMPS_PREFIX(x) kmp1s2_##x
+#define KMPS_KMP_PREFIX(x) kmp1_##x
+#define KMPS_VARS uint count;
+#define KMPS_INIT(kmp,src,s) s->u.count = 0
+#define KMPS_FOUND(kmp,src,s) s->u.count++
+#include <ucw/kmp-search.h>
+
+static void
+test1(void)
+{
+  TRACE("Running test1");
+  struct kmp1_struct kmp;
+  kmp1_init(&kmp);
+  kmp1_add(&kmp, "ahoj");
+  kmp1_add(&kmp, "hoj");
+  kmp1_add(&kmp, "aho");
+  kmp1_build(&kmp);
+  struct kmp1s1_search s1;
+  kmp1s1_search(&kmp, &s1, "asjlahslhalahosjkjhojsas");
+  ASSERT(s1.best->len == 3);
+  struct kmp1s2_search s2;
+  kmp1s2_search(&kmp, &s2, "asjlahslhalahojsjkjhojsas");
+  ASSERT(s2.u.count == 4);
+  kmp1_cleanup(&kmp);
+}
+
+#ifdef CONFIG_CHARSET		/* This one depends on libucw-charset */
+
+/* TEST2 - various tracing */
+
+#define KMP_PREFIX(x) kmp2_##x
+#define KMP_USE_UTF8
+#define KMP_TOLOWER
+#define KMP_ONLYALPHA
+#define KMP_STATE_VARS char *str; uint id;
+#define KMP_ADD_EXTRA_ARGS uint id
+#define KMP_VARS char *start;
+#define KMP_ADD_INIT(kmp,src) kmp->u.start = src
+#define KMP_ADD_NEW(kmp,src,s) do{ TRACE("Inserting string %s with id %d", kmp->u.start, id); \
+  s->u.str = kmp->u.start; s->u.id = id; }while(0)
+#define KMP_ADD_DUP(kmp,src,s) TRACE("String %s already inserted", kmp->u.start)
+#define KMP_WANT_CLEANUP
+#define KMP_WANT_SEARCH
+#define KMPS_ADD_CONTROLS
+#define KMPS_MERGE_CONTROLS
+#define KMPS_FOUND(kmp,src,s) TRACE("String %s with id %d found", s->out->u.str, s->out->u.id)
+#define KMPS_STEP(kmp,src,s) TRACE("Got to state %p after reading %d", s->s, s->c)
+#include <ucw/kmp.h>
+
+static void
+test2(void)
+{
+  TRACE("Running test2");
+  struct kmp2_struct kmp;
+  kmp2_init(&kmp);
+  kmp2_add(&kmp, "ahoj", 1);
+  kmp2_add(&kmp, "ahoj", 2);
+  kmp2_add(&kmp, "hoj", 3);
+  kmp2_add(&kmp, "aho", 4);
+  kmp2_add(&kmp, "aba", 5);
+  kmp2_add(&kmp, "aba", 5);
+  kmp2_add(&kmp, "pěl", 5);
+  kmp2_build(&kmp);
+  kmp2_run(&kmp, "Šíleně žluťou�ký kůň úpěl �ábelské ódy labababaks sdahojdhsaladsjhla");
+  kmp2_cleanup(&kmp);
+}
+
+#endif
+
+/* TEST3 - random tests */
+
+#define KMP_PREFIX(x) kmp3_##x
+#define KMP_STATE_VARS uint index;
+#define KMP_ADD_EXTRA_ARGS uint index
+#define KMP_VARS char *start;
+#define KMP_ADD_INIT(kmp,src) kmp->u.start = src
+#define KMP_ADD_NEW(kmp,src,s) s->u.index = index
+#define KMP_ADD_DUP(kmp,src,s) *(kmp->u.start) = 0
+#define KMP_WANT_CLEANUP
+#define KMP_WANT_SEARCH
+#define KMPS_VARS uint sum, *cnt;
+#define KMPS_FOUND(kmp,src,s) do{ ASSERT(s->u.cnt[s->out->u.index]); s->u.cnt[s->out->u.index]--; s->u.sum--; }while(0)
+#include <ucw/kmp.h>
+
+static void
+test3(void)
+{
+  TRACE("Running test3");
+  struct mempool *pool = mp_new(1024);
+  for (uint testn = 0; testn < 100; testn++)
+  {
+    mp_flush(pool);
+    uint n = random_max(100);
+    char *s[n];
+    struct kmp3_struct kmp;
+    kmp3_init(&kmp);
+    for (uint i = 0; i < n; i++)
+      {
+        uint m = random_max(10);
+        s[i] = mp_alloc(pool, m + 1);
+        for (uint j = 0; j < m; j++)
+	  s[i][j] = 'a' + random_max(3);
+        s[i][m] = 0;
+        kmp3_add(&kmp, s[i], i);
+      }
+    kmp3_build(&kmp);
+    for (uint i = 0; i < 10; i++)
+      {
+        uint m = random_max(100);
+        byte b[m + 1];
+        for (uint j = 0; j < m; j++)
+	  b[j] = 'a' + random_max(4);
+        b[m] = 0;
+        uint cnt[n];
+	struct kmp3_search search;
+	search.u.sum = 0;
+	search.u.cnt = cnt;
+        for (uint j = 0; j < n; j++)
+          {
+	    cnt[j] = 0;
+	    if (*s[j])
+	      for (uint k = 0; k < m; k++)
+	        if (!strncmp(b + k, s[j], strlen(s[j])))
+	          cnt[j]++, search.u.sum++;
+	  }
+        kmp3_search(&kmp, &search, b);
+        ASSERT(search.u.sum == 0);
+      }
+    kmp3_cleanup(&kmp);
+  }
+  mp_delete(pool);
+}
+
+/* TEST4 - user-defined character type */
+
+struct kmp4_struct;
+struct kmp4_state;
+
+static inline int
+kmp4_eq(struct kmp4_struct *kmp UNUSED, byte *a, byte *b)
+{
+  return (a == b) || (a && b && *a == *b);
+}
+
+static inline uint
+kmp4_hash(struct kmp4_struct *kmp UNUSED, struct kmp4_state *s, byte *c)
+{
+  return (c ? (*c << 16) : 0) + (uint)(uintptr_t)s;
+}
+
+#define KMP_PREFIX(x) kmp4_##x
+#define KMP_CHAR byte *
+#define KMP_CONTROL_CHAR NULL
+#define KMP_GET_CHAR(kmp,src,c) ({ c = src++; !!*c; })
+#define KMP_GIVE_HASHFN
+#define KMP_GIVE_EQ
+#define KMP_WANT_CLEANUP
+#define KMP_WANT_SEARCH
+#define KMPS_FOUND(kmp,src,s) TRACE("found")
+#define KMPS_ADD_CONTROLS
+#define KMPS_MERGE_CONTROLS
+#include <ucw/kmp.h>
+
+static void
+test4(void)
+{
+  TRACE("Running test4");
+  struct kmp4_struct kmp;
+  kmp4_init(&kmp);
+  kmp4_add(&kmp, "ahoj");
+  kmp4_build(&kmp);
+  kmp4_run(&kmp, "djdhaskjdahoahaahojojshdaksjahdahojskj");
+  kmp4_cleanup(&kmp);
+}
+
+int
+main(void)
+{
+  test1();
+#ifdef CONFIG_CHARSET
+  test2();
+#endif
+  test3();
+  test4();
+  return 0;
+}
diff --git a/libucw/ucw/kmp-test.t b/libucw/ucw/kmp-test.t
new file mode 100644
index 0000000..200c9ce
--- /dev/null
+++ b/libucw/ucw/kmp-test.t
@@ -0,0 +1,3 @@
+# Tests for the kmp module
+
+Run:	../obj/ucw/kmp-test
diff --git a/libucw/ucw/kmp.h b/libucw/ucw/kmp.h
new file mode 100644
index 0000000..335827f
--- /dev/null
+++ b/libucw/ucw/kmp.h
@@ -0,0 +1,463 @@
+/*
+ *      Knuth-Morris-Pratt's Substring Search for N given strings
+ *
+ *      (c) 1999--2005, Robert Spalek <robert@ucw.cz>
+ *      (c) 2006, Pavel Charvat <pchar@ucw.cz>
+ *
+ *      (In fact, the algorithm is usually referred to as Aho-McCorasick,
+ *      but that's just an extension of KMP to multiple strings.)
+ */
+
+/*
+ *  This is not a normal header file, it's a generator of KMP algorithm.
+ *  Each time you include it with parameters set in the corresponding
+ *  preprocessor macros, it generates KMP structures and functions
+ *  with the parameters given.
+ *
+ *  This file contains only construction of the automaton. The search
+ *  itself can be generated by inclusion of file ucw/kmp-search.h.
+ *  Separeted headers allow the user to define multiple search
+ *  routines for one common set of key strings.
+ *
+ *  Example:
+ *
+ *	#define KMP_PREFIX(x) kmp_##x
+ *	#define KMP_WANT_CLEANUP
+ *	#define KMP_WANT_SEARCH // includes ucw/kmp-search.h automatically
+ *	#define KMPS_FOUND(kmp,src,s) printf("found\n")
+ *	#include <ucw/kmp.h>
+ *
+ *    [...]
+ *
+ *	struct kmp_struct kmp;	// a structure describing the whole automaton
+ *	kmp_init(&kmp);		// initialization (must be called before all other functions)
+ *
+ *	// add key strings we want to search
+ *	kmp_add(&kmp, "aaa");
+ *	kmp_add(&kmp, "abc");
+ *
+ *	// complete the automaton, no more strings can be added later
+ *	kmp_build(&kmp);
+ *
+ *	// example of search, should print single "found" to stdout
+ *	kmp_run(&kmp, "aabaabca");
+ *
+ *	// destroy all internal structures
+ *	kmp_cleanup(&kmp);
+ *
+ *
+ *  Brief description of all parameters:
+ *
+ *    Basic parameters:
+ *	KMP_PREFIX(x)		macro to add a name prefix (used on all global names
+ *				defined by the KMP generator); mandatory;
+ *				we abbreviate this to P(x) below
+ *
+ *	KMP_CHAR		alphabet type, the default is u16
+ *
+ *	KMP_SOURCE		user-defined text source; KMP_GET_CHAR must
+ *	KMP_GET_CHAR(kmp,src,c)	return zero at the end or nonzero together with the next character in c otherwise;
+ *				if not defined, zero-terminated array of bytes is used as the input
+ *
+ *	KMP_VARS		user-defined variables in 'struct P(struct)'
+ *				-- a structure describing the whole automaton;
+ *				these variables are stored in .u substructure to avoid collisions
+ *	KMP_STATE_VARS		user-defined variables in 'struct P(state)'
+ *				-- created for each state of the automaton;
+ *				these variables are stored in .u substructure to avoid collisions
+ *
+ *    Parameters which select how the input is interpreted (if KMP_SOURCE is unset):
+ *	KMP_USE_ASCII		reads single bytes from the input (default)
+ *	KMP_USE_UTF8		reads UTF-8 characters from the input (valid UTF-8 needed)
+ *	KMP_TOLOWER		converts all to lowercase
+ *	KMP_UNACCENT		removes accents
+ *	KMP_ONLYALPHA		converts non-alphas to KMP_CONTROL_CHAR (see below)
+ *
+ *    Parameters controlling add(kmp, src):
+ *	KMP_ADD_EXTRA_ARGS	extra arguments, should be used carefully because of possible collisions
+ *	KMP_ADD_INIT(kmp,src)	called in the beginning of add(), src is the first
+ *      KMP_INIT_STATE(kmp,s)   initialization of a new state s (called before KMP_ADD_{NEW,DUP});
+ *				null state is not included and should be handled after init() if necessary;
+ *				all user-defined data are filled by zeros before call to KMP_INIT_STATE
+ *	KMP_ADD_NEW(kmp,src,s)	initialize last state of every new key string (called after KMP_INIT_STATE);
+ *				the string must be parsed before so src is after the last string's character
+ *	KMP_ADD_DUP(kmp,src,s)  analogy of KMP_ADD_NEW called for duplicates
+ *
+ *    Parameters to build():
+ *      KMP_BUILD_STATE(kmp,s)	called for all states (including null) in order of non-decreasing tree depth
+ *
+ *    Other parameters:
+ *	KMP_WANT_CLEANUP	define cleanup()
+ *	KMP_WANT_SEARCH		includes ucw/kmp-search.h with the same prefix;
+ *				there can be multiple search variants for a single KMP automaton
+ *	KMP_USE_POOL		allocates in a given pool
+ *	KMP_CONTROL_CHAR	special control character (default is ':')
+ *	KMP_GIVE_ALLOC		if set, you must supply custom allocation functions:
+ *				void *alloc(unsigned int size) -- allocate space for
+ *				a state. Default is pooled allocation from a local pool or HASH_USE_POOL.
+ *				void free(void *) -- the converse.
+ *	KMP_GIVE_HASHFN		if set, you must supply custom hash function:
+ *				unsigned int hash(struct P(struct) *kmp, struct P(state) *state, KMP_CHAR c);
+ *				default hash function works only for integer character types
+ *	KMP_GIVE_EQ		if set, you must supply custom compare function of two characters:
+ *				int eq(struct P(struct) *kmp, KMP_CHAR a, KMP_CHAR b);
+ *				default is 'a == b'
+ */
+
+#ifndef KMP_PREFIX
+#error Missing KMP_PREFIX
+#endif
+
+#include <ucw/mempool.h>
+#include <alloca.h>
+#include <string.h>
+
+#define P(x) KMP_PREFIX(x)
+
+#ifdef KMP_CHAR
+typedef KMP_CHAR P(char_t);
+#else
+typedef u16 P(char_t);
+#endif
+
+typedef u32 P(len_t);
+
+#ifdef KMP_NODE
+typedef KMP_NODE P(node_t);
+#else
+typedef struct {} P(node_t);
+#endif
+
+struct P(struct);
+
+struct P(state) {
+  struct P(state) *from;	/* state with the previous character (forms a tree with null state in the root) */
+  struct P(state) *back;	/* backwards edge to the longest shorter state with same suffix */
+  struct P(state) *next;	/* the longest of shorter matches (or NULL) */
+  P(len_t) len;			/* state depth if it represents a key string, zero otherwise */
+  P(char_t) c;			/* last character of the represented string */
+  struct {
+#   ifdef KMP_STATE_VARS
+    KMP_STATE_VARS
+#   endif
+  } u;				/* user-defined data*/
+};
+
+/* Control char */
+static inline P(char_t)
+P(control) (void)
+{
+# ifdef KMP_CONTROL_CHAR
+  return KMP_CONTROL_CHAR;
+# else
+  return ':';
+# endif
+}
+
+/* User-defined source */
+struct P(hash_table);
+
+#define HASH_GIVE_HASHFN
+#ifdef KMP_GIVE_HASHFN
+static inline uint
+P(hash_hash) (struct P(hash_table) *t, struct P(state) *f, P(char_t) c)
+{
+  return P(hash) ((struct P(struct) *) t, f, c);
+}
+#else
+static inline uint
+P(hash_hash) (struct P(hash_table) *t UNUSED, struct P(state) *f, P(char_t) c)
+{
+  return (((uint)c) << 16) + (uint)(uintptr_t)f;
+}
+#endif
+
+#ifndef KMP_GIVE_EQ
+static inline int
+P(eq) (struct P(struct) *kmp UNUSED, P(char_t) c1, P(char_t) c2)
+{
+  return c1 == c2;
+}
+#endif
+
+static inline int
+P(is_control) (struct P(struct) *kmp, P(char_t) c)
+{
+  return P(eq) (kmp, c, P(control)());
+}
+
+#define HASH_GIVE_EQ
+static inline int
+P(hash_eq) (struct P(hash_table) *t, struct P(state) *f1, P(char_t) c1, struct P(state) *f2, P(char_t) c2)
+{
+  return f1 == f2 && P(eq)((struct P(struct) *) t, c1, c2);
+}
+
+#ifdef KMP_GIVE_ALLOC
+#define HASH_GIVE_ALLOC
+static inline void *
+P(hash_alloc) (struct P(hash_table) *t, uint size)
+{
+  return P(alloc) ((struct P(struct) *) t, size);
+}
+
+static inline void
+P(hash_free) (struct P(hash_table) *t, void *ptr)
+{
+  P(free) ((struct P(struct) *) t, ptr);
+}
+#endif
+
+#define HASH_GIVE_INIT_KEY
+static inline void
+P(hash_init_key) (struct P(hash_table) *t UNUSED, struct P(state) *s, struct P(state) *f, P(char_t) c)
+{
+  bzero(s, sizeof(*s));
+# ifdef KMP_INIT_STATE
+  UNUSED struct P(struct) *kmp = (struct P(struct) *)t;
+  { KMP_INIT_STATE(kmp, s); }
+# endif
+  s->from = f;
+  s->c = c;
+  s->next = f->back; /* the pointers hold the link-list of sons... changed in build() */
+  f->back = s;
+}
+
+#undef P
+#define HASH_PREFIX(x) KMP_PREFIX(hash_##x)
+#define HASH_NODE struct KMP_PREFIX(state)
+#define HASH_KEY_COMPLEX(x) x from, x c
+#define HASH_KEY_DECL struct KMP_PREFIX(state) *from, KMP_PREFIX(char_t) c
+#define HASH_WANT_NEW
+#define HASH_WANT_FIND
+#ifdef KMP_WANT_CLEANUP
+#define HASH_WANT_CLEANUP
+#endif
+#if defined(KMP_USE_POOL)
+#define HASH_USE_POOL KMP_USE_POOL
+#else
+#define HASH_AUTO_POOL 4096
+#endif
+#define HASH_CONSERVE_SPACE
+#define HASH_TABLE_DYNAMIC
+#include <ucw/hashtable.h>
+#define P(x) KMP_PREFIX(x)
+
+struct P(struct) {
+  struct P(hash_table) hash;		/* hash table of state transitions */
+  struct P(state) null;			/* null state */
+  struct {
+#   ifdef KMP_VARS
+    KMP_VARS
+#   endif
+  } u;					/* user-defined data */
+};
+
+#ifdef KMP_SOURCE
+typedef KMP_SOURCE P(source_t);
+#else
+typedef char *P(source_t);
+#endif
+
+#ifdef KMP_GET_CHAR
+static inline int
+P(get_char) (struct P(struct) *kmp UNUSED, P(source_t) *src UNUSED, P(char_t) *c UNUSED)
+{
+  return KMP_GET_CHAR(kmp, (*src), (*c));
+}
+#else
+#  if defined(KMP_USE_UTF8)
+#    include <ucw/unicode.h>
+#    if defined(KMP_ONLYALPHA) || defined(KMP_TOLOWER) || defined(KMP_UNACCENT)
+#      include <charset/unicat.h>
+#    endif
+#  elif defined(KMP_USE_ASCII)
+#    if defined(KMP_ONLYALPHA) || defined(KMP_TOLOWER)
+#      include <ucw/chartype.h>
+#    endif
+#  endif
+static inline int
+P(get_char) (struct P(struct) *kmp UNUSED, P(source_t) *src, P(char_t) *c)
+{
+# ifdef KMP_USE_UTF8
+  uint cc;
+  *src = utf8_get(*src, &cc);
+# ifdef KMP_ONLYALPHA
+  if (!cc) {}
+  else if (!Ualpha(cc))
+    cc = P(control)();
+  else
+# endif
+    {
+#     ifdef KMP_TOLOWER
+      cc = Utolower(cc);
+#     endif
+#     ifdef KMP_UNACCENT
+      cc = Uunaccent(cc);
+#     endif
+    }
+# else
+  uint cc = *(*src)++;
+# ifdef KMP_ONLYALPHA
+  if (!cc) {}
+  else if (!Calpha(cc))
+    cc = P(control)();
+  else
+# endif
+#   ifdef KMP_TOLOWER
+    cc = Clocase(cc);
+#   endif
+#   ifdef KMP_UNACCENT
+#   error Do not know how to unaccent ASCII characters
+#   endif
+# endif
+  *c = cc;
+  return !!cc;
+}
+#endif
+
+static struct P(state) *
+P(add) (struct P(struct) *kmp, P(source_t) src
+#   ifdef KMP_ADD_EXTRA_ARGS
+    , KMP_ADD_EXTRA_ARGS
+#   endif
+)
+{
+# ifdef KMP_ADD_INIT
+  { KMP_ADD_INIT(kmp, src); }
+# endif
+
+  P(char_t) c;
+  if (!P(get_char)(kmp, &src, &c))
+    return NULL;
+  struct P(state) *p = &kmp->null, *s;
+  uint len = 0;
+  do
+    {
+      s = P(hash_find)(&kmp->hash, p, c);
+      if (!s)
+	for (;;)
+	  {
+	    s = P(hash_new)(&kmp->hash, p, c);
+	    len++;
+	    if (!(P(get_char)(kmp, &src, &c)))
+	      goto enter_new;
+	    p = s;
+	  }
+      p = s;
+      len++;
+    }
+  while (P(get_char)(kmp, &src, &c));
+  if (s->len)
+    {
+#     ifdef KMP_ADD_DUP
+      { KMP_ADD_DUP(kmp, src, s); }
+#     endif
+      return s;
+    }
+enter_new:
+  s->len = len;
+# ifdef KMP_ADD_NEW
+  { KMP_ADD_NEW(kmp, src, s); }
+# endif
+  return s;
+}
+
+static void
+P(init) (struct P(struct) *kmp)
+{
+  bzero(&kmp->null, sizeof(struct P(state)));
+  P(hash_init)(&kmp->hash);
+}
+
+#ifdef KMP_WANT_CLEANUP
+static inline void
+P(cleanup) (struct P(struct) *kmp)
+{
+  P(hash_cleanup)(&kmp->hash);
+}
+#endif
+
+static inline int
+P(empty) (struct P(struct) *kmp)
+{
+  return !kmp->hash.hash_count;
+}
+
+static inline struct P(state) *
+P(chain_start) (struct P(state) *s)
+{
+  return s->len ? s : s->next;
+}
+
+static void
+P(build) (struct P(struct) *kmp)
+{
+  if (P(empty)(kmp))
+    return;
+  uint read = 0, write = 0;
+  struct P(state) *fifo[kmp->hash.hash_count], *null = &kmp->null;
+  for (struct P(state) *s = null->back; s; s = s->next)
+    fifo[write++] = s;
+  null->back = NULL;
+# ifdef KMP_BUILD_STATE
+  { KMP_BUILD_STATE(kmp, null); }
+# endif
+  while (read != write)
+    {
+      struct P(state) *s = fifo[read++], *t;
+      for (t = s->back; t; t = t->next)
+	fifo[write++] = t;
+      for (t = s->from->back; 1; t = t->back)
+        {
+	  if (!t)
+	    {
+	      s->back = null;
+	      s->next = NULL;
+	      break;
+	    }
+	  s->back = P(hash_find)(&kmp->hash, t, s->c);
+	  if (s->back)
+	    {
+	      s->next = s->back->len ? s->back : s->back->next;
+	      break;
+	    }
+	}
+#     ifdef KMP_BUILD_STATE
+      { KMP_BUILD_STATE(kmp, s); }
+#     endif
+    }
+}
+
+#undef P
+#undef KMP_CHAR
+#undef KMP_SOURCE
+#undef KMP_GET_CHAR
+#undef KMP_VARS
+#undef KMP_STATE_VARS
+#undef KMP_CONTEXT
+#undef KMP_USE_ASCII
+#undef KMP_USE_UTF8
+#undef KMP_TOLOWER
+#undef KMP_UNACCENT
+#undef KMP_ONLYALPHA
+#undef KMP_CONTROL_CHAR
+#undef KMP_ADD_EXTRA_ARGS
+#undef KMP_ADD_INIT
+#undef KMP_ADD_NEW
+#undef KMP_ADD_DUP
+#undef KMP_INIT_STATE
+#undef KMP_BUILD_STATE
+#undef KMP_USE_POOL
+#undef KMP_GIVE_ALLOC
+#undef KMP_GIVE_HASHFN
+#undef KMP_GIVE_EQ
+
+#ifdef KMP_WANT_SEARCH
+#  undef KMP_WANT_SEARCH
+#  define KMPS_PREFIX(x) KMP_PREFIX(x)
+#  define KMPS_KMP_PREFIX(x) KMP_PREFIX(x)
+#  include <ucw/kmp-search.h>
+#endif
+
+#undef KMP_PREFIX
diff --git a/libucw/ucw/lib.h b/libucw/ucw/lib.h
new file mode 100644
index 0000000..003f7b1
--- /dev/null
+++ b/libucw/ucw/lib.h
@@ -0,0 +1,246 @@
+/*
+ *	The UCW Library -- Miscellaneous Functions
+ *
+ *	(c) 1997--2018 Martin Mares <mj@ucw.cz>
+ *	(c) 2005--2014 Tomas Valla <tom@ucw.cz>
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_LIB_H
+#define _UCW_LIB_H
+
+#include <ucw/config.h>
+#include <stdarg.h>
+#include <stdbool.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define assert_failed ucw_assert_failed
+#define assert_failed_msg ucw_assert_failed_msg
+#define assert_failed_noinfo ucw_assert_failed_noinfo
+#define big_alloc ucw_big_alloc
+#define big_alloc_zero ucw_big_alloc_zero
+#define big_free ucw_big_free
+#define die ucw_die
+#define log_die_hook ucw_log_die_hook
+#define log_file ucw_log_file
+#define log_fork ucw_log_fork
+#define log_init ucw_log_init
+#define log_pid ucw_log_pid
+#define log_title ucw_log_title
+#define msg ucw_msg
+#define page_alloc ucw_page_alloc
+#define page_alloc_zero ucw_page_alloc_zero
+#define page_free ucw_page_free
+#define page_realloc ucw_page_realloc
+#define random_set_seed ucw_random_set_seed
+#define random_gen_seed ucw_random_gen_seed
+#define random_max ucw_random_max
+#define random_max_u64 ucw_random_max_u64
+#define random_u32 ucw_random_u32
+#define random_u64 ucw_random_u64
+#define vdie ucw_vdie
+#define vmsg ucw_vmsg
+#define xfree ucw_xfree
+#define xmalloc ucw_xmalloc
+#define xmalloc_zero ucw_xmalloc_zero
+#define xrealloc ucw_xrealloc
+#define xstrdup ucw_xstrdup
+#endif
+
+/*** === Macros for handling structures, offsets and alignment ***/
+
+#define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))		/** Check that a pointer @x is of type @type. Fail compilation if not. **/
+#define PTR_TO(s, i) &((s*)0)->i					/** Return OFFSETOF() in form of a pointer. **/
+#define OFFSETOF(s, i) ((uint)offsetof(s, i))				/** Offset of item @i from the start of structure @s **/
+#define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))		/** Given a pointer @p to item @i of structure @s, return a pointer to the start of the struct. **/
+
+/** Align an integer @s to the nearest higher multiple of @a (which should be a power of two) **/
+#define ALIGN_TO(s, a) (((s)+a-1)&~(a-1))
+
+/** Align a pointer @p to the nearest higher multiple of @s. **/
+#define ALIGN_PTR(p, s) ((uintptr_t)(p) % (s) ? (typeof(p))((uintptr_t)(p) + (s) - (uintptr_t)(p) % (s)) : (p))
+
+#define UNALIGNED_PART(ptr, type) (((uintptr_t) (ptr)) % sizeof(type))
+
+/*** === Other utility macros ***/
+
+#define MIN(a,b) (((a)<(b))?(a):(b))			/** Minimum of two numbers **/
+#define MAX(a,b) (((a)>(b))?(a):(b))			/** Maximum of two numbers **/
+#define CLAMP(x,min,max) ({ typeof(x) _t=x; (_t < min) ? min : (_t > max) ? max : _t; })	/** Clip a number @x to interval [@min,@max] **/
+#define ABS(x) ((x) < 0 ? -(x) : (x))			/** Absolute value **/
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))		/** The number of elements of an array **/
+#define STRINGIFY(x) #x					/** Convert macro parameter to a string **/
+#define STRINGIFY_EXPANDED(x) STRINGIFY(x)		/** Convert an expanded macro parameter to a string **/
+#define GLUE(x,y) x##y					/** Glue two tokens together **/
+#define GLUE_(x,y) x##_##y				/** Glue two tokens together, separating them by an underscore **/
+
+#define COMPARE(x,y) do { if ((x)<(y)) return -1; if ((x)>(y)) return 1; } while(0)		/** Numeric comparison function for qsort() **/
+#define REV_COMPARE(x,y) COMPARE(y,x)								/** Reverse numeric comparison **/
+#define COMPARE_LT(x,y) do { if ((x)<(y)) return 1; if ((x)>(y)) return 0; } while(0)
+#define COMPARE_GT(x,y) COMPARE_LT(y,x)
+
+#define	ROL(x, bits) (((x) << (bits)) | ((uint)(x) >> (sizeof(uint)*8 - (bits))))		/** Bitwise rotation of an unsigned int to the left **/
+#define	ROR(x, bits) (((uint)(x) >> (bits)) | ((x) << (sizeof(uint)*8 - (bits))))		/** Bitwise rotation of an unsigned int to the right **/
+
+/*** === Shortcuts for GCC Extensions ***/
+
+#ifdef __GNUC__
+
+#undef inline
+#define NONRET __attribute__((noreturn))				/** Function does not return **/
+#define UNUSED __attribute__((unused))					/** Variable/parameter is knowingly unused **/
+#define CONSTRUCTOR __attribute__((constructor))			/** Call function upon start of program **/
+#define CONSTRUCTOR_WITH_PRIORITY(p) __attribute__((constructor(p)))	/** Define constructor with a given priority **/
+#define PACKED __attribute__((packed))					/** Structure should be packed **/
+#define CONST __attribute__((const))					/** Function depends only on arguments **/
+#define PURE __attribute__((pure))					/** Function depends only on arguments and global vars **/
+#define FORMAT_CHECK(x,y,z) __attribute__((format(x,y,z)))		/** Checking of printf-like format strings **/
+#define likely(x) __builtin_expect((x),1)				/** Use `if (likely(@x))` if @x is almost always true **/
+#define unlikely(x) __builtin_expect((x),0)				/** Use `if (unlikely(@x))` to hint that @x is almost always false **/
+#define ALWAYS_INLINE inline __attribute__((always_inline))		/** Forcibly inline **/
+#define NO_INLINE __attribute__((noinline))				/** Forcibly uninline **/
+#define LIKE_MALLOC __attribute__((malloc))				/** Function returns a "new" pointer **/
+#define SENTINEL_CHECK __attribute__((sentinel))			/** The last argument must be NULL **/
+
+#else
+#error This program requires the GNU C compiler.
+#endif
+
+/***
+ * [[logging]]
+ *
+ * === Basic logging functions (see <<log:,Logging>> and <ucw/log.h> for more)
+ ***/
+
+enum log_levels {			/** The available log levels to pass to msg() and friends. **/
+  L_DEBUG=0,				// 'D' - Debugging
+  L_INFO,				// 'I' - Informational
+  L_WARN,				// 'W' - Warning
+  L_ERROR,				// 'E' - Error, but non-critical
+  L_INFO_R,				// 'i' - An alternative set of levels for messages caused by remote events
+  L_WARN_R,				// 'w'   (e.g., a packet received via network)
+  L_ERROR_R,				// 'e'
+  L_FATAL,				// '!' - Fatal error
+  L_MAX
+};
+
+#define LOG_LEVEL_NAMES P(DEBUG) P(INFO) P(WARN) P(ERROR) P(INFO_R) P(WARN_R) P(ERROR_R) P(FATAL)
+
+// Return the letter associated with a given severity level
+#define LS_LEVEL_LETTER(level) ("DIWEiwe!###"[( level )])
+
+#define L_SIGHANDLER	0x80000000	/** Avoid operations that are unsafe in signal handlers **/
+#define L_LOGGER_ERR	0x40000000	/** Used internally to avoid infinite reporting of logging errors **/
+
+/**
+ * This is the basic printf-like function for logging a message.
+ * The @flags contain the log level and possibly other flag bits (like `L_SIGHANDLER`).
+ * Does not change the value of errno.
+ **/
+void msg(uint flags, const char *fmt, ...) FORMAT_CHECK(printf,2,3);
+void vmsg(uint flags, const char *fmt, va_list args);		/** A vararg version of msg(). **/
+void die(const char *, ...) NONRET FORMAT_CHECK(printf,1,2);	/** Log a fatal error message and exit the program. **/
+void vdie(const char *fmt, va_list args) NONRET;		/** va_list version of die() **/
+
+extern char *log_title;			/** An optional log message title. Set to program name by log_init(). **/
+extern int log_pid;			/** An optional PID printed in each log message. Set to 0 if it shouldn't be logged. **/
+extern void (*log_die_hook)(void);	/** An optional function called just before die() exists. **/	// API: log_die_hook
+
+void log_init(const char *argv0);	/** Set @log_title to the program name extracted from @argv[0]. **/
+void log_fork(void);			/** Call after fork() to update @log_pid. **/
+void log_file(const char *name);	/** Establish logging to the named file. Also redirect stderr there. **/
+
+void assert_failed(const char *assertion, const char *file, int line) NONRET;
+void assert_failed_msg(const char *assertion, const char *file, int line, const char *fmt, ...) NONRET FORMAT_CHECK(printf,4,5);
+void assert_failed_noinfo(void) NONRET;
+
+#ifdef DEBUG_ASSERTS
+/**
+ * Check an assertion. If the condition @x is false, stop the program with a fatal error.
+ * Assertion checks are compiled only when `DEBUG_ASSERTS` is defined.
+ **/
+#define ASSERT(x) ({ if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); 1; })
+
+/**
+ * Check an assertion with a debug message. If the condition @cond is false,
+ * print the message and stop the program with fatal error.
+ * Assertion checks are compiled only when `DEBUG_ASSERTS` is defined.
+ **/
+#define ASSERT_MSG(cond,str,x...) ({ if (unlikely(!(cond))) assert_failed_msg(#cond, __FILE__, __LINE__, str,##x); 1; })
+
+#else
+#define ASSERT(x) ({ if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); 1; })
+#define ASSERT_MSG(cond,str,x...) ASSERT(cond)
+#endif
+
+#define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1]
+
+#ifdef LOCAL_DEBUG
+#define DBG(x,y...) msg(L_DEBUG, x,##y)	/** If `LOCAL_DEBUG` is defined before including <ucw/lib.h>, log a debug message. Otherwise do nothing. **/
+/**
+ * If `LOCAL_DEBUG` is defined before including <ucw/lib.h>, log current
+ * file name and line number. Otherwise do nothing.
+ **/
+#define DBG_SPOT msg(L_DEBUG, "%s:%d (%s)", __FILE__, __LINE__, __func__)
+#else
+#define DBG(x,y...) do { } while(0)
+#define DBG_SPOT do { } while(0)
+#endif
+
+#ifdef DEBUG_ASSERTS
+/**
+ * Sometimes, we may want to check that a pointer points to a valid memory
+ * location before we start using it for anything more complicated. This
+ * macro checks pointer validity by reading the byte it points to.
+ **/
+#define ASSERT_READABLE(ptr) ({ volatile char *__p = (ptr); *__p; })
+/** Like the previous macro, but it checks writeability, too. **/
+#define ASSERT_WRITEABLE(ptr) ({ volatile char *__p = (ptr); *__p = *__p; })
+#else
+#define ASSERT_READABLE(ptr) do { } while(0)
+#define ASSERT_WRITEABLE(ptr) do { } while(0)
+#endif
+
+/*** === Memory allocation ***/
+
+/*
+ * Unfortunately, several libraries we might want to link to define
+ * their own xmalloc and we don't want to interfere with them, hence
+ * the renaming.
+ */
+#define xmalloc ucw_xmalloc
+#define xrealloc ucw_xrealloc
+#define xfree ucw_xfree
+
+void *xmalloc(size_t) LIKE_MALLOC;		/** Allocate memory and die() if there is none. **/
+void *xrealloc(void *, size_t);			/** Reallocate memory and die() if there is none. **/
+void xfree(void *);				/** Free memory allocated by xmalloc() or xrealloc(). **/
+
+void *xmalloc_zero(size_t) LIKE_MALLOC;		/** Allocate memory and fill it by zeroes. **/
+char *xstrdup(const char *) LIKE_MALLOC;	/** Make a xmalloc()'ed copy of a string. Returns NULL for NULL string. **/
+
+/* bigalloc.c */
+
+void *page_alloc(u64 len) LIKE_MALLOC;		// Internal: allocates a multiple of CPU_PAGE_SIZE bytes with mmap
+void *page_alloc_zero(u64 len) LIKE_MALLOC;
+void page_free(void *start, u64 len);
+void *page_realloc(void *start, u64 old_len, u64 new_len);
+
+void *big_alloc(u64 len) LIKE_MALLOC;		/** Allocate a large memory block in the most efficient way available. **/
+void *big_alloc_zero(u64 len) LIKE_MALLOC;	/** Allocate and clear a large memory block. **/
+void big_free(void *start, u64 len);		/** Free block allocated by @big_alloc() or @big_alloc_zero(). **/
+
+/*** === Random numbers (random-legacy.c) ***/
+
+void random_set_seed(uint seed);		/** Initialize seed value for the legacy interface below. **/
+uint random_gen_seed(void);			/** Combines fastrand_gen_seed_value() and random_set_seed(). **/
+uint random_u32(void);				/** Return a pseudorandom 32-bit number. **/
+uint random_max(uint max);			/** Return a pseudorandom 30-bit number in range [0,@max). **/
+u64 random_u64(void);				/** Return a pseudorandom 64-bit number. **/
+u64 random_max_u64(u64 max);			/** Return a pseudorandom 64-bit number in range [0,@max). **/
+
+#endif
diff --git a/libucw/ucw/libucw.pc b/libucw/ucw/libucw.pc
new file mode 100644
index 0000000..08790da
--- /dev/null
+++ b/libucw/ucw/libucw.pc
@@ -0,0 +1,15 @@
+# pkg-config metadata for libucw
+
+libdir=@LIBDIR@
+incdir=.
+
+perl_modules_dir=@INSTALL_PERL_DIR@
+perl_module_flags=-I${perl_modules_dir}
+build_system=@INSTALL_SHARE_DIR@/ucw/build
+
+Name: libucw
+Description: A library of utility functions and data structures
+Version: @UCW_VERSION@
+Cflags: -I${incdir}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw@UCW_ABI_SUFFIX@
+Libs.private: @LIBUCW_LIBS@
diff --git a/libucw/ucw/lizard-safe.c b/libucw/ucw/lizard-safe.c
new file mode 100644
index 0000000..0aa218d
--- /dev/null
+++ b/libucw/ucw/lizard-safe.c
@@ -0,0 +1,98 @@
+/*
+ *	LiZaRd -- Fast compression method based on Lempel-Ziv 77
+ *
+ *	(c) 2004, Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/threads.h>
+#include <ucw/sighandler.h>
+#include <ucw/lizard.h>
+
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <errno.h>
+
+struct lizard_buffer {
+  uint len;
+  void *ptr;
+};
+
+struct lizard_buffer *
+lizard_alloc(void)
+{
+  struct lizard_buffer *buf = xmalloc(sizeof(struct lizard_buffer));
+  buf->len = 0;
+  buf->ptr = NULL;
+  handle_signal(SIGSEGV);
+  return buf;
+}
+
+void
+lizard_free(struct lizard_buffer *buf)
+{
+  unhandle_signal(SIGSEGV);
+  if (buf->ptr)
+    munmap(buf->ptr, buf->len + CPU_PAGE_SIZE);
+  xfree(buf);
+}
+
+static void
+lizard_realloc(struct lizard_buffer *buf, uint max_len)
+  /* max_len needs to be aligned to CPU_PAGE_SIZE */
+{
+  if (max_len <= buf->len)
+    return;
+  if (max_len < 2*buf->len)				// to ensure logarithmic cost
+    max_len = 2*buf->len;
+
+  if (buf->ptr)
+    munmap(buf->ptr, buf->len + CPU_PAGE_SIZE);
+  buf->len = max_len;
+  buf->ptr = mmap(NULL, buf->len + CPU_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  if (buf->ptr == MAP_FAILED)
+    die("mmap(anonymous, %d bytes): %m", (uint)(buf->len + CPU_PAGE_SIZE));
+  if (mprotect(buf->ptr + buf->len, CPU_PAGE_SIZE, PROT_NONE) < 0)
+    die("mprotect: %m");
+}
+
+static jmp_buf safe_decompress_jump;
+static int
+sigsegv_handler(int signal UNUSED)
+{
+  longjmp(safe_decompress_jump, 1);
+  return 1;
+}
+
+byte *
+lizard_decompress_safe(const byte *in, struct lizard_buffer *buf, uint expected_length)
+{
+  uint lock_offset = ALIGN_TO(expected_length + 3, CPU_PAGE_SIZE);	// +3 due to the unaligned access
+  if (lock_offset > buf->len)
+    lizard_realloc(buf, lock_offset);
+  volatile ucw_sighandler_t old_handler = set_signal_handler(SIGSEGV, sigsegv_handler);
+  byte *ptr;
+  if (!setjmp(safe_decompress_jump))
+  {
+    ptr = buf->ptr + buf->len - lock_offset;
+    int len = lizard_decompress(in, ptr);
+    if (len != (int) expected_length)
+    {
+      ptr = NULL;
+      errno = EINVAL;
+    }
+  }
+  else
+  {
+    msg(L_ERROR, "SIGSEGV caught in lizard_decompress()");
+    ptr = NULL;
+    errno = EFAULT;
+  }
+  set_signal_handler(SIGSEGV, old_handler);
+  return ptr;
+}
diff --git a/libucw/ucw/lizard-test.c b/libucw/ucw/lizard-test.c
new file mode 100644
index 0000000..0a8030d
--- /dev/null
+++ b/libucw/ucw/lizard-test.c
@@ -0,0 +1,125 @@
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-binary.h>
+#include <ucw/lizard.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+static char *options = CF_SHORT_OPTS "cdtx";
+static char *help = "\
+Usage: lizard-test <options> input-file [output-file]\n\
+\n\
+Options:\n"
+CF_USAGE
+"-c\t\tCompress\n\
+-d\t\tDecompress\n\
+-t\t\tCompress, decompress, and compare (in memory only, default)\n\
+-x\t\tLet the test crash by shrinking the output buffer\n\
+";
+
+static void NONRET
+usage(void)
+{
+  fputs(help, stderr);
+  exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+  int opt;
+  uint action = 't';
+  uint crash = 0;
+  log_init(argv[0]);
+  while ((opt = cf_getopt(argc, argv, options, CF_NO_LONG_OPTS, NULL)) >= 0)
+    switch (opt)
+    {
+      case 'c':
+      case 'd':
+      case 't':
+	action = opt;
+	break;
+      case 'x':
+	crash++;
+	break;
+      default:
+	usage();
+    }
+  if (action == 't' && argc != optind+1
+  || action != 't' && argc != optind+2)
+    usage();
+
+  void *mi, *mo;
+  int li, lo;
+  uint adler = 0;
+
+  struct stat st;
+  stat(argv[optind], &st);
+  li = st.st_size;
+  struct fastbuf *fi = bopen(argv[optind], O_RDONLY, 1<<16);
+  if (action != 'd')
+  {
+    lo = li * LIZARD_MAX_MULTIPLY + LIZARD_MAX_ADD;
+    li += LIZARD_NEEDS_CHARS;
+  }
+  else
+  {
+    lo = bgetl(fi);
+    adler = bgetl(fi);
+    li -= 8;
+  }
+  mi = xmalloc(li);
+  mo = xmalloc(lo);
+  li = bread(fi, mi, li);
+  bclose(fi);
+
+  printf("%d ", li);
+  if (action == 'd')
+    printf("->expected %d (%08x) ", lo, adler);
+  fflush(stdout);
+  if (action != 'd')
+    lo = lizard_compress(mi, li, mo);
+  else
+  {
+    lo = lizard_decompress(mi, mo);
+    if (adler32(mo, lo) != adler)
+      printf("wrong Adler32 ");
+  }
+  printf("-> %d ", lo);
+  fflush(stdout);
+
+  if (action != 't')
+  {
+    struct fastbuf *fo = bopen(argv[optind+1], O_CREAT | O_TRUNC | O_WRONLY, 1<<16);
+    if (action == 'c')
+    {
+      bputl(fo, li);
+      bputl(fo, adler32(mi, li));
+    }
+    bwrite(fo, mo, lo);
+    bclose(fo);
+  }
+  else
+  {
+    int smaller_li;
+    if (li >= (int) CPU_PAGE_SIZE)
+      smaller_li = li - CPU_PAGE_SIZE;
+    else
+      smaller_li = 0;
+    struct lizard_buffer *buf = lizard_alloc();
+    byte *ptr = lizard_decompress_safe(mo, buf, crash ? smaller_li : li);
+    if (!ptr)
+      printf("err: %m");
+    else if (memcmp(mi, ptr, li))
+      printf("WRONG");
+    else
+      printf("OK");
+    lizard_free(buf);
+  }
+  printf("\n");
+}
diff --git a/libucw/ucw/lizard.c b/libucw/ucw/lizard.c
new file mode 100644
index 0000000..a3b280f
--- /dev/null
+++ b/libucw/ucw/lizard.c
@@ -0,0 +1,478 @@
+/*
+ *	LiZaRd -- Fast compression method based on Lempel-Ziv 77
+ *
+ *	(c) 2004, Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ *
+ *	The file format is based on LZO1X and
+ *	the compression method is based on zlib.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/lizard.h>
+
+#include <string.h>
+
+typedef u16 hash_ptr_t;
+struct hash_record {
+  /* the position in the original text is implicit; it is computed by locate_string() */
+  hash_ptr_t next;			// 0=end
+  hash_ptr_t prev;			// high bit: 0=record in array, 1=head in hash-table (i.e. value of hashf)
+};
+
+#define	HASH_SIZE	(1<<14)		// size of hash-table
+#define	HASH_RECORDS	(1<<15)		// maximum number of records in hash-table, 0 is unused ==> subtract 1
+#define	CHAIN_MAX_TESTS		8	// crop longer collision chains
+#define	CHAIN_GOOD_MATCH	32	// we already have a good match => end
+
+static inline uint
+hashf(const byte *string)
+  /* 0..HASH_SIZE-1 */
+{
+    return string[0] ^ (string[1]<<3) ^ (string[2]<<6);
+}
+
+static inline byte *
+locate_string(const byte *string, int record_id, int head)
+  /* The strings are recorded into the hash-table regularly, hence there is no
+   * need to store the pointer there.  */
+{
+  string += record_id - head;
+  if (record_id >= head)
+    string -= HASH_RECORDS-1;
+  return (byte *)string;
+}
+
+static inline uint
+find_match(uint record_id, struct hash_record *hash_rec, const byte *string, const byte *string_end, byte **best_ptr, uint head)
+  /* hash_tab[hash] == record_id points to the head of the double-linked
+   * link-list of strings with the same hash.  The records are statically
+   * stored in circular array hash_rec (with the 1st entry unused), and the
+   * pointers are just 16-bit indices.  The strings in every collision chain
+   * are ordered by age.  */
+{
+  uint count = CHAIN_MAX_TESTS;
+  uint best_len = 0;
+  while (record_id && count-- > 0)
+  {
+    byte *record_string = locate_string(string, record_id, head);
+    byte *cmp = record_string;
+    if (cmp[0] == string[0] && cmp[2] == string[2])
+    /* implies cmp[1] == string[1] */
+    {
+      if (cmp[3] == string[3])
+      {
+	cmp += 4;
+	if (*cmp++ == string[4] && *cmp++ == string[5]
+	    && *cmp++ == string[6] && *cmp++ == string[7])
+	{
+	  const byte *str = string + 8;
+	  while (str <= string_end && *cmp++ == *str++);
+	}
+      }
+      else
+	cmp += 4;
+      uint len = cmp - record_string - 1;	/* cmp points 2 characters after the last match */
+      if (len > best_len)
+      {
+	best_len = len;
+	*best_ptr = record_string;
+	if (best_len >= CHAIN_GOOD_MATCH)	/* optimization */
+	  break;
+      }
+    }
+    record_id = hash_rec[record_id].next;
+  }
+  return best_len;
+}
+
+static uint
+hash_string(hash_ptr_t *hash_tab, uint hash, struct hash_record *hash_rec, /*byte *string,*/ uint head, uint *to_delete)
+  /* We reuse hash-records stored in a circular array.  First, delete the old
+   * one and then add the new one in front of the link-list.  */
+{
+  struct hash_record *rec = hash_rec + head;
+  if (*to_delete)				/* unlink the original record */
+  {
+    uint prev_id = rec->prev & ((1<<15)-1);
+    if (rec->prev & (1<<15))			/* was a head */
+      hash_tab[prev_id] = 0;
+    else					/* thanks to the ordering, this was a tail */
+      hash_rec[prev_id].next = 0;
+  }
+  rec->next = hash_tab[hash];
+  rec->prev = (1<<15) | hash;
+  hash_rec[rec->next].prev = head;
+  hash_tab[hash] = head;			/* add the new record before the link-list */
+
+  if (++head >= HASH_RECORDS)			/* circular buffer, reuse old records, 0 is unused */
+  {
+    head = 1;
+    *to_delete = 1;
+  }
+  return head;
+}
+
+static inline byte *
+dump_unary_value(byte *out, uint l)
+{
+  while (l > 255)
+  {
+    l -= 255;
+    *out++ = 0;
+  }
+  *out++ = l;
+  return out;
+}
+
+static byte *
+flush_copy_command(uint bof, byte *out, const byte *start, uint len)
+{
+  if (bof && len <= 238)
+    *out++ = len + 17;
+  else if (len < 4)
+  {
+    /* cannot happen when !!bof */
+    out[-2] |= len;				/* invariant: lowest 2 bits 2 bytes back */
+#ifdef	CPU_ALLOW_UNALIGNED
+    * (u32*) out = * (u32*) start;
+    return out + len;
+#else
+    while (len-- > 0)
+      *out++ = *start++;
+    return out;
+#endif
+  }
+  else
+  {
+    /* leave 2 least significant bits of out[-2] set to 0 */
+    if (len <= 18)
+      *out++ = len - 3;
+    else
+    {
+      *out++ = 0;
+      out = dump_unary_value(out, len - 18);
+    }
+  }
+  memcpy(out, start, len);
+  return out + len;
+}
+
+int
+lizard_compress(const byte *in, uint in_len, byte *out)
+  /* Requires out being allocated for at least in_len * LIZARD_MAX_MULTIPLY +
+   * LIZARD_MAX_ADD.  There must be at least LIZARD_NEEDS_CHARS characters
+   * allocated after in.  Returns the actual compressed length. */
+{
+  hash_ptr_t hash_tab[HASH_SIZE];
+  struct hash_record hash_rec[HASH_RECORDS];
+  const byte *in_end = in + in_len;
+  byte *out_start = out;
+  const byte *copy_start = in;
+  uint head = 1;					/* 0 in unused */
+  uint to_delete = 0, bof = 1;
+  bzero(hash_tab, sizeof(hash_tab));		/* init the hash-table */
+  while (in < in_end)
+  {
+    uint hash = hashf(in);
+    byte *best = NULL;
+    uint len = find_match(hash_tab[hash], hash_rec, in, in_end, &best, head);
+    if (len < 3)
+#if 0			// TODO: now, our routine does not detect matches of length 2
+      if (len == 2 && (in - best->string - 1) < (1<<10))
+      { /* pass-thru */ }
+      else
+#endif
+      {
+literal:
+	head = hash_string(hash_tab, hash, hash_rec, head, &to_delete);
+	in++;					/* add a literal */
+	continue;
+      }
+
+    if (in + len > in_end)			/* crop EOF */
+    {
+      len = in_end - in;
+      if (len < 3)
+	goto literal;
+    }
+    /* Record the match.  */
+    uint copy_len = in - copy_start;
+    uint is_in_copy_mode = bof || copy_len >= 4;
+    uint shift = in - best - 1;
+    /* Try to use a 2-byte sequence.  */
+#if 0
+    if (len == 2)
+    {
+      if (is_in_copy_mode || !copy_len)		/* cannot use with 0 copied characters, because this bit pattern is reserved for copy mode */
+	goto literal;
+      else
+	goto dump_2sequence;
+    } else
+#endif
+    /* now, len >= 3 */
+    if (shift < (1<<11) && len <= 8)
+    {
+      shift |= (len-3 + 2)<<11;
+dump_2sequence:
+      if (copy_len)
+	out = flush_copy_command(bof, out, copy_start, copy_len);
+      *out++ = (shift>>6) & ~3;			/* shift fits into 10 bits */
+      *out++ = shift & 0xff;
+    }
+    else if (len == 3 && is_in_copy_mode)
+    {
+      if (shift < (1<<11) + (1<<10))		/* optimisation for length-3 matches after a copy command */
+      {
+	shift -= 1<<11;
+	goto dump_2sequence;			/* shift has 11 bits and contains also len */
+      }
+      else					/* avoid 3-sequence compressed to 3 sequence if it can simply be appended */
+	goto literal;
+    }
+    /* We have to use a 3-byte sequence.  */
+    else
+    {
+      if (copy_len)
+	out = flush_copy_command(bof, out, copy_start, copy_len);
+      if (shift < (1<<14))
+      {
+	if (len <= 33)
+	  *out++ = (1<<5) | (len-2);
+	else
+	{
+	  *out++ = 1<<5;
+	  out = dump_unary_value(out, len - 33);
+	}
+      }
+      else /* shift < (1<<15)-1 becase of HASH_RECORDS */
+      {
+	shift++;				/* because shift==0 is reserved for EOF */
+	byte pos_bit = ((shift>>11) & (1<<3)) | (1<<4);
+	if (len <= 9)
+	  *out++ = pos_bit | (len-2);
+	else
+	{
+	  *out++ = pos_bit;
+	  out = dump_unary_value(out, len - 9);
+	}
+      }
+      *out++ = (shift>>6) & ~3;			/* rest of shift fits into 14 bits */
+      *out++ = shift & 0xff;
+    }
+    /* Update the hash-table.  */
+    head = hash_string(hash_tab, hash, hash_rec, head, &to_delete);
+    for (uint i=1; i<len; i++)
+      head = hash_string(hash_tab, hashf(in+i), hash_rec, head, &to_delete);
+    in += len;
+    copy_start = in;
+    bof = 0;
+  }
+  uint copy_len = in - copy_start;
+  if (copy_len)
+    out = flush_copy_command(bof, out, copy_start, copy_len);
+  *out++ = 17;					/* add EOF */
+  *out++ = 0;
+  *out++ = 0;
+  return out - out_start;
+}
+
+static inline byte *
+read_unary_value(const byte *in, uint *val)
+{
+  uint l = 0;
+  while (!*in++)
+    l += 255;
+  l += in[-1];
+  *val = l;
+  return (byte *)in;
+}
+
+int
+lizard_decompress(const byte *in, byte *out)
+  /* Requires out being allocated for the decompressed length must be known
+   * beforehand.  It is desirable to lock the following memory page for
+   * read-only access to prevent buffer overflow.  Returns the actual
+   * decompressed length or a negative number when an error has occurred.  */
+{
+  byte *out_start = out;
+  uint expect_copy_command = 1;
+  uint len;
+  if (*in > 17)					/* short copy command at BOF */
+  {
+    len = *in++ - 17;
+    goto perform_copy_command;
+  }
+  while (1)
+  {
+    uint c = *in++;
+    uint pos;
+    if (c < 0x10)
+      if (expect_copy_command == 1)
+      {
+	if (!c)
+	{
+	  in = read_unary_value(in, &len);
+	  len += 18;
+	}
+	else
+	  len = c + 3;
+	goto perform_copy_command;
+      }
+      else
+      {
+	pos = ((c&0xc)<<6) | *in++;
+	if (expect_copy_command == 2)
+	{
+	  pos += 1<<11;
+	  len = 3;
+	}
+	else
+	  len = 2;
+	pos++;
+      }
+    else if (c < 0x20)
+    {
+      pos = (c&0x8)<<11;
+      len = c&0x7;
+      if (!len)
+      {
+	in = read_unary_value(in, &len);
+	len += 9;
+      }
+      else
+	len += 2;
+      pos |= (*in++ & 0xfc)<<6;
+      pos |= *in++;
+      if (!pos)					/* EOF */
+	break;
+      /* do NOT pos++ */
+    }
+    else if (c < 0x40)
+    {
+      len = c&0x1f;
+      if (!len)
+      {
+	in = read_unary_value(in, &len);
+	len += 33;
+      }
+      else
+	len += 2;
+      pos = (*in++ & 0xfc)<<6;
+      pos |= *in++;
+      pos++;
+    }
+    else /* high bits encode the length */
+    {
+      len = ((c&0xe0)>>5) -2 +3;
+      pos = (c&0x1c)<<6;
+      pos |= *in++;
+      pos++;
+    }
+    /* take from the sliding window */
+    if (len <= pos)
+    {
+      memcpy(out, out-pos, len);
+      out += len;
+    }
+    else
+    {						/* overlapping */
+      for (; len-- > 0; out++)
+	*out = *(out-pos);
+      /* It's tempting to use out[-pos] above, but unfortunately it's not the same */
+    }
+    /* extract the copy-bits */
+    len = in[-2] & 0x3;
+    if (len)
+    {
+      expect_copy_command = 0;
+#ifdef	CPU_ALLOW_UNALIGNED
+      * (u32*) out = * (u32*) in;
+      out += len;
+      in += len;
+#else
+      while (len-- > 0)
+	*out++ = *in++;
+#endif
+    }
+    else
+      expect_copy_command = 1;
+    continue;
+
+perform_copy_command:
+    expect_copy_command = 2;
+    memcpy(out, in, len);
+    out += len;
+    in += len;
+  }
+
+  return out - out_start;
+}
+
+/*
+
+Description of the LZO1X format :
+=================================
+
+The meaning of the commands depends on the current mode. It can be either
+the compressed mode or the copy mode. In some cases, the compressed mode
+also distinguishes whether we just left the copy mode or not.
+
+Beginning of file:
+------------------
+
+Start in copy mode. If the first byte is 00010001, it means probably EOF (empty file),
+so switch to the compressed mode.  If it is bigger, subtract 17 and copy this number of
+the following characters to the output and switch to the compressed mode.
+If it is smaller, interpret it as a regular copy mode command.
+
+Compressed mode:
+----------------
+
+Read the first byte of the sequence and determine the type of bit encoding by
+looking at the most significant bits.  The sequence is always at least 2 bytes
+long.  Decode sequences of these types until the EOF or END marker is read.
+
+  length L = length of the text taken from the sliding window
+
+    If L=0, then count the number Z of the following zero bytes and add Z*255
+    to the value of the following non-zero byte.  This allows setting L
+    arbitrarily high.
+
+  position p = relative position of the beginning of the text
+
+    Exception: 00010001 00000000 00000000 means EOF
+
+  copying C = length 1..3 of copied characters or END=0
+
+    C following characters will be copied from the compressed text to the
+    output.  The number CC is always stored in the 2 least significant bits of
+    the second last byte of the sequence.
+
+    If END is read, the algorithm switches to the copy mode.
+
+pattern					length		position
+
+0000ppCC 		 pppppppp	2		10 bits		[default interpretation]
+0000ppCC 		 pppppppp	3		10 bits + 2048	[just after return from copy mode]
+0001pLLL L*	ppppppCC pppppppp	3..9 + extend	15 bits		[pos 0 interpreted as EOF]
+001LLLLL L*	ppppppCC pppppppp	3..33 + extend	14 bits
+LLLpppCC		 pppppppp	3..8		11 bits		[LLL >= 010]
+
+Copy mode:
+----------
+
+Read the first byte and, if the most significant bits are 0000, perform the
+following command, otherwise switch to the compressed mode (and evaluate the
+command there).
+
+pattern					length		position
+
+0000LLLL L*				4..18 + extend	N/A
+
+  Copy L characters from the compressed text to the output.  The overhead for
+  incompressible strings is only roughly 1/256 + epsilon.
+
+*/
diff --git a/libucw/ucw/lizard.h b/libucw/ucw/lizard.h
new file mode 100644
index 0000000..19af423
--- /dev/null
+++ b/libucw/ucw/lizard.h
@@ -0,0 +1,157 @@
+/*
+ *	LiZaRd -- Fast compression method based on Lempel-Ziv 77
+ *
+ *	(c) 2004, Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_LIZARD_H
+#define _UCW_LIZARD_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define adler32_update ucw_adler32_update
+#define lizard_alloc ucw_lizard_alloc
+#define lizard_compress ucw_lizard_compress
+#define lizard_decompress ucw_lizard_decompress
+#define lizard_decompress_safe ucw_lizard_decompress_safe
+#define lizard_free ucw_lizard_free
+#endif
+
+/***
+ * [[basic]]
+ * Basic application
+ * -----------------
+ **/
+
+/**
+ * The compression routine needs input buffer 8 characters longer, because it
+ * does not check the input bounds all the time.
+ **/
+#define	LIZARD_NEEDS_CHARS	8
+
+#define	LIZARD_MAX_MULTIPLY	23./22
+#define	LIZARD_MAX_ADD		4
+  /* In the worst case, the compressed file will not be longer than its
+   * original length * 23/22 + 4.
+   *
+   * The additive constant is for EOF and the header of the file.
+   *
+   * The multiplicative constant comes from 19-byte incompressible string
+   * followed by a 3-sequence that can be compressed into 2-byte link.  This
+   * breaks the copy-mode and it needs to be restarted with a new header.  The
+   * total length is 2(header) + 19(string) + 2(link) = 23.
+   */
+
+/**
+ * The compressed data will not be longer than `LIZARD_MAX_LEN(input_length)`.
+ * Note that `LIZARD_MAX_LEN(length) > length` (this is not a problem of the algorithm,
+ * every lossless compression algorithm must have an input for which it produces a larger
+ * output).
+ *
+ * Use this to compute the size of @out parameter of @lizard_compress().
+ **/
+#define LIZARD_MAX_LEN(LENGTH) ((LENGTH) * LIZARD_MAX_MULTIPLY + LIZARD_MAX_ADD)
+
+/* lizard.c */
+
+/**
+ * Compress data provided in @in.
+ * The input buffer must be at last `@in_len + <<def_LIZARD_NEEDS_CHARS,LIZARD_NEEDS_CHARS>>`
+ * long (the compression algorithm does not check the bounds all the time).
+ *
+ * The output will be stored in @out. The @out buffer must be at last <<def_LIZARD_LEN,`LIZARD_LEN(@in_len)`>>
+ * bytes long for the output to fit in for sure.
+ *
+ * The function returns number of bytes actually needed (the size of output).
+ *
+ * Use @lizard_decompress() to get the original data.
+ **/
+int lizard_compress(const byte *in, uint in_len, byte *out);
+
+/**
+ * Decompress data previously compressed by @lizard_compress().
+ * Input is taken from @in and the result stored in @out.
+ * The size of output is returned.
+ *
+ * Note that you need to know the maximal possible size of the output to
+ * allocate enough memory.
+ *
+ * See also <<safe,safe decompression>>.
+ **/
+int lizard_decompress(const byte *in, byte *out);
+
+/* lizard-safe.c */
+
+/***
+ * [[safe]]
+ * Safe decompression
+ * ------------------
+ *
+ * You can use safe decompression, when you want to make sure you got the
+ * length right and when you want to reuse the buffer for output.
+ ***/
+
+struct lizard_buffer;	/** Type of the output buffer for @lizard_decompress_safe(). **/
+
+struct lizard_buffer *lizard_alloc(void);	/** Get me a new <<struct_lizard_buffer,`lizard_buffer`>>. **/
+/**
+ * Return memory used by a <<struct_lizard_buffer,`lizard_buffer`>>.
+ * It frees even the data stored in it (the result of
+ * @lizard_decompress_safe() call that used this buffer).
+ **/
+void lizard_free(struct lizard_buffer *buf);
+
+/**
+ * This one acts much like @lizard_decompress(). The difference is it
+ * checks the data to be of correct length (therefore it will not
+ * crash on invalid data).
+ *
+ * It decompresses data provided by @in. The @buf is used to get the
+ * memory for output (you get one by @lizard_alloc()).
+ *
+ * The pointer to decompressed data is returned. To free it, free the
+ * buffer by @lizard_free().
+ *
+ * In the case of error, NULL is returned. In that case, `errno` is
+ * set either to `EINVAL` (expected_length does not match) or to
+ * `EFAULT` (a segfault has been caught while decompressing -- it
+ * probably means expected_length was set way too low). Both cases
+ * suggest either wrongly computed length or data corruption.
+ *
+ * The @buf argument may be reused for multiple decompresses. However,
+ * the data will be overwritten by the next call.
+ *
+ * Beware this function is not thread-safe and is not even reentrant
+ * (because of internal segfault handling).
+ **/
+byte *lizard_decompress_safe(const byte *in, struct lizard_buffer *buf, uint expected_length);
+
+/* adler32.c */
+
+/***
+ * [[adler]]
+ * Adler-32 checksum
+ * -----------------
+ *
+ * This is here because it is commonly used to check data compressed by LiZaRd.
+ * However, it could also belong to <<hash,hashing routines>>.
+ ***/
+
+/**
+ * Update the Adler-32 checksum with more data.
+ * @adler is the old value, @byte points to @len bytes of data to update with.
+ * Result is returned.
+ **/
+uint adler32_update(uint adler, const byte *ptr, uint len);
+
+/**
+ * Compute the Adler-32 checksum of a block of data.
+ **/
+static inline uint adler32(const byte *buf, uint len)
+{
+  return adler32_update(1, buf, len);
+}
+
+#endif
diff --git a/libucw/ucw/log-conf-test.cf b/libucw/ucw/log-conf-test.cf
new file mode 100644
index 0000000..828f6e3
--- /dev/null
+++ b/libucw/ucw/log-conf-test.cf
@@ -0,0 +1,35 @@
+Include etc/libucw
+
+Logging {
+
+Stream {
+	Name		logfile
+	FileName	log/test
+	StdErrFollows	1
+	Limit { Rate 100 }
+}
+
+Stream {
+	Name		logfile2
+	FileName	log/test2
+	Microseconds	1
+	Levels:reset	info warn error
+	Types:reset	default foo
+	ErrorsFatal	1
+	ShowTypes	1
+}
+
+Stream {
+	Name		syslog
+	SyslogFacility	user
+	SyslogPID	1
+}
+
+Stream {
+	Name		combined
+	Substream	logfile
+	Substream	logfile2
+	Substream	syslog
+}
+
+}
diff --git a/libucw/ucw/log-conf.c b/libucw/ucw/log-conf.c
new file mode 100644
index 0000000..72bbefd
--- /dev/null
+++ b/libucw/ucw/log-conf.c
@@ -0,0 +1,370 @@
+/*
+ *	UCW Library -- Logging: Configuration of Log Streams
+ *
+ *	(c) 2009 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/conf.h>
+#include <ucw/simple-lists.h>
+#include <ucw/tbf.h>
+#include <ucw/threads.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <sys/time.h>
+
+#ifndef TEST
+
+/*** Configuration of streams ***/
+
+struct stream_config {
+  cnode n;
+  char *name;
+  char *file_name;
+  int file_desc;
+  char *syslog_facility;
+  u32 levels;
+  clist types;				// simple_list of names
+  clist substreams;			// simple_list of names
+  clist limits;				// of struct limit_config's
+  int microseconds;			// Enable logging of precise timestamps
+  int show_types;
+  int syslog_pids;
+  int errors_fatal;
+  int stderr_follows;
+  struct log_stream *ls;
+  int mark;				// Used temporarily in log_config_commit()
+};
+
+struct limit_config {
+  cnode n;
+  clist types;				// simple_list of names
+  double rate;
+  uint burst;
+};
+
+static char *
+stream_init(void *ptr)
+{
+  struct stream_config *c = ptr;
+
+  c->levels = ~0U;
+  c->file_desc = -1;
+  return NULL;
+}
+
+static char *
+stream_commit(void *ptr)
+{
+  struct stream_config *c = ptr;
+
+  if (c->syslog_facility)
+    {
+      if (!log_syslog_facility_exists(c->syslog_facility))
+	return cf_printf("SyslogFacility `%s' is not recognized", c->syslog_facility);
+      if (c->file_name)
+	return "Both FileName and SyslogFacility selected";
+      if (c->microseconds)
+	return "Syslog streams do not support microsecond precision";
+    }
+  if (c->stderr_follows && !c->file_name)
+    return "StdErrFollows requires a file-based stream";
+  return NULL;
+}
+
+static const char * const level_names[] = {
+#define P(x) #x,
+  LOG_LEVEL_NAMES
+#undef P
+  NULL
+};
+
+static struct cf_section limit_config = {
+  CF_TYPE(struct limit_config),
+  CF_ITEMS {
+#define P(x) PTR_TO(struct limit_config, x)
+    CF_LIST("Types", P(types), &cf_string_list_config),
+    CF_DOUBLE("Rate", P(rate)),
+    CF_UINT("Burst", P(burst)),
+#undef P
+    CF_END
+  }
+};
+
+static struct cf_section stream_config = {
+  CF_TYPE(struct stream_config),
+  CF_INIT(stream_init),
+  CF_COMMIT(stream_commit),
+  CF_ITEMS {
+#define P(x) PTR_TO(struct stream_config, x)
+    CF_STRING("Name", P(name)),
+    CF_STRING("FileName", P(file_name)),
+    CF_INT("FileDesc", P(file_desc)),
+    CF_STRING("SyslogFacility", P(syslog_facility)),
+    CF_BITMAP_LOOKUP("Levels", P(levels), level_names),
+    CF_LIST("Types", P(types), &cf_string_list_config),
+    CF_LIST("Substream", P(substreams), &cf_string_list_config),
+    CF_LIST("Limit", P(limits), &limit_config),
+    CF_INT("Microseconds", P(microseconds)),
+    CF_INT("ShowTypes", P(show_types)),
+    CF_INT("SyslogPID", P(syslog_pids)),
+    CF_INT("ErrorsFatal", P(errors_fatal)),
+    CF_INT("StdErrFollows", P(stderr_follows)),
+#undef P
+    CF_END
+  }
+};
+
+static clist log_stream_confs;
+
+static struct stream_config *
+stream_find(const char *name)
+{
+  CLIST_FOR_EACH(struct stream_config *, c, log_stream_confs)
+    if (!strcmp(c->name, name))
+      return c;
+  return NULL;
+}
+
+static char *
+stream_resolve(struct stream_config *c)
+{
+  if (c->mark == 2)
+    return NULL;
+  if (c->mark == 1)
+    return cf_printf("Log stream `%s' has substreams which refer to itself", c->name);
+
+  c->mark = 1;
+  char *err;
+  CLIST_FOR_EACH(simp_node *, s, c->substreams)
+    {
+      struct stream_config *d = stream_find(s->s);
+      if (!d)
+	return cf_printf("Log stream `%s' refers to unknown substream `%s'", c->name, s->s);
+      if (err = stream_resolve(d))
+	return err;
+    }
+  c->mark = 2;
+  return NULL;
+}
+
+static char *
+log_config_commit(void *ptr UNUSED)
+{
+  // Verify uniqueness of names
+  CLIST_FOR_EACH(struct stream_config *, c, log_stream_confs)
+    if (stream_find(c->name) != c)
+      return cf_printf("Log stream `%s' defined twice", c->name);
+
+  // Check that all substreams resolve and that there are no cycles
+  char *err;
+  CLIST_FOR_EACH(struct stream_config *, c, log_stream_confs)
+    if (err = stream_resolve(c))
+      return err;
+
+  return NULL;
+}
+
+static struct cf_section log_config = {
+  CF_COMMIT(log_config_commit),
+  CF_ITEMS {
+    CF_LIST("Stream", &log_stream_confs, &stream_config),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR
+log_config_init(void)
+{
+  cf_declare_section("Logging", &log_config, 0);
+}
+
+/*** Type sets ***/
+
+static uint
+log_type_mask(clist *l)
+{
+  if (clist_empty(l))
+    return ~0U;
+
+  uint types = 0;
+  CLIST_FOR_EACH(simp_node *, s, *l)
+    if (!strcmp(s->s, "all"))
+      return ~0U;
+    else
+      {
+	/*
+	 *  We intentionally ignore unknown types as not all types are known
+	 *  to all programs sharing a common configuration file. This is also
+	 *  the reason why Types is a list and not a bitmap.
+	 */
+	int type = log_find_type(s->s);
+	if (type >= 0)
+	  types |= 1 << LS_GET_TYPE(type);
+      }
+  return types;
+}
+
+/*** Generating limiters ***/
+
+/*
+ *  When limiting is enabled, we let log_stream->filter point to this function
+ *  and log_stream->user_data point to an array of pointers to token bucket
+ *  filters for individual message types.
+ */
+static int
+log_limiter(struct log_stream *ls, struct log_msg *m)
+{
+  struct token_bucket_filter **limits = ls->user_data;
+  if (!limits)
+    return 0;
+  struct token_bucket_filter *tbf = limits[LS_GET_TYPE(m->flags)];
+  if (!tbf)
+    return 0;
+
+  ASSERT(!(m->flags & L_SIGHANDLER));
+  if (m->flags & L_LOGGER_ERR)
+    return 0;
+
+  timestamp_t now = ((timestamp_t) m->tv->tv_sec * 1000) + (m->tv->tv_usec / 1000);
+  ucwlib_lock();
+  int res = tbf_limit(tbf, now);
+  ucwlib_unlock();
+
+  if (res < 0)
+    {
+      if (res == -1)
+	{
+	  struct log_msg mm = *m;
+	  mm.flags |= L_LOGGER_ERR;
+	  mm.raw_msg = "(maximum logging rate exceeded, some messages will be suppressed)";
+	  log_pass_msg(ls, &mm);
+	}
+      return 1;
+    }
+  else
+    return 0;
+}
+
+static void
+log_apply_limits(struct log_stream *ls, struct limit_config *lim)
+{
+  uint mask = log_type_mask(&lim->types);
+  if (!mask)
+    return;
+
+  if (!ls->user_data)
+    {
+      ls->user_data = cf_malloc_zero(LS_NUM_TYPES * sizeof(struct token_bucket_filter *));
+      ls->filter = log_limiter;
+    }
+  struct token_bucket_filter **limits = ls->user_data;
+  struct token_bucket_filter *tbf = cf_malloc_zero(sizeof(*lim));
+  tbf->rate = lim->rate;
+  tbf->burst = lim->burst;
+  tbf_init(tbf);
+
+  for (uint i=0; i < LS_NUM_TYPES; i++)
+    if (mask & (1 << i))
+      limits[i] = tbf;
+}
+
+/*** Generating streams ***/
+
+char *
+log_check_configured(const char *name)
+{
+  if (stream_find(name))
+    return NULL;
+  else
+    return cf_printf("Log stream `%s' not found", name);
+}
+
+static struct log_stream *
+do_new_configured(struct stream_config *c)
+{
+  struct log_stream *ls;
+  ASSERT(c);
+
+  if (c->ls)
+    return c->ls;
+
+  if (c->file_name)
+    ls = log_new_file(c->file_name, (c->stderr_follows ? FF_FD2_FOLLOWS : 0));
+  else if (c->file_desc >= 0)
+    ls = log_new_fd(c->file_desc, (c->stderr_follows ? FF_FD2_FOLLOWS : 0));
+  else if (c->syslog_facility)
+    ls = log_new_syslog(c->syslog_facility, (c->syslog_pids ? LOG_PID : 0));
+  else
+    ls = log_new_stream(sizeof(*ls));
+
+  CLIST_FOR_EACH(simp_node *, s, c->substreams)
+    log_add_substream(ls, do_new_configured(stream_find(s->s)));
+
+  ls->levels = c->levels;
+  if (c->microseconds)
+    ls->msgfmt |= LSFMT_USEC;
+  if (c->show_types)
+    ls->msgfmt |= LSFMT_TYPE;
+  if (c->errors_fatal)
+    ls->stream_flags |= LSFLAG_ERR_IS_FATAL;
+  ls->types = log_type_mask(&c->types);
+
+  CLIST_FOR_EACH(struct limit_config *, lim, c->limits)
+    log_apply_limits(ls, lim);
+
+  c->ls = ls;
+  return ls;
+}
+
+struct log_stream *
+log_new_configured(const char *name)
+{
+  struct stream_config *c = stream_find(name);
+  if (!c)
+    die("Unable to find log stream %s", name);
+  if (c->ls)
+    return log_ref_stream(c->ls);
+  return do_new_configured(c);
+}
+
+void
+log_configured(const char *name)
+{
+  log_set_default_stream(log_new_configured(name));
+}
+
+#else /* TEST */
+
+#include <unistd.h>
+#include <ucw/getopt.h>
+
+int main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  int c;
+  while ((c = cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL)) >= 0)
+    die("No options here.");
+
+  int type = log_register_type("foo");
+  struct log_stream *ls = log_new_configured("combined");
+  log_drop_stderr();
+  for (uint i=0; i<10; i++)
+    {
+      msg(L_INFO | ls->regnum | type, "Hello, universe!");
+      usleep(200000);
+    }
+  fprintf(stderr, "Alas, this was printed to stderr.\n");
+
+  log_close_all();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/log-file.c b/libucw/ucw/log-file.c
new file mode 100644
index 0000000..2e7a8d2
--- /dev/null
+++ b/libucw/ucw/log-file.c
@@ -0,0 +1,215 @@
+/*
+ *	UCW Library -- Logging to Files
+ *
+ *	(c) 1997--2015 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/io.h>
+#include <ucw/threads.h>
+#include <ucw/simple-lists.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <time.h>
+#include <errno.h>
+
+struct file_stream {
+  struct log_stream ls;		// ls.name is the current name of the log file
+  int fd;
+  uint flags;			// FF_xxx
+  char *orig_name;		// Original name with strftime escapes
+};
+
+#define MAX_EXPAND 64		// Maximum size of expansion of strftime escapes
+
+static int log_switch_nest;
+static bool log_stderr_replaced;
+
+static void
+do_log_reopen(struct file_stream *fs, const char *name)
+{
+  int fd = ucw_open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
+  if (fd < 0)
+    die("Unable to open log file %s: %m", name);
+  if (fs->fd >= 0)
+    close(fs->fd);
+  fs->fd = fd;
+  if (fs->flags & FF_FD2_FOLLOWS)
+    {
+      dup2(fd, 2);
+      log_stderr_replaced = 1;
+    }
+  if (fs->ls.name)
+    {
+      xfree(fs->ls.name);
+      fs->ls.name = NULL;	// We have to keep the stream consistent -- die() below can invoke logging
+    }
+  fs->ls.name = xstrdup(name);
+}
+
+static int
+do_log_switch(struct file_stream *fs, struct tm *tm)
+{
+  if (!(fs->flags & FF_FORMAT_NAME))
+    {
+      if (fs->fd >= 0)
+	return 1;
+      else
+	{
+	  do_log_reopen(fs, fs->orig_name);
+	  return 1;
+	}
+    }
+
+  int buflen = strlen(fs->orig_name) + MAX_EXPAND;
+  char name[buflen];
+  int switched = 0;
+
+  ucwlib_lock();
+  if (!log_switch_nest)		// Avoid infinite loops if we die when switching logs
+    {
+      log_switch_nest++;
+      int l = strftime(name, buflen, fs->orig_name, tm);
+      if (l < 0 || l >= buflen)
+	die("Error formatting log file name: %m");
+      if (!fs->ls.name || strcmp(name, fs->ls.name))
+	{
+	  do_log_reopen(fs, name);
+	  switched = 1;
+	}
+      log_switch_nest--;
+    }
+  ucwlib_unlock();
+  return switched;
+}
+
+static void
+file_close(struct log_stream *ls)
+{
+  struct file_stream *fs = (struct file_stream *) ls;
+  if ((fs->flags & FF_CLOSE_FD) && fs->fd >= 0)
+    close(fs->fd);
+  xfree(fs->ls.name);
+  xfree(fs->orig_name);
+}
+
+static int
+file_handler(struct log_stream *ls, struct log_msg *m)
+{
+  struct file_stream *fs = (struct file_stream *) ls;
+  if ((fs->flags & FF_FORMAT_NAME) && m->tm)
+    do_log_switch(fs, m->tm);
+
+  int r = write(fs->fd, m->m, m->m_len);
+  return ((r < 0) ? errno : 0);
+}
+
+struct log_stream *
+log_new_fd(int fd, uint flags)
+{
+  struct log_stream *ls = log_new_stream(sizeof(struct file_stream));
+  struct file_stream *fs = (struct file_stream *) ls;
+  fs->fd = fd;
+  if (fd == 2)
+    log_stderr_replaced = 1;
+  fs->flags = flags;
+  ls->msgfmt = LSFMT_DEFAULT;
+  ls->handler = file_handler;
+  ls->close = file_close;
+  ls->name = xmalloc(16);
+  snprintf(ls->name, 16, "fd%d", fd);
+  return ls;
+}
+
+struct log_stream *
+log_new_file(const char *path, uint flags)
+{
+  struct log_stream *ls = log_new_stream(sizeof(struct file_stream));
+  struct file_stream *fs = (struct file_stream *) ls;
+  fs->fd = -1;
+  fs->flags = FF_CLOSE_FD | flags;
+  fs->orig_name = xstrdup(path);
+  if (strchr(path, '%'))
+    fs->flags |= FF_FORMAT_NAME;
+  ls->msgfmt = LSFMT_DEFAULT;
+  ls->handler = file_handler;
+  ls->close = file_close;
+
+  time_t now = time(NULL);
+  struct tm *tm = localtime(&now);
+  ASSERT(tm);
+  do_log_switch(fs, tm);		// die()'s on errors
+  return ls;
+}
+
+int
+log_switch(void)
+{
+  time_t now = time(NULL);
+  struct tm *tm = localtime(&now);
+  ASSERT(tm);
+
+  int switched = 0;
+  for (int i=0; i < log_streams_after; i++)
+    if (log_streams.ptr[i]->handler == file_handler)
+      switched |= do_log_switch((struct file_stream *) log_streams.ptr[i], tm);
+  return switched;
+}
+
+void
+log_switch_disable(void)
+{
+  log_switch_nest++;
+}
+
+void
+log_switch_enable(void)
+{
+  ASSERT(log_switch_nest);
+  log_switch_nest--;
+}
+
+void
+log_file(const char *name)
+{
+  if (!name)
+    return;
+
+  log_set_default_stream(log_new_file(name, FF_FD2_FOLLOWS));
+}
+
+void
+log_drop_stderr(void)
+{
+  if (!log_stderr_replaced)
+    {
+      if (dup2(1, 2) < 0)
+	die("Cannot get rid of stderr: %m");
+      log_stderr_replaced = 1;
+    }
+}
+
+#ifdef TEST
+
+int main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  log_file("/proc/self/fd/1");
+  // struct log_stream *ls = log_new_fd(1, 0);
+  // struct log_stream *ls = log_new_file("/tmp/quork-%Y%m%d-%H%M%S", 0);
+  for (int i=1; i<argc; i++)
+    msg(L_INFO, argv[i]);
+  log_close_all();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/log-internal.h b/libucw/ucw/log-internal.h
new file mode 100644
index 0000000..dc1d152
--- /dev/null
+++ b/libucw/ucw/log-internal.h
@@ -0,0 +1,37 @@
+/*
+ *	UCW Library -- Internals of Logging
+ *
+ *	(c) 1997--2009 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_LOG_INTERNAL_H_
+#define _UCW_LOG_INTERNAL_H_
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define log_pass_msg ucw_log_pass_msg
+#define log_stream_default ucw_log_stream_default
+#define log_streams ucw_log_streams
+#define log_streams_after ucw_log_streams_after
+#define log_type_names ucw_log_type_names
+#endif
+
+/* Pass a message to a stream. */
+void log_pass_msg(struct log_stream *ls, struct log_msg *m);
+
+/* Define an array (growing buffer) for pointers to log_streams. */
+#define GBUF_TYPE struct log_stream*
+#define GBUF_PREFIX(x) lsbuf_##x
+#include <ucw/gbuf.h>
+
+extern struct lsbuf_t log_streams;
+extern int log_streams_after;
+
+extern struct log_stream log_stream_default;
+
+extern char **log_type_names;
+
+#endif
diff --git a/libucw/ucw/log-stream.c b/libucw/ucw/log-stream.c
new file mode 100644
index 0000000..342fe09
--- /dev/null
+++ b/libucw/ucw/log-stream.c
@@ -0,0 +1,212 @@
+/*
+ *	UCW Library -- Logging: Management of Log Streams
+ *
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *	(c) 2009--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/simple-lists.h>
+
+#include <string.h>
+
+/* Initial number of streams to allocate (must be >=2) */
+#define LS_INIT_STREAMS 8
+
+/* Flag indicating initialization of the module */
+static int log_initialized = 0;
+
+/* The head of the list of freed log_streams indexes in log_streams.ptr (~0U if none free).
+ * Freed positions in log_streams.ptr are connected into a linked list in the following way:
+ * log_streams.ptr[log_streams_free].levels is the index of next freed position (or ~0U) */
+static uint log_streams_free = ~0U;
+
+/* Initialize the logstream module.
+ * It is not neccessary to call this explicitely as it is called by
+ * the first log_new_stream()  (for backward compatibility and ease of use). */
+static void
+log_init_module(void)
+{
+  if (log_initialized)
+    return;
+
+  /* Create the growing array */
+  lsbuf_init(&log_streams);
+  lsbuf_set_size(&log_streams, LS_INIT_STREAMS);
+
+  bzero(log_streams.ptr, sizeof(struct log_stream*) * (log_streams.len));
+  log_streams_free = ~0U;
+
+  log_initialized = 1;
+
+  /* init the default stream (0) as forwarder to fd2 */
+  struct log_stream *ls = log_new_stream(sizeof(*ls));
+  ASSERT(ls == log_streams.ptr[0]);
+  ASSERT(ls->regnum == 0);
+  ls->name = "default";
+  log_add_substream(ls, &log_stream_default);
+}
+
+void
+log_close_all(void)
+{
+  if (!log_initialized)
+    return;
+
+  // Remove substreams of all streams
+  for (int i=0; i < log_streams_after; i++)
+    if (log_streams.ptr[i]->regnum >= 0)
+      log_rm_substream(log_streams.ptr[i], NULL);
+
+  // Close all streams that remain and free all cached structures
+  for (int i=0; i < log_streams_after; i++)
+    {
+      struct log_stream *ls = log_streams.ptr[i];
+      if (ls->regnum >= 0)
+	log_close_stream(ls);
+      ASSERT(ls->regnum < 0 || !ls->use_count);
+      xfree(ls);
+    }
+
+  /* Back to the default state */
+  lsbuf_done(&log_streams);
+  log_streams_after = 0;
+  log_streams_free = ~0U;
+  log_initialized = 0;
+}
+
+void
+log_add_substream(struct log_stream *where, struct log_stream *what)
+{
+  ASSERT(where);
+  ASSERT(what);
+
+  simp_node *n = xmalloc(sizeof(simp_node));
+  n->p = log_ref_stream(what);
+  clist_add_tail(&where->substreams, &n->n);
+}
+
+int
+log_rm_substream(struct log_stream *where, struct log_stream *what)
+{
+  void *tmp;
+  int cnt = 0;
+  ASSERT(where);
+
+  CLIST_FOR_EACH_DELSAFE(simp_node *, i, where->substreams, tmp)
+    if (i->p == what || !what)
+      {
+	clist_remove(&i->n);
+	log_close_stream(i->p);
+	xfree(i);
+	cnt++;
+      }
+  return cnt;
+}
+
+struct log_stream *
+log_new_stream(size_t size)
+{
+  struct log_stream *l;
+  int index;
+
+  /* Initialize the data structures if needed */
+  log_init_module();
+
+  /* Get a free stream, possibly recycling a closed one */
+  if (log_streams_free == ~0U)
+    {
+      lsbuf_grow(&log_streams, log_streams_after+1);
+      index = log_streams_after++;
+      l = log_streams.ptr[index] = xmalloc(size);
+    }
+  else
+    {
+      index = log_streams_free;
+      l = xrealloc(log_streams.ptr[index], size);
+      log_streams.ptr[index] = l;
+      log_streams_free = l->levels;
+    }
+
+  /* Initialize the stream */
+  bzero(l, sizeof(*l));
+  l->levels = ~0U;
+  l->types = ~0U;
+  l->regnum = LS_SET_STRNUM(index);
+  clist_init(&l->substreams);
+  return log_ref_stream(l);
+}
+
+int
+log_close_stream(struct log_stream *ls)
+{
+  ASSERT(ls);
+  ASSERT(ls->use_count);
+  if (--ls->use_count)
+    return 0;
+
+  /* Unlink all subtreams */
+  log_rm_substream(ls, NULL);
+
+  /* Close the stream and add it to the free-list */
+  if (ls->close)
+    ls->close(ls);
+  ls->levels = log_streams_free;
+  log_streams_free = LS_GET_STRNUM(ls->regnum);
+  ls->regnum = -1;
+  return 1;
+}
+
+void
+log_set_format(struct log_stream *ls, uint mask, uint data)
+{
+  ls->msgfmt = (ls->msgfmt & mask) | data;
+  CLIST_FOR_EACH(simp_node *, i, ls->substreams)
+    log_set_format(i->p, mask, data);
+}
+
+void
+log_set_default_stream(struct log_stream *ls)
+{
+  struct log_stream *def = log_stream_by_flags(0);
+  log_rm_substream(def, NULL);
+  log_add_substream(def, ls);
+  log_close_stream(ls);
+}
+
+/*** Registry of type names ***/
+
+int log_register_type(const char *name)
+{
+  if (!log_type_names)
+    {
+      log_type_names = xmalloc_zero(LS_NUM_TYPES * sizeof(char *));
+      log_type_names[0] = "default";
+    }
+  uint id;
+  for (id=0; id < LS_NUM_TYPES && log_type_names[id]; id++)
+    if (!strcmp(log_type_names[id], name))
+      return LS_SET_TYPE(id);
+  ASSERT(id < LS_NUM_TYPES);
+  log_type_names[id] = xstrdup(name);
+  return LS_SET_TYPE(id);
+}
+
+/** Find a message type by name and return its ID encoded by `LS_SET_TYPE`. Returns -1 if no such type found. **/
+int log_find_type(const char *name)
+{
+  if (!strcmp(name, "default"))
+    return 0;
+  if (!log_type_names)
+    return -1;
+
+  for (uint id=0; id < LS_NUM_TYPES && log_type_names[id]; id++)
+    if (!strcmp(log_type_names[id], name))
+      return LS_SET_TYPE(id);
+  return -1;
+}
diff --git a/libucw/ucw/log-syslog.c b/libucw/ucw/log-syslog.c
new file mode 100644
index 0000000..31e66d6
--- /dev/null
+++ b/libucw/ucw/log-syslog.c
@@ -0,0 +1,123 @@
+/*
+ *	UCW Library -- Logging to Syslog
+ *
+ *	(c) 2009 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+
+#include <string.h>
+#include <syslog.h>
+
+struct syslog_stream {
+  struct log_stream ls;
+  int facility;
+};
+
+static int syslog_open_count;
+
+static void
+syslog_close(struct log_stream *ls UNUSED)
+{
+  if (!--syslog_open_count)
+    closelog();
+}
+
+/* Convert syslog facility to its identifier. */
+static int
+syslog_facility(const char *name)
+{
+  // Unfortunately, there is no standard way how to get at the list of facility names
+  static const struct {
+    const char *name;
+    int id;
+  } facilities[] = {
+    { "auth",		LOG_AUTH },
+    { "authpriv",	LOG_AUTHPRIV },
+    { "cron",		LOG_CRON },
+    { "daemon",		LOG_DAEMON },
+    { "ftp",		LOG_FTP },
+    { "kern",		LOG_KERN },
+    { "lpr",		LOG_LPR },
+    { "mail",		LOG_MAIL },
+    { "news",		LOG_NEWS },
+    { "syslog",		LOG_SYSLOG },
+    { "user",		LOG_USER },
+    { "uucp",		LOG_UUCP },
+    { "local0",		LOG_LOCAL0 },
+    { "local1",		LOG_LOCAL1 },
+    { "local2",		LOG_LOCAL2 },
+    { "local3",		LOG_LOCAL3 },
+    { "local4",		LOG_LOCAL4 },
+    { "local5",		LOG_LOCAL5 },
+    { "local6",		LOG_LOCAL6 },
+    { "local7",		LOG_LOCAL7 },
+  };
+
+  for (uint i=0; i < ARRAY_SIZE(facilities); i++)
+    if (!strcmp(facilities[i].name, name))
+      return facilities[i].id;
+  return -1;
+}
+
+/* Convert severity level to syslog constants */
+static int
+syslog_level(int level)
+{
+  static const int levels[] = {
+    [L_DEBUG] =		LOG_DEBUG,
+    [L_INFO] =		LOG_INFO,
+    [L_INFO_R] =	LOG_INFO,
+    [L_WARN] =		LOG_WARNING,
+    [L_WARN_R] =	LOG_WARNING,
+    [L_ERROR] =		LOG_ERR,
+    [L_ERROR_R] =	LOG_ERR,
+    [L_FATAL] =		LOG_CRIT,
+  };
+  return ((level < (int)ARRAY_SIZE(levels)) ? levels[level] : LOG_NOTICE);
+}
+
+/* simple syslog write handler */
+static int
+syslog_handler(struct log_stream *ls, struct log_msg *m)
+{
+  struct syslog_stream *ss = (struct syslog_stream *) ls;
+  int prio;
+  ASSERT(ls);
+  ASSERT(m);
+
+  prio = syslog_level(LS_GET_LEVEL(m->flags)) | ss->facility;
+  syslog(prio, "%s", m->m);
+  return 0;
+}
+
+struct log_stream *
+log_new_syslog(const char *facility, int options)
+{
+  int fac = syslog_facility(facility);
+  if (fac < 0)
+    die("No such syslog facility: %s", facility);
+
+  struct log_stream *ls = log_new_stream(sizeof(struct syslog_stream));
+  struct syslog_stream *ss = (struct syslog_stream *) ls;
+  ls->name = "syslog";
+  ls->msgfmt = 0;
+  ls->handler = syslog_handler;
+  ls->close = syslog_close;
+  ss->facility = fac;
+
+  if (!syslog_open_count++)
+    openlog(log_title, options, LOG_INFO);
+  return ls;
+}
+
+int
+log_syslog_facility_exists(const char *facility)
+{
+  return (syslog_facility(facility) >= 0);
+}
diff --git a/libucw/ucw/log.c b/libucw/ucw/log.c
new file mode 100644
index 0000000..3ad879b
--- /dev/null
+++ b/libucw/ucw/log.c
@@ -0,0 +1,465 @@
+/*
+ *	UCW Library -- Logging
+ *
+ *	(c) 1997--2009 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *	(c) 2014 Tomas Valla <tom@ucw.cz>
+ *	(c) 2020 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/simple-lists.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <time.h>
+#include <alloca.h>
+#include <errno.h>
+
+char *log_title;
+int log_pid;
+void (*log_die_hook)(void);
+
+static void NONRET do_die(void);
+
+/*** The default log stream, which logs to stderr ***/
+
+static int default_log_handler(struct log_stream *ls UNUSED, struct log_msg *m)
+{
+  // This is a completely bare version of the log-file module. Errors are ignored.
+  if (write(2, m->m, m->m_len) < 0)
+    {
+    }
+  return 0;
+}
+
+struct log_stream log_stream_default = {
+  .name = "stderr",
+  .use_count = 1000000,
+  .handler = default_log_handler,
+  .levels = ~0U,
+  .types = ~0U,
+  .msgfmt = LSFMT_DEFAULT,
+  // an empty clist
+  .substreams.head = {
+    .next = (cnode *) &log_stream_default.substreams.head,
+    .prev = (cnode *) &log_stream_default.substreams.head,
+  },
+};
+
+/*** Registry of streams and their identifiers ***/
+
+struct lsbuf_t log_streams;		/* A growing array of pointers to log_streams */
+int log_streams_after = 0;		/* The first never-used index in log_streams.ptr */
+
+/*
+ *  Find a stream by its identifier given as LS_SET_STRNUM(flags).
+ *  Returns NULL if the stream doesn't exist or it's invalid.
+ *
+ *  If the log-stream machinery has not been initialized (which is normal for programs
+ *  with no fancy logging), the log_streams gbuf is empty and this function only
+ *  translates stream #0 to the static log_stream_default.
+ */
+
+struct log_stream *
+log_stream_by_flags(uint flags)
+{
+  int n = LS_GET_STRNUM(flags);
+  if (n < 0 || n >= log_streams_after || log_streams.ptr[n]->regnum == -1)
+    return (n ? NULL : &log_stream_default);
+  return log_streams.ptr[n];
+}
+
+/*** Known message types ***/
+
+char **log_type_names;
+
+char *
+log_type_name(uint flags)
+{
+  uint type = LS_GET_TYPE(flags);
+
+  if (!log_type_names || !log_type_names[type])
+    return "default";
+  else
+    return log_type_names[type];
+}
+
+/*** Logging ***/
+
+void
+vmsg(uint cat, const char *fmt, va_list args)
+{
+  int saved_errno = errno;
+  struct timeval tv;
+  struct tm tm;
+  va_list args2;
+  char stime[24];
+  char sutime[12];
+  char msgbuf[256];
+  char *p;
+  int len;
+  uint sighandler = cat & L_SIGHANDLER;
+  struct log_stream *ls;
+  struct log_msg m = { .flags = cat };
+
+  /* Find the destination stream */
+  if (sighandler)
+    ls = &log_stream_default;
+  else if (!(ls = log_stream_by_flags(cat)))
+    {
+      msg((LS_CTRL_MASK&cat)|L_WARN, "No log_stream with number %d! Logging to the default log.", LS_GET_STRNUM(cat));
+      ls = &log_stream_default;
+    }
+
+  /* Get the current time */
+  if (!sighandler)
+    {
+      /* CAVEAT: These calls are not safe in signal handlers. */
+      gettimeofday(&tv, NULL);
+      m.tv = &tv;
+      if (localtime_r(&tv.tv_sec, &tm))
+	m.tm = &tm;
+    }
+
+  /* Generate time strings */
+  if (m.tm)
+    {
+      strftime(stime, sizeof(stime), "%Y-%m-%d %H:%M:%S", &tm);
+      snprintf(sutime, sizeof(sutime), ".%06d", (int)tv.tv_usec);
+      m.stime = stime;
+      m.sutime = sutime;
+    }
+  else
+    {
+      m.stime = "\?\?\?\?-\?\?-\?\? \?\?:\?\?:\?\?";
+      m.sutime = ".\?\?\?\?\?\?";
+    }
+
+  /* Generate the message string */
+  va_copy(args2, args);
+  errno = saved_errno;
+  len = vsnprintf(msgbuf, sizeof(msgbuf), fmt, args2);
+  va_end(args2);
+  if (len < (int) sizeof(msgbuf) || sighandler)
+    m.raw_msg = msgbuf;
+  else
+    {
+      m.raw_msg = xmalloc(len+1);
+      errno = saved_errno;
+      vsnprintf(m.raw_msg, len+1, fmt, args);
+    }
+
+  /* Remove non-printable characters and newlines */
+  p = m.raw_msg;
+  while (*p)
+    {
+      if (*p >= 0 && *p < 0x20 && *p != '\t')
+	*p = 0x7f;
+      p++;
+    }
+
+  /* Pass the message to the log_stream */
+  log_pass_msg(ls, &m);
+  if (m.error)
+    {
+      /* Error (such as infinite loop) occurred */
+      log_pass_msg(&log_stream_default, &m);
+    }
+
+  if (m.raw_msg != msgbuf)
+    xfree(m.raw_msg);
+
+  errno = saved_errno;
+}
+
+static void
+log_report_err(struct log_stream *ls, struct log_msg *m, int err)
+{
+  if (m->flags & L_LOGGER_ERR)
+    return;
+  if (ls->stream_flags & LSFLAG_ERR_REPORTED)
+    return;
+  ls->stream_flags |= LSFLAG_ERR_REPORTED;
+
+  struct log_msg errm = *m;
+  char errbuf[128];
+  char *name = (ls->name ? : "<unnamed>");
+
+  errm.flags = ((ls->stream_flags & LSFLAG_ERR_IS_FATAL) ? L_FATAL : L_ERROR);
+  errm.flags |= L_LOGGER_ERR | (m->flags & LS_CTRL_MASK);
+  errm.raw_msg = errbuf;
+  if (err == EDEADLK)
+    snprintf(errbuf, sizeof(errbuf), "Error logging to %s: Maximum nesting level of log streams exceeded", name);
+  else
+    {
+      errno = err;
+      snprintf(errbuf, sizeof(errbuf), "Error logging to %s: %m", name);
+    }
+  log_pass_msg(&log_stream_default, &errm);
+
+  if (ls->stream_flags & LSFLAG_ERR_IS_FATAL)
+    do_die();
+}
+
+/* Maximal depth of log_pass_msg recursion */
+#define LS_MAX_DEPTH 64
+
+void
+log_pass_filtered(struct log_stream *ls, struct log_msg *m)
+{
+  /* Pass the message to substreams */
+  CLIST_FOR_EACH(simp_node *, s, ls->substreams)
+    {
+      log_pass_msg(s->p, m);
+      if (m->error)
+	return;
+    }
+
+  /* Will pass to the handler of this stream... is there any? */
+  if (!ls->handler)
+    return;
+
+  /* Will print a message type? */
+  char *type = NULL;
+  if ((ls->msgfmt & LSFMT_TYPE) && LS_GET_TYPE(m->flags))
+    type = log_type_name(m->flags);
+
+  /* Upper bound on message length */
+  int len = strlen(m->raw_msg) + strlen(m->stime) + strlen(m->sutime) + 32;
+  if (log_title)
+    len += strlen(log_title);
+  if (ls->name)
+    len += strlen(ls->name);
+  if (type)
+    len += strlen(type) + 3;
+
+  /* Get a buffer and format the message */
+  char *free_buf = NULL;
+  if (len <= 256 || (m->flags & L_SIGHANDLER))
+    m->m = alloca(len);
+  else
+    m->m = free_buf = xmalloc(len);
+  char *p = m->m;
+
+  /* Level (2 chars) */
+  if (ls->msgfmt & LSFMT_LEVEL)
+    {
+      *p++ = LS_LEVEL_LETTER(LS_GET_LEVEL(m->flags));
+      *p++ = ' ';
+    }
+
+  /* Time (|stime| + |sutime| + 1 chars) */
+  if (ls->msgfmt & LSFMT_TIME)
+    {
+      const char *q = m->stime;
+      while (*q)
+	*p++ = *q++;
+      if (ls->msgfmt & LSFMT_USEC)
+	{
+	  q = m->sutime;
+	  while (*q)
+	    *p++ = *q++;
+	}
+      *p++ = ' ';
+    }
+
+  /* Process name, PID ( |log_title| + 6 + (|PID|<=10) chars ) */
+  if ((ls->msgfmt & LSFMT_TITLE) && log_title)
+    {
+      if ((ls->msgfmt & LSFMT_PID) && log_pid)
+	p += sprintf(p, "[%s (%d)] ", log_title, log_pid);
+      else
+	p += sprintf(p, "[%s] ", log_title);
+    }
+  else
+    {
+      if ((ls->msgfmt & LSFMT_PID) && log_pid)
+	p += sprintf(p, "[%d] ", log_pid);
+    }
+
+  /* log_stream name ( |ls->name| + 4 chars ) */
+  if (ls->msgfmt & LSFMT_LOGNAME)
+    {
+      if (ls->name)
+	p += sprintf(p, "<%s> ", ls->name);
+      else
+	p += sprintf(p, "<?> ");
+    }
+
+  /* Message type ( |type| + 3 chars ) */
+  if (type)
+    p += sprintf(p, "{%s} ", type);
+
+  /* The message itself ( |m| + 1 chars ) */
+    {
+      const char *q = m->raw_msg;
+      while (*q)
+	*p++ = *q++;
+      *p++ = '\n';
+      *p = '\0';
+      m->m_len = p - m->m;
+      int err = ls->handler(ls, m);
+      if (err)
+	log_report_err(ls, m, err);
+    }
+
+  if (free_buf)
+    xfree(free_buf);
+}
+
+void
+log_pass_msg(struct log_stream *ls, struct log_msg *m)
+{
+  ASSERT(ls);
+
+  /* Check recursion depth */
+  if (m->depth > LS_MAX_DEPTH)
+    {
+      log_report_err(ls, m, EDEADLK);
+      m->error = 1;
+      return;
+    }
+
+  /* Filter by level and type */
+  if (!((1 << LS_GET_LEVEL(m->flags)) & ls->levels) ||
+      !((1 << LS_GET_TYPE(m->flags)) & ls->types))
+    return;
+
+  m->depth++;
+
+  if (ls->filter && ls->filter(ls, m))
+    {
+      // The filter might have called log_pass_filtered()
+    }
+  else
+    log_pass_filtered(ls, m);
+
+  m->depth--;
+}
+
+/*** Utility functions ***/
+
+void
+msg(uint cat, const char *fmt, ...)
+{
+  va_list args;
+
+  va_start(args, fmt);
+  vmsg(cat, fmt, args);
+  va_end(args);
+}
+
+static void NONRET
+do_die(void)
+{
+#ifdef DEBUG_DIE_BY_ABORT
+  abort();
+#else
+  const char *env = getenv(CONFIG_UCW_ENV_VAR_DIE_BY_ABORT);
+  if (env && *env)
+    abort();
+  exit(1);
+#endif
+}
+
+void
+vdie(const char *fmt, va_list args)
+{
+  vmsg(L_FATAL, fmt, args);
+  if (log_die_hook)
+    log_die_hook();
+  do_die();
+}
+
+void
+die(const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vdie(fmt, args);
+}
+
+void
+assert_failed(const char *assertion, const char *file, int line)
+{
+  msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
+  abort();
+}
+
+void
+assert_failed_msg(const char *assertion, const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vmsg(L_DEBUG, fmt, args);
+  msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
+  abort();
+}
+
+void
+assert_failed_noinfo(void)
+{
+  die("Internal error: Assertion failed.");
+}
+
+static const char *
+log_basename(const char *n)
+{
+  const char *p = n;
+
+  while (*n)
+    if (*n++ == '/')
+      p = n;
+  return p;
+}
+
+void
+log_init(const char *argv0)
+{
+  if (argv0)
+    {
+      static char log_progname[32];
+      strncpy(log_progname, log_basename(argv0), sizeof(log_progname)-1);
+      log_progname[sizeof(log_progname)-1] = 0;
+      log_title = log_progname;
+    }
+}
+
+void
+log_fork(void)
+{
+  log_pid = getpid();
+}
+
+#ifdef TEST
+
+#include <syslog.h>
+
+int main(void)
+{
+  int type = log_find_type("foo");
+  ASSERT(type < 0);
+  type = log_register_type("foo");
+
+  struct log_stream *ls = log_new_syslog("local3", 0);
+#if 0
+  log_add_substream(ls, ls);
+  ls->stream_flags |= LSFLAG_ERR_IS_FATAL;
+#endif
+  msg(L_INFO | ls->regnum, "Brum <%300s>", ":-)");
+  log_set_format(log_default_stream(), ~0U, LSFMT_USEC | LSFMT_TYPE);
+  msg(L_INFO | type, "Brum <%300s>", ":-)");
+  log_close_all();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/log.h b/libucw/ucw/log.h
new file mode 100644
index 0000000..7724c6c
--- /dev/null
+++ b/libucw/ucw/log.h
@@ -0,0 +1,325 @@
+/*
+ *	UCW Library -- Logging
+ *
+ *	(c) 1997--2015 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Tomas Gavenciak <gavento@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_LOG_H_
+#define _UCW_LOG_H_
+
+#include <ucw/clists.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define log_add_substream ucw_log_add_substream
+#define log_check_configured ucw_log_check_configured
+#define log_close_all ucw_log_close_all
+#define log_close_stream ucw_log_close_stream
+#define log_configured ucw_log_configured
+#define log_drop_stderr ucw_log_drop_stderr
+#define log_find_type ucw_log_find_type
+#define log_new_configured ucw_log_new_configured
+#define log_new_fd ucw_log_new_fd
+#define log_new_file ucw_log_new_file
+#define log_new_stream ucw_log_new_stream
+#define log_new_syslog ucw_log_new_syslog
+#define log_pass_filtered ucw_log_pass_filtered
+#define log_register_type ucw_log_register_type
+#define log_rm_substream ucw_log_rm_substream
+#define log_set_default_stream ucw_log_set_default_stream
+#define log_set_format ucw_log_set_format
+#define log_stream_by_flags ucw_log_stream_by_flags
+#define log_switch ucw_log_switch
+#define log_switch_disable ucw_log_switch_disable
+#define log_switch_enable ucw_log_switch_enable
+#define log_syslog_facility_exists ucw_log_syslog_facility_exists
+#define log_type_name ucw_log_type_name
+#endif
+
+/*** === Messages and streams ***/
+
+/**
+ * Inside the logging system, a log message is always represented by this structure.
+ **/
+struct log_msg {
+  char *m;				// The formatted message itself, ending with \n\0
+  int m_len;				// Length without the \0
+  struct tm *tm;			// Current time
+  struct timeval *tv;
+  uint flags;				// Category and other flags as passed to msg()
+  char *raw_msg;			// Unformatted parts
+  char *stime;
+  char *sutime;
+  uint depth;				// Recursion depth
+  bool error;				// An error has occurred (e.g., an infinite loop in sub-streams)
+};
+
+/**
+ * Each stream is represented by an instance of this structure.
+ **/
+struct log_stream {
+  char *name;				// Optional name, allocated by the user (or constructor)
+  int regnum;				// Stream number, already encoded by LS_SET_STRNUM(); -1 if closed
+  uint levels;				// Bitmask of accepted severity levels (default: all)
+  uint types;				// Bitmask of accepted message types (default: all)
+  uint msgfmt;				// Formatting flags (LSFMT_xxx)
+  uint use_count;			// Number of references to the stream
+  uint stream_flags;			// Various other flags (LSFLAG_xxx)
+  int (*filter)(struct log_stream* ls, struct log_msg *m);	// Filter function, return non-zero to discard the message
+  clist substreams;			// Pass the message to these streams (simple_list of pointers)
+  int (*handler)(struct log_stream *ls, struct log_msg *m);	// Called to commit the message, return 0 for success, errno on error
+  void (*close)(struct log_stream* ls);	// Called upon log_close_stream()
+  void *user_data;			// Not used by the logging system
+  // Private data of the handler follow
+};
+
+/**
+ * Formatting flags specifying the format of the message passed to the handler.
+ **/
+enum ls_fmt {
+  LSFMT_LEVEL =		1,		// severity level (one letter) */
+  LSFMT_TIME =		2,		// date and time (YYYY-mm-dd HH:MM:SS) */
+  LSFMT_USEC = 		4,		// also micro-seconds */
+  LSFMT_TITLE =		8,		// program title (log_title) */
+  LSFMT_PID =		16,		// program PID (log_pid) */
+  LSFMT_LOGNAME =	32,		// name of the log_stream */
+  LSFMT_TYPE =		64,		// message type
+};
+
+#define LSFMT_DEFAULT (LSFMT_LEVEL | LSFMT_TIME | LSFMT_TITLE | LSFMT_PID)	/** Default format **/
+
+/**
+ * General stream flags.
+ **/
+enum ls_flag {
+  LSFLAG_ERR_IS_FATAL =	1,		// When a logging error occurs, die() immediately
+  LSFLAG_ERR_REPORTED =	2,		// A logging error has been already reported on this stream
+};
+
+/***
+ * === Message flags
+ *
+ * The @flags parameter of <<basics:msg()>> is divided to several groups of bits (from the LSB):
+ * message severity level (`L_xxx`), destination stream, message type
+ * and control bits (e.g., `L_SIGHANDLER`).
+ ***/
+
+enum ls_flagbits {			// Bit widths of groups
+  LS_LEVEL_BITS =	8,
+  LS_STRNUM_BITS =	16,
+  LS_TYPE_BITS =	5,
+  LS_CTRL_BITS =	3,
+};
+
+enum ls_flagpos {			// Bit positions of groups
+  LS_LEVEL_POS =	0,
+  LS_STRNUM_POS =	LS_LEVEL_POS + LS_LEVEL_BITS,
+  LS_TYPE_POS =		LS_STRNUM_POS + LS_STRNUM_BITS,
+  LS_CTRL_POS =		LS_TYPE_POS + LS_TYPE_BITS,
+};
+
+enum ls_flagmasks {			// Bit masks of groups
+  LS_LEVEL_MASK =	((1 << LS_LEVEL_BITS) - 1) << LS_LEVEL_POS,
+  LS_STRNUM_MASK =	((1 << LS_STRNUM_BITS) - 1) << LS_STRNUM_POS,
+  LS_TYPE_MASK =	((1 << LS_TYPE_BITS) - 1) << LS_TYPE_POS,
+  LS_CTRL_MASK =	((1 << LS_CTRL_BITS) - 1) << LS_CTRL_POS,
+};
+
+// "Get" macros (break flags to parts)
+#define LS_GET_LEVEL(flags)	(((flags) & LS_LEVEL_MASK) >> LS_LEVEL_POS)	/** Extract severity level **/
+#define LS_GET_STRNUM(flags)	(((flags) & LS_STRNUM_MASK) >> LS_STRNUM_POS)	/** Extract stream number **/
+#define LS_GET_TYPE(flags)	(((flags) & LS_TYPE_MASK) >> LS_TYPE_POS)	/** Extract message type **/
+#define LS_GET_CTRL(flags)	(((flags) & LS_CTRL_MASK) >> LS_CTRL_POS)	/** Extract control bits **/
+
+// "Set" macros (parts to flags)
+#define LS_SET_LEVEL(level)	((level) << LS_LEVEL_POS)			/** Convert severity level to flags **/
+#define LS_SET_STRNUM(strnum)	((strnum) << LS_STRNUM_POS)			/** Convert stream number to flags **/
+#define LS_SET_TYPE(type)	((type) << LS_TYPE_POS)				/** Convert message type to flags **/
+#define LS_SET_CTRL(ctrl)	((ctrl) << LS_CTRL_POS)				/** Convert control bits to flags **/
+
+#define LS_NUM_TYPES (1 << LS_TYPE_BITS)
+
+/** Register a new message type and return the corresponding flag set (encoded by `LS_SET_TYPE`). **/
+int log_register_type(const char *name);
+
+/** Find a message type by name and return the corresponding flag set. Returns -1 if no such type found. **/
+int log_find_type(const char *name);
+
+/** Given a flag set, extract the message type ID and return its name. **/
+char *log_type_name(uint flags);
+
+/*** === Operations on streams ***/
+
+/**
+ * Allocate a new log stream with no handler and an empty substream list.
+ * Since struct log_stream is followed by private data, @size bytes of memory are allocated
+ * for the whole structure. See below for functions creating specific stream types.
+ **/
+struct log_stream *log_new_stream(size_t size);
+
+/**
+ * Decrement the use count of a stream. If it becomes zero, close the stream,
+ * free its memory, and unlink all its substreams.
+ **/
+int log_close_stream(struct log_stream *ls);
+
+/**
+ * Get a new reference on an existing stream. For convenience, the return value is
+ * equal to the argument @ls.
+ **/
+static inline struct log_stream *log_ref_stream(struct log_stream *ls)
+{
+  ls->use_count++;
+  return ls;
+}
+
+/**
+ * Link a substream to a stream. The substream gains a reference, preventing
+ * it from being freed until it is unlinked.
+ **/
+void log_add_substream(struct log_stream *where, struct log_stream *what);
+
+/**
+ * Unlink all occurrences of a substream @what from stream @where. Each
+ * occurrence loses a reference. If @what is NULL, all substreams are unlinked.
+ * Returns the number of unlinked substreams.
+ **/
+int log_rm_substream(struct log_stream *where, struct log_stream *what);
+
+/**
+ * Set formatting flags of a given stream and all its substreams. The flags are
+ * AND'ed with @mask and OR'ed with @data.
+ **/
+void log_set_format(struct log_stream *ls, uint mask, uint data);
+
+/**
+ * Find a stream by its registration number (in the format of logging flags).
+ * Returns NULL if there is no such stream.
+ **/
+struct log_stream *log_stream_by_flags(uint flags);
+
+/** Return a pointer to the default stream (stream #0). **/
+static inline struct log_stream *log_default_stream(void)
+{
+  return log_stream_by_flags(0);
+}
+
+/**
+ * Make the specified stream the default destination.
+ *
+ * In fact, it takes the fixed default stream and attaches @ls as its only
+ * substream. If there were any other substreams, they are removed.
+ *
+ * Log streams created by <<basics:log_file()>> or @log_configured() are made default
+ * by calling this function.
+ **/
+void log_set_default_stream(struct log_stream *ls);
+
+/**
+ * Close all open streams, un-initialize the module, free all memory and
+ * reset the logging mechanism to use stderr only.
+ **/
+void log_close_all(void);
+
+/**
+ * The filter function of a stream might want to modify the message
+ * before passing it to the handler and/or substreams. In this case,
+ * the filter should make a local copy of `struct log_msg`, call
+ * @log_pass_filtered() on it and return true, so that the original
+ * message will not be processed any further.
+ **/
+void log_pass_filtered(struct log_stream *ls, struct log_msg *m);
+
+/***
+ * === Logging to files
+ *
+ * All log files are open in append mode, which guarantees atomicity of write()
+ * even in multi-threaded programs.
+ ***/
+
+struct log_stream *log_new_file(const char *path, uint flags);	/** Create a stream bound to a log file. See `FF_xxx` for @flags. **/
+struct log_stream *log_new_fd(int fd, uint flags);		/** Create a stream bound to a file descriptor. See `FF_xxx` for @flags. **/
+
+enum log_file_flag {		/** Flags used for file-based logging **/
+  FF_FORMAT_NAME = 1,		// Internal: Name contains strftime escapes
+  FF_CLOSE_FD = 2,		// Close the fd with the stream (use with log_new_fd())
+  FF_FD2_FOLLOWS = 4,		// Maintain stderr as a clone of this stream
+};
+
+/**
+ * When a time-based name of the log file changes, the logger switches to a new
+ * log file automatically. This can be sometimes inconvenient, so you can use
+ * this function to disable the automatic switches. The calls to this function
+ * can be nested.
+ **/
+void log_switch_disable(void);
+void log_switch_enable(void);		/** Negate the effect of log_switch_disable(). **/
+int log_switch(void);			/** Switch log files manually. **/
+
+/**
+ * Drop stderr if it is not already redirected to a log file.
+ * This is usually needed in daemons to make sure that the original
+ * stderr does not stay open (stdin and stdout are dropped by our
+ * <<daemon:,daemon setup functions>> automatically). More specifically,
+ * it makes stderr a clone of stdout.
+ **/
+void log_drop_stderr(void);
+
+/***
+ * === Logging to syslog
+ *
+ * This log stream uses the libc interface to the system logging daemon (`syslogd`).
+ * This interface has several limitations:
+ *
+ *   * Syslog are poorer than our scheme, so they are translated with a slight
+ *     loss of information (most importantly, the distinction between local and
+ *     remote messages is lost). If you are interested in details, search the
+ *     source for syslog_level().
+ *   * Syslog options (especially logging of PID with each message) must be fixed
+ *     during initialization of the logger
+ *   * Syslog provides its own formatting, so we turn off all formatting flags
+ *     of the LibUCW logger. You can override this manually by setting the @msgfmt
+ *     field of the log stream, but the result won't be nice.
+ *   * Syslog does not support timestamps with sub-second precision.
+ ***/
+
+/**
+ * Create a log stream for logging to a selected syslog facility.
+ * The @options are passed to openlog(). (Beware, due to limitations of the
+ * syslog interface in libc, the @options are shared for all syslog streams
+ * and they are applied when the first stream is created.)
+ **/
+struct log_stream *log_new_syslog(const char *facility, int options);
+
+/**
+ * Verify that a facility of the given name exists. Return 1 if it does, 0 otherwise.
+ **/
+int log_syslog_facility_exists(const char *facility);
+
+/***
+ * === Configuring log streams
+ *
+ * If you use the LibUCW mechanism for parsing config files, you can let your
+ * user configure arbitrary log streams in the Logging section of the config file
+ * (see examples in the default config file). LibUCW automatically verifies that
+ * the configuration is consistent (this is performed in the commit hook of the
+ * config section), but it opens the streams only upon request. The following
+ * functions can be used to control that.
+ ***/
+
+/** Open a log stream configured under the specified name and increase its use count. **/
+struct log_stream *log_new_configured(const char *name);
+
+/** Open a log stream configured under the specified name and use it as the default destination. **/
+void log_configured(const char *name);
+
+/**
+ * Verify that a stream called @name was configured. If it wasn't, return an error
+ * message. This is intended to be used in configuration commit hooks.
+ **/
+char *log_check_configured(const char *name);
+
+#endif
diff --git a/libucw/ucw/main-block.c b/libucw/ucw/main-block.c
new file mode 100644
index 0000000..6093984
--- /dev/null
+++ b/libucw/ucw/main-block.c
@@ -0,0 +1,143 @@
+/*
+ *	UCW Library -- Main Loop: Block I/O
+ *
+ *	(c) 2004--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mainloop.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+static void
+block_io_timer_expired(struct main_timer *tm)
+{
+  struct main_block_io *bio = tm->data;
+  timer_del(&bio->timer);
+  if (bio->error_handler)
+    bio->error_handler(bio, BIO_ERR_TIMEOUT);
+}
+
+void
+block_io_add(struct main_block_io *bio, int fd)
+{
+  bio->file.fd = fd;
+  file_add(&bio->file);
+  bio->timer.handler = block_io_timer_expired;
+  bio->timer.data = bio;
+}
+
+void
+block_io_del(struct main_block_io *bio)
+{
+  timer_del(&bio->timer);
+  file_del(&bio->file);
+}
+
+static int
+block_io_read_handler(struct main_file *fi)
+{
+  struct main_block_io *bio = (struct main_block_io *) fi;
+
+  while (bio->rpos < bio->rlen)
+    {
+      int l = read(fi->fd, bio->rbuf + bio->rpos, bio->rlen - bio->rpos);
+      DBG("BIO: FD %d: read %d", fi->fd, l);
+      if (l < 0)
+	{
+	  if (errno != EINTR && errno != EAGAIN && bio->error_handler)
+	    bio->error_handler(bio, BIO_ERR_READ);
+	  return HOOK_IDLE;
+	}
+      else if (!l)
+	break;
+      bio->rpos += l;
+    }
+  DBG("BIO: FD %d done read %d of %d", fi->fd, bio->rpos, bio->rlen);
+  fi->read_handler = NULL;
+  file_chg(fi);
+  bio->read_done(bio);
+  return HOOK_RETRY;
+}
+
+static int
+block_io_write_handler(struct main_file *fi)
+{
+  struct main_block_io *bio = (struct main_block_io *) fi;
+
+  while (bio->wpos < bio->wlen)
+    {
+      int l = write(fi->fd, bio->wbuf + bio->wpos, bio->wlen - bio->wpos);
+      DBG("BIO: FD %d: write %d", fi->fd, l);
+      if (l < 0)
+	{
+	  if (errno != EINTR && errno != EAGAIN && bio->error_handler)
+	    bio->error_handler(bio, BIO_ERR_WRITE);
+	  return HOOK_IDLE;
+	}
+      bio->wpos += l;
+    }
+  DBG("BIO: FD %d done write %d", fi->fd, bio->wpos);
+  fi->write_handler = NULL;
+  file_chg(fi);
+  bio->write_done(bio);
+  return HOOK_RETRY;
+}
+
+void
+block_io_read(struct main_block_io *bio, void *buf, uint len)
+{
+  ASSERT(bio->file.n.next);
+  if (len)
+    {
+      bio->file.read_handler = block_io_read_handler;
+      bio->rbuf = buf;
+      bio->rpos = 0;
+      bio->rlen = len;
+    }
+  else
+    {
+      bio->file.read_handler = NULL;
+      bio->rbuf = NULL;
+      bio->rpos = bio->rlen = 0;
+    }
+  file_chg(&bio->file);
+}
+
+void
+block_io_write(struct main_block_io *bio, const void *buf, uint len)
+{
+  ASSERT(bio->file.n.next);
+  if (len)
+    {
+      bio->file.write_handler = block_io_write_handler;
+      bio->wbuf = buf;
+      bio->wpos = 0;
+      bio->wlen = len;
+    }
+  else
+    {
+      bio->file.write_handler = NULL;
+      bio->wbuf = NULL;
+      bio->wpos = bio->wlen = 0;
+    }
+  file_chg(&bio->file);
+}
+
+void
+block_io_set_timeout(struct main_block_io *bio, timestamp_t expires_delta)
+{
+  if (!expires_delta)
+    timer_del(&bio->timer);
+  else
+    timer_add_rel(&bio->timer, expires_delta);
+}
diff --git a/libucw/ucw/main-rec.c b/libucw/ucw/main-rec.c
new file mode 100644
index 0000000..d3d4a58
--- /dev/null
+++ b/libucw/ucw/main-rec.c
@@ -0,0 +1,441 @@
+/*
+ *	UCW Library -- Main Loop: Record I/O
+ *
+ *	(c) 2011--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/mainloop.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+
+struct rio_buffer {
+  cnode n;
+  uint full;
+  uint written;
+  byte buf[];
+};
+
+static void
+rec_io_timer_expired(struct main_timer *tm)
+{
+  struct main_rec_io *rio = tm->data;
+  timer_del(&rio->timer);
+  rio->notify_handler(rio, RIO_ERR_TIMEOUT);
+}
+
+static int rec_io_deferred_start_read(struct main_hook *ho);
+
+void
+rec_io_add(struct main_rec_io *rio, int fd)
+{
+  rio->file.fd = fd;
+  file_add(&rio->file);
+  rio->timer.handler = rec_io_timer_expired;
+  rio->timer.data = rio;
+  rio->start_read_hook.handler = rec_io_deferred_start_read;
+  rio->start_read_hook.data = rio;
+  clist_init(&rio->idle_write_buffers);
+  clist_init(&rio->busy_write_buffers);
+}
+
+void
+rec_io_del(struct main_rec_io *rio)
+{
+  if (!rec_io_is_active(rio))
+    return;
+
+  timer_del(&rio->timer);
+  hook_del(&rio->start_read_hook);
+  file_del(&rio->file);
+
+  rio->file.read_handler = NULL;
+  rio->read_started = rio->read_running = 0;
+  rio->read_avail = rio->read_prev_avail = 0;
+  if (rio->read_buf)
+    {
+      DBG("RIO: Freeing read buffer");
+      xfree(rio->read_buf);
+      rio->read_buf = rio->read_rec_start = NULL;
+    }
+
+  rio->file.write_handler = NULL;
+  rio->write_watermark = 0;
+  struct rio_buffer *b;
+  while ((b = clist_remove_head(&rio->idle_write_buffers)) || (b = clist_remove_head(&rio->busy_write_buffers)))
+    {
+      DBG("RIO: Freeing write buffer");
+      xfree(b);
+    }
+}
+
+static int
+rec_io_process_read_buf(struct main_rec_io *rio)
+{
+  uint got;
+  ASSERT(rio->read_prev_avail < rio->read_avail);
+  while (rio->read_running && (got = rio->read_handler(rio)))
+    {
+      DBG("RIO READ: Ate %u bytes", got);
+      if (got == ~0U)
+	return HOOK_IDLE;
+      ASSERT(got <= rio->read_avail);
+      rio->read_rec_start += got;
+      rio->read_avail -= got;
+      rio->read_prev_avail = 0;
+      if (!rio->read_avail)
+	{
+	  DBG("RIO READ: Resetting buffer");
+	  rio->read_rec_start = rio->read_buf;
+	  break;
+	}
+    }
+  DBG("RIO READ: Want more");
+  return (rio->read_running ? HOOK_RETRY : HOOK_IDLE);
+}
+
+static int
+rec_io_read_handler(struct main_file *fi)
+{
+  struct main_rec_io *rio = (struct main_rec_io *) fi;
+
+  if (rio->read_rec_max && rio->read_avail >= rio->read_rec_max)
+    {
+      rec_io_stop_read(rio);
+      rio->notify_handler(rio, RIO_ERR_RECORD_TOO_LARGE);
+      return HOOK_IDLE;
+    }
+
+restart: ;
+  uint rec_start_pos = rio->read_rec_start - rio->read_buf;
+  uint rec_end_pos = rec_start_pos + rio->read_avail;
+  uint free_space = rio->read_buf_size - rec_end_pos;
+  DBG("RIO READ: rec_start=%u avail=%u prev_avail=%u free=%u/%u",
+    rec_start_pos, rio->read_avail, rio->read_prev_avail,
+    free_space, rio->read_buf_size);
+  if (free_space <= rio->read_buf_size/8)
+    {
+      if (rec_start_pos && rec_start_pos >= rio->read_buf_size/2)
+	{
+	  // Moving the partial record to the start of the buffer
+	  DBG("RIO READ: Moving partial record to start");
+	  memmove(rio->read_buf, rio->read_rec_start, rio->read_avail);
+	  rio->read_rec_start = rio->read_buf;
+	}
+      else
+	{
+	  DBG("RIO READ: Resizing buffer");
+	  rio->read_buf_size *= 2;
+	  rio->read_buf = xrealloc(rio->read_buf, rio->read_buf_size);
+	  rio->read_rec_start = rio->read_buf + rec_start_pos;
+	}
+      goto restart;
+    }
+
+  int l = read(fi->fd, rio->read_buf + rec_end_pos, free_space);
+  DBG("RIO READ: Read %d bytes", l);
+  if (l < 0)
+    {
+      if (errno != EINTR && errno != EAGAIN)
+	{
+	  DBG("RIO READ: Signalling error");
+	  rec_io_stop_read(rio);
+	  rio->notify_handler(rio, RIO_ERR_READ);
+	}
+      return HOOK_IDLE;
+    }
+  if (!l)
+    {
+      DBG("RIO READ: Signalling EOF");
+      rec_io_stop_read(rio);
+      rio->notify_handler(rio, RIO_EVENT_EOF);
+      return HOOK_IDLE;
+    }
+  rio->read_prev_avail = rio->read_avail;
+  rio->read_avail += l;
+  DBG("RIO READ: Available: %u bytes", rio->read_avail);
+
+  return rec_io_process_read_buf(rio);
+}
+
+static int
+rec_io_deferred_start_read(struct main_hook *ho)
+{
+  struct main_rec_io *rio = ho->data;
+
+  DBG("RIO: Starting reading");
+  if (!rio->read_buf)
+    {
+      if (!rio->read_buf_size)
+	rio->read_buf_size = 256;
+      rio->read_buf = xmalloc(rio->read_buf_size);
+      DBG("RIO: Created read buffer (%u bytes)", rio->read_buf_size);
+      rio->read_rec_start = rio->read_buf;
+    }
+
+  rio->file.read_handler = rec_io_read_handler;
+  file_chg(&rio->file);
+  hook_del(ho);
+  rio->read_running = 1;
+
+  rio->read_prev_avail = 0;
+  if (rio->read_avail)
+    rec_io_process_read_buf(rio);
+
+  return HOOK_IDLE;
+}
+
+static void
+rec_io_recalc_read(struct main_rec_io *rio)
+{
+  uint flow = !rio->write_throttle_read || rio->write_watermark < rio->write_throttle_read;
+  uint run = rio->read_started && flow;
+  DBG("RIO: Recalc read (flow=%u, start=%u) -> %u", flow, rio->read_started, run);
+  if (run != rio->read_running)
+    {
+      if (run)
+	{
+	  /*
+	   * Since we need to rescan the read buffer for leftover records and we
+	   * can be deep in the call stack at this moment, we better defer most
+	   * of the work to a main_hook, which will be called in the next iteration
+	   * of the main loop.
+	   */
+	  if (!hook_is_active(&rio->start_read_hook))
+	    {
+	      DBG("RIO: Scheduling start of reading");
+	      hook_add(&rio->start_read_hook);
+	    }
+	}
+      else
+	{
+	  if (hook_is_active(&rio->start_read_hook))
+	    {
+	      DBG("RIO: Descheduling start of reading");
+	      hook_del(&rio->start_read_hook);
+	    }
+	  rio->file.read_handler = NULL;
+	  file_chg(&rio->file);
+	  DBG("RIO: Reading stopped");
+	  rio->read_running = 0;
+	}
+    }
+}
+
+void
+rec_io_start_read(struct main_rec_io *rio)
+{
+  ASSERT(rec_io_is_active(rio));
+  rio->read_started = 1;
+  rec_io_recalc_read(rio);
+}
+
+void
+rec_io_stop_read(struct main_rec_io *rio)
+{
+  ASSERT(rec_io_is_active(rio));
+  rio->read_started = 0;
+  rec_io_recalc_read(rio);
+}
+
+static void
+rec_io_stop_write(struct main_rec_io *rio)
+{
+  DBG("RIO WRITE: Stopping write");
+  // XXX: When we are called after a write error, there might still
+  // be some data queued, but we need not care.
+  rio->file.write_handler = NULL;
+  file_chg(&rio->file);
+}
+
+static int
+rec_io_write_handler(struct main_file *fi)
+{
+  struct main_rec_io *rio = (struct main_rec_io *) fi;
+  struct rio_buffer *b = clist_head(&rio->busy_write_buffers);
+  if (!b)
+    {
+      rec_io_stop_write(rio);
+      return HOOK_IDLE;
+    }
+
+  int l = write(fi->fd, b->buf + b->written, b->full - b->written);
+  DBG("RIO WRITE: Written %d bytes", l);
+  if (l < 0)
+    {
+      if (errno != EINTR && errno != EAGAIN)
+	{
+	  rec_io_stop_write(rio);
+	  rio->notify_handler(rio, RIO_ERR_WRITE);
+	}
+      return HOOK_IDLE;
+    }
+  b->written += l;
+  if (b->written == b->full)
+    {
+      DBG("RIO WRITE: Written full buffer");
+      clist_remove(&b->n);
+      clist_add_tail(&rio->idle_write_buffers, &b->n);
+    }
+
+  rio->write_watermark -= l;
+  int ret = HOOK_RETRY;
+  if (!rio->write_watermark)
+    {
+      ret = HOOK_IDLE;
+      rec_io_stop_write(rio);
+    }
+  rec_io_recalc_read(rio);
+
+  // Call the hook, but carefully, because it can delete the RIO structure
+  if (rio->notify_handler(rio, rio->write_watermark ? RIO_EVENT_PART_WRITTEN : RIO_EVENT_ALL_WRITTEN) == HOOK_IDLE)
+    ret = HOOK_IDLE;
+  return ret;
+}
+
+static struct rio_buffer *
+rec_io_get_buffer(struct main_rec_io *rio)
+{
+  struct rio_buffer *b = clist_remove_tail(&rio->idle_write_buffers);
+  if (b)
+    DBG("RIO WRITE: Recycled old buffer");
+  else
+    {
+      if (!rio->write_buf_size)
+	rio->write_buf_size = 1024;
+      b = xmalloc(sizeof(struct rio_buffer) + rio->write_buf_size);
+      DBG("RIO WRITE: Allocated new buffer");
+    }
+  b->full = b->written = 0;
+  return b;
+}
+
+void
+rec_io_write(struct main_rec_io *rio, const void *data, uint len)
+{
+  const byte *bdata = data;
+  ASSERT(rec_io_is_active(rio));
+  if (!len)
+    return;
+
+  while (len)
+    {
+      struct rio_buffer *b = clist_tail(&rio->busy_write_buffers);
+      if (!b || b->full >= rio->write_buf_size)
+	{
+	  b = rec_io_get_buffer(rio);
+	  clist_add_tail(&rio->busy_write_buffers, &b->n);
+	}
+      uint l = MIN(len, rio->write_buf_size - b->full);
+      memcpy(b->buf + b->full, bdata, l);
+      b->full += l;
+      bdata += l;
+      len -= l;
+      rio->write_watermark += l;
+      DBG("RIO WRITE: Buffered %u bytes of data (total %u)", l, rio->write_watermark);
+      rec_io_recalc_read(rio);
+    }
+
+  if (!rio->file.write_handler)
+    {
+      DBG("RIO WRITE: Starting write");
+      rio->file.write_handler = rec_io_write_handler;
+      file_chg(&rio->file);
+    }
+}
+
+void
+rec_io_set_timeout(struct main_rec_io *rio, timestamp_t expires_delta)
+{
+  DBG("RIO: Setting timeout %u", (uint) expires_delta);
+  if (!expires_delta)
+    timer_del(&rio->timer);
+  else
+    timer_add_rel(&rio->timer, expires_delta);
+}
+
+uint
+rec_io_parse_line(struct main_rec_io *rio)
+{
+  for (uint i = rio->read_prev_avail; i < rio->read_avail; i++)
+    if (rio->read_rec_start[i] == '\n')
+      return i+1;
+  return 0;
+}
+
+#ifdef TEST
+
+static uint rhand(struct main_rec_io *rio)
+{
+  uint r = rec_io_parse_line(rio);
+  if (r)
+    {
+      rio->read_rec_start[r-1] = 0;
+      printf("Read <%s>\n", rio->read_rec_start);
+      if (rio->read_rec_start[0] == '!')
+	{
+	  rec_io_del(rio);
+	  main_shut_down();
+	  return ~0U;
+	}
+      rec_io_set_timeout(rio, 10000);
+      rio->read_rec_start[r-1] = '\n';
+      rec_io_write(rio, rio->read_rec_start, r);
+    }
+  return r;
+}
+
+static int ehand(struct main_rec_io *rio, int cause)
+{
+  if (cause < 0 || cause == RIO_EVENT_EOF)
+    {
+      msg(L_ERROR, "Error %d", cause);
+      rec_io_del(rio);
+      main_shut_down();
+      return HOOK_IDLE;
+    }
+  else
+    {
+      msg(L_INFO, "Event %d", cause);
+      return HOOK_RETRY;
+    }
+}
+
+int
+main(void)
+{
+  log_init(NULL);
+  main_init();
+
+  struct main_rec_io rio = {};
+  rio.read_buf_size = 4;
+  rio.read_handler = rhand;
+  rio.notify_handler = ehand;
+  // rio.read_rec_max = 40;
+  rio.write_buf_size = 4;
+  rio.write_throttle_read = 6;
+  rec_io_add(&rio, 0);
+  rec_io_start_read(&rio);
+  rec_io_set_timeout(&rio, 10000);
+
+  main_debug();
+
+  main_loop();
+  msg(L_INFO, "Finished.");
+
+  if (file_is_active(&rio.file))
+    rec_io_del(&rio);
+  main_cleanup();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/main-test.c b/libucw/ucw/main-test.c
new file mode 100644
index 0000000..8e9f376
--- /dev/null
+++ b/libucw/ucw/main-test.c
@@ -0,0 +1,151 @@
+/*
+ *	UCW Library -- Main Loop: Testing
+ *
+ *	(c) 2004--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mainloop.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#ifdef TEST
+
+static struct main_process mp;
+static struct main_block_io fin, fout;
+static struct main_hook hook;
+static struct main_timer tm;
+static struct main_signal sg;
+static int sig_counter;
+
+static byte rb[16];
+
+static void dread(struct main_block_io *bio)
+{
+  if (bio->rpos < bio->rlen)
+    {
+      msg(L_INFO, "Read EOF");
+      bio->data = NULL;	// Mark as deleted
+      block_io_del(bio);
+    }
+  else
+    {
+      msg(L_INFO, "Read done");
+      block_io_read(bio, rb, sizeof(rb));
+      block_io_set_timeout(&fin, 3000);
+    }
+}
+
+static void derror(struct main_block_io *bio, int cause)
+{
+  switch (cause)
+    {
+    case BIO_ERR_READ:
+    case BIO_ERR_WRITE:
+      msg(L_INFO, "derror: %s error: %m", (cause == BIO_ERR_READ ? "read" : "write"));
+      break;
+    case BIO_ERR_TIMEOUT:
+      msg(L_INFO, "derror: Timeout");
+      break;
+    default:
+      ASSERT(0);
+    }
+  bio->data = NULL;
+  block_io_del(bio);
+}
+
+static void dwrite(struct main_block_io *bio UNUSED)
+{
+  msg(L_INFO, "Write done");
+}
+
+static int dhook(struct main_hook *ho UNUSED)
+{
+  msg(L_INFO, "Hook called");
+  if (sig_counter >= 3)
+    return HOOK_SHUTDOWN;
+  return 0;
+}
+
+static void dtimer(struct main_timer *tm)
+{
+  msg(L_INFO, "Timer tick");
+  timer_add_rel(tm, 11000);
+  timer_add_rel(tm, 10000);
+}
+
+static void dentry(void)
+{
+  log_fork();
+  main_teardown();
+  msg(L_INFO, "*** SUBPROCESS START ***");
+  sleep(2);
+  msg(L_INFO, "*** SUBPROCESS FINISH ***");
+  exit(0);
+}
+
+static void dexit(struct main_process *pr)
+{
+  msg(L_INFO, "Subprocess %d exited with status %x", pr->pid, pr->status);
+}
+
+static void dsignal(struct main_signal *sg UNUSED)
+{
+  msg(L_INFO, "SIGINT received (send 3 times to really quit, or use Ctrl-\\)");
+  sig_counter++;
+}
+
+int
+main(void)
+{
+  log_init(NULL);
+  main_init();
+
+  fin.read_done = dread;
+  fin.error_handler = derror;
+  fin.data = "";
+  block_io_add(&fin, 0);
+  block_io_read(&fin, rb, sizeof(rb));
+
+  fout.write_done = dwrite;
+  fout.error_handler = derror;
+  fout.data = "";
+  block_io_add(&fout, 1);
+  block_io_write(&fout, "Hello, world!\n", 14);
+
+  hook.handler = dhook;
+  hook_add(&hook);
+
+  tm.handler = dtimer;
+  timer_add_rel(&tm,  1000);
+
+  sg.signum = SIGINT;
+  sg.handler = dsignal;
+  signal_add(&sg);
+
+  mp.handler = dexit;
+  if (!process_fork(&mp))
+    dentry();
+
+  main_debug();
+
+  main_loop();
+  msg(L_INFO, "Finished.");
+
+  if (fin.data)
+    block_io_del(&fin);
+  if (fout.data)
+    block_io_del(&fout);
+  hook_del(&hook);
+  signal_del(&sg);
+  timer_del(&tm);
+  main_cleanup();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/mainloop.c b/libucw/ucw/mainloop.c
new file mode 100644
index 0000000..dcc0f74
--- /dev/null
+++ b/libucw/ucw/mainloop.c
@@ -0,0 +1,915 @@
+/*
+ *	UCW Library -- Main Loop
+ *
+ *	(c) 2004--2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/heap.h>
+#include <ucw/mainloop.h>
+#include <ucw/threads.h>
+#include <ucw/gary.h>
+#include <ucw/process.h>
+#include <ucw/time.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/poll.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+
+#ifdef CONFIG_UCW_THREADS
+#include <pthread.h>
+#define THREAD_SIGMASK pthread_sigmask
+#else
+#define THREAD_SIGMASK sigprocmask
+#endif
+
+#ifdef CONFIG_UCW_EPOLL
+#include <sys/epoll.h>
+#endif
+
+#define MAIN_TIMER_LESS(x,y) ((x)->expires < (y)->expires)
+#define MAIN_TIMER_SWAP(heap,a,b,t) (t=heap[a], heap[a]=heap[b], heap[b]=t, heap[a]->index=(a), heap[b]->index=(b))
+
+#define EPOLL_BUF_SIZE 256
+
+static void file_del_ctx(struct main_context *m, struct main_file *fi);
+static void signal_del_ctx(struct main_context *m, struct main_signal *ms);
+
+static void
+main_get_time_ctx(struct main_context *m)
+{
+  m->now = get_timestamp();
+}
+
+static struct main_context *
+main_current_nocheck(void)
+{
+  return ucwlib_thread_context()->main_context;
+}
+
+struct main_context *
+main_current(void)
+{
+  struct main_context *m = main_current_nocheck();
+  ASSERT(m);
+  return m;
+}
+
+static int
+main_is_current(struct main_context *m)
+{
+  return (m == main_current_nocheck());
+}
+
+static inline uint
+count_timers(struct main_context *m)
+{
+  if (m->timer_table)
+    return GARY_SIZE(m->timer_table) - 1;
+  else
+    return 0;
+}
+
+struct main_context *
+main_new(void)
+{
+  struct main_context *m = xmalloc_zero(sizeof(*m));
+
+  DBG("MAIN: New context");
+  clist_init(&m->file_list);
+  clist_init(&m->file_active_list);
+  clist_init(&m->hook_list);
+  clist_init(&m->hook_done_list);
+  clist_init(&m->process_list);
+  clist_init(&m->signal_list);
+#ifdef CONFIG_UCW_EPOLL
+  m->epoll_fd = epoll_create(64);
+  if (m->epoll_fd < 0)
+    die("epoll_create() failed: %m");
+  m->epoll_events = xmalloc(EPOLL_BUF_SIZE * sizeof(struct epoll_event));
+  clist_init(&m->file_recalc_list);
+#else
+  m->poll_table_obsolete = 1;
+#endif
+  main_get_time_ctx(m);
+  sigemptyset(&m->want_signals);
+  m->sig_pipe_recv = m->sig_pipe_send = -1;
+
+  return m;
+}
+
+static void
+main_prepare_delete(struct main_context *m)
+{
+  /*
+   *  If the context is current, deactivate it first. But beware,
+   *  we must not call functions that depend on the current context.
+   */
+  if (main_is_current(m))
+    main_switch_context(NULL);
+
+  // Close epoll descriptor early enough, it might be shared after fork!
+#ifdef CONFIG_UCW_EPOLL
+  xfree(m->epoll_events);
+  close(m->epoll_fd);
+  m->epoll_fd = -1;
+#else
+  GARY_FREE(m->poll_table);
+  GARY_FREE(m->poll_file_table);
+#endif
+
+  if (m->sigchld_handler)
+    {
+      signal_del_ctx(m, m->sigchld_handler);
+      xfree(m->sigchld_handler);
+    }
+  if (m->sig_pipe_file)
+    {
+      file_del_ctx(m, m->sig_pipe_file);
+      xfree(m->sig_pipe_file);
+     }
+  if (m->sig_pipe_recv >= 0)
+    {
+      close(m->sig_pipe_recv);
+      close(m->sig_pipe_send);
+    }
+}
+
+static void
+main_do_delete(struct main_context *m)
+{
+  GARY_FREE(m->timer_table);
+  xfree(m);
+}
+
+void
+main_delete(struct main_context *m)
+{
+  if (!m)
+    return;
+
+  main_prepare_delete(m);
+  ASSERT(clist_empty(&m->file_list));
+  ASSERT(clist_empty(&m->file_active_list));
+#ifdef CONFIG_UCW_EPOLL
+  ASSERT(clist_empty(&m->file_recalc_list));
+#endif
+  ASSERT(clist_empty(&m->hook_list));
+  ASSERT(clist_empty(&m->hook_done_list));
+  ASSERT(clist_empty(&m->process_list));
+  ASSERT(clist_empty(&m->signal_list));
+  ASSERT(!count_timers(m));
+  main_do_delete(m);
+}
+
+void
+main_destroy(struct main_context *m)
+{
+  if (!m)
+    return;
+  main_prepare_delete(m);
+
+  // Close all files
+  clist_add_list_tail(&m->file_list, &m->file_active_list);
+#ifdef CONFIG_UCW_EPOLL
+  clist_add_list_tail(&m->file_list, &m->file_recalc_list);
+#endif
+  CLIST_FOR_EACH(struct main_file *, f, m->file_list)
+    close(f->fd);
+
+  main_do_delete(m);
+}
+
+struct main_context *
+main_switch_context(struct main_context *m)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct main_context *m0 = c->main_context;
+
+  /*
+   *  Not only we need to switch the signal sets of the two contexts,
+   *  but it is also necessary to avoid invoking a signal handler
+   *  in the middle of changing c->main_context.
+   */
+  if (m0 && !clist_empty(&m0->signal_list))
+    THREAD_SIGMASK(SIG_BLOCK, &m0->want_signals, NULL);
+  c->main_context = m;
+  if (m && !clist_empty(&m->signal_list))
+    THREAD_SIGMASK(SIG_UNBLOCK, &m->want_signals, NULL);
+
+  return m0;
+}
+
+void
+main_init(void)
+{
+  struct main_context *m = main_switch_context(main_new());
+  ASSERT(!m);
+}
+
+void
+main_cleanup(void)
+{
+  main_delete(main_current_nocheck());
+}
+
+void
+main_teardown(void)
+{
+  main_destroy(main_current_nocheck());
+}
+
+void
+main_get_time(void)
+{
+  main_get_time_ctx(main_current());
+}
+
+void
+timer_add(struct main_timer *tm, timestamp_t expires)
+{
+  struct main_context *m = main_current();
+
+  if (!m->timer_table)
+    {
+      GARY_INIT(m->timer_table, 1);
+      m->timer_table[0] = NULL;
+    }
+
+  if (expires)
+    DBG("MAIN: Setting timer %p (expire at now+%lld)", tm, (long long)(expires - m->now));
+  else
+    DBG("MAIN: Clearing timer %p", tm);
+  uint num_timers = count_timers(m);
+  if (tm->expires < expires)
+    {
+      if (!tm->expires)
+	{
+	  tm->expires = expires;
+	  tm->index = num_timers + 1;
+	  GARY_RESIZE(m->timer_table, num_timers + 2);
+	  HEAP_INSERT(struct main_timer *, m->timer_table, num_timers, MAIN_TIMER_LESS, MAIN_TIMER_SWAP, tm);
+	}
+      else
+	{
+	  tm->expires = expires;
+	  HEAP_INCREASE(struct main_timer *, m->timer_table, num_timers, MAIN_TIMER_LESS, MAIN_TIMER_SWAP, tm->index, tm);
+	}
+    }
+  else if (tm->expires > expires)
+    {
+      if (!expires)
+	{
+	  ASSERT(tm->index && tm->index <= num_timers);
+	  HEAP_DELETE(struct main_timer *, m->timer_table, num_timers, MAIN_TIMER_LESS, MAIN_TIMER_SWAP, tm->index);
+	  tm->index = 0;
+	  tm->expires = 0;
+	  GARY_POP(m->timer_table);
+	}
+      else
+	{
+	  tm->expires = expires;
+	  HEAP_DECREASE(struct main_timer *, m->timer_table, num_timers, MAIN_TIMER_LESS, MAIN_TIMER_SWAP, tm->index, tm);
+	}
+    }
+}
+
+void
+timer_add_rel(struct main_timer *tm, timestamp_t expires_delta)
+{
+  struct main_context *m = main_current();
+  return timer_add(tm, m->now + expires_delta);
+}
+
+void
+timer_del(struct main_timer *tm)
+{
+  timer_add(tm, 0);
+}
+
+static uint
+file_want_events(struct main_file *fi)
+{
+  uint events = 0;
+  if (fi->read_handler)
+    events |= POLLIN;
+  if (fi->write_handler)
+    events |= POLLOUT;
+  return events;
+}
+
+static void
+file_set_events(struct main_context *m, struct main_file *fi, uint mask)
+{
+  uint prev_events = fi->want_events;
+  if (prev_events == mask)
+    return;
+  DBG("MAIN: Changing requested events for fd %d to %x", fi->fd, mask);
+  fi->want_events = mask;
+
+#ifdef CONFIG_UCW_EPOLL
+  if (m->epoll_fd < 0)
+    return;
+  struct epoll_event evt = {
+    .events = mask,
+    .data.ptr = fi,
+  };
+  int op;
+  if (!prev_events)
+    {
+      op = EPOLL_CTL_ADD;
+      m->poll_cnt++;
+    }
+  else if (!mask)
+    {
+      op = EPOLL_CTL_DEL;
+      m->poll_cnt--;
+    }
+  else
+    op = EPOLL_CTL_MOD;
+  if (epoll_ctl(m->epoll_fd, op, fi->fd, &evt) < 0)
+    {
+      // Some clients call file_del() on an already closed descriptor. Trying to be benevolent.
+      if (errno != EBADF || op != EPOLL_CTL_DEL)
+	die("epoll_ctl() failed: %m");
+    }
+#else
+  if (!prev_events || !mask || !fi->pollfd)
+    m->poll_table_obsolete = 1;
+  else
+    fi->pollfd->events = mask;
+#endif
+}
+
+void
+file_add(struct main_file *fi)
+{
+  struct main_context *m = main_current();
+
+  DBG("MAIN: Adding file %p (fd=%d)", fi, fi->fd);
+  ASSERT(!file_is_active(fi));
+  clist_add_tail(&m->file_list, &fi->n);
+  m->file_cnt++;
+  file_set_events(m, fi, file_want_events(fi));
+  if (fcntl(fi->fd, F_SETFL, O_NONBLOCK) < 0)
+    msg(L_ERROR, "Error setting fd %d to non-blocking mode: %m. Keep fingers crossed.", fi->fd);
+}
+
+void
+file_chg(struct main_file *fi)
+{
+  struct main_context *m = main_current();
+#ifdef CONFIG_UCW_EPOLL
+  clist_remove(&fi->n);
+  clist_add_tail(&m->file_recalc_list, &fi->n);
+#else
+  file_set_events(m, fi, file_want_events(fi));
+#endif
+}
+
+static void
+file_del_ctx(struct main_context *m, struct main_file *fi)
+{
+  // XXX: Can be called on a non-current context
+  DBG("MAIN: Deleting file %p (fd=%d)", fi, fi->fd);
+
+  if (!file_is_active(fi))
+    return;
+  clist_unlink(&fi->n);
+  m->file_cnt--;
+  file_set_events(m, fi, 0);
+}
+
+void
+file_del(struct main_file *fi)
+{
+  file_del_ctx(main_current(), fi);
+}
+
+void
+hook_add(struct main_hook *ho)
+{
+  struct main_context *m = main_current();
+
+  DBG("MAIN: Adding hook %p", ho);
+  if (hook_is_active(ho))
+    clist_unlink(&ho->n);
+  clist_add_tail(&m->hook_list, &ho->n);
+}
+
+void
+hook_del(struct main_hook *ho)
+{
+  DBG("MAIN: Deleting hook %p", ho);
+  if (hook_is_active(ho))
+    clist_unlink(&ho->n);
+}
+
+static void
+sigchld_received(struct main_signal *sg UNUSED)
+{
+  struct main_context *m = main_current();
+  int stat;
+  pid_t pid;
+
+  while ((pid = waitpid(-1, &stat, WNOHANG)) > 0)
+    {
+      DBG("MAIN: Child %d exited with status %x", pid, stat);
+      CLIST_FOR_EACH(struct main_process *, pr, m->process_list)
+	if (pr->pid == pid)
+	  {
+	    pr->status = stat;
+	    process_del(pr);
+	    format_exit_status(pr->status_msg, pr->status);
+	    DBG("MAIN: Calling process exit handler");
+	    pr->handler(pr);
+	    break;
+	  }
+    }
+}
+
+void
+process_add(struct main_process *mp)
+{
+  struct main_context *m = main_current();
+
+  DBG("MAIN: Adding process %p (pid=%d)", mp, mp->pid);
+  ASSERT(!process_is_active(mp));
+  ASSERT(mp->handler);
+  clist_add_tail(&m->process_list, &mp->n);
+  if (!m->sigchld_handler)
+    {
+      struct main_signal *sg = xmalloc_zero(sizeof(*sg));
+      m->sigchld_handler = sg;
+      sg->signum = SIGCHLD;
+      sg->handler = sigchld_received;
+      signal_add(sg);
+    }
+}
+
+void
+process_del(struct main_process *mp)
+{
+  DBG("MAIN: Deleting process %p (pid=%d)", mp, mp->pid);
+  if (process_is_active(mp))
+    clist_unlink(&mp->n);
+}
+
+int
+process_fork(struct main_process *mp)
+{
+  pid_t pid = fork();
+  if (pid < 0)
+    {
+      DBG("MAIN: Fork failed");
+      mp->status = -1;
+      format_exit_status(mp->status_msg, -1);
+      mp->handler(mp);
+      return 1;
+    }
+  else if (!pid)
+    return 0;
+  else
+    {
+      DBG("MAIN: Forked process %d", (int) pid);
+      mp->pid = pid;
+      process_add(mp);
+      return 1;
+    }
+}
+
+static int
+pipe_read_handler(struct main_file *mf UNUSED)
+{
+  struct main_context *m = main_current();
+  int signum;
+  int n = read(m->sig_pipe_recv, &signum, sizeof(signum));
+
+  if (n < 0)
+    {
+      if (errno != EAGAIN)
+	msg(L_ERROR, "Error reading signal pipe: %m");
+      return 0;
+    }
+  ASSERT(n == sizeof(signum));
+
+  DBG("MAIN: Sigpipe: received signal %d", signum);
+  struct main_signal iter = { .signum = -1 };
+  struct main_signal *sg = clist_head(&m->signal_list);
+  while (sg)
+    {
+      if (sg->signum == signum)
+	{
+	  DBG("MAIN: Sigpipe: invoking handler %p", sg);
+	  clist_insert_after(&iter.n, &sg->n);
+	  sg->handler(sg);
+	  sg = clist_next(&m->signal_list, &iter.n);
+	  clist_remove(&iter.n);
+	}
+      else
+	sg = clist_next(&m->signal_list, &sg->n);
+    }
+
+  return 1;
+}
+
+static void
+pipe_configure(int fd)
+{
+  int flags;
+  if ((flags = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, flags|O_NONBLOCK) < 0)
+    die("Could not set file descriptor %d to non-blocking: %m", fd);
+}
+
+static void
+pipe_setup(struct main_context *m)
+{
+  DBG("MAIN: Sigpipe: Setting up the pipe");
+
+  int pipe_result[2];
+  if (pipe(pipe_result) == -1)
+    die("Could not create signal pipe: %m");
+  pipe_configure(pipe_result[0]);
+  pipe_configure(pipe_result[1]);
+  m->sig_pipe_recv = pipe_result[0];
+  m->sig_pipe_send = pipe_result[1];
+
+  struct main_file *f = xmalloc_zero(sizeof(*f));
+  m->sig_pipe_file = f;
+  f->fd = m->sig_pipe_recv;
+  f->read_handler = pipe_read_handler;
+  file_add(f);
+}
+
+static void
+signal_handler_pipe(int signum)
+{
+  struct main_context *m = main_current();
+#ifdef LOCAL_DEBUG
+  msg(L_DEBUG | L_SIGHANDLER, "MAIN: Sigpipe: sending signal %d down the drain", signum);
+#endif
+  if (write(m->sig_pipe_send, &signum, sizeof(signum)) < 0)
+    {
+    }
+}
+
+void
+signal_add(struct main_signal *ms)
+{
+  struct main_context *m = main_current();
+
+  DBG("MAIN: Adding signal %p (sig=%d)", ms, ms->signum);
+
+  ASSERT(!signal_is_active(ms));
+  // Adding at the head of the list is better if we are in the middle of walking the list.
+  clist_add_head(&m->signal_list, &ms->n);
+  if (m->sig_pipe_recv < 0)
+    pipe_setup(m);
+
+  struct sigaction sa = {
+    .sa_handler = signal_handler_pipe,
+    .sa_flags = SA_NOCLDSTOP | SA_RESTART,
+  };
+  sigaction(ms->signum, &sa, NULL);
+
+  sigset_t ss;
+  sigemptyset(&ss);
+  sigaddset(&ss, ms->signum);
+  THREAD_SIGMASK(SIG_UNBLOCK, &ss, NULL);
+  sigaddset(&m->want_signals, ms->signum);
+}
+
+static void
+signal_del_ctx(struct main_context *m, struct main_signal *ms)
+{
+  // XXX: Can be called on a non-current context
+  DBG("MAIN: Deleting signal %p (sig=%d)", ms, ms->signum);
+
+  if (!signal_is_active(ms))
+    return;
+  clist_unlink(&ms->n);
+
+  int another = 0;
+  CLIST_FOR_EACH(struct main_signal *, s, m->signal_list)
+    if (s->signum == ms->signum)
+      another++;
+  if (!another)
+    {
+      if (main_is_current(m))
+	{
+	  sigset_t ss;
+	  sigemptyset(&ss);
+	  sigaddset(&ss, ms->signum);
+	  THREAD_SIGMASK(SIG_BLOCK, &ss, NULL);
+	}
+      sigdelset(&m->want_signals, ms->signum);
+    }
+}
+
+void
+signal_del(struct main_signal *ms)
+{
+  signal_del_ctx(main_current(), ms);
+}
+
+#ifdef CONFIG_UCW_DEBUG
+
+void
+file_debug(struct main_file *fi)
+{
+  msg(L_DEBUG, "\t\t%p (fd %d, rh %p, wh %p, data %p)",
+    fi, fi->fd, fi->read_handler, fi->write_handler, fi->data);
+}
+
+void
+hook_debug(struct main_hook *ho)
+{
+  msg(L_DEBUG, "\t\t%p (func %p, data %p)", ho, ho->handler, ho->data);
+}
+
+void
+signal_debug(struct main_signal *sg)
+{
+  if (sg->signum < 0)
+    msg(L_DEBUG, "\t\t(placeholder)");
+  else
+    msg(L_DEBUG, "\t\t%p (sig %d, func %p, data %p)", sg, sg->signum, sg->handler, sg->data);
+}
+
+static void
+timer_debug_ctx(struct main_context *m, struct main_timer *tm)
+{
+  msg(L_DEBUG, "\t\t%p (expires %lld, data %p)", tm, (long long)(tm->expires - m->now), tm->data);
+}
+
+void
+timer_debug(struct main_timer *tm)
+{
+  timer_debug_ctx(main_current(), tm);
+}
+
+void
+process_debug(struct main_process *pr)
+{
+  msg(L_DEBUG, "\t\t%p (pid %d, func %p, data %p)", pr, pr->pid, pr->handler, pr->data);
+}
+
+void
+main_debug_context(struct main_context *m UNUSED)
+{
+  msg(L_DEBUG, "### Main loop status on %lld", (long long) m->now);
+  msg(L_DEBUG, "\tActive timers:");
+  uint num_timers = count_timers(m);
+  for (uint i = 1; i <= num_timers; i++)
+    timer_debug(m->timer_table[i]);
+  msg(L_DEBUG, "\tActive files:");
+  CLIST_FOR_EACH(struct main_file *, fi, m->file_list)
+    file_debug(fi);
+  CLIST_FOR_EACH(struct main_file *, fi, m->file_active_list)
+    file_debug(fi);
+#ifdef CONFIG_UCW_EPOLL
+  CLIST_FOR_EACH(struct main_file *, fi, m->file_recalc_list)
+    file_debug(fi);
+#endif
+  msg(L_DEBUG, "\tActive hooks:");
+  CLIST_FOR_EACH(struct main_hook *, ho, m->hook_done_list)
+    hook_debug(ho);
+  CLIST_FOR_EACH(struct main_hook *, ho, m->hook_list)
+    hook_debug(ho);
+  msg(L_DEBUG, "\tActive processes:");
+  CLIST_FOR_EACH(struct main_process *, pr, m->process_list)
+    process_debug(pr);
+  msg(L_DEBUG, "\tActive signal catchers:");
+  CLIST_FOR_EACH(struct main_signal *, sg, m->signal_list)
+    signal_debug(sg);
+}
+
+#else
+
+// Stubs
+void file_debug(struct main_file *fi UNUSED) { }
+void hook_debug(struct main_hook *ho UNUSED) { }
+void signal_debug(struct main_signal *sg UNUSED) { }
+void timer_debug(struct main_timer *tm UNUSED) { }
+void process_debug(struct main_process *pr UNUSED) { }
+void main_debug_context(struct main_context *m UNUSED) { }
+
+#endif
+
+static void
+process_timers(struct main_context *m)
+{
+  struct main_timer *tm;
+  while (count_timers(m) && (tm = m->timer_table[1])->expires <= m->now)
+    {
+      DBG("MAIN: Timer %p expired at now-%lld", tm, (long long)(m->now - tm->expires));
+      tm->handler(tm);
+    }
+}
+
+static enum main_hook_return
+process_hooks(struct main_context *m)
+{
+  int hook_min = HOOK_RETRY;
+  int hook_max = HOOK_SHUTDOWN;
+  struct main_hook *ho;
+
+  while (ho = clist_remove_head(&m->hook_list))
+    {
+      clist_add_tail(&m->hook_done_list, &ho->n);
+      DBG("MAIN: Hook %p", ho);
+      int ret = ho->handler(ho);
+      hook_min = MIN(hook_min, ret);
+      hook_max = MAX(hook_max, ret);
+    }
+  clist_move(&m->hook_list, &m->hook_done_list);
+  if (hook_min == HOOK_SHUTDOWN ||
+    hook_min == HOOK_DONE && hook_max == HOOK_DONE ||
+    m->shutdown)
+    {
+      DBG("MAIN: Shut down by %s", m->shutdown ? "main_shut_down" : "a hook");
+      return HOOK_SHUTDOWN;
+    }
+  if (hook_max == HOOK_RETRY)
+    return HOOK_RETRY;
+  else
+    return HOOK_IDLE;
+}
+
+#ifdef CONFIG_UCW_EPOLL
+
+static void
+recalc_files(struct main_context *m)
+{
+  struct main_file *fi;
+
+  while (fi = clist_remove_head(&m->file_recalc_list))
+    {
+      file_set_events(m, fi, file_want_events(fi));
+      clist_add_tail(&m->file_list, &fi->n);
+    }
+}
+
+#else
+
+static void
+rebuild_poll_table(struct main_context *m)
+{
+  GARY_INIT_OR_RESIZE(m->poll_table, m->file_cnt);
+  GARY_INIT_OR_RESIZE(m->poll_file_table, m->file_cnt);
+  DBG("MAIN: Rebuilding poll table: %d entries", m->file_cnt);
+  // From this point on, the gary's must not be resized: we keep pointers to their entries
+
+  struct pollfd *p = m->poll_table;
+  struct main_file **pf = m->poll_file_table;
+  m->poll_cnt = 0;
+  CLIST_FOR_EACH(struct main_file *, fi, m->file_list)
+    {
+      p->fd = fi->fd;
+      p->events = fi->want_events;
+      if (p->events)
+	{
+	  fi->pollfd = p++;
+	  *pf++ = fi;
+	  m->poll_cnt++;
+	}
+    }
+  m->poll_table_obsolete = 0;
+}
+
+#endif
+
+void
+main_loop(void)
+{
+  DBG("MAIN: Entering main_loop");
+  struct main_context *m = main_current();
+
+  main_get_time_ctx(m);
+  m->shutdown = 0;
+
+  for (;;)
+    {
+      timestamp_t wake = m->now + 1000000000;
+      process_timers(m);
+      switch (process_hooks(m))
+	{
+	case HOOK_SHUTDOWN:
+	  return;
+	case HOOK_RETRY:
+	  wake = 0;
+	  break;
+	default: ;
+	}
+
+      int timeout = 0;
+      if (!m->single_step)
+	{
+	  if (count_timers(m))
+	    wake = MIN(wake, m->timer_table[1]->expires);
+	  main_get_time_ctx(m);
+	  timeout = ((wake > m->now) ? wake - m->now : 0);
+	}
+
+#ifdef CONFIG_UCW_EPOLL
+      recalc_files(m);
+      DBG("MAIN: Epoll for %d fds and timeout %d ms", m->poll_cnt, timeout);
+      int n = epoll_wait(m->epoll_fd, m->epoll_events, EPOLL_BUF_SIZE, timeout);
+#else
+      if (m->poll_table_obsolete)
+	rebuild_poll_table(m);
+      DBG("MAIN: Poll for %d fds and timeout %d ms", m->poll_cnt, timeout);
+      int n = poll(m->poll_table, m->poll_cnt, timeout);
+#endif
+
+      DBG("\t-> %d events", n);
+      if (n < 0 && errno != EAGAIN && errno != EINTR)
+	die("(e)poll failed: %m");
+      timestamp_t old_now = m->now;
+      main_get_time_ctx(m);
+      m->idle_time += m->now - old_now;
+
+      if (n <= 0)
+	{
+	  if (m->single_step)
+	    return;
+	  else
+	    continue;
+	}
+
+      // Relink all files with a pending event to file_active_list
+#ifdef CONFIG_UCW_EPOLL
+      for (int i=0; i<n; i++)
+	{
+	  struct epoll_event *e = &m->epoll_events[i];
+	  struct main_file *fi = e->data.ptr;
+	  clist_remove(&fi->n);
+	  clist_add_tail(&m->file_active_list, &fi->n);
+	  fi->events = e->events;
+	}
+#else
+      struct pollfd *p = m->poll_table;
+      struct main_file **pf = m->poll_file_table;
+      for (uint i=0; i < m->poll_cnt; i++)
+	if (p[i].revents)
+	  {
+	    struct main_file *fi = pf[i];
+	    clist_remove(&fi->n);
+	    clist_add_tail(&m->file_active_list, &fi->n);
+	    fi->events = p[i].revents;
+	  }
+#endif
+
+      /*
+       *  Process the buffered file events. This is pretty tricky, since
+       *  user callbacks can modify the file structure or even destroy it.
+       *  In such cases, we detect that the structure was relinked and stop
+       *  processing its events, leaving them for the next iteration of the
+       *  main loop.
+       */
+      struct main_file *fi;
+      while (fi = clist_head(&m->file_active_list))
+	{
+	  if (fi->read_handler && (fi->events & (POLLIN | POLLHUP)))
+	    {
+	      fi->events &= ~(POLLIN | POLLHUP);
+	      do
+		DBG("MAIN: Read event on fd %d", fi->fd);
+	      while (fi->read_handler && fi->read_handler(fi));
+	      continue;
+	    }
+	  if (fi->write_handler && (fi->events & (POLLOUT | POLLHUP | POLLERR)))
+	    {
+	      fi->events &= ~(POLLOUT | POLLHUP | POLLERR);
+	      do
+		DBG("MAIN: Write event on fd %d", fi->fd);
+	      while (fi->write_handler && fi->write_handler(fi));
+	      continue;
+	    }
+	  clist_remove(&fi->n);
+	  clist_add_tail(&m->file_list, &fi->n);
+	}
+    }
+}
+
+void
+main_step(void)
+{
+  struct main_context *m = main_current();
+  m->single_step = 1;
+  main_loop();
+  m->single_step = 0;
+}
diff --git a/libucw/ucw/mainloop.h b/libucw/ucw/mainloop.h
new file mode 100644
index 0000000..98722e5
--- /dev/null
+++ b/libucw/ucw/mainloop.h
@@ -0,0 +1,731 @@
+/*
+ *	UCW Library -- Main Loop
+ *
+ *	(c) 2004--2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_MAINLOOP_H
+#define _UCW_MAINLOOP_H
+
+#include <ucw/clists.h>
+#include <ucw/process.h>
+
+#include <signal.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define block_io_add ucw_block_io_add
+#define block_io_del ucw_block_io_del
+#define block_io_read ucw_block_io_read
+#define block_io_set_timeout ucw_block_io_set_timeout
+#define block_io_write ucw_block_io_write
+#define file_add ucw_file_add
+#define file_chg ucw_file_chg
+#define file_debug ucw_file_debug
+#define file_del ucw_file_del
+#define hook_add ucw_hook_add
+#define hook_debug ucw_hook_debug
+#define hook_del ucw_hook_del
+#define main_cleanup ucw_main_cleanup
+#define main_current ucw_main_current
+#define main_debug_context ucw_main_debug_context
+#define main_delete ucw_main_delete
+#define main_destroy ucw_main_destroy
+#define main_get_time ucw_main_get_time
+#define main_init ucw_main_init
+#define main_loop ucw_main_loop
+#define main_new ucw_main_new
+#define main_step ucw_main_step
+#define main_switch_context ucw_main_switch_context
+#define main_teardown ucw_main_teardown
+#define process_add ucw_process_add
+#define process_debug ucw_process_debug
+#define process_del ucw_process_del
+#define process_fork ucw_process_fork
+#define rec_io_add ucw_rec_io_add
+#define rec_io_del ucw_rec_io_del
+#define rec_io_parse_line ucw_rec_io_parse_line
+#define rec_io_set_timeout ucw_rec_io_set_timeout
+#define rec_io_start_read ucw_rec_io_start_read
+#define rec_io_stop_read ucw_rec_io_stop_read
+#define rec_io_write ucw_rec_io_write
+#define signal_add ucw_signal_add
+#define signal_debug ucw_signal_debug
+#define signal_del ucw_signal_del
+#define timer_add ucw_timer_add
+#define timer_add_rel ucw_timer_add_rel
+#define timer_debug ucw_timer_debug
+#define timer_del ucw_timer_del
+#endif
+
+/***
+ * [[basic]]
+ * Basic operations
+ * ----------------
+ *
+ * First of all, let us take a look at the basic operations with main loop contexts.
+ ***/
+
+/** The main loop context **/
+struct main_context {
+  timestamp_t now;			/* [*] Current time in milliseconds since an unknown epoch. See main_get_time(). */
+  timestamp_t idle_time;		/* [*] Total time in milliseconds spent by waiting for events. */
+  uint shutdown;				/* [*] Setting this to nonzero forces the main_loop() function to terminate. */
+  clist file_list;
+  clist file_active_list;
+  clist hook_list;
+  clist hook_done_list;
+  clist process_list;
+  clist signal_list;
+  uint file_cnt;
+  uint single_step;
+#ifdef CONFIG_UCW_EPOLL
+  int epoll_fd;				/* File descriptor used for epoll */
+  struct epoll_event *epoll_events;
+  clist file_recalc_list;
+#else
+  uint poll_table_obsolete;
+  struct pollfd *poll_table;
+  struct main_file **poll_file_table;
+#endif
+  uint poll_cnt;
+  struct main_timer **timer_table;	/* Growing array containing the heap of timers */
+  sigset_t want_signals;
+  int sig_pipe_send;
+  int sig_pipe_recv;
+  struct main_file *sig_pipe_file;
+  struct main_signal *sigchld_handler;
+};
+
+struct main_context *main_new(void);		/** Create a new context. **/
+
+/**
+ * Delete a context, assuming it does have any event handlers attached. Does nothing if @m is NULL.
+ * It is allowed to call @main_delete() from a hook function of the same context, but you must
+ * never return to the main loop -- e.g., you can exit() the process instead.
+ **/
+void main_delete(struct main_context *m);
+
+/**
+ * Delete a context. If there are any event handlers attached, they are deactivated
+ * (but the responsibility to free the memory there were allocated from lies upon you).
+ * If there are any file handlers, the corresponding file descriptors are closed.
+ **/
+void main_destroy(struct main_context *m);
+
+/** Switch the current context of the calling thread. Returns the previous current context. **/
+struct main_context *main_switch_context(struct main_context *m);
+
+/** Return the current context. Dies if there is none or if the context has been deleted. **/
+struct main_context *main_current(void);
+
+/** Initialize the main loop module and create a top-level context. **/
+void main_init(void);
+
+/** Deinitialize the main loop module, calling @main_delete() on the top-level context. **/
+void main_cleanup(void);
+
+/**
+ * Deinitialize the main loop module, calling @main_destroy() on the top-level context.
+ * This is especially useful in a freshly forked-off child process.
+ **/
+void main_teardown(void);
+
+/**
+ * Start the event loop on the current context.
+ * It will watch the provided objects and call callbacks.
+ * Terminates when someone calls @main_shut_down(),
+ * or when all <<hook,hooks>> return <<enum_main_hook_return,`HOOK_DONE`>>
+ * or at last one <<hook,hook>> returns <<enum_main_hook_return,`HOOK_SHUTDOWN`>>.
+ **/
+void main_loop(void);
+
+/**
+ * Perform a single iteration of the main loop.
+ * Check if there are any events ready and process them.
+ * If there are none, do not wait.
+ **/
+void main_step(void);
+
+/** Ask the main loop to terminate at the nearest occasion. **/
+static inline void main_shut_down(void)
+{
+  main_current()->shutdown = 1;
+}
+
+/**
+ * Show the current state of a given context (use @main_debug() for the current context).
+ * Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`.
+ **/
+void main_debug_context(struct main_context *m);
+
+static inline void main_debug(void)
+{
+  main_debug_context(main_current());
+}
+
+/***
+ * [[time]]
+ * Timers
+ * ------
+ *
+ * The event loop provides the current time, measured as a 64-bit number
+ * of milliseconds since the system epoch (represented in the type `timestamp_t`).
+ *
+ * You can also register timers, which call a handler function at a given moment.
+ * The handler function must either call @timer_del() to delete the timer, or call
+ * @timer_add() with a different expiration time.
+ ***/
+
+/**
+ * Get the current timestamp cached in the current context. It is refreshed in every
+ * iteration of the event loop, or explicitly by calling @main_get_time().
+ **/
+static inline timestamp_t main_get_now(void)
+{
+  return main_current()->now;
+}
+
+/**
+ * This is a description of a timer.
+ * You define the handler function and possibly user-defined data you wish
+ * to pass to the handler, and then you invoke @timer_add().
+ **/
+struct main_timer {
+  cnode n;
+  timestamp_t expires;
+  uint index;
+  void (*handler)(struct main_timer *tm);	/* [*] Function to be called when the timer expires. */
+  void *data;					/* [*] Data for use by the handler */
+};
+
+/**
+ * Add a new timer into the main loop to be watched and called
+ * when it expires. It can also be used to modify an already running
+ * timer. It is permitted (and usual) to call this function from the
+ * timer's handler itself if you want the timer to trigger again.
+ *
+ * The @expire parameter is absolute (in the same time scale as @main_get_now()),
+ * use @timer_add_rel() for a relative version.
+ **/
+void timer_add(struct main_timer *tm, timestamp_t expires);
+
+/** Like @timer_add(), but the expiration time is relative to the current time. **/
+void timer_add_rel(struct main_timer *tm, timestamp_t expires_delta);
+
+/**
+ * Removes a timer from the active ones. It is permitted (and common) to call
+ * this function from the timer's handler itself if you want to deactivate
+ * the timer. Removing an already removed timer does nothing.
+ **/
+void timer_del(struct main_timer *tm);
+
+/** Tells whether a timer is running. **/
+static inline int timer_is_active(struct main_timer *tm)
+{
+  return !!tm->expires;
+}
+
+/**
+ * Forces refresh of the current timestamp cached in the active context.
+ * You usually do not need to call this, since it is called every time the
+ * loop polls for events. It is here if you need extra precision or some of the
+ * hooks takes a long time.
+ **/
+void main_get_time(void);
+
+/** Show current state of a timer. Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`. **/
+void timer_debug(struct main_timer *tm);
+
+/***
+ * [[hooks]]
+ * Loop hooks
+ * ----------
+ *
+ * The hooks are called whenever the main loop performs an iteration.
+ * You can shutdown the main loop from within them or request an iteration
+ * to happen without sleeping (just poll, no waiting for events).
+ ***/
+
+/**
+ * A hook. It contains the function to call and some user data.
+ *
+ * The handler() must return one value from
+ * <<enum_main_hook_return,`main_hook_return`>>.
+ *
+ * Fill with the hook and data and pass it to @hook_add().
+ **/
+struct main_hook {
+  cnode n;
+  int (*handler)(struct main_hook *ho);		/* [*] Hook function; returns HOOK_xxx */
+  void *data;					/* [*] For use by the handler */
+};
+
+/**
+ * Return value of the hook handler().
+ * Specifies what should happen next.
+ *
+ * - `HOOK_IDLE` -- Let the loop sleep until something happens, call after that.
+ * - `HOOK_RETRY` -- Force the loop to perform another iteration without sleeping.
+ *   This will cause calling of all the hooks again soon.
+ * - `HOOK_DONE` -- The loop will terminate if all hooks return this.
+ * - `HOOK_SHUTDOWN` -- Shuts down the loop.
+ *
+ * The `HOOK_IDLE` and `HOOK_RETRY` constants are also used as return values
+ * of file handlers.
+ **/
+enum main_hook_return {
+  HOOK_IDLE,
+  HOOK_RETRY,
+  HOOK_DONE = -1,
+  HOOK_SHUTDOWN = -2
+};
+
+/**
+ * Inserts a new hook into the loop.
+ * The hook will be scheduled at least once before next sleep.
+ * May be called from inside a hook handler too.
+ * Adding an already added hook is permitted and if the hook has been run,
+ * it will be run again before next sleep.
+ **/
+void hook_add(struct main_hook *ho);
+
+/**
+ * Removes an existing hook from the loop.
+ * May be called from inside a hook handler (to delete itself or another hook).
+ * Removing an already removed hook does nothing.
+ **/
+void hook_del(struct main_hook *ho);
+
+/** Tells if a hook is active (i.e., added). **/
+static inline int hook_is_active(struct main_hook *ho)
+{
+  return clist_is_linked(&ho->n);
+}
+
+/** Show current state of a hook. Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`. **/
+void hook_debug(struct main_hook *ho);
+
+
+/***
+ * [[file]]
+ * Activity on file descriptors
+ * ----------------------------
+ *
+ * You can ask the main loop to watch a set of file descriptors for activity.
+ * (This is a generalization of the select() and poll() system calls. Internally,
+ * it uses either poll() or the more efficient epoll().)
+ *
+ * You create a <<struct_main_file,`struct main_file`>>, fill in a file descriptor
+ * and pointers to handler functions to be called when the descriptor becomes
+ * ready for reading and/or writing, and call @file_add(). When you need to
+ * modify the handlers (e.g., to set them to NULL if you are no longer interested
+ * in a given event), you should call @file_chg() to notify the main loop about
+ * the changes.
+ *
+ * From within the handler functions, you are allowed to call @file_chg() and even
+ * @file_del().
+ *
+ * The return value of a handler function should be either <<enum_main_hook_return,`HOOK_RETRY`>>
+ * or <<enum_main_hook_return,`HOOK_IDLE`>>. <<enum_main_hook_return,`HOOK_RETRY`>>
+ * signals that the function would like to consume more data immediately
+ * (i.e., it wants to be called again soon, but the event loop can postpone it after
+ * processing other events to avoid starvation). <<enum_main_hook_return,`HOOK_IDLE`>>
+ * tells that the handler wants to be called when the descriptor becomes ready again.
+ *
+ * For backward compatibility, 0 can be used instead of <<enum_main_hook_return,`HOOK_IDLE`>>
+ * and 1 for <<enum_main_hook_return,`HOOK_RETRY`>>.
+ *
+ * If you want to read/write fixed-size blocks of data asynchronously, the
+ * <<blockio,Asynchronous block I/O>> interface could be more convenient.
+ ***/
+
+/**
+ * This structure describes a file descriptor to be watched and the handlers
+ * to be called when the descriptor is ready for reading and/or writing.
+ **/
+struct main_file {
+  cnode n;
+  int fd;					/* [*] File descriptor */
+  int (*read_handler)(struct main_file *fi);	/* [*] To be called when ready for reading/writing; must call file_chg() afterwards */
+  int (*write_handler)(struct main_file *fi);
+  void *data;					/* [*] Data for use by the handlers */
+  uint events;
+  uint want_events;
+#ifndef CONFIG_UCW_EPOLL
+  struct pollfd *pollfd;
+#endif
+};
+
+/**
+ * Insert a <<struct_main_file,`main_file`>> structure into the main loop to be
+ * watched for activity. You can call this at any time, even inside a handler
+ * (of course for a different file descriptor than the one of the handler).
+ *
+ * The file descriptor is automatically set to the non-blocking mode.
+ **/
+void file_add(struct main_file *fi);
+
+/**
+ * Tell the main loop that the file structure has changed. Call it whenever you
+ * change any of the handlers.
+ *
+ * Can be called only on active files (only the ones added by @file_add()).
+ **/
+void file_chg(struct main_file *fi);
+
+/**
+ * Removes a file from the watched set. If you want to close a descriptor,
+ * please use this function first.
+ *
+ * Can be called from a handler.
+ * Removing an already removed file does nothing.
+ **/
+void file_del(struct main_file *fi);
+
+/** Tells if a file is active (i.e., added). **/
+static inline int file_is_active(struct main_file *fi)
+{
+  return clist_is_linked(&fi->n);
+}
+
+/** Show current state of a file. Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`. **/
+void file_debug(struct main_file *fi);
+
+/***
+ * [[blockio]]
+ * Asynchronous block I/O
+ * ----------------------
+ *
+ * If you are reading or writing fixed-size blocks of data, you can let the
+ * block I/O interface handle the boring routine of handling partial reads
+ * and writes for you.
+ *
+ * You just create <<struct_main_block_io,`struct main_block_io`>> and call
+ * @block_io_add() on it, which sets up some <<struct_main_file,`main_file`>>s internally.
+ * Then you can just call @block_io_read() or @block_io_write() to ask for
+ * reading or writing of a given block. When the operation is finished,
+ * your handler function is called.
+ *
+ * Additionally, the block I/O is equipped with a timer, which can be used
+ * to detect communication timeouts. The timer is not touched internally
+ * (except that it gets added and deleted at the right places), feel free
+ * to adjust it from your handler functions by @block_io_set_timeout().
+ * When the timer expires, the error handler is automatically called with
+ * <<enum_block_io_err_cause,`BIO_ERR_TIMEOUT`>>.
+ ***/
+
+/** The block I/O structure. **/
+struct main_block_io {
+  struct main_file file;
+  byte *rbuf;					/* Read/write pointers for use by file_read/write */
+  uint rpos, rlen;
+  const byte *wbuf;
+  uint wpos, wlen;
+  void (*read_done)(struct main_block_io *bio);	/* [*] Called when file_read is finished; rpos < rlen if EOF */
+  void (*write_done)(struct main_block_io *bio);	/* [*] Called when file_write is finished */
+  void (*error_handler)(struct main_block_io *bio, int cause);	/* [*] Handler to call on errors */
+  struct main_timer timer;
+  void *data;					/* [*] Data for use by the handlers */
+};
+
+/** Activate a block I/O structure. **/
+void block_io_add(struct main_block_io *bio, int fd);
+
+/** Deactivate a block I/O structure. Calling twice is safe. **/
+void block_io_del(struct main_block_io *bio);
+
+/**
+ * Specifies when or why an error happened. This is passed to the error handler.
+ * `errno` is still set to the original source of error. The only exception
+ * is `BIO_ERR_TIMEOUT`, in which case `errno` is not set and the only possible
+ * cause of it is timeout of the timer associated with the block_io
+ * (see @block_io_set_timeout()).
+ **/
+enum block_io_err_cause {
+  BIO_ERR_READ,
+  BIO_ERR_WRITE,
+  BIO_ERR_TIMEOUT
+};
+
+/**
+ * Ask the main loop to read @len bytes of data from @bio into @buf.
+ * It cancels any previous unfinished read requested in this way.
+ *
+ * When the read is done, the read_done() handler is called. If an EOF occurred,
+ * `rpos < rlen` (eg. not all data were read).
+ *
+ * Can be called from a handler.
+ *
+ * You can use a call with zero @len to cancel the current read, but all read data
+ * will be thrown away.
+ **/
+void block_io_read(struct main_block_io *bio, void *buf, uint len);
+
+/**
+ * Request that the main loop writes @len bytes of data from @buf to @bio.
+ * Cancels any previous unfinished write and overwrites `write_handler`.
+ *
+ * When it is written, the write_done() handler is called.
+ *
+ * Can be called from a handler.
+ *
+ * If you call it with zero @len, it will cancel the previous write, but note
+ * that some data may already be written.
+ **/
+void block_io_write(struct main_block_io *bio, const void *buf, uint len);
+
+/**
+ * Sets a timer for a file @bio. If the timer is not overwritten or disabled
+ * until @expires_delta milliseconds, the file timeouts and error_handler() is called with
+ * <<enum_block_io_err_cause,`BIO_ERR_TIMEOUT`>>. A value of `0` stops the timer.
+ *
+ * Previous setting of the timeout on the same file will be overwritten.
+ *
+ * The use-cases for this are mainly sockets or pipes, when:
+ *
+ * - You want to drop inactive connections (no data comes in or out for a given time, not
+ *   incomplete messages).
+ * - You want to enforce answer in a given time (for example authentication).
+ * - Watching maximum time for a whole connection.
+ **/
+void block_io_set_timeout(struct main_block_io *bio, timestamp_t expires_delta);
+
+/** Tells if a @bio is active (i.e., added). **/
+static inline int block_io_is_active(struct main_block_io *bio)
+{
+  return file_is_active(&bio->file);
+}
+
+/***
+ * [[recordio]]
+ * Asynchronous record I/O
+ * -----------------------
+ *
+ * Record-based I/O is another front-end to the main loop file operations.
+ * Unlike its older cousin `main_block_io`, it is able to process records
+ * of variable length.
+ *
+ * To set it up, you create <<struct_main_rec_io,`struct main_rec_io`>> and call
+ * @rec_io_add() on it, which sets up some <<struct_main_file,`main_file`>>s internally.
+ *
+ * To read data from the file, call @rec_io_start_read() first. Whenever any data
+ * arrive from the file, they are appended to an internal buffer and the `read_handler`
+ * hook is called. The hook checks if the buffer already contains a complete record.
+ * If it is so, it processes the record and returns the number of bytes consumed.
+ * Otherwise, it returns 0 to tell the buffering machinery that more data are needed.
+ * When the read handler decides to destroy the `main_rec_io`, it must return `~0U`.
+ *
+ * On the write side, `main_rec_io` maintains a buffer keeping all data that should
+ * be written to the file. The @rec_io_write() function appends data to this buffer
+ * and it is written on background. A simple flow-control mechanism can be asked
+ * for: when more than `write_throttle_read` data are buffered for writing, reading
+ * is temporarily suspended.
+ *
+ * Additionally, the record I/O is equipped with a timer, which can be used
+ * to detect communication timeouts. The timer is not touched internally
+ * (except that it gets added and deleted at the right places), feel free
+ * to adjust it from your handler functions by @rec_io_set_timeout().
+ *
+ * All important events are passed to the `notify_handler`: errors when
+ * reading or writing, timeouts, the write buffer becoming empty, ... See
+ * <<enum_rec_io_notify_status,`enum rec_io_notify_status`>> for a complete list.
+ ***/
+
+/** The record I/O structure. **/
+struct main_rec_io {
+  struct main_file file;
+  byte *read_buf;
+  byte *read_rec_start;				/* [*] Start of current record */
+  uint read_avail;				/* [*] How much data is available */
+  uint read_prev_avail;				/* [*] How much data was available in previous read_handler */
+  uint read_buf_size;				/* [*] Read buffer size allocated (can be set before rec_io_add()) */
+  uint read_started;				/* Reading requested by user */
+  uint read_running;				/* Reading really runs (read_started && not stopped by write_throttle_read) */
+  uint read_rec_max;				/* [*] Maximum record size (0=unlimited) */
+  clist busy_write_buffers;
+  clist idle_write_buffers;
+  uint write_buf_size;				/* [*] Write buffer size allocated (can be set before rec_io_add()) */
+  uint write_watermark;				/* [*] How much data are waiting to be written */
+  uint write_throttle_read;			/* [*] If more than write_throttle_read bytes are buffered, stop reading; 0=no stopping */
+  uint (*read_handler)(struct main_rec_io *rio);	/* [*] Called whenever more bytes are read; returns 0 (want more) or number of bytes eaten */
+  int (*notify_handler)(struct main_rec_io *rio, int status);	/* [*] Called to notify about errors and other events */
+						/* Returns either HOOK_RETRY or HOOK_IDLE. */
+  struct main_timer timer;
+  struct main_hook start_read_hook;		/* Used internally to defer rec_io_start_read() */
+  void *data;					/* [*] Data for use by the handlers */
+};
+
+/** Activate a record I/O structure. **/
+void rec_io_add(struct main_rec_io *rio, int fd);
+
+/** Deactivate a record I/O structure. Calling twice is safe. **/
+void rec_io_del(struct main_rec_io *rio);
+
+/**
+ * Start reading.
+ *
+ * When there were some data in the buffer (e.g., because @rec_io_stop_read()
+ * was called from the `read_handler`), it is processed as if it were read
+ * from the file once again. That is, `read_prev_avail` is reset to 0 and
+ * the `read_handler` is called to process all buffered data.
+ ***/
+void rec_io_start_read(struct main_rec_io *rio);
+
+/** Stop reading. **/
+void rec_io_stop_read(struct main_rec_io *rio);
+
+/** Analogous to @block_io_set_timeout(). **/
+void rec_io_set_timeout(struct main_rec_io *rio, timestamp_t expires_delta);
+
+void rec_io_write(struct main_rec_io *rio, const void *data, uint len);
+
+/**
+ * An auxiliary function used for parsing of lines. When called in the @read_handler,
+ * it searches for the end of line character. When a complete line is found, the length
+ * of the line (including the end of line character) is returned. Otherwise, it returns zero.
+ **/
+uint rec_io_parse_line(struct main_rec_io *rio);
+
+/**
+ * Specifies what kind of error or other event happened, when the @notify_handler
+ * is called. In case of I/O errors, `errno` is still set.
+ *
+ * Upon @RIO_ERR_READ, @RIO_ERR_RECORD_TOO_LARGE and @RIO_EVENT_EOF, reading is stopped
+ * automatically. Upon @RIO_ERR_WRITE, writing is stopped. Upon @RIO_ERR_TIMEOUT, only the
+ * timer is deactivated.
+ *
+ * In all cases, the notification handler is allowed to call @rec_io_del(), but it
+ * must return @HOOK_IDLE in such cases.
+ **/
+enum rec_io_notify_status {
+  RIO_ERR_READ = -1,			/* read() returned an error, errno set */
+  RIO_ERR_WRITE = -2,			/* write() returned an error, errno set */
+  RIO_ERR_TIMEOUT = -3,			/* A timeout has occurred */
+  RIO_ERR_RECORD_TOO_LARGE = -4,	/* Read: read_rec_max has been exceeded */
+  RIO_EVENT_ALL_WRITTEN = 1,		/* All buffered data has been written */
+  RIO_EVENT_PART_WRITTEN = 2,		/* Some buffered data has been written, but more remains */
+  RIO_EVENT_EOF = 3,			/* Read: EOF seen */
+};
+
+/** Tells if a @rio is active (i.e., added). **/
+static inline int rec_io_is_active(struct main_rec_io *rio)
+{
+  return file_is_active(&rio->file);
+}
+
+/***
+ * [[process]]
+ * Child processes
+ * ---------------
+ *
+ * The main loop can watch child processes and notify you,
+ * when some of them terminates.
+ ***/
+
+/**
+ * Description of a watched process.
+ * You fill in the handler() and `data`.
+ * The rest is set with @process_fork().
+ **/
+struct main_process {
+  cnode n;
+  int pid;					/* Process id (0=not running) */
+  int status;					/* Exit status (-1=fork failed) */
+  char status_msg[EXIT_STATUS_MSG_SIZE];
+  void (*handler)(struct main_process *mp);	/* [*] Called when the process exits; process_del done automatically */
+  void *data;					/* [*] For use by the handler */
+};
+
+/**
+ * Asks the main loop to watch this process.
+ * As it is done automatically in @process_fork(), you need this only
+ * if you removed the process previously by @process_del().
+ **/
+void process_add(struct main_process *mp);
+
+/**
+ * Removes the process from the watched set. This is done
+ * automatically, when the process terminates, so you need it only
+ * when you do not want to watch a running process any more.
+ * Removing an already removed process does nothing.
+ */
+void process_del(struct main_process *mp);
+
+/**
+ * Forks and fills the @mp with information about the new process.
+ *
+ * If the fork() succeeds, it:
+ *
+ * - Returns 0 in the child.
+ * - Returns 1 in the parent and calls @process_add() on it.
+ *
+ * In the case of unsuccessful fork(), it:
+ *
+ * - Fills in the `status_msg` and sets `status` to -1.
+ * - Calls the handler() as if the process terminated.
+ * - Returns 1.
+ **/
+int process_fork(struct main_process *mp);
+
+/** Tells if a process is active (i.e., added). **/
+static inline int process_is_active(struct main_process *mp)
+{
+  return clist_is_linked(&mp->n);
+}
+
+/** Show current state of a process. Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`. **/
+void process_debug(struct main_process *pr);
+
+/***
+ * [[signal]]
+ * Synchronous delivery of signals
+ * -------------------------------
+ *
+ * UNIX signals are delivered to processes in an asynchronous way: when a signal
+ * arrives (and it is not blocked), the process is interrupted and the corresponding
+ * signal handler function is called. However, most data structures and even most
+ * system library calls are not safe with respect to interrupts, so most program
+ * using signals contain subtle race conditions and may fail once in a long while.
+ *
+ * To avoid this problem, the event loop can be asked for synchronous delivery
+ * of signals. When a signal registered with @signal_add() arrives, it wakes up
+ * the loop (if it is not already awake) and it is processed in the same way
+ * as all other events.
+ *
+ * When used in a multi-threaded program, the signals are delivered to the thread
+ * which is currently using the particular main loop context. If the context is not
+ * current in any thread, the signals are blocked.
+ *
+ * As usually with UNIX signals, multiple instances of a single signal can be
+ * merged and delivered only once. (Some implementations of the main loop can even
+ * drop a signal completely during very intensive signal traffic, when an internal
+ * signal queue overflows.)
+ ***/
+
+/** Description of a signal to catch. **/
+struct main_signal {
+  cnode n;
+  int signum;					/* [*] Signal to catch */
+  void (*handler)(struct main_signal *ms);	/* [*] Called when the signal arrives */
+  void *data;					/* [*] For use by the handler */
+};
+
+/** Request a signal to be caught and delivered synchronously. **/
+void signal_add(struct main_signal *ms);
+
+/** Cancel a request for signal catching. Calling twice is safe. **/
+void signal_del(struct main_signal *ms);
+
+/** Tells if a signal catcher is active (i.e., added). **/
+static inline int signal_is_active(struct main_signal *ms)
+{
+  return clist_is_linked(&ms->n);
+}
+
+/** Show current state of a signal catcher. Available only if LibUCW has been compiled with `CONFIG_UCW_DEBUG`. **/
+void signal_debug(struct main_signal *sg);
+
+#endif
diff --git a/libucw/ucw/md5.c b/libucw/ucw/md5.c
new file mode 100644
index 0000000..d244356
--- /dev/null
+++ b/libucw/ucw/md5.c
@@ -0,0 +1,279 @@
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * md5_context structure, pass it to md5_init, call md5_update as
+ * needed on buffers full of bytes, and then call md5_final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/md5.h>
+
+#include <string.h>		/* for memcpy() */
+
+#ifdef CPU_LITTLE_ENDIAN
+#define byteReverse(buf, len)	/* Nothing */
+#else
+void byteReverse(byte *buf, uint longs);
+
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+void byteReverse(byte *buf, uint longs)
+{
+  u32 t;
+  do {
+    t = (u32) ((uint) buf[3] << 8 | buf[2]) << 16 |
+      ((uint) buf[1] << 8 | buf[0]);
+    *(u32 *) buf = t;
+    buf += 4;
+  } while (--longs);
+}
+#endif
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void md5_init(md5_context *ctx)
+{
+  ctx->buf[0] = 0x67452301;
+  ctx->buf[1] = 0xefcdab89;
+  ctx->buf[2] = 0x98badcfe;
+  ctx->buf[3] = 0x10325476;
+
+  ctx->bits[0] = 0;
+  ctx->bits[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void md5_update(md5_context *ctx, const byte *buf, uint len)
+{
+  u32 t;
+
+  /* Update bitcount */
+
+  t = ctx->bits[0];
+  if ((ctx->bits[0] = t + ((u32) len << 3)) < t)
+    ctx->bits[1]++;		/* Carry from low to high */
+  ctx->bits[1] += len >> 29;
+
+  t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
+
+  /* Handle any leading odd-sized chunks */
+
+  if (t) {
+    byte *p = (byte *) ctx->in + t;
+
+    t = 64 - t;
+    if (len < t) {
+      memcpy(p, buf, len);
+      return;
+    }
+    memcpy(p, buf, t);
+    byteReverse(ctx->in, 16);
+    md5_transform(ctx->buf, (u32 *) ctx->in);
+    buf += t;
+    len -= t;
+  }
+  /* Process data in 64-byte chunks */
+
+  while (len >= 64) {
+    memcpy(ctx->in, buf, 64);
+    byteReverse(ctx->in, 16);
+    md5_transform(ctx->buf, (u32 *) ctx->in);
+    buf += 64;
+    len -= 64;
+  }
+
+  /* Handle any remaining bytes of data. */
+
+  memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+byte *md5_final(md5_context *ctx)
+{
+  uint count;
+  byte *p;
+
+  /* Compute number of bytes mod 64 */
+  count = (ctx->bits[0] >> 3) & 0x3F;
+
+  /* Set the first char of padding to 0x80.  This is safe since there is
+     always at least one byte free */
+  p = ctx->in + count;
+  *p++ = 0x80;
+
+  /* Bytes of padding needed to make 64 bytes */
+  count = 64 - 1 - count;
+
+  /* Pad out to 56 mod 64 */
+  if (count < 8) {
+    /* Two lots of padding:  Pad the first block to 64 bytes */
+    memset(p, 0, count);
+    byteReverse(ctx->in, 16);
+    md5_transform(ctx->buf, (u32 *) ctx->in);
+
+    /* Now fill the next block with 56 bytes */
+    memset(ctx->in, 0, 56);
+  } else {
+    /* Pad block to 56 bytes */
+    memset(p, 0, count - 8);
+  }
+  byteReverse(ctx->in, 14);
+
+  /* Append length in bits and transform */
+  memcpy(ctx->in + 56, ctx->bits, 8);
+  md5_transform(ctx->buf, (u32 *) ctx->in);
+  byteReverse((byte *) ctx->buf, 4);
+  return (byte *) ctx->buf;
+}
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+  ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+void md5_transform(u32 buf[4], u32 const in[16])
+{
+  u32 a, b, c, d;
+
+  a = buf[0];
+  b = buf[1];
+  c = buf[2];
+  d = buf[3];
+
+  MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+  MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+  MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+  MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+  MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+  MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+  MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+  MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+  MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+  MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+  MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+  MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+  MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+  MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+  MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+  MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+  MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+  MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+  MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+  MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+  MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+  MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+  MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+  MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+  MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+  MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+  MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+  MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+  MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+  MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+  MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+  MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+  MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+  MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+  MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+  MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+  MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+  MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+  MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+  MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+  MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+  MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+  MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+  MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+  MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+  MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+  MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+  MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+  MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+  MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+  MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+  MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+  MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+  MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+  MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+  MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+  MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+  MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+  MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+  MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+  MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+  MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+  MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+  MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+
+void md5_hash_buffer(byte *outbuf, const byte *buffer, uint length)
+{
+  md5_context c;
+  md5_init(&c);
+  md5_update(&c, buffer, length);
+  memcpy(outbuf, md5_final(&c), MD5_SIZE);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <unistd.h>
+#include <ucw/string.h>
+
+int main(void)
+{
+  md5_context hd;
+  byte buf[3];
+  int cnt;
+
+  md5_init(&hd);
+  while ((cnt = read(0, buf, sizeof(buf))) > 0)
+    md5_update(&hd, buf, cnt);
+
+  char text[MD5_HEX_SIZE];
+  mem_to_hex(text, md5_final(&hd), MD5_SIZE, 0);
+  puts(text);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/md5.h b/libucw/ucw/md5.h
new file mode 100644
index 0000000..7d9abeb
--- /dev/null
+++ b/libucw/ucw/md5.h
@@ -0,0 +1,74 @@
+/*
+ *	UCW Library -- MD5 Message Digest
+ *
+ *	This file is in public domain (see ucw/md5.c).
+ */
+
+#ifndef _UCW_MD5_H
+#define _UCW_MD5_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define md5_final ucw_md5_final
+#define md5_hash_buffer ucw_md5_hash_buffer
+#define md5_init ucw_md5_init
+#define md5_transform ucw_md5_transform
+#define md5_update ucw_md5_update
+#endif
+
+/**
+ * Internal MD5 hash state.
+ * You should use it just as an opaque handle only.
+ */
+typedef struct {
+	u32 buf[4];
+	u32 bits[2];
+	byte in[64];
+} md5_context;
+
+void md5_init(md5_context *context); /** Initialize the MD5 hashing algorithm in @context. **/
+/**
+ * Push another @len bytes of data from @buf to the MD5 hash
+ * represented by @context. You can call it multiple time on the same
+ * @context without reinitializing it and the result will be the same
+ * as if you concatenated all the data together and fed them here all at
+ * once.
+ */
+void md5_update(md5_context *context, const byte *buf, uint len);
+/**
+ * Call this after the last @md5_update(). It will terminate the
+ * algorithm and return a pointer to the result.
+ *
+ * Note that the data it points to are stored inside the @context, so
+ * if you use it to compute another hash or it ceases to exist, the
+ * pointer becomes invalid.
+ *
+ * To convert the hash to its usual hexadecimal representation, see
+ * <<string:mem_to_hex()>>.
+ */
+byte *md5_final(md5_context *context);
+
+/**
+ * This is the core routine of the MD5 algorithm. It takes 16 longwords of
+ * data in @in and transforms the hash in @buf according to them.
+ *
+ * You probably do not want to call this one directly.
+ */
+void md5_transform(u32 buf[4], const u32 in[16]);
+
+/**
+ * MD5 one-shot convenience method. It takes @length bytes from
+ * @buffer, creates the hash from them and returns it in @output.
+ *
+ * It is equivalent to this code:
+ *
+ *  md5_context c;
+ *  md5_init(&c);
+ *  md5_update(&c, buffer, length);
+ *  memcpy(outbuf, md5_final(&c), MD5_SIZE);
+ */
+void md5_hash_buffer(byte *outbuf, const byte *buffer, uint length);
+
+#define MD5_HEX_SIZE 33 /** How many bytes a string buffer for MD5 in hexadecimal format should have. **/
+#define MD5_SIZE 16 /** Number of bytes the MD5 hash takes in the binary form. **/
+
+#endif /* !_UCW_MD5_H */
diff --git a/libucw/ucw/md5.t b/libucw/ucw/md5.t
new file mode 100644
index 0000000..d3c7a0c
--- /dev/null
+++ b/libucw/ucw/md5.t
@@ -0,0 +1,9 @@
+# Tests of the MD5 module
+
+Name:	MD5-1
+Run:	echo -n "abc" | ../obj/ucw/md5-t
+Out:	900150983cd24fb0d6963f7d28e17f72
+
+Name:	MD5-2
+Run:	echo -n "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" | ../obj/ucw/md5-t
+Out:	8215ef0796a20bcaaae116d3876c664a
diff --git a/libucw/ucw/mempool-fmt.c b/libucw/ucw/mempool-fmt.c
new file mode 100644
index 0000000..7dc7a10
--- /dev/null
+++ b/libucw/ucw/mempool-fmt.c
@@ -0,0 +1,99 @@
+/*
+ *	UCW Library -- Memory Pools (Formatting)
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+
+#include <alloca.h>
+#include <stdio.h>
+#include <string.h>
+
+static char *
+mp_vprintf_at(struct mempool *mp, size_t ofs, const char *fmt, va_list args)
+{
+  char *ret = mp_grow(mp, ofs + 1) + ofs;
+  va_list args2;
+  va_copy(args2, args);
+  int cnt = vsnprintf(ret, mp_avail(mp) - ofs, fmt, args2);
+  va_end(args2);
+  if (cnt < 0)
+    {
+      /* Our C library doesn't support C99 return value of vsnprintf, so we need to iterate */
+      do
+	{
+	  ret = mp_expand(mp) + ofs;
+	  va_copy(args2, args);
+	  cnt = vsnprintf(ret, mp_avail(mp) - ofs, fmt, args2);
+	  va_end(args2);
+	}
+      while (cnt < 0);
+    }
+  else if ((uint)cnt >= mp_avail(mp) - ofs)
+    {
+      ret = mp_grow(mp, ofs + cnt + 1) + ofs;
+      va_copy(args2, args);
+      int cnt2 = vsnprintf(ret, cnt + 1, fmt, args2);
+      va_end(args2);
+      ASSERT(cnt2 == cnt);
+    }
+  mp_end(mp, ret + cnt + 1);
+  return ret - ofs;
+}
+
+char *
+mp_vprintf(struct mempool *mp, const char *fmt, va_list args)
+{
+  mp_start(mp, 1);
+  return mp_vprintf_at(mp, 0, fmt, args);
+}
+
+char *
+mp_printf(struct mempool *p, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  char *res = mp_vprintf(p, fmt, args);
+  va_end(args);
+  return res;
+}
+
+char *
+mp_vprintf_append(struct mempool *mp, char *ptr, const char *fmt, va_list args)
+{
+  size_t ofs = mp_open(mp, ptr);
+  ASSERT(ofs && !ptr[ofs - 1]);
+  return mp_vprintf_at(mp, ofs - 1, fmt, args);
+}
+
+char *
+mp_printf_append(struct mempool *mp, char *ptr, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  char *res = mp_vprintf_append(mp, ptr, fmt, args);
+  va_end(args);
+  return res;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct mempool *mp = mp_new(64);
+  char *x = mp_printf(mp, "<Hello, %s!>", "World");
+  fputs(x, stdout);
+  x = mp_printf_append(mp, x, "<Appended>");
+  fputs(x, stdout);
+  x = mp_printf(mp, "<Hello, %50s!>\n", "World");
+  fputs(x, stdout);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/mempool-str.c b/libucw/ucw/mempool-str.c
new file mode 100644
index 0000000..48c60f4
--- /dev/null
+++ b/libucw/ucw/mempool-str.c
@@ -0,0 +1,121 @@
+/*
+ *	UCW Library -- Memory Pools (String Operations)
+ *
+ *	(c) 2004--2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/unicode.h>
+
+#include <alloca.h>
+#include <string.h>
+
+char *
+mp_strdup(struct mempool *p, const char *s)
+{
+  if (!s)
+    return NULL;
+  size_t l = strlen(s) + 1;
+  char *t = mp_alloc_fast_noalign(p, l);
+  memcpy(t, s, l);
+  return t;
+}
+
+void *
+mp_memdup(struct mempool *p, const void *s, size_t len)
+{
+  void *t = mp_alloc_fast(p, len);
+  memcpy(t, s, len);
+  return t;
+}
+
+char *
+mp_multicat(struct mempool *p, ...)
+{
+  va_list args, a;
+  va_start(args, p);
+  char *x, *y;
+  uint cnt = 0;
+  va_copy(a, args);
+  while (x = va_arg(a, char *))
+    cnt++;
+  size_t *sizes = alloca(cnt * sizeof(*sizes));
+  size_t len = 1;
+  cnt = 0;
+  va_end(a);
+  va_copy(a, args);
+  while (x = va_arg(a, char *))
+    len += sizes[cnt++] = strlen(x);
+  char *buf = mp_alloc_fast_noalign(p, len);
+  y = buf;
+  va_end(a);
+  cnt = 0;
+  while (x = va_arg(args, char *))
+    {
+      memcpy(y, x, sizes[cnt]);
+      y += sizes[cnt++];
+    }
+  *y = 0;
+  va_end(args);
+  return buf;
+}
+
+char *
+mp_strjoin(struct mempool *p, char **a, uint n, uint sep)
+{
+  size_t sizes[n];
+  size_t len = 1;
+  for (uint i=0; i<n; i++)
+    len += sizes[i] = strlen(a[i]);
+  if (sep && n)
+    len += n-1;
+  char *dest = mp_alloc_fast_noalign(p, len);
+  char *d = dest;
+  for (uint i=0; i<n; i++)
+    {
+      if (sep && i)
+	*d++ = sep;
+      memcpy(d, a[i], sizes[i]);
+      d += sizes[i];
+    }
+  *d = 0;
+  return dest;
+}
+
+char *
+mp_str_from_mem(struct mempool *a, const void *mem, size_t len)
+{
+  char *str = mp_alloc_noalign(a, len+1);
+  memcpy(str, mem, len);
+  str[len] = 0;
+  return str;
+}
+
+void *mp_append_utf8_32(struct mempool *pool, void *p, uint c)
+{
+  p = mp_spread(pool, p, UTF8_MAX_LEN);
+  return utf8_32_put(p, c);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  struct mempool *p = mp_new(64);
+  char *s = mp_strdup(p, "12345");
+  char *c = mp_multicat(p, "<<", s, ">>", NULL);
+  puts(c);
+  char *a[] = { "bugs", "gnats", "insects" };
+  puts(mp_strjoin(p, a, 3, '.'));
+  puts(mp_strjoin(p, a, 3, 0));
+  puts(mp_str_from_mem(p, s+1, 2));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/mempool.c b/libucw/ucw/mempool.c
new file mode 100644
index 0000000..194cdaf
--- /dev/null
+++ b/libucw/ucw/mempool.c
@@ -0,0 +1,583 @@
+/*
+ *	UCW Library -- Memory Pools (One-Time Allocation)
+ *
+ *	(c) 1997--2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2007--2017 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/alloc.h>
+#include <ucw/mempool.h>
+
+#include <string.h>
+
+#define MP_CHUNK_TAIL ALIGN_TO(sizeof(struct mempool_chunk), CPU_STRUCT_ALIGN)
+#define MP_SIZE_MAX (SIZE_MAX - MP_CHUNK_TAIL - CPU_PAGE_SIZE)
+
+struct mempool_chunk {
+#ifdef CONFIG_DEBUG
+  struct mempool *pool;		// Can be useful when analysing coredump for memory leaks
+#endif
+  struct mempool_chunk *next;
+  size_t size;
+};
+
+static size_t
+mp_align_size(size_t size)
+{
+#ifdef CONFIG_UCW_POOL_IS_MMAP
+  size = MAX(size, 64 + MP_CHUNK_TAIL);
+  return ALIGN_TO(size, CPU_PAGE_SIZE) - MP_CHUNK_TAIL;
+#else
+  return ALIGN_TO(size, CPU_STRUCT_ALIGN);
+#endif
+}
+
+static void *mp_allocator_alloc(struct ucw_allocator *a, size_t size)
+{
+  struct mempool *mp = (struct mempool *) a;
+  return mp_alloc_fast(mp, size);
+}
+
+static void *mp_allocator_realloc(struct ucw_allocator *a, void *ptr, size_t old_size, size_t new_size)
+{
+  if (new_size <= old_size)
+    return ptr;
+
+  /*
+   *  In the future, we might want to do something like mp_realloc(),
+   *  but we have to check that it is indeed the last block in the pool.
+   */
+  struct mempool *mp = (struct mempool *) a;
+  void *new = mp_alloc_fast(mp, new_size);
+  memcpy(new, ptr, old_size);
+  return new;
+}
+
+static void mp_allocator_free(struct ucw_allocator *a UNUSED, void *ptr UNUSED)
+{
+  // Does nothing
+}
+
+void
+mp_init(struct mempool *pool, size_t chunk_size)
+{
+  chunk_size = mp_align_size(MAX(sizeof(struct mempool), chunk_size));
+  *pool = (struct mempool) {
+    .allocator = {
+      .alloc = mp_allocator_alloc,
+      .realloc = mp_allocator_realloc,
+      .free = mp_allocator_free,
+    },
+    .chunk_size = chunk_size,
+    .threshold = chunk_size >> 1,
+    .last_big = &pool->last_big
+  };
+}
+
+static void *
+mp_new_big_chunk(struct mempool *pool, size_t size)
+{
+  struct mempool_chunk *chunk;
+  chunk = xmalloc(size + MP_CHUNK_TAIL) + size;
+  chunk->size = size;
+  if (pool)
+    pool->total_size += size + MP_CHUNK_TAIL;
+  return chunk;
+}
+
+static void
+mp_free_big_chunk(struct mempool *pool, struct mempool_chunk *chunk)
+{
+  pool->total_size -= chunk->size + MP_CHUNK_TAIL;
+  xfree((void *)chunk - chunk->size);
+}
+
+static void *
+mp_new_chunk(struct mempool *pool, size_t size)
+{
+#ifdef CONFIG_UCW_POOL_IS_MMAP
+  struct mempool_chunk *chunk;
+  chunk = page_alloc(size + MP_CHUNK_TAIL) + size;
+  chunk->size = size;
+  if (pool)
+    pool->total_size += size + MP_CHUNK_TAIL;
+  return chunk;
+#else
+  return mp_new_big_chunk(pool, size);
+#endif
+}
+
+static void
+mp_free_chunk(struct mempool *pool, struct mempool_chunk *chunk)
+{
+#ifdef CONFIG_UCW_POOL_IS_MMAP
+  pool->total_size -= chunk->size + MP_CHUNK_TAIL;
+  page_free((void *)chunk - chunk->size, chunk->size + MP_CHUNK_TAIL);
+#else
+  mp_free_big_chunk(pool, chunk);
+#endif
+}
+
+struct mempool *
+mp_new(size_t chunk_size)
+{
+  chunk_size = mp_align_size(MAX(sizeof(struct mempool), chunk_size));
+  struct mempool_chunk *chunk = mp_new_chunk(NULL, chunk_size);
+  struct mempool *pool = (void *)chunk - chunk_size;
+  DBG("Creating mempool %p with %zu bytes long chunks", pool, chunk_size);
+  chunk->next = NULL;
+#ifdef CONFIG_DEBUG
+  chunk->pool = pool;
+#endif
+  *pool = (struct mempool) {
+    .allocator = {
+      .alloc = mp_allocator_alloc,
+      .realloc = mp_allocator_realloc,
+      .free = mp_allocator_free,
+    },
+    .state = { .free = { chunk_size - sizeof(*pool) }, .last = { chunk } },
+    .chunk_size = chunk_size,
+    .threshold = chunk_size >> 1,
+    .last_big = &pool->last_big,
+    .total_size = chunk->size + MP_CHUNK_TAIL,
+  };
+  return pool;
+}
+
+static void
+mp_free_chain(struct mempool *pool, struct mempool_chunk *chunk)
+{
+  while (chunk)
+    {
+      struct mempool_chunk *next = chunk->next;
+      mp_free_chunk(pool, chunk);
+      chunk = next;
+    }
+}
+
+static void
+mp_free_big_chain(struct mempool *pool, struct mempool_chunk *chunk)
+{
+  while (chunk)
+    {
+      struct mempool_chunk *next = chunk->next;
+      mp_free_big_chunk(pool, chunk);
+      chunk = next;
+    }
+}
+
+void
+mp_delete(struct mempool *pool)
+{
+  DBG("Deleting mempool %p", pool);
+  mp_free_big_chain(pool, pool->state.last[1]);
+  mp_free_chain(pool, pool->unused);
+  mp_free_chain(pool, pool->state.last[0]); // can contain the mempool structure
+}
+
+void
+mp_flush(struct mempool *pool)
+{
+  mp_free_big_chain(pool, pool->state.last[1]);
+  struct mempool_chunk *chunk, *next;
+  for (chunk = pool->state.last[0]; chunk && (void *)chunk - chunk->size != pool; chunk = next)
+    {
+      next = chunk->next;
+      chunk->next = pool->unused;
+      pool->unused = chunk;
+    }
+  pool->state.last[0] = chunk;
+  pool->state.free[0] = chunk ? chunk->size - sizeof(*pool) : 0;
+  pool->state.last[1] = NULL;
+  pool->state.free[1] = 0;
+  pool->state.next = NULL;
+  pool->last_big = &pool->last_big;
+}
+
+static void
+mp_stats_chain(struct mempool *pool, struct mempool_chunk *chunk, struct mempool_stats *stats, uint idx)
+{
+  while (chunk)
+    {
+      stats->chain_size[idx] += chunk->size + MP_CHUNK_TAIL;
+      stats->chain_count[idx]++;
+      if (idx < 2)
+	{
+	  stats->used_size += chunk->size;
+	  if ((byte *)pool == (byte *)chunk - chunk->size)
+	    stats->used_size -= sizeof(*pool);
+	}
+      chunk = chunk->next;
+    }
+  stats->total_size += stats->chain_size[idx];
+}
+
+void
+mp_stats(struct mempool *pool, struct mempool_stats *stats)
+{
+  bzero(stats, sizeof(*stats));
+  mp_stats_chain(pool, pool->state.last[0], stats, 0);
+  mp_stats_chain(pool, pool->state.last[1], stats, 1);
+  mp_stats_chain(pool, pool->unused, stats, 2);
+  stats->used_size -= pool->state.free[0] + pool->state.free[1];
+  ASSERT(stats->total_size == pool->total_size);
+  ASSERT(stats->used_size <= stats->total_size);
+}
+
+u64
+mp_total_size(struct mempool *pool)
+{
+  return pool->total_size;
+}
+
+void
+mp_shrink(struct mempool *pool, u64 min_total_size)
+{
+  while (1)
+    {
+      struct mempool_chunk *chunk = pool->unused;
+      if (!chunk || pool->total_size - (chunk->size + MP_CHUNK_TAIL) < min_total_size)
+	break;
+      pool->unused = chunk->next;
+      mp_free_chunk(pool, chunk);
+    }
+}
+
+void *
+mp_alloc_internal(struct mempool *pool, size_t size)
+{
+  struct mempool_chunk *chunk;
+  if (size <= pool->threshold)
+    {
+      pool->idx = 0;
+      if (pool->unused)
+        {
+	  chunk = pool->unused;
+	  pool->unused = chunk->next;
+	}
+      else
+	{
+	  chunk = mp_new_chunk(pool, pool->chunk_size);
+#ifdef CONFIG_DEBUG
+	  chunk->pool = pool;
+#endif
+	}
+      chunk->next = pool->state.last[0];
+      pool->state.last[0] = chunk;
+      pool->state.free[0] = pool->chunk_size - size;
+      return (void *)chunk - pool->chunk_size;
+    }
+  else if (likely(size <= MP_SIZE_MAX))
+    {
+      pool->idx = 1;
+      size_t aligned = ALIGN_TO(size, CPU_STRUCT_ALIGN);
+      chunk = mp_new_big_chunk(pool, aligned);
+      chunk->next = pool->state.last[1];
+#ifdef CONFIG_DEBUG
+      chunk->pool = pool;
+#endif
+      pool->state.last[1] = chunk;
+      pool->state.free[1] = aligned - size;
+      return pool->last_big = (void *)chunk - aligned;
+    }
+  else
+    die("Cannot allocate %zu bytes from a mempool", size);
+}
+
+void *
+mp_alloc(struct mempool *pool, size_t size)
+{
+  return mp_alloc_fast(pool, size);
+}
+
+void *
+mp_alloc_noalign(struct mempool *pool, size_t size)
+{
+  return mp_alloc_fast_noalign(pool, size);
+}
+
+void *
+mp_alloc_zero(struct mempool *pool, size_t size)
+{
+  void *ptr = mp_alloc_fast(pool, size);
+  bzero(ptr, size);
+  return ptr;
+}
+
+void *
+mp_start_internal(struct mempool *pool, size_t size)
+{
+  void *ptr = mp_alloc_internal(pool, size);
+  pool->state.free[pool->idx] += size;
+  return ptr;
+}
+
+void *
+mp_start(struct mempool *pool, size_t size)
+{
+  return mp_start_fast(pool, size);
+}
+
+void *
+mp_start_noalign(struct mempool *pool, size_t size)
+{
+  return mp_start_fast_noalign(pool, size);
+}
+
+void *
+mp_grow_internal(struct mempool *pool, size_t size)
+{
+  if (unlikely(size > MP_SIZE_MAX))
+    die("Cannot allocate %zu bytes of memory", size);
+  size_t avail = mp_avail(pool);
+  void *ptr = mp_ptr(pool);
+  if (pool->idx)
+    {
+      size_t amortized = likely(avail <= MP_SIZE_MAX / 2) ? avail * 2 : MP_SIZE_MAX;
+      amortized = MAX(amortized, size);
+      amortized = ALIGN_TO(amortized, CPU_STRUCT_ALIGN);
+      struct mempool_chunk *chunk = pool->state.last[1], *next = chunk->next;
+      pool->total_size = pool->total_size - chunk->size + amortized;
+      ptr = xrealloc(ptr, amortized + MP_CHUNK_TAIL);
+      chunk = ptr + amortized;
+      chunk->next = next;
+      chunk->size = amortized;
+      pool->state.last[1] = chunk;
+      pool->state.free[1] = amortized;
+      pool->last_big = ptr;
+      return ptr;
+    }
+  else
+    {
+      void *p = mp_start_internal(pool, size);
+      memcpy(p, ptr, avail);
+      return p;
+    }
+}
+
+size_t
+mp_open(struct mempool *pool, void *ptr)
+{
+  return mp_open_fast(pool, ptr);
+}
+
+void *
+mp_realloc(struct mempool *pool, void *ptr, size_t size)
+{
+  return mp_realloc_fast(pool, ptr, size);
+}
+
+void *
+mp_realloc_zero(struct mempool *pool, void *ptr, size_t size)
+{
+  size_t old_size = mp_open_fast(pool, ptr);
+  ptr = mp_grow(pool, size);
+  if (size > old_size)
+    bzero(ptr + old_size, size - old_size);
+  mp_end(pool, ptr + size);
+  return ptr;
+}
+
+void *
+mp_spread_internal(struct mempool *pool, void *p, size_t size)
+{
+  void *old = mp_ptr(pool);
+  void *new = mp_grow_internal(pool, p-old+size);
+  return p-old+new;
+}
+
+void
+mp_restore(struct mempool *pool, struct mempool_state *state)
+{
+  struct mempool_chunk *chunk, *next;
+  struct mempool_state s = *state;
+  for (chunk = pool->state.last[0]; chunk != s.last[0]; chunk = next)
+    {
+      next = chunk->next;
+      chunk->next = pool->unused;
+      pool->unused = chunk;
+    }
+  for (chunk = pool->state.last[1]; chunk != s.last[1]; chunk = next)
+    {
+      next = chunk->next;
+      mp_free_big_chunk(pool, chunk);
+    }
+  pool->state = s;
+  pool->last_big = &pool->last_big;
+}
+
+struct mempool_state *
+mp_push(struct mempool *pool)
+{
+  struct mempool_state state = pool->state;
+  struct mempool_state *p = mp_alloc_fast(pool, sizeof(*p));
+  *p = state;
+  pool->state.next = p;
+  return p;
+}
+
+void
+mp_pop(struct mempool *pool)
+{
+  ASSERT(pool->state.next);
+  mp_restore(pool, pool->state.next);
+}
+
+#ifdef TEST
+
+#include <ucw/getopt.h>
+#include <stdio.h>
+
+static void
+fill(byte *ptr, uint len, uint magic)
+{
+  while (len--)
+    *ptr++ = (magic++ & 255);
+}
+
+static void
+check(byte *ptr, uint len, uint magic, uint align)
+{
+  ASSERT(!((uintptr_t)ptr & (align - 1)));
+  while (len--)
+    if (*ptr++ != (magic++ & 255))
+      ASSERT(0);
+}
+
+int main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  cf_def_file = NULL;
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 || argc != optind)
+    die("Invalid usage");
+
+  random_gen_seed();
+  uint max = 1000, n = 0, m = 0, can_realloc = 0;
+  void *ptr[max];
+  struct mempool_state *state[max];
+  uint len[max], num[max], align[max];
+  struct mempool *mp = mp_new(128), mp_static;
+
+  for (uint i = 0; i < 5000; i++)
+    {
+      for (uint j = 0; j < n; j++)
+	check(ptr[j], len[j], j, align[j]);
+#if 0
+      DBG("free_small=%u free_big=%u idx=%u chunk_size=%u last_big=%p", mp->state.free[0], mp->state.free[1], mp->idx, mp->chunk_size, mp->last_big);
+      for (struct mempool_chunk *ch = mp->state.last[0]; ch; ch = ch->next)
+	DBG("small %p %p %p %d", (byte *)ch - ch->size, ch, ch + 1, ch->size);
+      for (struct mempool_chunk *ch = mp->state.last[1]; ch; ch = ch->next)
+	DBG("big %p %p %p %d", (byte *)ch - ch->size, ch, ch + 1, ch->size);
+#endif
+      int r = random_max(100);
+      if ((r -= 1) < 0)
+        {
+	  DBG("flush");
+	  mp_flush(mp);
+	  n = m = 0;
+	}
+      else if ((r -= 1) < 0)
+        {
+	  DBG("delete & new");
+	  mp_delete(mp);
+	  if (random_max(2))
+	    mp = mp_new(random_max(0x1000) + 1);
+	  else
+	    mp = &mp_static, mp_init(mp, random_max(512) + 1);
+	  n = m = 0;
+	}
+      else if (n < max && (r -= 30) < 0)
+        {
+	  len[n] = random_max(0x2000);
+	  DBG("alloc(%u)", len[n]);
+	  align[n] = random_max(2) ? CPU_STRUCT_ALIGN : 1;
+	  ptr[n] = (align[n] == 1) ? mp_alloc_fast_noalign(mp, len[n]) : mp_alloc_fast(mp, len[n]);
+	  DBG(" -> (%p)", ptr[n]);
+	  fill(ptr[n], len[n], n);
+	  n++;
+	  can_realloc = 1;
+	}
+      else if (n < max && (r -= 20) < 0)
+        {
+	  len[n] = random_max(0x2000);
+	  DBG("start(%u)", len[n]);
+	  align[n] = random_max(2) ? CPU_STRUCT_ALIGN : 1;
+	  ptr[n] = (align[n] == 1) ? mp_start_fast_noalign(mp, len[n]) : mp_start_fast(mp, len[n]);
+	  DBG(" -> (%p)", ptr[n]);
+	  fill(ptr[n], len[n], n);
+	  n++;
+	  can_realloc = 1;
+	  goto grow;
+	}
+      else if (can_realloc && n && (r -= 10) < 0)
+        {
+	  if (mp_open(mp, ptr[n - 1]) != len[n - 1])
+	    ASSERT(0);
+grow:
+	  {
+	    uint k = n - 1;
+	    for (uint i = random_max(4); i--; )
+	      {
+	        uint l = len[k];
+	        len[k] = random_max(0x2000);
+	        DBG("grow(%u)", len[k]);
+	        ptr[k] = mp_grow(mp, len[k]);
+	        DBG(" -> (%p)", ptr[k]);
+	        check(ptr[k], MIN(l, len[k]), k, align[k]);
+	        fill(ptr[k], len[k], k);
+	      }
+	    mp_end(mp, ptr[k] + len[k]);
+	  }
+	}
+      else if (can_realloc && n && (r -= 20) < 0)
+        {
+	  uint i = n - 1, l = len[i];
+	  DBG("realloc(%p, %u)", ptr[i], len[i]);
+	  ptr[i] = mp_realloc(mp, ptr[i], len[i] = random_max(0x2000));
+	  DBG(" -> (%p, %u)", ptr[i], len[i]);
+	  check(ptr[i],  MIN(len[i], l), i, align[i]);
+	  fill(ptr[i], len[i], i);
+	}
+      else if (m < max && (r -= 5) < 0)
+        {
+	  DBG("push(%u)", m);
+	  num[m] = n;
+	  state[m++] = mp_push(mp);
+	  can_realloc = 0;
+	}
+      else if (m && (r -= 2) < 0)
+        {
+	  m--;
+	  DBG("pop(%u)", m);
+	  mp_pop(mp);
+	  n = num[m];
+	  can_realloc = 0;
+	}
+      else if (m && (r -= 1) < 0)
+        {
+	  uint i = random_max(m);
+	  DBG("restore(%u)", i);
+	  mp_restore(mp, state[i]);
+	  n = num[m = i];
+	  can_realloc = 0;
+	}
+      else if (can_realloc && n && (r -= 5) < 0)
+        ASSERT(mp_size(mp, ptr[n - 1]) == len[n - 1]);
+      else
+	{
+	  struct mempool_stats stats;
+	  mp_stats(mp, &stats);
+	}
+    }
+
+  mp_delete(mp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/mempool.h b/libucw/ucw/mempool.h
new file mode 100644
index 0000000..63e5a73
--- /dev/null
+++ b/libucw/ucw/mempool.h
@@ -0,0 +1,571 @@
+/*
+ *	UCW Library -- Memory Pools
+ *
+ *	(c) 1997--2015 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_POOLS_H
+#define _UCW_POOLS_H
+
+#include <ucw/alloc.h>
+#include <string.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define mp_alloc ucw_mp_alloc
+#define mp_alloc_internal ucw_mp_alloc_internal
+#define mp_alloc_noalign ucw_mp_alloc_noalign
+#define mp_alloc_zero ucw_mp_alloc_zero
+#define mp_append_utf8_32 ucw_mp_append_utf8_32
+#define mp_delete ucw_mp_delete
+#define mp_flush ucw_mp_flush
+#define mp_grow_internal ucw_mp_grow_internal
+#define mp_init ucw_mp_init
+#define mp_memdup ucw_mp_memdup
+#define mp_multicat ucw_mp_multicat
+#define mp_new ucw_mp_new
+#define mp_open ucw_mp_open
+#define mp_pop ucw_mp_pop
+#define mp_printf ucw_mp_printf
+#define mp_printf_append ucw_mp_printf_append
+#define mp_push ucw_mp_push
+#define mp_realloc ucw_mp_realloc
+#define mp_realloc_zero ucw_mp_realloc_zero
+#define mp_restore ucw_mp_restore
+#define mp_shrink ucw_mp_shrink
+#define mp_spread_internal ucw_mp_spread_internal
+#define mp_start ucw_mp_start
+#define mp_start_internal ucw_mp_start_internal
+#define mp_start_noalign ucw_mp_start_noalign
+#define mp_stats ucw_mp_stats
+#define mp_str_from_mem ucw_mp_str_from_mem
+#define mp_strdup ucw_mp_strdup
+#define mp_strjoin ucw_mp_strjoin
+#define mp_total_size ucw_mp_total_size
+#define mp_vprintf ucw_mp_vprintf
+#define mp_vprintf_append ucw_mp_vprintf_append
+#endif
+
+/***
+ * [[defs]]
+ * Definitions
+ * -----------
+ ***/
+
+/**
+ * Memory pool state (see @mp_push(), ...).
+ * You should use this one as an opaque handle only, the insides are internal.
+ **/
+struct mempool_state {
+  size_t free[2];
+  void *last[2];
+  struct mempool_state *next;
+};
+
+/**
+ * Memory pool.
+ * You should use this one as an opaque handle only, the insides are internal.
+ **/
+struct mempool {
+  struct ucw_allocator allocator;	// This must be the first element
+  struct mempool_state state;
+  void *unused, *last_big;
+  size_t chunk_size, threshold;
+  uint idx;
+  u64 total_size;
+};
+
+struct mempool_stats {			/** Mempool statistics. See @mp_stats(). **/
+  u64 total_size;			/* Real allocated size in bytes */
+  u64 used_size;			/* Estimated size allocated from mempool to application */
+  uint chain_count[3];			/* Number of allocated chunks in small/big/unused chains */
+  u64 chain_size[3];			/* Size of allocated chunks in small/big/unused chains */
+};
+
+/***
+ * [[basic]]
+ * Basic manipulation
+ * ------------------
+ ***/
+
+/**
+ * Initialize a given mempool structure.
+ * @chunk_size must be in the interval `[1, SIZE_MAX / 2]`.
+ * It will allocate memory by this large chunks and take
+ * memory to satisfy requests from them.
+ *
+ * Memory pools can be treated as <<trans:respools,resources>>, see <<trans:res_mempool()>>.
+ **/
+void mp_init(struct mempool *pool, size_t chunk_size);
+
+/**
+ * Allocate and initialize a new memory pool.
+ * See @mp_init() for @chunk_size limitations.
+ *
+ * The new mempool structure is allocated on the new mempool.
+ *
+ * Memory pools can be treated as <<trans:respools,resources>>, see <<trans:res_mempool()>>.
+ **/
+struct mempool *mp_new(size_t chunk_size);
+
+/**
+ * Cleanup mempool initialized by mp_init or mp_new.
+ * Frees all the memory allocated by this mempool and,
+ * if created by @mp_new(), the @pool itself.
+ **/
+void mp_delete(struct mempool *pool);
+
+/**
+ * Frees all data on a memory pool, but leaves it working.
+ * It can keep some of the chunks allocated to serve
+ * further allocation requests. Leaves the @pool alive,
+ * even if it was created with @mp_new().
+ **/
+void mp_flush(struct mempool *pool);
+
+/**
+ * Compute some statistics for debug purposes.
+ * See the definition of the <<struct_mempool_stats,mempool_stats structure>>.
+ * This function scans the chunk list, so it can be slow. If you are interested
+ * in total memory consumption only, mp_total_size() is faster.
+ **/
+void mp_stats(struct mempool *pool, struct mempool_stats *stats);
+
+/**
+ * Return how many bytes were allocated by the pool, including unused parts
+ * of chunks. This function runs in constant time.
+ **/
+u64 mp_total_size(struct mempool *pool);
+
+/**
+ * Release unused chunks of memory reserved for further allocation
+ * requests, but stop if mp_total_size() would drop below @min_total_size.
+ **/
+void mp_shrink(struct mempool *pool, u64 min_total_size);
+
+/***
+ * [[alloc]]
+ * Allocation routines
+ * -------------------
+ ***/
+
+/* For internal use only, do not call directly */
+void *mp_alloc_internal(struct mempool *pool, size_t size) LIKE_MALLOC;
+
+/**
+ * The function allocates new @size bytes on a given memory pool.
+ * If the @size is zero, the resulting pointer is undefined,
+ * but it may be safely reallocated or used as the parameter
+ * to other functions below.
+ *
+ * The resulting pointer is always aligned to a multiple of
+ * `CPU_STRUCT_ALIGN` bytes and this condition remains true also
+ * after future reallocations.
+ **/
+void *mp_alloc(struct mempool *pool, size_t size);
+
+/**
+ * The same as @mp_alloc(), but the result may be unaligned.
+ **/
+void *mp_alloc_noalign(struct mempool *pool, size_t size);
+
+/**
+ * The same as @mp_alloc(), but fills the newly allocated memory with zeroes.
+ **/
+void *mp_alloc_zero(struct mempool *pool, size_t size);
+
+/**
+ * Inlined version of @mp_alloc().
+ **/
+static inline void *mp_alloc_fast(struct mempool *pool, size_t size)
+{
+  size_t avail = pool->state.free[0] & ~(size_t)(CPU_STRUCT_ALIGN - 1);
+  if (size <= avail)
+    {
+      pool->state.free[0] = avail - size;
+      return (byte *)pool->state.last[0] - avail;
+    }
+  else
+    return mp_alloc_internal(pool, size);
+}
+
+/**
+ * Inlined version of @mp_alloc_noalign().
+ **/
+static inline void *mp_alloc_fast_noalign(struct mempool *pool, size_t size)
+{
+  if (size <= pool->state.free[0])
+    {
+      void *ptr = (byte *)pool->state.last[0] - pool->state.free[0];
+      pool->state.free[0] -= size;
+      return ptr;
+    }
+  else
+    return mp_alloc_internal(pool, size);
+}
+
+/**
+ * Return a generic allocator representing the given mempool.
+ **/
+static inline struct ucw_allocator *mp_get_allocator(struct mempool *mp)
+{
+  return &mp->allocator;
+}
+
+/***
+ * [[gbuf]]
+ * Growing buffers
+ * ---------------
+ *
+ * You do not need to know, how a buffer will need to be large,
+ * you can grow it incrementally to needed size. You can grow only
+ * one buffer at a time on a given mempool.
+ *
+ * Similar functionality is provided by <<growbuf:,growing buffes>> module.
+ ***/
+
+/* For internal use only, do not call directly */
+void *mp_start_internal(struct mempool *pool, size_t size) LIKE_MALLOC;
+void *mp_grow_internal(struct mempool *pool, size_t size);
+void *mp_spread_internal(struct mempool *pool, void *p, size_t size);
+
+static inline uint mp_idx(struct mempool *pool, void *ptr)
+{
+  return ptr == pool->last_big;
+}
+
+/**
+ * Open a new growing buffer (at least @size bytes long).
+ * If the @size is zero, the resulting pointer is undefined,
+ * but it may be safely reallocated or used as the parameter
+ * to other functions below.
+ *
+ * The resulting pointer is always aligned to a multiple of
+ * `CPU_STRUCT_ALIGN` bytes and this condition remains true also
+ * after future reallocations. There is an unaligned version as well.
+ *
+ * Keep in mind that you can't make any other pool allocations
+ * before you "close" the growing buffer with @mp_end().
+ */
+void *mp_start(struct mempool *pool, size_t size);
+void *mp_start_noalign(struct mempool *pool, size_t size);
+
+/**
+ * Inlined version of @mp_start().
+ **/
+static inline void *mp_start_fast(struct mempool *pool, size_t size)
+{
+  size_t avail = pool->state.free[0] & ~(size_t)(CPU_STRUCT_ALIGN - 1);
+  if (size <= avail)
+    {
+      pool->idx = 0;
+      pool->state.free[0] = avail;
+      return (byte *)pool->state.last[0] - avail;
+    }
+  else
+    return mp_start_internal(pool, size);
+}
+
+/**
+ * Inlined version of @mp_start_noalign().
+ **/
+static inline void *mp_start_fast_noalign(struct mempool *pool, size_t size)
+{
+  if (size <= pool->state.free[0])
+    {
+      pool->idx = 0;
+      return (byte *)pool->state.last[0] - pool->state.free[0];
+    }
+  else
+    return mp_start_internal(pool, size);
+}
+
+/**
+ * Return start pointer of the growing buffer allocated by latest @mp_start() or a similar function.
+ **/
+static inline void *mp_ptr(struct mempool *pool)
+{
+  return (byte *)pool->state.last[pool->idx] - pool->state.free[pool->idx];
+}
+
+/**
+ * Return the number of bytes available for extending the growing buffer.
+ * (Before a reallocation will be needed).
+ **/
+static inline size_t mp_avail(struct mempool *pool)
+{
+  return pool->state.free[pool->idx];
+}
+
+/**
+ * Grow the buffer allocated by @mp_start() to be at least @size bytes long
+ * (@size may be less than @mp_avail(), even zero). Reallocated buffer may
+ * change its starting position. The content will be unchanged to the minimum
+ * of the old and new sizes; newly allocated memory will be uninitialized.
+ * Multiple calls to mp_grow() have amortized linear cost wrt. the maximum value of @size. */
+static inline void *mp_grow(struct mempool *pool, size_t size)
+{
+  return (size <= mp_avail(pool)) ? mp_ptr(pool) : mp_grow_internal(pool, size);
+}
+
+/**
+ * Grow the buffer by at least one byte -- equivalent to <<mp_grow(),`mp_grow`>>`(@pool, @mp_avail(pool) + 1)`.
+ **/
+static inline void *mp_expand(struct mempool *pool)
+{
+  return mp_grow_internal(pool, mp_avail(pool) + 1);
+}
+
+/**
+ * Ensure that there is at least @size bytes free after @p,
+ * if not, reallocate and adjust @p.
+ **/
+static inline void *mp_spread(struct mempool *pool, void *p, size_t size)
+{
+  return (((size_t)((byte *)pool->state.last[pool->idx] - (byte *)p) >= size) ? p : mp_spread_internal(pool, p, size));
+}
+
+/**
+ * Append a character to the growing buffer. Called with @p pointing after
+ * the last byte in the buffer, returns a pointer after the last byte
+ * of the new (possibly reallocated) buffer.
+ **/
+static inline char *mp_append_char(struct mempool *pool, char *p, uint c)
+{
+  p = mp_spread(pool, p, 1);
+  *p++ = c;
+  return p;
+}
+
+/**
+ * Append a memory block to the growing buffer. Called with @p pointing after
+ * the last byte in the buffer, returns a pointer after the last byte
+ * of the new (possibly reallocated) buffer.
+ **/
+static inline void *mp_append_block(struct mempool *pool, void *p, const void *block, size_t size)
+{
+  char *q = mp_spread(pool, p, size);
+  memcpy(q, block, size);
+  return q + size;
+}
+
+/**
+ * Append a string to the growing buffer. Called with @p pointing after
+ * the last byte in the buffer, returns a pointer after the last byte
+ * of the new (possibly reallocated) buffer.
+ **/
+static inline void *mp_append_string(struct mempool *pool, void *p, const char *str)
+{
+  return mp_append_block(pool, p, str, strlen(str));
+}
+
+/**
+ * Append an UTF-8 character to the growing buffer. Called with @p pointing after
+ * the last byte in the buffer, returns a pointer after the last byte
+ * of the new (possibly reallocated) buffer.
+ **/
+void *mp_append_utf8_32(struct mempool *pool, void *p, uint c);
+
+/**
+ * Close the growing buffer. The @end must point just behind the data, you want to keep
+ * allocated (so it can be in the interval `[@mp_ptr(@pool), @mp_ptr(@pool) + @mp_avail(@pool)]`).
+ * Returns a pointer to the beginning of the just closed block.
+ **/
+static inline void *mp_end(struct mempool *pool, void *end)
+{
+  void *p = mp_ptr(pool);
+  pool->state.free[pool->idx] = (byte *)pool->state.last[pool->idx] - (byte *)end;
+  return p;
+}
+
+/**
+ * Close the growing buffer as a string. That is, append a zero byte and call mp_end().
+ **/
+static inline char *mp_end_string(struct mempool *pool, void *end)
+{
+  end = mp_append_char(pool, end, 0);
+  return mp_end(pool, end);
+}
+
+/**
+ * Return size in bytes of the last allocated memory block (with @mp_alloc() or @mp_end()).
+ **/
+static inline size_t mp_size(struct mempool *pool, void *ptr)
+{
+  uint idx = mp_idx(pool, ptr);
+  return ((byte *)pool->state.last[idx] - (byte *)ptr) - pool->state.free[idx];
+}
+
+/**
+ * Open the last memory block (allocated with @mp_alloc() or @mp_end())
+ * for growing and return its size in bytes. The contents and the start pointer
+ * remain unchanged. Do not forget to call @mp_end() to close it.
+ **/
+size_t mp_open(struct mempool *pool, void *ptr);
+
+/**
+ * Inlined version of @mp_open().
+ **/
+static inline size_t mp_open_fast(struct mempool *pool, void *ptr)
+{
+  pool->idx = mp_idx(pool, ptr);
+  size_t size = ((byte *)pool->state.last[pool->idx] - (byte *)ptr) - pool->state.free[pool->idx];
+  pool->state.free[pool->idx] += size;
+  return size;
+}
+
+/**
+ * Reallocate the last memory block (allocated with @mp_alloc() or @mp_end())
+ * to the new @size. Behavior is similar to @mp_grow(), but the resulting
+ * block is closed.
+ **/
+void *mp_realloc(struct mempool *pool, void *ptr, size_t size);
+
+/**
+ * The same as @mp_realloc(), but fills the additional bytes (if any) with zeroes.
+ **/
+void *mp_realloc_zero(struct mempool *pool, void *ptr, size_t size);
+
+/**
+ * Inlined version of @mp_realloc().
+ **/
+static inline void *mp_realloc_fast(struct mempool *pool, void *ptr, size_t size)
+{
+  mp_open_fast(pool, ptr);
+  ptr = mp_grow(pool, size);
+  mp_end(pool, (byte *)ptr + size);
+  return ptr;
+}
+
+/***
+ * [[store]]
+ * Storing and restoring state
+ * ---------------------------
+ *
+ * Mempools can remember history of what was allocated and return back
+ * in time.
+ ***/
+
+/**
+ * Save the current state of a memory pool.
+ * Do not call this function with an opened growing buffer.
+ **/
+static inline void mp_save(struct mempool *pool, struct mempool_state *state)
+{
+  *state = pool->state;
+  pool->state.next = state;
+}
+
+/**
+ * Save the current state to a newly allocated mempool_state structure.
+ * Do not call this function with an opened growing buffer.
+ **/
+struct mempool_state *mp_push(struct mempool *pool);
+
+/**
+ * Restore the state saved by @mp_save() or @mp_push() and free all
+ * data allocated after that point (including the state structure itself).
+ * You can't reallocate the last memory block from the saved state.
+ **/
+void mp_restore(struct mempool *pool, struct mempool_state *state);
+
+/**
+ * Inlined version of @mp_restore().
+ **/
+static inline void mp_restore_fast(struct mempool *pool, struct mempool_state *state)
+{
+  if (pool->state.last[0] != state->last[0] || pool->state.last[1] != state->last[1])
+    mp_restore(pool, state);
+  else
+    {
+      pool->state = *state;
+      pool->last_big = &pool->last_big;
+    }
+}
+
+/**
+ * Restore the state saved by the last call to @mp_push().
+ * @mp_pop() and @mp_push() works as a stack so you can push more states safely.
+ **/
+void mp_pop(struct mempool *pool);
+
+
+/***
+ * [[string]]
+ * String operations
+ * -----------------
+ ***/
+
+char *mp_strdup(struct mempool *, const char *) LIKE_MALLOC;		/** Makes a copy of a string on a mempool. Returns NULL for NULL string. **/
+void *mp_memdup(struct mempool *, const void *, size_t) LIKE_MALLOC;	/** Makes a copy of a memory block on a mempool. **/
+/**
+ * Concatenates all passed strings. The last parameter must be NULL.
+ * This will concatenate two strings:
+ *
+ *   char *message = mp_multicat(pool, "hello ", "world", NULL);
+ **/
+char *mp_multicat(struct mempool *, ...) LIKE_MALLOC SENTINEL_CHECK;
+/**
+ * Concatenates two strings and stores result on @mp.
+ */
+static inline char *LIKE_MALLOC mp_strcat(struct mempool *mp, const char *x, const char *y)
+{
+  return mp_multicat(mp, x, y, NULL);
+}
+/**
+ * Join strings and place @sep between each two neighboring.
+ * @p is the mempool to provide memory, @a is array of strings and @n
+ * tells how many there is of them.
+ **/
+char *mp_strjoin(struct mempool *p, char **a, uint n, uint sep) LIKE_MALLOC;
+/**
+ * Convert memory block to a string. Makes a copy of the given memory block
+ * in the mempool @p, adding an extra terminating zero byte at the end.
+ **/
+char *mp_str_from_mem(struct mempool *p, const void *mem, size_t len) LIKE_MALLOC;
+
+
+/***
+ * [[format]]
+ * Formatted output
+ * ---------------
+ ***/
+
+/**
+ * printf() into a in-memory string, allocated on the memory pool.
+ **/
+char *mp_printf(struct mempool *mp, const char *fmt, ...) FORMAT_CHECK(printf,2,3) LIKE_MALLOC;
+/**
+ * Like @mp_printf(), but uses `va_list` for parameters.
+ **/
+char *mp_vprintf(struct mempool *mp, const char *fmt, va_list args) LIKE_MALLOC;
+/**
+ * Like @mp_printf(), but it appends the data at the end of string
+ * pointed to by @ptr. The string is @mp_open()ed, so you have to
+ * provide something that can be.
+ *
+ * Returns pointer to the beginning of the string (the pointer may have
+ * changed due to reallocation).
+ *
+ * In some versions of LibUCW, this function was called mp_append_printf(). However,
+ * this name turned out to be confusing -- unlike other appending functions, this one is
+ * not called on an opened growing buffer. The old name will be preserved for backward
+ * compatibility for the time being.
+ **/
+char *mp_printf_append(struct mempool *mp, char *ptr, const char *fmt, ...) FORMAT_CHECK(printf,3,4);
+#define mp_append_printf mp_printf_append
+/**
+ * Like @mp_printf_append(), but uses `va_list` for parameters.
+ *
+ * In some versions of LibUCW, this function was called mp_append_vprintf(). However,
+ * this name turned out to be confusing -- unlike other appending functions, this one is
+ * not called on an opened growing buffer. The old name will be preserved for backward
+ * compatibility for the time being.
+ **/
+char *mp_vprintf_append(struct mempool *mp, char *ptr, const char *fmt, va_list args);
+#define mp_append_vprintf mp_vprintf_append
+
+#endif
diff --git a/libucw/ucw/mempool.t b/libucw/ucw/mempool.t
new file mode 100644
index 0000000..61956d4
--- /dev/null
+++ b/libucw/ucw/mempool.t
@@ -0,0 +1,12 @@
+# Tests for mempool modules
+
+Run:	../obj/ucw/mempool-t
+
+Run:	../obj/ucw/mempool-fmt-t
+Out:	<Hello, World!><Hello, World!><Appended><Hello,                                              World!>
+
+Run:	../obj/ucw/mempool-str-t
+Out:	<<12345>>
+	bugs.gnats.insects
+	bugsgnatsinsects
+	23
diff --git a/libucw/ucw/opt-conf.c b/libucw/ucw/opt-conf.c
new file mode 100644
index 0000000..20bc4ca
--- /dev/null
+++ b/libucw/ucw/opt-conf.c
@@ -0,0 +1,94 @@
+/*
+ *	UCW Library -- Interface between command-line options and configuration
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/opt.h>
+#include <ucw/opt-internal.h>
+#include <ucw/conf.h>
+#include <ucw/conf-internal.h>
+#include <ucw/fastbuf.h>
+
+#include <alloca.h>
+#include <math.h>
+
+static void opt_conf_end_of_options(struct cf_context *cc) {
+  cf_load_default(cc);
+  if (cc->postpone_commit && cf_close_group())
+    opt_failure("Loading of configuration failed");
+}
+
+static void opt_conf_check(struct opt_context *oc)
+{
+  switch (oc->conf_state) {
+    case OPT_CONF_HOOK_BEGIN:
+      oc->conf_state = OPT_CONF_HOOK_CONFIG;
+      break;
+    case OPT_CONF_HOOK_CONFIG:
+      break;
+    case OPT_CONF_HOOK_OTHERS:
+      opt_failure("Config options must stand before other options.");
+      break;
+    default:
+      ASSERT(0);
+  }
+}
+
+void opt_handle_config(const struct opt_item * opt UNUSED, const char * value, void * data)
+{
+  opt_conf_check(data);
+  if (cf_load(value))
+    exit(1);		// Error message is already printed by cf_load()
+}
+
+void opt_handle_set(const struct opt_item * opt UNUSED, const char * value, void * data)
+{
+  opt_conf_check(data);
+  struct cf_context *cc = cf_get_context();
+  cf_load_default(cc);
+  if (cf_set(value))
+    opt_failure("Cannot set %s", value);
+}
+
+void opt_handle_dumpconfig(const struct opt_item * opt UNUSED, const char * value UNUSED, void * data UNUSED)
+{
+  struct cf_context *cc = cf_get_context();
+  opt_conf_end_of_options(cc);
+  struct fastbuf *b = bfdopen(1, 4096);
+  cf_dump_sections(b);
+  bclose(b);
+  exit(0);
+}
+
+void opt_conf_hook_internal(const struct opt_item * opt, uint event, const char * value UNUSED, void * data) {
+  struct opt_context *oc = data;
+  struct cf_context *cc = cf_get_context();
+
+  if (event == OPT_HOOK_FINAL) {
+      opt_conf_end_of_options(cc);
+      return;
+  }
+
+  ASSERT(event == OPT_HOOK_BEFORE_VALUE);
+
+  if (opt->flags & OPT_BEFORE_CONFIG)
+    return;
+
+  switch (oc->conf_state) {
+    case OPT_CONF_HOOK_BEGIN:
+    case OPT_CONF_HOOK_CONFIG:
+      opt_conf_end_of_options(cc);
+      oc->conf_state = OPT_CONF_HOOK_OTHERS;
+      break;
+    case OPT_CONF_HOOK_OTHERS:
+      break;
+    default:
+      ASSERT(0);
+  }
+}
diff --git a/libucw/ucw/opt-help.c b/libucw/ucw/opt-help.c
new file mode 100644
index 0000000..f5f799b
--- /dev/null
+++ b/libucw/ucw/opt-help.c
@@ -0,0 +1,169 @@
+/*
+ *	UCW Library -- Formatting of command-line option help
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/opt.h>
+#include <ucw/opt-internal.h>
+#include <ucw/mempool.h>
+#include <ucw/gary.h>
+
+#include <string.h>
+
+struct help {
+  struct mempool *pool;
+  struct help_line *lines;			// A growing array of lines
+};
+
+struct help_line {
+  const char *extra;
+  char *fields[3];
+};
+
+static void opt_help_scan_item(struct help *h, struct opt_precomputed *opt)
+{
+  const struct opt_item *item = opt->item;
+
+  if (!item->help)
+    return;
+
+  bool force_col1 = 0;
+  if (item->cls == OPT_CL_HELP) {
+    if (item->flags & OPT_HELP_COL) {
+      force_col1 = 1;
+    } else {
+      struct help_line *l = GARY_PUSH(h->lines);
+      l->extra = item->help;
+      return;
+    }
+  }
+
+  if (item->letter >= OPT_POSITIONAL_TAIL)
+    return;
+
+  struct help_line *first = GARY_PUSH(h->lines);
+  char *text = mp_strdup(h->pool, item->help);
+  struct help_line *l = first;
+  while (text) {
+    char *eol = strchr(text, '\n');
+    if (eol)
+      *eol++ = 0;
+
+    int field = (l == first && !force_col1 ? 1 : 0);
+    char *f = text;
+    while (f) {
+      char *tab = strchr(f, '\t');
+      if (tab)
+        *tab++ = 0;
+      if (field < 3)
+        l->fields[field++] = f;
+      f = tab;
+    }
+
+    text = eol;
+    if (text)
+      l = GARY_PUSH(h->lines);
+  }
+
+  if (item->name) {
+    char *val = first->fields[1] ? : "";
+    if (opt->flags & OPT_REQUIRED_VALUE)
+      val = mp_printf(h->pool, "=%s", val);
+    else if (!(opt->flags & OPT_NO_VALUE))
+      val = mp_printf(h->pool, "[=%s]", val);
+    first->fields[1] = mp_printf(h->pool, "--%s%s", item->name, val);
+  }
+
+  if (item->letter) {
+    if (item->name)
+      first->fields[0] = mp_printf(h->pool, "-%c, ", item->letter);
+    else {
+      char *val = first->fields[1] ? : "";
+      if (!(opt->flags & OPT_REQUIRED_VALUE) && !(opt->flags & OPT_NO_VALUE))
+	val = mp_printf(h->pool, "[%s]", val);
+      first->fields[0] = mp_printf(h->pool, "-%c%s", item->letter, val);
+      first->fields[1] = NULL;
+    }
+  }
+}
+
+static void opt_help_scan(struct help *h, const struct opt_section *sec)
+{
+  for (const struct opt_item * item = sec->opt; item->cls != OPT_CL_END; item++) {
+    if (item->cls == OPT_CL_SECTION)
+      opt_help_scan(h, item->u.section);
+    else if (item->cls == OPT_CL_HOOK)
+      ;
+    else {
+      struct opt_precomputed opt;
+      opt_precompute(&opt, item);
+      opt_help_scan_item(h, &opt);
+    }
+  }
+}
+
+void opt_help(const struct opt_section * sec) {
+  // Prepare help text
+  struct help h;
+  h.pool = mp_new(4096);
+  GARY_INIT_ZERO(h.lines, 0);
+  opt_help_scan(&h, sec);
+
+  // Calculate natural width of each column
+  uint n = GARY_SIZE(h.lines);
+  uint widths[3] = { 0, 0, 0 };
+  for (uint i=0; i<n; i++) {
+    struct help_line *l = &h.lines[i];
+    for (uint f=0; f<3; f++) {
+      if (!l->fields[f])
+	l->fields[f] = "";
+      uint w = strlen(l->fields[f]);
+      widths[f] = MAX(widths[f], w);
+    }
+  }
+  if (widths[0] > 4) {
+    /*
+     *  This is tricky: if there are short options, which have an argument,
+     *  but no long variant, we are willing to let column 0 overflow to column 1.
+     */
+    widths[1] = MAX(widths[1], widths[0] - 4);
+    widths[0] = 4;
+  }
+  widths[1] += 4;
+
+  // Print columns
+  for (uint i=0; i<n; i++) {
+    struct help_line *l = &h.lines[i];
+    if (l->extra)
+      puts(l->extra);
+    else {
+      int t = 0;
+      for (uint f=0; f<3; f++) {
+	t += widths[f];
+	t -= printf("%s", l->fields[f]);
+	while (t > 0) {
+	  putchar(' ');
+	  t--;
+	}
+      }
+      putchar('\n');
+    }
+  }
+
+  // Clean up
+  GARY_FREE(h.lines);
+  mp_delete(h.pool);
+}
+
+void opt_handle_help(const struct opt_item * opt UNUSED, const char * value UNUSED, void * data)
+{
+  struct opt_context *oc = data;
+  opt_help(oc->options);
+  exit(0);
+}
diff --git a/libucw/ucw/opt-internal.h b/libucw/ucw/opt-internal.h
new file mode 100644
index 0000000..3d04463
--- /dev/null
+++ b/libucw/ucw/opt-internal.h
@@ -0,0 +1,46 @@
+/*
+ *	UCW Library -- Internals of the option parser
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_OPT_INTERNAL_H
+#define _UCW_OPT_INTERNAL_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define opt_precompute ucw_opt_precompute
+#endif
+
+enum opt_conf_state {
+  OPT_CONF_HOOK_BEGIN,
+  OPT_CONF_HOOK_CONFIG,
+  OPT_CONF_HOOK_OTHERS,
+};
+
+struct opt_context {
+  const struct opt_section * options;
+  struct opt_precomputed * opts;
+  struct opt_precomputed ** shortopt;
+  const struct opt_item ** hooks;
+  int opt_count;
+  int hook_count;
+  int positional_max;
+  int positional_count;
+  int stop_parsing;
+  enum opt_conf_state conf_state;
+};
+
+struct opt_precomputed {
+  const struct opt_item * item;
+  const char * name;
+  short flags;
+  short count;
+};
+
+void opt_precompute(struct opt_precomputed *opt, const struct opt_item *item);
+
+#endif
diff --git a/libucw/ucw/opt-test.c b/libucw/ucw/opt-test.c
new file mode 100644
index 0000000..1ac8c21
--- /dev/null
+++ b/libucw/ucw/opt-test.c
@@ -0,0 +1,195 @@
+/*
+ *	UCW Library -- Parsing of command line options
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/opt.h>
+#include <ucw/strtonum.h>
+#include <ucw/fastbuf.h>
+#include <ucw/gary.h>
+
+static void show_version(const struct opt_item * opt UNUSED, const char * value UNUSED, void * data UNUSED) {
+  printf("This is a simple tea boiling console v0.1.\n");
+  exit(EXIT_SUCCESS);
+}
+
+struct teapot_temperature {
+  enum {
+    TEMP_CELSIUS = 0,
+    TEMP_FAHRENHEIT,
+    TEMP_KELVIN,
+    TEMP_REAUMUR,
+    TEMP_RANKINE
+  } scale;
+  int value;
+} temperature;
+
+static char * temp_scale_str[] = { "C", "F", "K", "Re", "R" };
+
+static enum TEAPOT_TYPE {
+  TEAPOT_STANDARD = 0,
+  TEAPOT_EXCLUSIVE,
+  TEAPOT_GLASS,
+  TEAPOT_HANDS,
+  TEAPOT_UNDEFINED = -1
+} set = TEAPOT_UNDEFINED;
+
+static char * teapot_type_str[] = { "standard", "exclusive", "glass", "hands" };
+
+static int show_hooks = 0;
+static int english = 0;
+static int sugar = 0;
+static int verbose = 1;
+static int with_gas = 0;
+static int *black_magic;
+static int pray = 0;
+static int water_amount = 0;
+static int clean_pot = 1;
+static char * first_tea = NULL;
+
+#define MAX_TEA_COUNT 30
+static char * tea_list[MAX_TEA_COUNT];
+static int tea_num = 0;
+static void add_tea(const struct opt_item * opt UNUSED, const char * name, void * data) {
+  char ** tea_list = data;
+  if (tea_num >= MAX_TEA_COUNT) {
+    fprintf(stderr, "Cannot boil more than %d teas.\n", MAX_TEA_COUNT);
+    exit(OPT_EXIT_BAD_ARGS);
+  }
+  tea_list[tea_num++] = xstrdup(name);
+}
+
+static const char * teapot_temperature_parser(char * in, void * ptr) {
+  struct teapot_temperature * temp = ptr;
+  const char * next;
+  const char * err = str_to_int(&temp->value, in, &next, 10);
+  if (err)
+    return err;
+  if (!strcmp("C", next))
+    temp->scale = TEMP_CELSIUS;
+  else if (!strcmp("F", next))
+    temp->scale = TEMP_FAHRENHEIT;
+  else if (!strcmp("K", next))
+    temp->scale = TEMP_KELVIN;
+  else if (!strcmp("R", next))
+    temp->scale = TEMP_RANKINE;
+  else if (!strcmp("Re", next))
+    temp->scale = TEMP_REAUMUR;
+  else {
+    fprintf(stderr, "Unknown scale: %s\n", next);
+    exit(OPT_EXIT_BAD_ARGS);
+  }
+  return NULL;
+}
+
+static void teapot_temperature_dumper(struct fastbuf * fb, void * ptr) {
+  struct teapot_temperature * temp = ptr;
+  bprintf(fb, "%d%s", temp->value, temp_scale_str[temp->scale]);
+}
+
+static struct cf_user_type teapot_temperature_t = {
+  .size = sizeof(struct teapot_temperature),
+  .name = "teapot_temperature_t",
+  .parser = (cf_parser1*) teapot_temperature_parser,
+  .dumper = (cf_dumper1*) teapot_temperature_dumper
+};
+
+static void opt_test_hook(const struct opt_item * opt, uint event UNUSED, const char * value, void * data) {
+  if (!show_hooks)
+    return;
+  if (opt)
+    printf("[HOOK-%s:%c/%s=%s] ", (char *) data, opt->letter, opt->name, value);
+  else
+    printf("[HOOK-%s] ", (char *) data);
+}
+
+static struct opt_section water_options = {
+  OPT_ITEMS {
+    OPT_INT('w', "water", water_amount, OPT_REQUIRED | OPT_REQUIRED_VALUE, "<volume>\tAmount of water (in mls; required)"),
+    OPT_BOOL('G', "with-gas", with_gas, OPT_NO_VALUE, "\tUse water with gas"),
+    OPT_END
+  }
+};
+
+static struct opt_section options = {
+  OPT_ITEMS {
+    OPT_HELP("A simple tea boiling console."),
+    OPT_HELP("Usage: teapot [options] name-of-the-tea"),
+    OPT_HELP(""),
+    OPT_HELP("Black, green or white tea supported as well as fruit or herbal tea."),
+    OPT_HELP("You may specify more kinds of tea, all of them will be boiled for you, in the given order."),
+    OPT_HELP("At least one kind of tea must be specified."),
+    OPT_HELP(""),
+    OPT_HELP("Options:"),
+    OPT_HELP_OPTION,
+    OPT_CALL('V', "version", show_version, NULL, OPT_NO_VALUE, "\tShow the version"),
+    OPT_HELP(""),
+    OPT_BOOL('e', "english-style", english, 0, "\tEnglish style (with milk)"),
+    OPT_INT('s', "sugar", sugar, OPT_REQUIRED_VALUE, "<spoons>\tAmount of sugar (in teaspoons)"),
+    OPT_SWITCH(0, "standard-set", set, TEAPOT_STANDARD, OPT_SINGLE, "\tStandard teapot"),
+    OPT_SWITCH('x', "exclusive-set", set, TEAPOT_EXCLUSIVE, OPT_SINGLE, "\tExclusive teapot"),
+    OPT_SWITCH('g', "glass-set", set, TEAPOT_GLASS, OPT_SINGLE, "\tTransparent glass teapot"),
+    OPT_SWITCH('h', "hands", set, TEAPOT_HANDS, OPT_SINGLE, "\tUse user's hands as a teapot (a bit dangerous)"),
+    OPT_USER('t', "temperature", temperature, teapot_temperature_t, OPT_REQUIRED_VALUE | OPT_REQUIRED,
+		  "<value>\tWanted final temperature of the tea to be served (required)\n"
+	      "\t\tSupported scales:  Celsius [60C], Fahrenheit [140F],\n"
+	      "\t\t                   Kelvin [350K], Rankine [600R] and Reaumur [50Re]\n"
+	      "\t\tOnly integer values allowed."),
+    OPT_INC('v', "verbose", verbose, 0, "\tVerbose (the more -v, the more verbose)"),
+    OPT_INC('q', "quiet", verbose, OPT_NEGATIVE, "\tQuiet (the more -q, the more quiet)"),
+    OPT_INT_MULTIPLE('b', NULL, black_magic, 0, "<strength>\tUse black magic to make the tea extraordinarily delicious.\n\t\tMay be specified more than once to describe the amounts of black magic to be invoked in each step of tea boiling."),
+    OPT_BOOL('p', "pray", pray, OPT_SINGLE, "\tPray before boiling"),
+    OPT_BOOL(0, "no-clean", clean_pot, OPT_NEGATIVE, "\tDo not clean the teapot before boiling"),
+    OPT_STRING(OPT_POSITIONAL(1), NULL, first_tea, OPT_REQUIRED, ""),
+    OPT_CALL(OPT_POSITIONAL_TAIL, NULL, add_tea, &tea_list, 0, ""),
+    OPT_HELP(""),
+    OPT_HELP("Water options:"),
+    OPT_SECTION(water_options),
+    OPT_HOOK(opt_test_hook, "prearg", OPT_HOOK_BEFORE_ARG),
+    OPT_HOOK(opt_test_hook, "preval", OPT_HOOK_BEFORE_VALUE),
+    OPT_HOOK(opt_test_hook, "postval", OPT_HOOK_AFTER_VALUE),
+    OPT_BOOL('H', "show-hooks", show_hooks, 0, "\tDemonstrate the hooks."),
+    OPT_HELP(""),
+    OPT_HELP("Configuration options:"),
+    OPT_CONF_OPTIONS,
+    OPT_END
+  }
+};
+
+struct intnode {
+  cnode n;
+  int x;
+};
+
+int main(int argc UNUSED, char ** argv)
+{
+  cf_def_file = "etc/libucw";
+  GARY_INIT(black_magic, 0);
+  opt_parse(&options, argv+1);
+
+  printf("English style: %s|", english ? "yes" : "no");
+  if (sugar)
+    printf("Sugar: %d teaspoons|", sugar);
+  if (set != -1)
+    printf("Chosen teapot: %s|", teapot_type_str[set]);
+  printf("Temperature: %d%s|", temperature.value, temp_scale_str[temperature.scale]);
+  printf("Verbosity: %d|", verbose);
+  uint magick = GARY_SIZE(black_magic);
+  for (uint i=0; i<magick; i++)
+    printf("Black magic: %d|", black_magic[i]);
+  printf("Prayer: %s|", pray ? "yes" : "no");
+  printf("Clean: %s|", clean_pot ? "yes" : "no");
+  printf("Water amount: %d|", water_amount);
+  printf("Gas: %s|", with_gas ? "yes" : "no");
+  printf("First tea: %s|", first_tea);
+  for (int i=0; i<tea_num; i++)
+    printf("Boiling a tea: %s|", tea_list[i]);
+
+  printf("Everything OK. Bye.\n");
+}
diff --git a/libucw/ucw/opt.c b/libucw/ucw/opt.c
new file mode 100644
index 0000000..16e9e65
--- /dev/null
+++ b/libucw/ucw/opt.c
@@ -0,0 +1,425 @@
+/*
+ *	UCW Library -- Parsing of command-line options
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/opt.h>
+#include <ucw/opt-internal.h>
+#include <ucw/gary.h>
+#include <ucw/stkstring.h>
+#include <ucw/strtonum.h>
+
+#include <alloca.h>
+#include <math.h>
+
+static uint opt_default_value_flags[] = {
+    [OPT_CL_BOOL] = OPT_NO_VALUE,
+    [OPT_CL_STATIC] = OPT_MAYBE_VALUE,
+    [OPT_CL_MULTIPLE] = OPT_REQUIRED_VALUE,
+    [OPT_CL_SWITCH] = OPT_NO_VALUE,
+    [OPT_CL_INC] = OPT_NO_VALUE,
+    [OPT_CL_CALL] = 0,
+    [OPT_CL_SECTION] = 0,
+    [OPT_CL_HELP] = 0
+};
+
+void opt_failure(const char * mesg, ...) {
+  va_list args;
+  va_start(args, mesg);
+  vfprintf(stderr, mesg, args);
+  fprintf(stderr, "\nRun with --help for more information.\n");
+  exit(OPT_EXIT_BAD_ARGS);
+}
+
+static char *opt_name(struct opt_context *oc, struct opt_precomputed *opt)
+{
+  const struct opt_item *item = opt->item;
+  char *res;
+  if (item->letter >= OPT_POSITIONAL_TAIL)
+    res = stk_printf("positional argument #%d", oc->positional_count);
+  else if (opt->flags & OPT_SEEN_AS_LONG)
+    res = stk_printf("--%s", opt->name);
+  else
+    res = stk_printf("-%c", item->letter);
+  return xstrdup(res);
+}
+
+#define THIS_OPT opt_name(oc, opt)
+
+void opt_precompute(struct opt_precomputed *opt, const struct opt_item *item)
+{
+  opt->item = item;
+  opt->count = 0;
+  opt->name = item->name;
+  uint flags = item->flags;
+
+  if (item->letter >= OPT_POSITIONAL_TAIL) {
+    flags &= ~OPT_VALUE_FLAGS;
+    flags |= OPT_REQUIRED_VALUE;
+  }
+  if (!(flags & OPT_VALUE_FLAGS)) {
+    ASSERT(item->cls != OPT_CL_CALL);
+    flags |= opt_default_value_flags[item->cls];
+  }
+
+  opt->flags = flags;
+}
+
+static void opt_invoke_hooks(struct opt_context *oc, uint event, const struct opt_item *item, char *value)
+{
+  for (int i = 0; i < oc->hook_count; i++) {
+    const struct opt_item *hook = oc->hooks[i];
+    if (hook->flags & event) {
+      void *data = (hook->flags & OPT_HOOK_INTERNAL) ? oc : hook->ptr;
+      hook->u.hook(item, event, value, data);
+    }
+  }
+}
+
+static struct opt_precomputed * opt_find_item_longopt(struct opt_context * oc, char * str) {
+  uint len = strlen(str);
+  struct opt_precomputed * candidate = NULL;
+
+  for (int i = 0; i < oc->opt_count; i++) {
+    struct opt_precomputed *opt = &oc->opts[i];
+    if (!opt->name)
+      continue;
+
+    if (!strncmp(opt->name, str, len)) {
+      if (strlen(opt->name) == len)
+	return opt;
+    } else if (opt->item->cls == OPT_CL_BOOL) {
+      if (opt->flags & OPT_NEGATIVE) {
+	// If the option is called no-X, match X as well
+	if (!strncmp("no-", opt->name, 3) && !strncmp(opt->name+3, str, len)) {
+	  if (strlen(opt->name) == len+3)
+	    return opt;
+	} else
+	  continue;
+      } else {
+	// Match no-X as well
+	if (!strncmp("no-", str, 3) && !strncmp(opt->name, str+3, len-3)) {
+	  if (strlen(opt->name) == len-3)
+	    return opt;
+	} else
+	  continue;
+      }
+    } else
+      continue;
+
+    if (candidate)
+      opt_failure("Ambiguous option --%s: matches both --%s and --%s.", str, candidate->name, opt->name);
+    else
+      candidate = opt;
+  }
+
+  if (candidate)
+    return candidate;
+
+  opt_failure("Invalid option --%s.", str);
+}
+
+static void opt_parse_value(struct opt_context * oc, struct opt_precomputed * opt, char * value) {
+  const struct opt_item * item = opt->item;
+
+  if (opt->count++ && (opt->flags & OPT_SINGLE))
+    opt_failure("Option %s must be specified at most once.", THIS_OPT);
+
+  if (opt->flags & OPT_LAST_ARG)
+    oc->stop_parsing = 1;
+
+  opt_invoke_hooks(oc, OPT_HOOK_BEFORE_VALUE, item, value);
+
+  switch (item->cls) {
+    case OPT_CL_BOOL:
+      if (!value || !strcasecmp(value, "y") || !strcasecmp(value, "yes") || !strcasecmp(value, "true") || !strcasecmp(value, "1"))
+	*((int *) item->ptr) = 1 ^ (!!(opt->flags & OPT_NEGATIVE));
+      else if (!strcasecmp(value, "n") || !strcasecmp(value, "no") || !strcasecmp(value, "false") || !strcasecmp(value, "0"))
+	*((int *) item->ptr) = 0 ^ (!!(opt->flags & OPT_NEGATIVE));
+      else
+	opt_failure("Boolean argument for %s has a strange value. Supported (case insensitive): 1/0, y/n, yes/no, true/false.", THIS_OPT);
+      break;
+    case OPT_CL_STATIC:
+    case OPT_CL_MULTIPLE:
+      {
+	char * e = NULL;
+	void * ptr;
+	if (item->cls == OPT_CL_STATIC)
+	  ptr = item->ptr;
+	else
+	  ptr = GARY_PUSH_GENERIC(*(void **)item->ptr);
+#define OPT_PTR(type) ((type *) ptr)
+	switch (item->type) {
+	  case CT_INT:
+	    if (!value)
+	      *OPT_PTR(int) = 0;
+	    else
+	      e = cf_parse_int(value, OPT_PTR(int));
+	    if (e)
+	      opt_failure("Integer value parsing failed for %s: %s", THIS_OPT, e);
+	    break;
+	  case CT_U64:
+	    if (!value)
+	      *OPT_PTR(u64) = 0;
+	    else
+	      e = cf_parse_u64(value, OPT_PTR(u64));
+	    if (e)
+	      opt_failure("Unsigned 64-bit value parsing failed for %s: %s", THIS_OPT, e);
+	    break;
+	  case CT_DOUBLE:
+	    if (!value)
+	      *OPT_PTR(double) = NAN;
+	    else
+	      e = cf_parse_double(value, OPT_PTR(double));
+	    if (e)
+	      opt_failure("Floating-point value parsing failed for %s: %s", THIS_OPT, e);
+	    break;
+	  case CT_IP:
+	    if (!value)
+	      *OPT_PTR(u32) = 0;
+	    else
+	      e = cf_parse_ip(value, OPT_PTR(u32));
+	    if (e)
+	      opt_failure("IP address parsing failed for %s: %s", THIS_OPT, e);
+	    break;
+	  case CT_STRING:
+	    if (!value)
+	      *OPT_PTR(const char *) = NULL;
+	    else
+	      *OPT_PTR(const char *) = xstrdup(value);
+	    break;
+	  case CT_USER:
+	      {
+		char * e = item->u.utype->parser(value, ptr);
+		if (e)
+		  opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
+		break;
+	      }
+	  case CT_XTYPE:
+	      {
+		const char * e = item->u.xtype->parse(value, ptr, cf_get_pool());
+		if (e)
+		  opt_failure("Cannot parse the value of %s: %s", THIS_OPT, e);
+		break;
+	      }
+	  default:
+	    ASSERT(0);
+	}
+#undef OPT_PTR
+	break;
+      }
+    case OPT_CL_SWITCH:
+      if ((opt->flags & OPT_SINGLE) && *((int *)item->ptr) != -1)
+	opt_failure("Multiple switches: %s", THIS_OPT);
+      else
+	*((int *)item->ptr) = item->u.value;
+      break;
+    case OPT_CL_INC:
+      if (opt->flags & OPT_NEGATIVE)
+	(*((int *)item->ptr))--;
+      else
+	(*((int *)item->ptr))++;
+      break;
+    case OPT_CL_CALL:
+      {
+	void *data = (opt->flags & OPT_INTERNAL) ? oc : item->ptr;
+	item->u.call(item, value, data);
+	break;
+      }
+    case OPT_CL_BREAK:
+      oc->stop_parsing = 2;
+      break;
+    default:
+      ASSERT(0);
+  }
+
+  opt_invoke_hooks(oc, OPT_HOOK_AFTER_VALUE, item, value);
+}
+
+static int opt_longopt(struct opt_context * oc, char ** argv, int index) {
+  int eaten = 0;
+  char * name_in = argv[index] + 2; // skipping the -- on the beginning
+  uint pos = strchrnul(name_in, '=') - name_in;
+  struct opt_precomputed * opt = opt_find_item_longopt(oc, strndupa(name_in, pos));
+  char * value = NULL;
+
+  opt->flags |= OPT_SEEN_AS_LONG;
+
+  if (opt->item->cls == OPT_CL_BOOL &&
+      ((opt->flags & OPT_NEGATIVE)
+         ? (!strncmp(opt->item->name, "no-", 3) && !strncmp(name_in, opt->item->name + 3, pos-3))
+         : (!strncmp(name_in, "no-", 3) && !strncmp(name_in+3, opt->item->name, pos-3)))) {
+    if (name_in[pos])
+      opt_failure("Option --%s must not have any value.", name_in);
+    value = "n";
+  } else if (opt->flags & OPT_REQUIRED_VALUE) {
+    if (name_in[pos])
+      value = name_in + pos + 1;
+    else {
+      value = argv[index+1];
+      if (!value)
+	opt_failure("Option %s must have a value, but nothing supplied.", THIS_OPT);
+      eaten++;
+    }
+  } else if (opt->flags & OPT_MAYBE_VALUE) {
+    if (name_in[pos])
+      value = name_in + pos + 1;
+  } else {
+    if (name_in[pos])
+      opt_failure("Option %s must have no value.", THIS_OPT);
+  }
+  opt_parse_value(oc, opt, value);
+  return eaten;
+}
+
+static int opt_shortopt(struct opt_context * oc, char ** argv, int index) {
+  int chr = 0;
+  struct opt_precomputed * opt;
+  int o;
+
+  while (o = argv[index][++chr]) {
+    if (o < 0 || o >= 128)
+      opt_failure("Invalid character 0x%02x in option name. Only ASCII is allowed.", o & 0xff);
+    opt = oc->shortopt[o];
+
+    if (!opt)
+      opt_failure("Unknown option -%c.", o);
+
+    opt->flags &= ~OPT_SEEN_AS_LONG;
+
+    if (opt->flags & OPT_NO_VALUE)
+      opt_parse_value(oc, opt, NULL);
+    else if (opt->flags & OPT_REQUIRED_VALUE) {
+      if (argv[index][chr+1]) {
+        opt_parse_value(oc, opt, argv[index] + chr + 1);
+	return 0;
+      } else if (!argv[index+1])
+	opt_failure("Option -%c must have a value, but nothing supplied.", o);
+      else {
+	opt_parse_value(oc, opt, argv[index+1]);
+	return 1;
+      }
+    } else if (opt->flags & OPT_MAYBE_VALUE) {
+      if (argv[index][chr+1]) {
+        opt_parse_value(oc, opt, argv[index] + chr + 1);
+	return 0;
+      } else
+	opt_parse_value(oc, opt, NULL);
+    } else {
+      ASSERT(0);
+    }
+  }
+
+  return 0;
+}
+
+static void opt_positional(struct opt_context * oc, char * value) {
+  oc->positional_count++;
+  uint id = oc->positional_count > oc->positional_max ? OPT_POSITIONAL_TAIL : OPT_POSITIONAL(oc->positional_count);
+  struct opt_precomputed * opt = oc->shortopt[id];
+  if (!opt)
+    opt_failure("Too many positional arguments.");
+  else {
+    opt->flags &= ~OPT_SEEN_AS_LONG;
+    opt_parse_value(oc, opt, value);
+  }
+}
+
+static void opt_count_items(struct opt_context *oc, const struct opt_section *sec)
+{
+  for (const struct opt_item *item = sec->opt; item->cls != OPT_CL_END; item++) {
+    if (item->cls == OPT_CL_SECTION)
+      opt_count_items(oc, item->u.section);
+    else if (item->cls == OPT_CL_HOOK)
+      oc->hook_count++;
+    else if (item->letter || item->name) {
+      oc->opt_count++;
+      if (item->letter > OPT_POSITIONAL_TAIL)
+	oc->positional_max++;
+    }
+  }
+}
+
+static void opt_prepare_items(struct opt_context *oc, const struct opt_section *sec)
+{
+  for (const struct opt_item *item = sec->opt; item->cls != OPT_CL_END; item++) {
+    if (item->cls == OPT_CL_SECTION)
+      opt_prepare_items(oc, item->u.section);
+    else if (item->cls == OPT_CL_HOOK)
+      oc->hooks[oc->hook_count++] = item;
+    else if (item->letter || item->name) {
+      struct opt_precomputed * opt = &oc->opts[oc->opt_count++];
+      opt_precompute(opt, item);
+      if (item->letter)
+	oc->shortopt[(int) item->letter] = opt;
+    }
+  }
+}
+
+static void opt_check_required(struct opt_context *oc)
+{
+  for (int i = 0; i < oc->opt_count; i++) {
+    struct opt_precomputed *opt = &oc->opts[i];
+    if (!opt->count && (opt->flags & OPT_REQUIRED)) {
+      const struct opt_item *item = opt->item;
+      if (item->letter > OPT_POSITIONAL_TAIL)
+	opt_failure("Required positional argument #%d not found.", item->letter - OPT_POSITIONAL_TAIL);
+      else if (item->letter == OPT_POSITIONAL_TAIL)
+	opt_failure("Required positional argument not found.");
+      else if (item->letter && item->name)
+	opt_failure("Required option -%c/--%s not found.", item->letter, item->name);
+      else if (item->letter)
+	opt_failure("Required option -%c not found.", item->letter);
+      else
+	opt_failure("Required option --%s not found.", item->name);
+    }
+  }
+}
+
+int opt_parse(const struct opt_section * options, char ** argv) {
+  struct opt_context * oc = alloca(sizeof(*oc));
+  memset(oc, 0, sizeof (*oc));
+  oc->options = options;
+
+  opt_count_items(oc, options);
+  oc->opts = alloca(sizeof(*oc->opts) * oc->opt_count);
+  oc->shortopt = alloca(sizeof(*oc->shortopt) * (oc->positional_max + OPT_POSITIONAL_TAIL + 1));
+  memset(oc->shortopt, 0, sizeof(*oc->shortopt) * (oc->positional_max + OPT_POSITIONAL_TAIL + 1));
+  oc->hooks = alloca(sizeof (*oc->hooks) * oc->hook_count);
+
+  oc->opt_count = 0;
+  oc->hook_count = 0;
+  opt_prepare_items(oc, options);
+
+  int force_positional = 0;
+  int i, start_i = 0;
+  for (i=0; argv[i] && !oc->stop_parsing; i++) {
+    start_i = i;
+    char *arg = argv[i];
+    opt_invoke_hooks(oc, OPT_HOOK_BEFORE_ARG, NULL, NULL);
+    if (arg[0] != '-' || force_positional)
+      opt_positional(oc, arg);
+    else {
+      if (arg[1] == '-') {
+	if (arg[2] == '\0')
+	  force_positional++;
+	else
+	  i += opt_longopt(oc, argv, i);
+      } else if (arg[1])
+	i += opt_shortopt(oc, argv, i);
+      else
+	opt_positional(oc, arg);
+    }
+  }
+
+  opt_check_required(oc);
+  opt_invoke_hooks(oc, OPT_HOOK_FINAL, NULL, NULL);
+  return (oc->stop_parsing < 2 ? i : start_i);
+}
diff --git a/libucw/ucw/opt.h b/libucw/ucw/opt.h
new file mode 100644
index 0000000..dd37cc9
--- /dev/null
+++ b/libucw/ucw/opt.h
@@ -0,0 +1,411 @@
+/*
+ *	UCW Library -- Parsing of command line options
+ *
+ *	(c) 2013 Maria Matejka <mq@ucw.cz>
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_OPT_H
+#define _UCW_OPT_H
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/xtypes.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cf_def_file ucw_cf_def_file
+#define cf_env_file ucw_cf_env_file
+#define opt_conf_hook_internal ucw_opt_conf_hook_internal
+#define opt_failure ucw_opt_failure
+#define opt_handle_config ucw_opt_handle_config
+#define opt_handle_dumpconfig ucw_opt_handle_dumpconfig
+#define opt_handle_help ucw_opt_handle_help
+#define opt_handle_set ucw_opt_handle_set
+#define opt_help ucw_opt_help
+#define opt_parse ucw_opt_parse
+#endif
+
+#define OPT_EXIT_BAD_ARGS 2
+
+/***
+ * [[classes]]
+ * Option classes
+ * --------------
+ *
+ * Each option belongs to one of the following classes, which define
+ * the overall behavior of the option. In most cases, the classes
+ * are set automatically by <<macros,declaration macros>>.
+ *
+ * - `OPT_CL_END`: this is not a real option class, but a signal
+ *   that the list of options ends.
+ * - `OPT_CL_BOOL`: a boolean option. If specified without an argument,
+ *   it sets the corresponding variable to 1 (true). So does an argument of
+ *   `1`, `y`, `yes`, or `true`. Conversely, an argument of `0`, `n`, `no`,
+ *   or `false` sets the variable to 0 (false) and the same happens if
+ *   the option is given as `--no-`'option' with no argument.
+ * - `OPT_CL_STATIC`: options of this class just take a value and store
+ *   it in the variable.
+ * - `OPT_CL_MULTIPLE`: collect values from all occurrences of this
+ *   option in a growing array (see `gary.h`).
+ * - `OPT_CL_SWITCH`: a multiple-choice switch, which sets the variable
+ *   to a fixed value provided in option definition.
+ * - `OPT_CL_INC`: increments the variable (or decrements, if the
+ *   `OPT_NEGATIVE` flag is set).
+ * - `OPT_CL_CALL`: instead of setting a variable, call a function
+ *   and pass the value of the option to it.
+ * - `OPT_CL_SECTION`: not a real option, but an instruction to insert
+ *   contents of another list of options.
+ * - `OPT_CL_HELP`: no option, just print a help text.
+ * - `OPT_CL_HOOK`: no option, but a definition of a <<hooks,hook>>.
+ * - `OPT_CL_BREAK`: when a given option occurs, stop parsing and keep
+ *   the option in the argument list.
+ ***/
+
+enum opt_class {
+  OPT_CL_END,
+  OPT_CL_BOOL,
+  OPT_CL_STATIC,
+  OPT_CL_MULTIPLE,
+  OPT_CL_SWITCH,
+  OPT_CL_INC,
+  OPT_CL_CALL,
+  OPT_CL_SECTION,
+  OPT_CL_HELP,
+  OPT_CL_HOOK,
+  OPT_CL_BREAK,
+};
+
+/***
+ * [[opt_item]]
+ * Option definitions
+ * ------------------
+ *
+ * The list of options is represented by `struct opt_section`, which points to
+ * a sequence of `struct opt_item`s.
+ *
+ * These structures are seldom used directly -- instead, they are produced
+ * by <<macros,declaration macros>>.
+ ***/
+
+/** A section of option list. **/
+struct opt_section {
+  const struct opt_item * opt;
+};
+
+/** A definition of a single option item. **/
+struct opt_item {
+  const char * name;			// long name (NULL if none)
+  int letter;				// short name (0 if none)
+  void * ptr;				// variable to store the value to
+  const char * help;			// description in --help (NULL to omit the option from the help)
+  union opt_union {
+    const struct opt_section * section;	// subsection for OPT_CL_SECTION
+    int value;				// value for OPT_CL_SWITCH
+    void (* call)(const struct opt_item * opt, const char * value, void * data);		// function to call for OPT_CL_CALL
+    void (* hook)(const struct opt_item * opt, uint event, const char * value, void * data);	// function to call for OPT_CL_HOOK
+    struct cf_user_type * utype;	// specification of the user-defined type for CT_USER
+    const struct xtype * xtype;		// specification of the extended type for CT_XTYPE
+  } u;
+  u16 flags;				// as defined below (for hooks, event mask is stored instead)
+  byte cls;				// enum opt_class
+  byte type;				// enum cf_type
+};
+
+/***
+ * [[flags]]
+ * Option flags
+ * ------------
+ *
+ * Each option can specify a combination of the following flags.
+ ***/
+
+#define OPT_REQUIRED	    0x1		/** The option must be always present. **/
+#define OPT_REQUIRED_VALUE  0x2		/** The option must have a value. **/
+#define OPT_NO_VALUE	    0x4		/** The option must have no value. **/
+#define OPT_MAYBE_VALUE	    0x8		/** The option may have a value. **/
+#define OPT_NEGATIVE	    0x10	/** Reversing the effect of OPT_INC or saving @false into OPT_BOOL. **/
+#define OPT_LAST_ARG	    0x40	/** Stop processing arguments after this line. **/
+#define OPT_SINGLE	    0x100	/** The option must appear at most once. **/
+#define OPT_MULTIPLE	    0x200	/** The option may appear multiple times; will save all the values into a simple list. **/
+#define OPT_SEEN_AS_LONG    0x400	// Used internally to signal that we currently process the long form of the option
+#define OPT_BEFORE_CONFIG   0x800	/** The option may appear before a config file is loaded. **/
+#define OPT_HELP_COL        0x1000	/** Used for OPT_CL_HELP to signal that tabs switch columns. **/
+#define OPT_INTERNAL        0x4000	// Used internally to ask for passing of struct opt_context to OPT_CALL
+
+/**
+ * If none of these flags are specified, a default is chosen automatically
+ * according to option class:
+ *
+ * - `OPT_MAYBE_VALUE` for `OPT_CL_STATIC`
+ * - `OPT_REQUIRED_VALUE` for `OPT_CL_MULTIPLE`
+ * - `OPT_NO_VALUE` for `OPT_CL_BOOL`, `OPT_CL_SWITCH` and `OPT_CL_INC`
+ * - An error is reported in all other cases.
+ **/
+#define OPT_VALUE_FLAGS	    (OPT_REQUIRED_VALUE | OPT_NO_VALUE | OPT_MAYBE_VALUE)
+
+/***
+ * [[macros]]
+ * Macros for declaration of options
+ * ---------------------------------
+ *
+ * In most cases, option definitions are built using these macros.
+ ***/
+
+/** Used inside `struct opt_section` to start a list of items. **/
+#define OPT_ITEMS	.opt = ( struct opt_item[] )
+
+/** No option, just a piece of help text. **/
+#define OPT_HELP(line) { .help = line, .cls = OPT_CL_HELP }
+
+/** Like OPT_HELP, but the help text uses tab characters to switch columns like help text for ordinary options does. **/
+#define OPT_HELP_COLUMNS(line) { .help = line, .flags = OPT_HELP_COL, .cls = OPT_CL_HELP }
+
+/** Standard `--help` option. **/
+#define OPT_HELP_OPTION OPT_CALL(0, "help", opt_handle_help, NULL, OPT_BEFORE_CONFIG | OPT_INTERNAL | OPT_NO_VALUE, "\tShow this help")
+
+/** Boolean option. @target should be a variable of type `int`. **/
+#define OPT_BOOL(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, int *), .help = desc, .flags = fl, .cls = OPT_CL_BOOL, .type = CT_INT }
+
+/** String option. @target should be a variable of type `char *`. **/
+#define OPT_STRING(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, char **), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_STRING }
+
+/** Ordinary integer option. @target should be a variable of type `int`. **/
+#define OPT_INT(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, int *), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_INT }
+
+/** Unsigned integer option. @target should be a variable of type `uint`. **/
+#define OPT_UINT(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, uint *), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_INT }
+
+/** 64-bit integer option. @target should be a variable of type `u64`. **/
+#define OPT_U64(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, u64 *), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_U64 }
+
+/** Floating-point option. @target should be a variable of type `double`. **/
+#define OPT_DOUBLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, double *), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_DOUBLE }
+
+/** IP address option, currently IPv4 only. @target should be a variable of type `u32`. **/
+#define OPT_IP(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, u32 *), .help = desc, .flags = fl, .cls = OPT_CL_STATIC, .type = CT_IP }
+
+/** Multi-valued string option. @target should be a growing array of `char *`s. **/
+#define OPT_STRING_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, char ***), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_STRING }
+
+/** Multi-valued integer option. @target should be a growing array of `int`s. **/
+#define OPT_INT_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, int **), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_INT }
+
+/** Multi-valued unsigned integer option. @target should be a growing array of `uint`s. **/
+#define OPT_UINT_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, uint **), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_INT }
+
+/** Multi-valued 64-bit integer option. @target should be a growing array of `u64`s. **/
+#define OPT_U64_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, u64 **), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_U64 }
+
+/** Multi-valued floating-point option. @target should be a growing array of `double`s. **/
+#define OPT_DOUBLE_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, double **), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_DOUBLE }
+
+/** Multi-valued IPv4 address option. @target should be a growing array of `u32`s. **/
+#define OPT_IP_MULTIPLE(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, u32 **), .help = desc, .flags = fl, .cls = OPT_CL_MULTIPLE, .type = CT_IP }
+
+/** Switch option. @target should be a variable of type `int` and it will be set to the value @val. **/
+#define OPT_SWITCH(shortopt, longopt, target, val, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, int *), .help = desc, .flags = fl, .cls = OPT_CL_SWITCH, .type = CT_LOOKUP, .u.value = val }
+
+/** Incrementing option. @target should be a variable of type `int`. **/
+#define OPT_INC(shortopt, longopt, target, fl, desc) { .letter = shortopt, .name = longopt, .ptr = CHECK_PTR_TYPE(&target, int *), .flags = fl, .help = desc, .cls = OPT_CL_INC, .type = CT_INT }
+
+/** Breakpoint option. When this option occurs, parsing is terminated and the option is kept in the argument array. **/
+#define OPT_BREAK(shortopt, longopt, fl) { .letter = shortopt, .name = longopt, .flags = fl, .cls = OPT_CL_BREAK }
+
+/* FIXME: Backwards compatibility only, should not be used anymore. */
+#define OPT_UNS OPT_UINT
+#define OPT_UNS_MULTIPLE OPT_UINT_MULTIPLE
+
+
+/**
+ * When this option appears, call the function @fn with parameters @item, @value, @data,
+ * where @item points to the <<struct_opt_item,`struct opt_item`>> of this option,
+ * @value contains the current argument of the option (NULL if there is none),
+ * and @data is specified here.
+ **/
+#define OPT_CALL(shortopt, longopt, fn, data, fl, desc) { .letter = shortopt, .name = longopt, .ptr = data, .help = desc, .u.call = fn, .flags = fl, .cls = OPT_CL_CALL, .type = CT_USER }
+
+/**
+ * An option with user-defined syntax. @ttype is a <<conf:struct_cf_user_type,`cf_user_type`>>
+ * describing the syntax, @target is a variable of the corresponding type. If the @OPT_REQUIRED_VALUE
+ * flag is not set, the parser must be able to parse a NULL value.
+ **/
+#define OPT_USER(shortopt, longopt, target, ttype, fl, desc) { .letter = shortopt, .name = longopt, .ptr = &target, .u.utype = &ttype, .flags = fl, .help = desc, .cls = OPT_CL_STATIC, .type = CT_USER }
+
+/** Multi-valued option of user-defined type. @target should be a growing array of the right kind of items. **/
+#define OPT_USER_MULTIPLE(shortopt, longopt, target, ttype, fl, desc) { .letter = shortopt, .name = longopt, .ptr = &target, .u.utype = &ttype, .flags = fl, .help = desc, .cls = OPT_CL_MULTIPLE, .type = CT_USER }
+
+/**
+ * An option with user-defined syntax. @xtype is a <<xtypes:struct_xtype,`xtype`>>
+ * describing the syntax, @target is a variable of the corresponding type. If the @OPT_REQUIRED_VALUE
+ * flag is not set, the parser must be able to parse a NULL value.
+ **/
+#define OPT_XTYPE(shortopt, longopt, target, ttype, fl, desc) { .letter = shortopt, .name = longopt, .ptr = &target, .u.xtype = &ttype, .flags = fl, .help = desc, .cls = OPT_CL_STATIC, .type = CT_XTYPE }
+
+/** Multi-valued option of extended type. @target should be a growing array of the right kind of items. **/
+#define OPT_XTYPE_MULTIPLE(shortopt, longopt, target, ttype, fl, desc) { .letter = shortopt, .name = longopt, .ptr = &target, .u.xtype = &ttype, .flags = fl, .help = desc, .cls = OPT_CL_MULTIPLE, .type = CT_XTYPE }
+
+/** A sub-section. **/
+#define OPT_SECTION(sec) { .cls = OPT_CL_SECTION, .u.section = &sec }
+
+/** Declares a <<hooks,hook>> to call upon any event from the specified set. **/
+#define OPT_HOOK(fn, data, events) { .cls = OPT_CL_HOOK, .u.hook = fn, .flags = events, .ptr = data }
+
+/** A terminator signalling the end of the option list. **/
+#define OPT_END { .cls = OPT_CL_END }
+
+/***
+ * [[positional]]
+ * Positional arguments
+ * --------------------
+ *
+ * In addition to short and long options, the parser can also process 'positional
+ * arguments', which don't start with a dash and whose meaning depends solely on
+ * their position.
+ *
+ * Positional arguments are declared as options with short name `OPT_POSITIONAL(n)`
+ * (where `n` is the position of the argument, starting with 1) and long name
+ * NULL. To accept an arbitrary number of positional arguments, use
+ * `OPT_POSITIONAL_TAIL` instead, which matches all arguments, for which no
+ * `OPT_POSITIONAL` is defined. (In the latter case, you probably want to define
+ * the argument as `OPT_MULTIPLE` or `OPT_CALL`, so that the values do not
+ * overwrite each other.)
+ *
+ * Options and positional arguments can be mixed arbitrarily. When a `--` appears
+ * as an argument, it is understood as a signal that all other arguments are
+ * positional.
+ *
+ * `OPT_REQUIRED` can be used with positional arguments, but all required arguments
+ * must come before the non-required ones. When `OPT_POSITIONAL_TAIL` is declared
+ * required, it means that it must match at least once.
+ *
+ * Ordering of positional arguments within the list of options need not match
+ * their positions. Holes in position numbering are inadvisable.
+ ***/
+
+#define OPT_POSITIONAL(n)   (OPT_POSITIONAL_TAIL+(n))
+#define OPT_POSITIONAL_TAIL 128
+
+/***
+ * [[func]]
+ * Functions
+ * ---------
+ ***/
+
+/**
+ * Parse all arguments, given in a NULL-terminated array of strings.
+ *
+ * Typically, this is called from `main(argc, argv)` as `opt_parse(options, argv+1)`,
+ * skipping the 0th argument, which contains program name.
+ *
+ * Returns the number of arguments used (which need not be all of them
+ * if `OPT_LAST_ARG` was encountered).
+ *
+ * The argument array is left untouched.
+ * However, option values are not necessarily copied, the variables
+ * set by the parser may point to the argument array.
+ **/
+int opt_parse(const struct opt_section * options, char ** argv);
+
+/**
+ * Report parsing failure, suggest `--help`, and abort the program with
+ * exit code 2.
+ **/
+void opt_failure(const char * mesg, ...) FORMAT_CHECK(printf,1,2) NONRET;
+
+void opt_help(const struct opt_section * sec);
+void opt_handle_help(const struct opt_item * opt, const char * value, void * data);
+
+/***
+ * [[conf]]
+ * Cooperating with config file parser
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Parsing of command-line options and configuration files are usually
+ * intertwined in a somewhat tricky way. We want to provide command-line
+ * options that control the name of the configuration file, or possibly to
+ * override configuration settings from the command line. On the other hand,
+ * regular command-line options can refer to values loaded from the
+ * program's configuration.
+ *
+ * To achieve this goal, the option parser is able to cooperate with the
+ * config file parser. This is enabled by listing the `OPT_CONF_OPTIONS`
+ * macro in the list of command-line options.
+ *
+ * The following options are defined for you:
+ *
+ * - `-C` (`--config`) to load a specific configuration file. This option
+ *   suppresses loading of the default configuration, but it can be given
+ *   multiple times to merge settings from several files.
+ *
+ * - `-S` (`--set`) to include a part of configuration inline. For example,
+ *   you can use `-Ssection.item=value` to change a single configuration item.
+ *
+ * - `--dumpconfig` to dump the configuration to standard output and exit.
+ *   (This is available only if the program is compiled with `CONFIG_UCW_DEBUG`.)
+ *
+ * The default configuration file (as specified by <<var_cf_def_file,`cf_def_file`>>) is loaded
+ * as soon as the first option different from `-C` is encountered, unless
+ * a different file has been already loaded. For this reason, `-C` must be
+ * the very first argument given to the program.
+ *
+ * This interface supersedes <<conf:getopt_h,`cf_getopt()`>>.
+ ***/
+
+#ifdef CONFIG_UCW_DEBUG
+#define OPT_CONF_OPTIONS    OPT_CONF_CONFIG, OPT_CONF_SET, OPT_CONF_DUMPCONFIG, OPT_CONF_HOOK
+#else
+#define OPT_CONF_OPTIONS    OPT_CONF_CONFIG, OPT_CONF_SET, OPT_CONF_HOOK
+#endif
+
+#define OPT_CONF_CONFIG	    OPT_CALL('C', "config", opt_handle_config, NULL, OPT_BEFORE_CONFIG | OPT_INTERNAL | OPT_REQUIRED_VALUE, "<file>\tOverride the default configuration file")
+#define OPT_CONF_SET	    OPT_CALL('S', "set", opt_handle_set, NULL, OPT_BEFORE_CONFIG | OPT_INTERNAL | OPT_REQUIRED_VALUE, "<item>\tManual setting of a configuration item")
+#define OPT_CONF_DUMPCONFIG OPT_CALL(0, "dumpconfig", opt_handle_dumpconfig, NULL, OPT_INTERNAL | OPT_NO_VALUE, "\tDump program configuration")
+#define OPT_CONF_HOOK	    OPT_HOOK(opt_conf_hook_internal, NULL, OPT_HOOK_BEFORE_VALUE | OPT_HOOK_FINAL | OPT_HOOK_INTERNAL)
+
+void opt_handle_config(const struct opt_item * opt, const char * value, void * data);
+void opt_handle_set(const struct opt_item * opt, const char * value, void * data);
+void opt_handle_dumpconfig(const struct opt_item * opt, const char * value, void * data);
+void opt_conf_hook_internal(const struct opt_item * opt, uint event, const char * value, void * data);
+
+// XXX: This is duplicated with <ucw/getopt.h>, but that one will hopefully go away one day.
+/**
+ * The name of the default configuration file (NULL if configuration has been
+ * already loaded). It is initialized to `CONFIG_UCW_DEFAULT_CONFIG`, but you
+ * usually want to replace it by your own config file.
+ */
+extern char *cf_def_file;
+/**
+ * Name of environment variable that can override what configuration is loaded.
+ * Defaults to the value of the `CONFIG_UCW_ENV_VAR_CONFIG` compile-time option.
+ **/
+extern char *cf_env_file;
+
+/***
+ * [[hooks]]
+ * Hooks
+ * -----
+ *
+ * You can supply hook functions, which will be called by the parser upon various
+ * events. Hooks are declared as option items of class `OPT_CL_HOOK`, whose @flags
+ * field specifies a mask of events the hook wants to receive.
+ *
+ * Please note that the hook interface is not considered stable yet,
+ * so it might change in future versions of libucw.
+ *
+ * The following events are defined:
+ ***/
+
+#define OPT_HOOK_BEFORE_ARG	0x1	/** Call before option parsing **/
+#define OPT_HOOK_BEFORE_VALUE	0x2	/** Call before value parsing **/
+#define OPT_HOOK_AFTER_VALUE	0x4	/** Call after value parsing **/
+#define OPT_HOOK_FINAL		0x8	/** Call just before @opt_parse() returns **/
+#define OPT_HOOK_INTERNAL       0x4000	// Used internally to ask for passing of struct opt_context
+
+#endif
diff --git a/libucw/ucw/opt.t b/libucw/ucw/opt.t
new file mode 100644
index 0000000..8ac0443
--- /dev/null
+++ b/libucw/ucw/opt.t
@@ -0,0 +1,59 @@
+# Tests of the command line option parser
+
+Name:	Opt-1
+Run:	../obj/ucw/opt-test 2>&1 1>/dev/null
+Exit:	2
+Out:	Required option -t/--temperature not found.
+	Run with --help for more information.
+
+Name:	Opt-2
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling
+Out:	English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-3
+Run:	../obj/ucw/opt-test -vvqvqvhpe -t120F -w4 darjeeling
+Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 3|Prayer: yes|Clean: yes|Water amount: 4|Gas: no|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-4
+Run:	../obj/ucw/opt-test -t120F -w4 puerh darjeeling earl-grey
+Out:	English style: no|Temperature: 120F|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 4|Gas: no|First tea: puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
+
+Name:	Opt-5
+Run:	../obj/ucw/opt-test -ghx 2>&1 1>/dev/null
+Exit:	2
+Out:	Multiple switches: -h
+	Run with --help for more information.
+
+Name:	Opt-6
+Run:	../obj/ucw/opt-test -t120F -w4 -b15 -he -- --puerh darjeeling earl-grey
+Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 1|Black magic: 15|Prayer: no|Clean: yes|Water amount: 4|Gas: no|First tea: --puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
+
+Name:	Opt-7
+Run:	../obj/ucw/opt-test -t120F -w4 -b15 -b54 -he -- --puerh darjeeling earl-grey
+Out:	English style: yes|Chosen teapot: hands|Temperature: 120F|Verbosity: 1|Black magic: 15|Black magic: 54|Prayer: no|Clean: yes|Water amount: 4|Gas: no|First tea: --puerh|Boiling a tea: darjeeling|Boiling a tea: earl-grey|Everything OK. Bye.
+
+Name:	Opt-bool-1
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling --english-style
+Out:	English style: yes|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-bool-2
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling --english-style --no-english-style
+Out:	English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-bool-negative-1
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling --clean
+Out:	English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-bool-negative-2
+Run:	../obj/ucw/opt-test -t95C -w640 -gG darjeeling --no-clean
+Out:	English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: no|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
+
+Name:	Opt-Conf-1
+Run:	../obj/ucw/opt-test -h -SX.Y=Z 2>&1 1>/dev/null
+Exit:	2
+Out:	Config options must stand before other options.
+	Run with --help for more information.
+
+Name:	Opt-Hook-1
+Run:	../obj/ucw/opt-test -Ht 95C -w640 -gG darjeeling
+Out:	[HOOK-postval:H/show-hooks=(null)] [HOOK-preval:t/temperature=95C] [HOOK-postval:t/temperature=95C] [HOOK-prearg] [HOOK-preval:w/water=640] [HOOK-postval:w/water=640] [HOOK-prearg] [HOOK-preval:g/glass-set=(null)] [HOOK-postval:g/glass-set=(null)] [HOOK-preval:G/with-gas=(null)] [HOOK-postval:G/with-gas=(null)] [HOOK-prearg] [HOOK-preval:�/(null)=darjeeling] [HOOK-postval:�/(null)=darjeeling] English style: no|Chosen teapot: glass|Temperature: 95C|Verbosity: 1|Prayer: no|Clean: yes|Water amount: 640|Gas: yes|First tea: darjeeling|Everything OK. Bye.
diff --git a/libucw/ucw/partmap.c b/libucw/ucw/partmap.c
new file mode 100644
index 0000000..9108353
--- /dev/null
+++ b/libucw/ucw/partmap.c
@@ -0,0 +1,100 @@
+/*
+ *	UCW Library -- Mapping of File Parts
+ *
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2009 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/io.h>
+#include <ucw/partmap.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#ifdef CONFIG_UCW_PARTMAP_IS_MMAP
+#define PARTMAP_WINDOW ~(size_t)0
+#else
+#ifdef TEST
+#define PARTMAP_WINDOW 4096
+#else
+#define PARTMAP_WINDOW 16777216
+#endif
+#endif
+
+struct partmap *
+partmap_open(char *name, int writeable)
+{
+  struct partmap *p = xmalloc_zero(sizeof(struct partmap));
+
+  p->fd = ucw_open(name, writeable ? O_RDWR : O_RDONLY);
+  if (p->fd < 0)
+    die("open(%s): %m", name);
+  if ((p->file_size = ucw_seek(p->fd, 0, SEEK_END)) < 0)
+    die("lseek(%s): %m", name);
+  p->writeable = writeable;
+#ifdef CONFIG_UCW_PARTMAP_IS_MMAP
+  partmap_load(p, 0, p->file_size);
+#endif
+  return p;
+}
+
+ucw_off_t
+partmap_size(struct partmap *p)
+{
+  return p->file_size;
+}
+
+void
+partmap_close(struct partmap *p)
+{
+  if (p->start_map)
+    munmap(p->start_map, p->end_off - p->start_off);
+  close(p->fd);
+  xfree(p);
+}
+
+void
+partmap_load(struct partmap *p, ucw_off_t start, uint size)
+{
+  if (p->start_map)
+    munmap(p->start_map, p->end_off - p->start_off);
+  ucw_off_t end = start + size;
+  ucw_off_t win_start = start/CPU_PAGE_SIZE * CPU_PAGE_SIZE;
+  size_t win_len = PARTMAP_WINDOW;
+  if (win_len > (size_t) (p->file_size - win_start))
+    win_len = ALIGN_TO(p->file_size - win_start, CPU_PAGE_SIZE);
+  if ((ucw_off_t) (win_start+win_len) < end)
+    die("partmap_map: Window is too small for mapping %d bytes", size);
+  if (win_len)
+    {
+      p->start_map = ucw_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
+      if (p->start_map == MAP_FAILED)
+	die("mmap failed at position %lld: %m", (long long)win_start);
+    }
+  else
+    p->start_map = NULL;
+  p->start_off = win_start;
+  p->end_off = win_start+win_len;
+  madvise(p->start_map, win_len, MADV_SEQUENTIAL);
+}
+
+#ifdef TEST
+int main(int argc, char **argv)
+{
+  struct partmap *p = partmap_open(argv[1], 0);
+  uint l = partmap_size(p);
+  uint i;
+  for (i=0; i<l; i++)
+    putchar(*(char *)partmap_map(p, i, 1));
+  partmap_close(p);
+  return 0;
+}
+#endif
diff --git a/libucw/ucw/partmap.h b/libucw/ucw/partmap.h
new file mode 100644
index 0000000..15d0887
--- /dev/null
+++ b/libucw/ucw/partmap.h
@@ -0,0 +1,52 @@
+/*
+ *	UCW Library -- Mapping of File Parts
+ *
+ *	(c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2005 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_PARTMAP_H
+#define _UCW_PARTMAP_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define partmap_close ucw_partmap_close
+#define partmap_load ucw_partmap_load
+#define partmap_open ucw_partmap_open
+#define partmap_size ucw_partmap_size
+#endif
+
+struct partmap {
+  int fd;
+  ucw_off_t file_size;
+  ucw_off_t start_off, end_off;
+  byte *start_map;
+  int writeable;
+};
+
+struct partmap *partmap_open(char *name, int writeable);
+void partmap_close(struct partmap *p);
+ucw_off_t partmap_size(struct partmap *p);
+void partmap_load(struct partmap *p, ucw_off_t start, uint size);
+
+static inline void *partmap_map(struct partmap *p, ucw_off_t start, uint size UNUSED)
+{
+#ifndef CONFIG_UCW_PARTMAP_IS_MMAP
+  if (unlikely(!p->start_map || start < p->start_off || (ucw_off_t) (start+size) > p->end_off))
+    partmap_load(p, start, size);
+#endif
+  return p->start_map + (start - p->start_off);
+}
+
+static inline void *partmap_map_forward(struct partmap *p, ucw_off_t start, uint size UNUSED)
+{
+#ifndef CONFIG_UCW_PARTMAP_IS_MMAP
+  if (unlikely((ucw_off_t) (start+size) > p->end_off))
+    partmap_load(p, start, size);
+#endif
+  return p->start_map + (start - p->start_off);
+}
+
+#endif
diff --git a/libucw/ucw/perl/Filelock/Filelock.pm b/libucw/ucw/perl/Filelock/Filelock.pm
new file mode 100644
index 0000000..a81865e
--- /dev/null
+++ b/libucw/ucw/perl/Filelock/Filelock.pm
@@ -0,0 +1,32 @@
+# Perl module for setting process limits
+#
+# (c) 2007 Pavel Charvat <pchar@ucw.cz>
+#
+# This software may be freely distributed and used according to the terms
+# of the GNU Lesser General Public License.
+#
+#
+#
+# Interface:
+#   UCW::Filelock::fcntl_lock($fd, $cmd, $type, $whence, $start, $len)
+#
+
+package UCW::Filelock;
+
+use 5.006;
+use strict;
+use warnings;
+
+require DynaLoader;
+
+our @ISA = qw(DynaLoader);
+unshift @DynaLoader::dl_library_path, "lib";
+
+our $VERSION = '0.01';
+
+bootstrap UCW::Filelock $VERSION;
+
+# Preloaded methods go here.
+
+1;
+__END__
diff --git a/libucw/ucw/perl/Filelock/Filelock.xs b/libucw/ucw/perl/Filelock/Filelock.xs
new file mode 100644
index 0000000..df92e03
--- /dev/null
+++ b/libucw/ucw/perl/Filelock/Filelock.xs
@@ -0,0 +1,30 @@
+/*
+ * PerlXS module for managing file locks
+ *
+ * (c) 2007 Pavel Charvat <pchar@ucw.cz>
+ */
+
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+
+
+MODULE = UCW::Filelock		PACKAGE = UCW::Filelock
+
+PROTOTYPES: ENABLED
+
+int
+fcntl_lock(IN int fd, IN int cmd, IN int type, IN int whence, IN int start, IN int len)
+CODE:
+	struct flock fl;
+	fl.l_type = type;
+	fl.l_whence = whence;
+	fl.l_start = start;
+	fl.l_len = len;
+
+	RETVAL = fcntl(fd, cmd, &fl);
+OUTPUT:
+	RETVAL
diff --git a/libucw/ucw/perl/Filelock/MANIFEST b/libucw/ucw/perl/Filelock/MANIFEST
new file mode 100644
index 0000000..f921f06
--- /dev/null
+++ b/libucw/ucw/perl/Filelock/MANIFEST
@@ -0,0 +1,6 @@
+Makefile
+Makefile.PL
+MANIFEST
+Fcntllock.pm
+Fcntllock.xs
+lib/UCW/.exists
diff --git a/libucw/ucw/perl/Filelock/Makefile b/libucw/ucw/perl/Filelock/Makefile
new file mode 100644
index 0000000..a6d92e4
--- /dev/null
+++ b/libucw/ucw/perl/Filelock/Makefile
@@ -0,0 +1,31 @@
+# Makefile for the Filelock Perl module  (c) 2007 Pavel Chrvat <pchar@ucw.cz>
+
+DIRS+=ucw/perl/Filelock/arch/auto/UCW/Filelock
+FILELOCK_DIR=ucw/perl/Filelock
+
+PROGS+=$(o)/ucw/perl/Filelock/Filelock.pm
+
+extras:: $(o)/ucw/perl/Filelock/arch/auto/UCW/Filelock/Filelock.$(SOEXT)
+
+$(o)/ucw/perl/Filelock/arch/auto/UCW/Filelock/Filelock.$(SOEXT): $(o)/$(FILELOCK_DIR)/Filelock.xs $(o)/$(FILELOCK_DIR)/Filelock.pm $(o)/$(FILELOCK_DIR)/Makefile
+	$(M)MAKE $@
+	$(Q)cd $(o)/$(FILELOCK_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
+	$(Q)touch $@
+	$(Q)cp $@ run/$(DATADIR)/
+
+$(o)/$(FILELOCK_DIR)/Makefile: $(o)/$(FILELOCK_DIR)/Makefile.PL
+	$(M)PREPARE $@
+	$(Q)cd $(o)/$(FILELOCK_DIR) && perl Makefile.PL
+
+$(o)/$(FILELOCK_DIR)/Filelock.xs: $(s)/$(FILELOCK_DIR)/Filelock.xs
+	$(Q)cp $^ $@
+
+$(o)/$(FILELOCK_DIR)/Makefile.PL: $(s)/$(FILELOCK_DIR)/Makefile.PL
+	$(Q)cp $^ $@
+
+UCW_PERL_INSTALL+=install-perl-ucw-filelock
+install-perl-ucw-filelock:
+	install -d -m 755 $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/UCW/ $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/auto/UCW/
+	install -m 644 $(s)/$(FILELOCK_DIR)/Filelock.pm $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/UCW/
+	install -m 644 $(o)/ucw/perl/Filelock/arch/auto/UCW/Filelock/Filelock.$(SOEXT) $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/auto/UCW/
+.PHONY: install-perl-ucw-filelock
diff --git a/libucw/ucw/perl/Filelock/Makefile.PL b/libucw/ucw/perl/Filelock/Makefile.PL
new file mode 100644
index 0000000..edc23aa
--- /dev/null
+++ b/libucw/ucw/perl/Filelock/Makefile.PL
@@ -0,0 +1,9 @@
+# Makefile for Perl MakeMaker  (c) 2007 Pavel Charvat <pchar@ucw.cz>
+
+use ExtUtils::MakeMaker;
+WriteMakefile(
+    'NAME'		=> 'UCW::Filelock',
+    'VERSION_FROM'	=> 'Filelock.pm',
+    'INST_LIB'		=> 'lib',
+    'INST_ARCHLIB'	=> 'arch',
+);
diff --git a/libucw/ucw/perl/Makefile b/libucw/ucw/perl/Makefile
new file mode 100644
index 0000000..19b2ba5
--- /dev/null
+++ b/libucw/ucw/perl/Makefile
@@ -0,0 +1,16 @@
+# Perl modules
+
+DIRS+=ucw/perl
+UCW_PERL_INSTALL=
+
+include $(s)/ucw/perl/UCW/Makefile
+
+ifdef CONFIG_UCW_PERL_MODULES
+include $(s)/ucw/perl/Ulimit/Makefile
+include $(s)/ucw/perl/Filelock/Makefile
+endif
+
+INSTALL_TARGETS+=install-perl-ucw
+
+install-perl-ucw: $(UCW_PERL_INSTALL)
+.PHONY: install-perl-ucw
diff --git a/libucw/ucw/perl/UCW/CGI.pm b/libucw/ucw/perl/UCW/CGI.pm
new file mode 100644
index 0000000..d9c2ea6
--- /dev/null
+++ b/libucw/ucw/perl/UCW/CGI.pm
@@ -0,0 +1,501 @@
+#	Poor Man's CGI Module for Perl
+#
+#	(c) 2002--2017 Martin Mares <mj@ucw.cz>
+#	Slightly modified by Tomas Valla <tom@ucw.cz>
+#
+#	This software may be freely distributed and used according to the terms
+#	of the GNU Lesser General Public License.
+
+package UCW::CGI;
+
+use strict;
+use warnings;
+
+require Exporter;
+our $VERSION = 1.0;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(&html_escape &url_escape &url_deescape &url_param_escape &url_param_deescape &self_ref &self_form &http_get);
+our @EXPORT_OK = qw();
+
+# Configuration settings
+our $debug = 0;
+our $utf8_mode = 0;
+
+sub http_error($;@) {
+	my $err = shift @_;
+	print join("\n", "Status: $err", "Content-Type: text/plain", @_, "", $err, "");
+	exit;
+}
+
+### Escaping ###
+
+sub url_escape($) {
+	my $x = shift @_;
+	defined $x or return;
+	utf8::encode($x) if $utf8_mode;
+	$x =~ s/([^-\$_.!*'(),0-9A-Za-z\x80-\xff])/"%".unpack('H2',$1)/ge;
+	utf8::decode($x) if $utf8_mode;
+	return $x;
+}
+
+sub url_strict_escape($) {
+	my $x = shift @_;
+	defined $x or return;
+	utf8::encode($x);
+	$x =~ s/([^-\$_.!*'(),0-9A-Za-z])/"%".unpack('H2',$1)/ge;
+	return $x;
+}
+
+sub url_deescape($) {
+	my $x = shift @_;
+	defined $x or return;
+	utf8::encode($x) if $utf8_mode;
+	$x =~ s/%(..)/pack("H2",$1)/ge;
+	utf8::decode($x) if $utf8_mode;
+	return $x;
+}
+
+sub url_param_escape($) {
+	my $x = shift @_;
+	defined $x or return;
+	utf8::encode($x) if $utf8_mode;
+	$x =~ s/([^-\$_.!*'(),0-9A-Za-z])/"%".unpack('H2',$1)/ge;
+	$x =~ s/%20/+/g;
+	utf8::decode($x) if $utf8_mode;
+	return $x;
+}
+
+sub url_param_deescape($) {
+	my $x = shift @_;
+	defined $x or return;
+	$x =~ s/\+/ /g;
+	return url_deescape($x);
+}
+
+sub html_escape($) {
+	my $x = shift @_;
+	defined $x or return;
+	$x =~ s/&/&amp;/g;
+	$x =~ s/</&lt;/g;
+	$x =~ s/>/&gt;/g;
+	$x =~ s/"/&quot;/g;
+	$x =~ s/'/&#39;/g;
+	return $x;
+}
+
+### Analysing RFC 822 Style Headers ###
+
+sub rfc822_prepare($) {
+	my $x = shift @_;
+	# Convert all %'s and backslash escapes to %xx escapes
+	$x =~ s/%/%25/g;
+	$x =~ s/\\(.)/"%".unpack("H2",$1)/ge;
+	# Remove all comments, beware, they can be nested (unterminated comments are closed at EOL automatically)
+	while ($x =~ s/^(("[^"]*"|[^"(])*(\([^)]*)*)(\([^()]*(\)|$))/$1 /) { }
+	# Remove quotes and escape dangerous characters inside (again closing at the end automatically)
+	$x =~ s{"([^"]*)("|$)}{my $z=$1; $z =~ s/([^0-9a-zA-Z%_-])/"%".unpack("H2",$1)/ge; $z;}ge;
+	# All control characters are properly escaped, tokens are clearly visible.
+	# Finally remove all unnecessary spaces.
+	$x =~ s/\s+/ /g;
+	$x =~ s/(^ | $)//g;
+	$x =~ s{\s*([()<>@,;:\\"/\[\]?=])\s*}{$1}g;
+	return $x;
+}
+
+sub rfc822_deescape($) {
+	my $x = shift @_;
+	return url_deescape($x);
+}
+
+### Reading of HTTP headers ###
+
+sub http_get($) {
+	my $h = shift @_;
+	$h =~ tr/a-z-/A-Z_/;
+	return $ENV{"HTTP_$h"} // $ENV{"$h"};
+}
+
+### Parsing of Arguments ###
+
+my $main_arg_table;
+my %raw_args;
+
+sub parse_raw_args_ll($$) {
+	my ($arg, $s) = @_;
+	$s =~ s/\r\n/\n/g;
+	$s =~ s/\r/\n/g;
+	utf8::decode($s) if $utf8_mode;
+	push @{$raw_args{$arg}}, $s;
+}
+
+sub parse_raw_args($) {
+	my ($s) = @_;
+	$s =~ s/\s+//;
+	for $_ (split /[&:]/, $s) {
+		(/^([^=]+)=(.*)$/) or next;
+		my $arg = $1;
+		$_ = $2;
+		s/\+/ /g;
+		s/%(..)/pack("H2",$1)/eg;
+		parse_raw_args_ll($arg, $_);
+	}
+}
+
+sub parse_multipart_form_data();
+
+sub init_args() {
+	if (!defined $ENV{"GATEWAY_INTERFACE"}) {
+		print STDERR "Must be called as a CGI script.\n";
+		$UCW::CGI::ErrorHandler::exit_code = 1;
+		exit;
+	}
+
+	my $method = $ENV{"REQUEST_METHOD"};
+	if (my $qs = $ENV{"QUERY_STRING"}) {
+		parse_raw_args($qs);
+	}
+	if ($method eq "GET" || $method eq "HEAD") {
+	} elsif ($method eq "POST") {
+		my $content_type = $ENV{"CONTENT_TYPE"} // "";
+		if ($content_type =~ /^application\/x-www-form-urlencoded\b/i) {
+			while (<STDIN>) {
+				chomp;
+				parse_raw_args($_);
+			}
+		} elsif ($content_type =~ /^multipart\/form-data\b/i) {
+			parse_multipart_form_data();
+		} else {
+			http_error "415 Unsupported Media Type";
+			exit;
+		}
+	} else {
+		http_error "405 Method Not Allowed", "Allow: GET, HEAD, POST";
+	}
+}
+
+sub parse_args($) {			# CAVEAT: attached files must be defined in the main arg table
+	my $args = shift @_;
+	if (!$main_arg_table) {
+		$main_arg_table = $args;
+		init_args();
+	}
+
+	for my $a (values %$args) {
+		my $r = ref($a->{'var'});
+		$a->{'default'} //= '';
+		if ($r eq 'SCALAR') {
+			${$a->{'var'}} = $a->{'default'};
+		} elsif ($r eq 'ARRAY') {
+			@{$a->{'var'}} = ();
+		}
+	}
+
+	for my $arg (keys %$args) {
+		my $a = $args->{$arg};
+		defined($raw_args{$arg}) or next;
+		for (@{$raw_args{$arg}}) {
+			$a->{'multiline'} or s/(\n|\t)/ /g;
+			unless ($a->{'preserve_spaces'}) {
+				s/^\s+//;
+				s/\s+$//;
+			}
+			if (my $rx = $a->{'check'}) {
+				if (!/^$rx$/) { $_ = $a->{'default'}; }
+			}
+
+			my $v = $a->{'var'};
+			my $r = ref($v);
+			if ($r eq 'SCALAR') {
+				$$v = $_;
+			} elsif ($r eq 'ARRAY') {
+				push @$v, $_;
+			}
+		}
+	}
+}
+
+### Parsing Multipart Form Data ###
+
+my $boundary;
+my $boundary_len;
+my $mp_buffer;
+my $mp_buffer_i;
+my $mp_buffer_boundary;
+my $mp_eof;
+
+sub refill_mp_data($) {
+	my ($more) = @_;
+	if ($mp_buffer_boundary >= $mp_buffer_i) {
+		return $mp_buffer_boundary - $mp_buffer_i;
+	} elsif ($mp_buffer_i + $more <= length($mp_buffer) - $boundary_len) {
+		return $more;
+	} else {
+		if ($mp_buffer_i) {
+			$mp_buffer = substr($mp_buffer, $mp_buffer_i);
+			$mp_buffer_i = 0;
+		}
+		while ($mp_buffer_i + $more > length($mp_buffer) - $boundary_len) {
+			last if $mp_eof;
+			my $data;
+			my $n = read(STDIN, $data, 2048);
+			if ($n > 0) {
+				$mp_buffer .= $data;
+			} else {
+				$mp_eof = 1;
+			}
+		}
+		$mp_buffer_boundary = index($mp_buffer, $boundary, $mp_buffer_i);
+		if ($mp_buffer_boundary >= 0) {
+			return $mp_buffer_boundary;
+		} elsif ($mp_eof) {
+			return length($mp_buffer);
+		} else {
+			return length($mp_buffer) - $boundary_len;
+		}
+	}
+}
+
+sub get_mp_line($) {
+	my ($allow_empty) = @_;
+	my $n = refill_mp_data(1024);
+	my $i = index($mp_buffer, "\r\n", $mp_buffer_i);
+	if ($i >= $mp_buffer_i && $i < $mp_buffer_i + $n - 1) {
+		my $s = substr($mp_buffer, $mp_buffer_i, $i - $mp_buffer_i);
+		$mp_buffer_i = $i + 2;
+		return $s;
+	} elsif ($allow_empty) {
+		if ($n) {							# An incomplete line
+			my $s = substr($mp_buffer, $mp_buffer_i, $n);
+			$mp_buffer_i += $n;
+			return $s;
+		} else {							# No more lines
+			return undef;
+		}
+	} else {
+		http_error "400 Bad Request: Premature end of multipart POST data";
+	}
+}
+
+sub skip_mp_boundary() {
+	if ($mp_buffer_boundary != $mp_buffer_i) {
+		http_error "400 Bad Request: Premature end of multipart POST data";
+	}
+	$mp_buffer_boundary = -1;
+	$mp_buffer_i += 2;
+	my $b = get_mp_line(0);
+	print STDERR "SEP $b\n" if $debug;
+	$mp_buffer_boundary = index($mp_buffer, $boundary, $mp_buffer_i);
+	if (substr("\r\n$b", 0, $boundary_len) eq "$boundary--") {
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+sub parse_mp_header() {
+	my $h = {};
+	my $last;
+	while ((my $l = get_mp_line(0)) ne "") {
+		print STDERR "HH $l\n" if $debug;
+		if (my ($name, $value) = ($l =~ /([A-Za-z0-9-]+)\s*:\s*(.*)/)) {
+			$name =~ tr/A-Z/a-z/;
+			$h->{$name} = $value;
+			$last = $name;
+		} elsif ($l =~ /^\s+/ && $last) {
+			$h->{$last} .= $l;
+		} else {
+			$last = undef;
+		}
+	}
+	foreach my $n (keys %$h) {
+		$h->{$n} = rfc822_prepare($h->{$n});
+		print STDERR "H $n: $h->{$n}\n" if $debug;
+	}
+	return (keys %$h) ? $h : undef;
+}
+
+sub parse_multipart_form_data() {
+	# First of all, find the boundary string
+	my $ct = rfc822_prepare($ENV{"CONTENT_TYPE"});
+	if (!(($boundary) = ($ct =~ /^.*;\s*boundary=([^; ]+)/))) {
+		http_error "400 Bad Request: Multipart content with no boundary string received";
+	}
+	$boundary = rfc822_deescape($boundary);
+	print STDERR "BOUNDARY IS $boundary\n" if $debug;
+
+	# BUG: IE 3.01 on Macintosh forgets to add the "--" at the start of the boundary string
+	# as the MIME specs preach. Workaround borrowed from CGI.pm in Perl distribution.
+	my $agent = http_get("User-Agent") // "";
+	$boundary = "--$boundary" unless $agent =~ /MSIE\s+3\.0[12];\s*Mac/;
+	$boundary = "\r\n$boundary";
+	$boundary_len = length($boundary) + 2;
+
+	# Check upload size in advance
+	if (my $size = http_get("Content-Length")) {
+		my $max_allowed = 0;
+		foreach my $a (values %$main_arg_table) {
+			$max_allowed += $a->{"maxsize"} || 65536;
+		}
+		if ($size > $max_allowed) {
+			http_error "413 Request Entity Too Large";
+		}
+	}
+
+	# Initialize our buffering mechanism and part splitter
+	$mp_buffer = "\r\n";
+	$mp_buffer_i = 0;
+	$mp_buffer_boundary = -1;
+	$mp_eof = 0;
+
+	# Skip garbage before the 1st part
+	while (my $i = refill_mp_data(256)) { $mp_buffer_i += $i; }
+	skip_mp_boundary() || return;
+
+	# Process individual parts
+	do { PART: {
+		print STDERR "NEXT PART\n" if $debug;
+		my $h = parse_mp_header();
+		my ($field, $cdisp, $a);
+		if ($h &&
+		    ($cdisp = $h->{"content-disposition"}) &&
+		    $cdisp =~ /^form-data/ &&
+		    (($field) = ($cdisp =~ /;name=([^;]+)/)) &&
+		    ($a = $main_arg_table->{"$field"})) {
+			print STDERR "FIELD $field\n" if $debug;
+			if (defined $h->{"content-transfer-encoding"}) {
+				http_error "400 Bad Request: Unexpected Content-Transfer-Encoding";
+			}
+			if (defined $a->{"var"}) {
+				while (defined (my $l = get_mp_line(1))) {
+					print STDERR "VALUE $l\n" if $debug;
+					parse_raw_args_ll($field, $l);
+				}
+				next PART;
+			} elsif (defined $a->{"file"}) {
+				require File::Temp;
+				require IO::Handle;
+				my $max_size = $a->{"maxsize"} || 1048576;
+				my @tmpargs = (undef, UNLINK => 1);
+				push @tmpargs, DIR => $a->{"tmpdir"} if defined $a->{"tmpdir"};
+				my ($fh, $fn) = File::Temp::tempfile(@tmpargs);
+				print STDERR "FILE UPLOAD to $fn\n" if $debug;
+				${$a->{"file"}} = $fn;
+				${$a->{"fh"}} = $fh if defined $a->{"fh"};
+				if (defined $a->{"filename"}){
+					my ($filename) = ($cdisp =~ /;filename=([^;]+)/);
+					(${$a->{"filename"}}) = rfc822_deescape($filename) if defined $filename;
+				}
+				my $total_size = 0;
+				while (my $i = refill_mp_data(4096)) {
+					print $fh substr($mp_buffer, $mp_buffer_i, $i);
+					$mp_buffer_i += $i;
+					$total_size += $i;
+					if ($total_size > $max_size) { http_error "413 Request Entity Too Large"; }
+				}
+				$fh->flush();	# Don't close the handle, the file would disappear otherwise
+				next PART;
+			}
+		}
+		print STDERR "SKIPPING\n" if $debug;
+		while (my $i = refill_mp_data(256)) { $mp_buffer_i += $i; }
+	} } while (skip_mp_boundary());
+}
+
+### Generating Self-ref URL's ###
+
+sub make_out_args(@) {		# Usage: make_out_args([arg_table, ...] name => value, ...)
+	my @arg_tables = ( $main_arg_table );
+	while (@_ && ref($_[0]) eq 'HASH') {
+		push @arg_tables, shift @_;
+	}
+	my %overrides = @_;
+	my $out = {};
+	for my $table (@arg_tables) {
+		for my $name (keys %$table) {
+			my $arg = $table->{$name};
+			defined($arg->{'var'}) || next;
+			defined($arg->{'pass'}) && !$arg->{'pass'} && !exists $overrides{$name} && next;
+			defined $arg->{'default'} or $arg->{'default'} = "";
+			my $value;
+			if (!defined($value = $overrides{$name})) {
+				if (exists $overrides{$name}) {
+					$value = $arg->{'default'};
+				} else {
+					$value = ${$arg->{'var'}};
+					defined $value or $value = $arg->{'default'};
+				}
+			}
+			if ($value ne $arg->{'default'}) {
+				$out->{$name} = $value;
+			}
+		}
+	}
+	return $out;
+}
+
+sub self_ref(@) {
+	my $out = make_out_args(@_);
+	return "?" . join(':', map { "$_=" . url_param_escape($out->{$_}) } sort keys %$out);
+}
+
+sub self_form(@) {
+	my $out = make_out_args(@_);
+	return join('', map { "<input type=hidden name=$_ value='" . html_escape($out->{$_}) . "'>\n" } sort keys %$out);
+}
+
+### Cookies
+
+sub set_cookie($$@) {
+	#
+	# Unfortunately, the support for the new cookie standard (RFC 2965) among
+	# web browsers is still very scarce, so we are still using the old Netscape
+	# specification.
+	#
+	# Usage: set_cookie(name, value, option => value...), where options are:
+	#
+	#	max-age		maximal age in seconds
+	#	domain		domain name scope
+	#	path		path name scope
+	#	secure		if present, cookie applies only to SSL connections
+	#			(in this case, the value should be undefined)
+	#	discard		if present with any value, the cookie is discarded
+	#
+
+	my $key = shift @_;
+	my $value = shift @_;
+	my %other = @_;
+	if (exists $other{'discard'}) {
+		delete $other{'discard'};
+		$other{'max-age'} = 0;
+	}
+	if (defined(my $age = $other{'max-age'})) {
+		delete $other{'max-age'};
+		my $exp = ($age ? (time + $age) : 0);
+		# Avoid problems with locales
+		my ($S,$M,$H,$d,$m,$y,$wd) = gmtime $exp;
+		my @wdays = ( 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' );
+		my @mons = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' );
+		$other{'expires'} = sprintf("%s, %02d-%s-%d %02d:%02d:%02d GMT",
+			$wdays[$wd], $d, $mons[$m], $y+1900, $H, $M, $S);
+	}
+
+	print "Set-Cookie: $key=", url_strict_escape($value);
+	foreach my $k (keys %other) {
+		print "; $k";
+		print "=", $other{$k} if defined $other{$k};
+	}
+	print "\n";
+}
+
+sub parse_cookies() {
+	my $h = http_get("Cookie") or return ();
+	my @cook = ();
+	foreach my $x (split /;\s*/, $h) {
+		my ($k,$v) = split /=/, $x;
+		$v = url_deescape($v) if defined $v;
+		push @cook, $k => $v;
+	}
+	return @cook;
+}
+
+1;  # OK
diff --git a/libucw/ucw/perl/UCW/CGI/ErrorHandler.pm b/libucw/ucw/perl/UCW/CGI/ErrorHandler.pm
new file mode 100644
index 0000000..16ccfa2
--- /dev/null
+++ b/libucw/ucw/perl/UCW/CGI/ErrorHandler.pm
@@ -0,0 +1,53 @@
+#	Poor Man's CGI Module for Perl -- Error Handling
+#
+#	(c) 2002--2012 Martin Mares <mj@ucw.cz>
+#
+#	This software may be freely distributed and used according to the terms
+#	of the GNU Lesser General Public License.
+
+package UCW::CGI::ErrorHandler;
+
+# E-mail address of the script admin (optional, preferably set in a BEGIN block)
+our $error_mail;
+
+# A function called for reporting of errors
+our $error_hook;
+
+# Set to true if you want to show detailed error messages to the user
+our $print_errors = 0;
+
+my $error_reported;
+our $exit_code;
+
+sub report_bug($)
+{
+	if (!defined $error_reported) {
+		$error_reported = 1;
+		print STDERR $_[0];
+		if (defined($error_hook)) {
+			&$error_hook($_[0]);
+		} else {
+			print "Status: 500\n";
+			print "Content-Type: text/plain\n\n";
+			if ($print_errors) {
+				print "Internal bug: ", $_[0], "\n";
+			} else {
+				print "Internal bug.\n";
+			}
+			print "Please notify $error_mail\n" if defined $error_mail;
+		}
+	}
+	die;
+}
+
+BEGIN {
+	$SIG{__DIE__} = sub { report_bug($_[0]); };
+	$SIG{__WARN__} = sub { report_bug("WARNING: " . $_[0]); };
+	$exit_code = 0;
+}
+
+END {
+	$? = $exit_code;
+}
+
+42;
diff --git a/libucw/ucw/perl/UCW/CGI/Makefile b/libucw/ucw/perl/UCW/CGI/Makefile
new file mode 100644
index 0000000..584e893
--- /dev/null
+++ b/libucw/ucw/perl/UCW/CGI/Makefile
@@ -0,0 +1,15 @@
+# More CGI support
+
+DIRS+=ucw/perl/UCW/CGI
+EXTRA_RUNDIRS+=lib/perl5/UCW/CGI
+UCW_CGI_PERL_MODULES+=ErrorHandler.pm
+CGI_MODULES=$(addprefix $(o)/ucw/perl/UCW/CGI/,$(UCW_CGI_PERL_MODULES))
+PROGS+=$(CGI_MODULES)
+
+$(CGI_MODULES) : PERL_MODULE_DIR=UCW/CGI
+
+UCW_PERL_INSTALL+=install-perl-ucw-cgi
+install-perl-ucw-cgi:
+	install -d -m 755 $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/CGI
+	install -m 644 $(addprefix $(s)/ucw/perl/UCW/CGI/,$(UCW_CGI_PERL_MODULES)) $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/CGI
+.PHONY: install-perl-ucw-cgi
diff --git a/libucw/ucw/perl/UCW/Config.pm b/libucw/ucw/perl/UCW/Config.pm
new file mode 100644
index 0000000..6e79fc1
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Config.pm
@@ -0,0 +1,54 @@
+#	Perl module for parsing LibUCW configuration files (using the ucw-config utility)
+#
+#	(c) 2002--2005 Martin Mares <mj@ucw.cz>
+#
+#	This software may be freely distributed and used according to the terms
+#	of the GNU Lesser General Public License.
+
+package UCW::Config;
+
+use strict;
+use warnings;
+use Getopt::Long;
+
+our %Sections = ();
+
+our $DefaultConfigFile = "";
+our $Usage = "-C, --config filename   Override the default configuration file
+-S, --set sec.item=val  Manual setting of a configuration item";
+
+
+sub Parse(@) {
+	my @options = @_;
+	my $defargs = "";
+	my $override_config = 0;
+	push @options, "config|C=s" => sub { my ($o,$a)=@_; $defargs .= " -C'$a'"; $override_config=1; };
+	push @options, "set|S=s" => sub { my ($o,$a)=@_; $defargs .= " -S'$a'"; };
+	Getopt::Long::Configure("bundling");
+	Getopt::Long::GetOptions(@options) or return 0;
+	if (!$override_config && $DefaultConfigFile) {
+		$defargs = "-C'$DefaultConfigFile' $defargs";
+	}
+	foreach my $section (keys %Sections) {
+		my $opts = $Sections{$section};
+		my $optlist = join(";", keys %$opts);
+		my %filtered_opts = map { my $t=$_; $t=~s/[#\$]+$//; $t => $$opts{$_} } keys %$opts;
+		my @l = `bin/config $defargs "$section\{$optlist\}"`;
+		$? && exit 1;
+		foreach my $o (@l) {
+			$o =~ /^CF_.*_([^=]+)='(.*)'\n$/ or die "Cannot parse bin/config output: $_";
+			my $var = $filtered_opts{$1};
+			my $val = $2;
+			if (ref $var eq "SCALAR") {
+				$$var = $val;
+			} elsif (ref $var eq "ARRAY") {
+				push @$var, $val;
+			} elsif (ref $var) {
+				die ("UCW::Config::Parse: don't know how to set $o");
+			}
+		}
+	}
+	1;
+}
+
+1;  # OK
diff --git a/libucw/ucw/perl/UCW/Configure.pm b/libucw/ucw/perl/UCW/Configure.pm
new file mode 100644
index 0000000..dc1dac8
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure.pm
@@ -0,0 +1,236 @@
+#	Perl module for UCW Configure Scripts
+#
+#	(c) 2005--2010 Martin Mares <mj@ucw.cz>
+#
+#	This software may be freely distributed and used according to the terms
+#	of the GNU Lesser General Public License.
+
+package UCW::Configure;
+
+use strict;
+use warnings;
+use IO::File;
+
+BEGIN {
+	# The somewhat hairy Perl export mechanism
+	use Exporter();
+	our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+	$VERSION = 1.0;
+	@ISA = qw(Exporter);
+	@EXPORT = qw(&Init &Log &Notice &Warn &Fail &IsSet &IsGiven &Set &UnSet &Append &Override &Get &Test &TestBool &Include &Finish &FindFile &TryFindFile &DebugDump &PostConfig &AtWrite);
+	@EXPORT_OK = qw();
+	%EXPORT_TAGS = ();
+}
+
+our %vars;
+our %overriden;
+our @postconfigs;
+our @atwrites;
+
+sub DebugDump() {
+	print "VARS:\n";
+	print "$_: $vars{$_}\n" foreach( keys %vars );
+}
+
+sub Log($) {
+	print @_;
+	STDOUT->flush;
+}
+
+sub Notice($) {
+	print @_ if $vars{"VERBOSE"};
+	STDOUT->flush;
+}
+
+sub Warn($) {
+	print "WARNING: ", @_;
+	STDOUT->flush;
+}
+
+sub Fail($) {
+	Log("ERROR: " . (shift @_) . "\n");
+	exit 1;
+}
+
+sub IsSet($) {
+	my ($x) = @_;
+	return exists $vars{$x};
+}
+
+sub IsGiven($) {
+	my ($x) = @_;
+	return exists $overriden{$x};
+}
+
+sub Get($) {
+	my ($x) = @_;
+	return $vars{$x};
+}
+
+sub Set($;$) {
+	my ($x,$y) = @_;
+	$y=1 unless defined $y;
+	$vars{$x}=$y unless $overriden{$x};
+}
+
+sub UnSet($) {
+	my ($x) = @_;
+	delete $vars{$x} unless $overriden{$x};
+}
+
+sub Append($$) {
+	my ($x,$y) = @_;
+	Set($x, (IsSet($x) ? (Get($x) . " $y") : $y));
+}
+
+sub Override($;$) {
+	my ($x,$y) = @_;
+	$y=1 unless defined $y;
+	$vars{$x}=$y;
+	$overriden{$x} = 1;
+}
+
+sub Test($$$) {
+	my ($var,$msg,$sub) = @_;
+	Log "$msg ... ";
+	if (IsSet($var)) {
+		Log Get($var) . " (preset)\n";
+	} else {
+		my $val = &$sub();
+		Set($var, $val);
+		Log "$val\n";
+	}
+}
+
+sub TestBool($$$) {
+	my ($var,$msg,$sub) = @_;
+	Log "$msg ... ";
+	if (IsSet($var) || IsGiven($var)) {
+		Log ((Get($var) ? "yes" : "no") . " (set)\n");
+	} else {
+		my ($val, $comment) = &$sub();
+		if ($val) {
+			Set($var);
+		} else {
+			UnSet($var);
+		}
+		Log (($val ? "yes" : "no") . "\n");
+	}
+}
+
+sub TryFindFile($) {
+	my ($f) = @_;
+	if ($f =~ m{^/}) {
+		return (-f $f) ? $f : undef;
+	} elsif (-f $f) {
+		return "./$f";
+	} elsif (-f (Get("SRCDIR")."/$f")) {
+		return Get("SRCDIR")."/$f";
+	} else {
+		return undef;
+	}
+}
+
+sub FindFile($) {
+	my ($f) = @_;
+	my $F;
+	defined ($F = TryFindFile($f)) or Fail "Cannot find file $f";
+	return $F;
+}
+
+sub Init($$) {
+	my ($srcdir,$defconfig) = @_;
+	sub usage($) {
+		my ($dc) = @_;
+		print STDERR "Usage: [<srcdir>/]configure " . (defined $dc ? "[" : "") . "<config-name>" . (defined $dc ? "]" : "") .
+			" [<option>[=<value>] | -<option>] ...\n";
+		exit 1;
+	}
+	Set('CONFIG' => $defconfig) if defined $defconfig;
+	if (@ARGV) {
+		usage($defconfig) if $ARGV[0] eq "--help";
+		if (!defined($defconfig) || $ARGV[0] !~ /^-?[A-Z][A-Z0-9_]*(=|$)/) {
+			# This does not look like an option, so read it as a file name
+			Set('CONFIG' => shift @ARGV);
+		}
+	}
+	Set("SRCDIR", $srcdir);
+
+	foreach my $x (@ARGV) {
+		if ($x =~ /^(\w+)=(.*)/) {
+			Override($1 => $2);
+		} elsif ($x =~ /^-(\w+)$/) {
+			Override($1 => 0);
+			delete $vars{$1};
+		} elsif ($x =~ /^(\w+)$/) {
+			Override($1 => 1);
+		} else {
+			print STDERR "Invalid option $x\n";
+			exit 1;
+		}
+	}
+
+	defined Get("CONFIG") or usage($defconfig);
+	if (!TryFindFile(Get("CONFIG"))) {
+		TryFindFile(Get("CONFIG")."/config") or Fail "Cannot find configuration " . Get("CONFIG");
+		Override("CONFIG" => Get("CONFIG")."/config");
+	}
+}
+
+sub Include($) {
+	my ($f) = @_;
+	$f = FindFile($f);
+	Notice "Loading configuration $f\n";
+	require $f;
+}
+
+sub PostConfig(&) {
+	unshift @postconfigs, $_[0];
+}
+
+sub AtWrite(&) {
+	unshift @atwrites, $_[0];
+}
+
+sub Finish() {
+	for my $post (@postconfigs) {
+		&$post();
+	}
+
+	print "\n";
+
+	if (Get("SRCDIR") ne ".") {
+		Log "Preparing for compilation from directory " . Get("SRCDIR") . " to obj/ ... ";
+		-l "src" and unlink "src";
+		symlink Get("SRCDIR"), "src" or Fail "Cannot link source directory to src: $!";
+		Override("SRCDIR" => "src");
+		-l "Makefile" and unlink "Makefile";
+		-f "Makefile" and Fail "Makefile already exists";
+		symlink "src/Makefile", "Makefile" or Fail "Cannot link Makefile: $!";
+	} else {
+		Log "Preparing for compilation from current directory to obj/ ... ";
+	}
+	if (-d "obj") {
+		`rm -rf obj`; Fail "Cannot delete old obj directory" if $?;
+	}
+	-d "obj" or mkdir("obj", 0777) or Fail "Cannot create obj directory: $!";
+	-d "obj/ucw" or mkdir("obj/ucw", 0777) or Fail "Cannot create obj/ucw directory: $!";
+	Log "done\n";
+
+	Log "Generating config.mk ... ";
+	open X, ">obj/config.mk" or Fail $!;
+	print X "# Generated automatically by $0, please don't touch manually.\n";
+	foreach my $x (sort keys %vars) {
+		print X "$x=$vars{$x}\n";
+	}
+	print X "s=\${SRCDIR}\n";
+	print X "o=obj\n";
+	close X;
+	Log "done\n";
+
+	for my $wr (@atwrites) {
+		&$wr();
+	}
+}
+
+1;  # OK
diff --git a/libucw/ucw/perl/UCW/Configure/Build.pm b/libucw/ucw/perl/UCW/Configure/Build.pm
new file mode 100644
index 0000000..042d14c
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Build.pm
@@ -0,0 +1,26 @@
+# UCW Library configuration system: find UCW build system
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+# This module asks pkg-config for a path to UCW build system
+# and sets propper variables for it (or fails, as it is expected
+# the build system is crucial).
+
+package UCW::Configure::Build;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+if (!IsGiven("BUILDSYS")) {
+	Test("BUILDSYS", "Looking for UCW build system", sub {
+		my $path=`pkg-config libucw --variable=build_system`;
+		if($? || not defined $path) {
+			Fail("Not found (is libUCW installed and PKG_CONFIG_PATH set?)");
+		}
+		chomp $path;
+		return $path;
+	});
+}
+
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/C.pm b/libucw/ucw/perl/UCW/Configure/C.pm
new file mode 100644
index 0000000..9265a88
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/C.pm
@@ -0,0 +1,279 @@
+# UCW Library configuration system: OS and C compiler
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
+# (c) 2006 Robert Spalek <robert@ucw.cz>
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+# (c) 2023 Milan Rusek <milan.rusek@economia.cz>
+
+### OS ###
+
+package UCW::Configure::C;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+Test("OS", "Checking on which OS we run", sub {
+	my $os = `uname`;
+	chomp $os;
+	Fail "Unable to determine OS type" if $? || $os eq "";
+	return $os;
+});
+
+if (Get("OS") eq "Linux") {
+	Set("CONFIG_LINUX");
+} elsif (Get("OS") eq "Darwin") {
+	Set("CONFIG_DARWIN");
+} else {
+	Fail "Don't know how to run on this operating system.";
+}
+
+### Compiler ###
+
+# Default compiler
+Test("CC", "Checking for C compiler", sub { return "gcc"; });
+
+# GCC version
+Test("GCCVER", "Checking for GCC version", sub {
+	my $gcc = Get("CC");
+	my $ver = `$gcc --version | sed '2,\$d; s/^\\(.* \\)*\\([0-9]*\\.[0-9]*\\).*/\\2/'`;
+	chomp $ver;
+	Fail "Unable to determine GCC version" if $? || $ver eq "";
+	return $ver;
+});
+my ($gccmaj, $gccmin) = split(/\./, Get("GCCVER"));
+my $gccver = 1000*$gccmaj + $gccmin;
+$gccver >= 3000 or Fail "GCC older than 3.0 doesn't support C99 well enough.";
+
+### CPU ###
+
+Test("ARCH", "Checking for machine architecture", sub {
+	#
+	# We have to ask GCC for the target architecture, because it may
+	# differ from what uname tells us. This can happen even if we are
+	# not cross-compiling, for example on Linux with amd64 kernel, but
+	# i386 userspace.
+	#
+	my $gcc = Get("CC");
+	my $mach = `$gcc -dumpmachine 2>/dev/null`;
+	if (!$? && $mach ne "") {
+		$mach =~ s/-.*//;
+	} else {
+		$mach = `uname -m`;
+		Fail "Unable to determine machine type" if $? || $mach eq "";
+	}
+	chomp $mach;
+	if ($mach =~ /^i[0-9]86$/) {
+		return "i386";
+	} elsif ($mach =~ /^(x86[_-]|amd)64$/) {
+		return "amd64";
+	} elsif ($mach eq 'powerpc') {
+		return $mach;
+	} elsif ($mach eq 'aarch64') {
+		return $mach;
+	} else {
+		return "unknown ($mach)";
+	}
+});
+
+my $arch = Get("ARCH");
+if ($arch eq 'i386') {
+	Set("CPU_I386");
+	UnSet("CPU_64BIT_POINTERS");
+	Set("CPU_LITTLE_ENDIAN");
+	UnSet("CPU_BIG_ENDIAN");
+	Set("CPU_ALLOW_UNALIGNED");
+	Set("CPU_STRUCT_ALIGN" => 4);
+} elsif ($arch eq "amd64") {
+	Set("CPU_AMD64");
+	Set("CPU_64BIT_POINTERS");
+	Set("CPU_LITTLE_ENDIAN");
+	UnSet("CPU_BIG_ENDIAN");
+	Set("CPU_ALLOW_UNALIGNED");
+	Set("CPU_STRUCT_ALIGN" => 8);
+} elsif ($arch eq "powerpc") {
+	Set("CPU_AMD64");
+	UnSet("CPU_64BIT_POINTERS");
+	UnSet("CPU_LITTLE_ENDIAN");
+	Set("CPU_BIG_ENDIAN");
+	UnSet("CPU_ALLOW_UNALIGNED");
+	Set("CPU_STRUCT_ALIGN" => 4);
+} elsif ($arch eq "armhf") {
+	Set("CPU_ARM");
+	UnSet("CPU_64BIT_POINTERS");
+	Set("CPU_LITTLE_ENDIAN");
+	UnSet("CPU_BIG_ENDIAN");
+	UnSet("CPU_ALLOW_UNALIGNED");
+	Set("CPU_STRUCT_ALIGN" => 4);
+} elsif ($arch eq "aarch64") {
+	Set("CPU_ARM");
+	Set("CPU_64BIT_POINTERS");
+	Set("CPU_LITTLE_ENDIAN");
+	UnSet("CPU_BIG_ENDIAN");
+	UnSet("CPU_ALLOW_UNALIGNED");
+	Set("CPU_STRUCT_ALIGN" => 8);
+} elsif (!Get("CPU_LITTLE_ENDIAN") && !Get("CPU_BIG_ENDIAN")) {
+	Fail "Architecture not recognized, please set CPU_xxx variables manually.";
+}
+
+### Compiler and its Options ###
+
+# C flags: tell the compiler we're speaking C99, and disable common symbols
+Set("CLANG" => "-std=gnu99 -fno-common");
+
+# C optimizations
+Set("COPT" => '-O2');
+if ($arch =~ /^(i386|amd64)$/ && Get("CONFIG_EXACT_CPU")) {
+	if ($gccver >= 4002) {
+		Append('COPT', '-march=native');
+	} else {
+		Warn "CONFIG_EXACT_CPU not supported with old GCC, ignoring.\n";
+	}
+}
+
+# C optimizations for highly exposed code
+Set("COPT2" => '-O3');
+
+# Warnings
+Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes');
+Set("CWARNS_OFF" => '');
+
+# Linker flags
+Set("LOPT" => "");
+
+# Extra libraries
+Set("LIBS" => "");
+
+# Extra flags for compiling and linking shared libraries
+Set("CSHARED" => '-fPIC');
+Append("LOPT" => "-Wl,--rpath-link,run/lib -Lrun/lib");
+if (!IsSet("CONFIG_LOCAL")) {
+	# Beware that in non-local builds the INSTALL_LIB_DIR must exist in
+	# standard search paths for shared libraries.
+	Set("SO_LINK_PATH" => '');
+}
+else {
+	# In local builds, we need to link binaries with custom --rpath.
+	# GCC seems to fail when this directory does not exist.
+	Set("SO_LINK_PATH" => "-Wl,--rpath," . Get("INSTALL_LIB_DIR"));
+	AtWrite {
+		my $libdir = Get("INSTALL_LIB_DIR");
+		if (IsSet("CONFIG_SHARED")) {
+			`mkdir -p $libdir`; Fail("Cannot create $libdir") if $?;
+		}
+	};
+}
+if (IsSet("CONFIG_DARWIN")) {
+	Set("LSHARED" => '-dynamiclib -install_name $(@F)$(SONAME_SUFFIX) -undefined dynamic_lookup');
+} else {
+	Set("LSHARED" => '-shared -Wl,-soname,$(@F)$(SONAME_SUFFIX)');
+}
+
+# Extra switches depending on GCC version:
+if ($gccver == 3000) {
+	Append("COPT" => "-fstrict-aliasing");
+} elsif ($gccver == 3003) {
+	Append("CWARNS" => "-Wundef -Wredundant-decls");
+	Append("COPT" => "-finline-limit=20000 --param max-inline-insns-auto=1000");
+} elsif ($gccver == 3004) {
+	Append("CWARNS" => "-Wundef -Wredundant-decls");
+	Append("COPT" => "-finline-limit=2000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
+} elsif ($gccver >= 4000) {
+	Append("CWARNS" => "-Wundef -Wredundant-decls -Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers");
+	Append("CWARNS_OFF" => "-Wno-pointer-sign");
+	Append("COPT" => "-finline-limit=5000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
+} else {
+	Warn "Don't know anything about this GCC version, using default switches.\n";
+}
+
+if (IsSet("CONFIG_DEBUG")) {
+	# If debugging:
+	Set("DEBUG_ASSERTS");
+	Set("DEBUG_DIE_BY_ABORT") if Get("CONFIG_DEBUG") > 1;
+	Set("CDEBUG" => "-ggdb");
+} else {
+	# If building a release version:
+	Append("COPT" => "-fomit-frame-pointer");
+	Append("LOPT" => "-s");
+}
+
+# Link-time optimization (experimental)
+# This is currently very inefficient, because we do not attempt to disable
+# optimizations when compiling individual modules. Therefore, we optimize
+# each shared library module twice: when compiling and when linking.
+# Doing it properly would require hacking makefiles.
+if (IsSet("CONFIG_LTO")) {
+	Append("LOPT", "-flto");
+	Append("COPT", "-flto");
+}
+
+if (IsSet("CONFIG_DARWIN")) {
+	# gcc-4.0 on Darwin doesn't set this in the gnu99 mode
+	Append("CLANG" => "-fnested-functions");
+	# Directory hierarchy of the fink project
+	Append("LIBS" => "-L/sw/lib");
+	Append("COPT" => "-I/sw/include");
+}
+
+### Compiling test programs ###
+
+sub TestCompile($$) {
+	my ($testname, $source) = @_;
+	my $dir = "conftest-$testname";
+	`rm -rf $dir && mkdir $dir`; $? and Fail "Cannot initialize $dir";
+
+	open SRC, ">$dir/conftest.c";
+	print SRC $source;
+	close SRC;
+
+	my $cmd = join(" ",
+		map { defined($_) ? $_ : "" }
+			"cd $dir &&",
+			Get("CC"), Get("CLANG"), Get("COPT"), Get("CEXTRA"), Get("LIBS"),
+			"conftest.c", "-o", "conftest",
+			">conftest.log", "2>&1"
+		);
+	`$cmd`;
+	my $result = !$?;
+
+	`rm -rf $dir` unless Get("KEEP_CONFTEST");
+
+	return $result;
+}
+
+### Writing C headers with configuration ###
+
+sub ConfigHeader($$) {
+	my ($hdr, $rules) = @_;
+	Log "Generating $hdr ... ";
+	open X, ">obj/$hdr" or Fail $!;
+	print X "/* Generated automatically by $0, please don't touch manually. */\n";
+
+	sub match_rules($$) {
+		my ($rules, $name) = @_;
+		for (my $i=0; $i < scalar @$rules; $i++) {
+			my ($r, $v) = ($rules->[$i], $rules->[$i+1]);
+			return $v if $name =~ $r;
+		}
+		return 0;
+	}
+
+	foreach my $x (sort keys %UCW::Configure::vars) {
+		next unless match_rules($rules, $x);
+		my $v = $UCW::Configure::vars{$x};
+		# Try to add quotes if necessary
+		$v = '"' . $v . '"' unless ($v =~ /^"/ || $v =~ /^\d*$/);
+		print X "#define $x $v\n";
+	}
+	close X;
+	Log "done\n";
+}
+
+AtWrite {
+	ConfigHeader("autoconf.h", [
+		# Symbols with "_" anywhere in their name are exported
+		"_" => 1
+	]);
+};
+
+# Return success
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/Doc.pm b/libucw/ucw/perl/UCW/Configure/Doc.pm
new file mode 100644
index 0000000..fe36592
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Doc.pm
@@ -0,0 +1,32 @@
+# UCW Library configuration system: documentation requirements
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+package UCW::Configure::Doc;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+if (!IsGiven("CONFIG_DOC") || IsSet("CONFIG_DOC")) {
+	Test("HAVE_ASCII_DOC", "Checking for AsciiDoc", sub {
+		my $version = `asciidoc --version 2>&1`;
+		return "none" if !defined $version || $version eq "";
+		my( $vnum ) = $version =~ / (\d+\.\S*)$/;
+		return $vnum;
+	});
+
+	my( $major ) = Get("HAVE_ASCII_DOC") =~ /^(\d+)/;
+	if (defined $major && $major >= 7) {
+		Set("CONFIG_DOC");
+	} else {
+		if (IsGiven("CONFIG_DOC")) {
+			Fail("Need asciidoc >= 7\n");
+		} else {
+			Warn("Need asciidoc >= 7 to build documentation\n");
+			UnSet("CONFIG_DOC");
+		}
+	}
+}
+
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/LibUCW.pm b/libucw/ucw/perl/UCW/Configure/LibUCW.pm
new file mode 100644
index 0000000..4bf8adb
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/LibUCW.pm
@@ -0,0 +1,130 @@
+# UCW Library configuration system: parameters of the library
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
+# (c) 2006 Robert Spalek <robert@ucw.cz>
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+# (c) 2020 Pavel Charvat <pchar@ucw.cz>
+
+package UCW::Configure::LibUCW;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+# Turn on debugging support if CONFIG_DEBUG
+if (Get("CONFIG_DEBUG")) {
+	Set("CONFIG_UCW_DEBUG");
+}
+
+# Determine page size
+Test("CPU_PAGE_SIZE", "Determining page size", sub {
+	my $p;
+	if (IsSet("CONFIG_DARWIN")) {
+		$p = `sysctl -n hw.pagesize`;
+		defined $p or Fail "sysctl hw.pagesize failed";
+	} elsif (IsSet("CONFIG_LINUX")) {
+		$p = `getconf PAGE_SIZE`;
+		defined $p or Fail "getconf PAGE_SIZE failed";
+	}
+	chomp $p;
+	return $p;
+});
+
+# Decide how will ucw/partmap.c work
+Set("CONFIG_UCW_PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");
+
+# Option for ucw/mempool.c
+Set("CONFIG_UCW_POOL_IS_MMAP");
+
+# Guess optimal bit width of the radix-sorter
+Test("CONFIG_UCW_RADIX_SORTER_BITS", "Determining radix sorter bucket width", sub {
+	if (Get("CPU_AMD64")) {
+		# All amd64 CPUs have large enough L1 cache
+		return 12;
+	} else {
+		# This should be safe everywhere
+		return 10;
+	}
+});
+
+# Detect if thread-local storage is supported
+if (Get("CONFIG_UCW_THREADS")) {
+	TestBool("CONFIG_UCW_TLS", "Checking if GCC supports thread-local storage", sub {
+		if (UCW::Configure::C::TestCompile("__thread", "__thread int i;\nint main(void) { return 0; }\n")) {
+			return 1;
+		} else {
+			return 0;
+		}
+	});
+}
+
+# Detect if we have the epoll() syscall
+TestBool("CONFIG_UCW_EPOLL", "Checking for epoll", sub {
+	return UCW::Configure::C::TestCompile("epoll", <<'FINIS' ) ? 1 : 0;
+#include <sys/epoll.h>
+int main(void)
+{
+	epoll_create(256);
+	return 0;
+}
+FINIS
+});
+
+# Detect if we have the getrandom() syscall
+TestBool("CONFIG_UCW_GETRANDOM", "Checking for getrandom", sub {
+	return UCW::Configure::C::TestCompile("getrandom", <<'FINIS' ) ? 1 : 0;
+#include <sys/random.h>
+int main(void)
+{
+	char c;
+	getrandom(&c, 1, 0);
+	return 0;
+}
+FINIS
+});
+
+# Check if we want to use monotonic clock
+TestBool("CONFIG_UCW_MONOTONIC_CLOCK", "Checking for monotonic clock", sub {
+	return Get("CONFIG_LINUX");
+});
+
+if (IsSet("CONFIG_DARWIN")) {
+	# Darwin does not support BSD regexes, fix up
+	if (!IsSet("CONFIG_UCW_POSIX_REGEX") && !IsSet("CONFIG_UCW_PCRE")) {
+		Set("CONFIG_UCW_POSIX_REGEX" => 1);
+		Warn "BSD regex library on Darwin isn't compatible, using POSIX regex.\n";
+	}
+
+	# Fill in some constants not found in the system header files
+	Set("SOL_TCP" => 6);		# missing in /usr/include/netinet/tcp.h
+	if (IsGiven("CONFIG_UCW_DIRECT_IO") && IsSet("CONFIG_UCW_DIRECT_IO")) {
+		Fail("Direct I/O is not available on darwin");
+	} else {
+		UnSet("CONFIG_UCW_DIRECT_IO");
+	}
+}
+
+PostConfig {
+	AtWrite {
+		UCW::Configure::C::ConfigHeader("ucw/autoconf.h", [
+			# Included symbols
+			'^CONFIG_UCW_' => 1,
+			'^CPU_' => 1,
+			'^UCW_VERSION(_|$)' => 1,
+		]);
+	} if Get("CONFIG_INSTALL_API");
+
+	# Include direct FB?
+	if (!IsSet("CONFIG_UCW_THREADS") || !IsSet("CONFIG_UCW_DIRECT_IO")) {
+		if (IsGiven("CONFIG_UCW_FB_DIRECT") && IsSet("CONFIG_UCW_FB_DIRECT")) {
+			if (!IsSet("CONFIG_UCW_THREADS")) {
+				Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_UCW_THREADS");
+			} else {
+				Fail("CONFIG_UCW_FB_DIRECT needs CONFIG_UCW_DIRECT_IO");
+			}
+		}
+		UnSet("CONFIG_UCW_FB_DIRECT");
+	}
+};
+
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/Makefile b/libucw/ucw/perl/UCW/Configure/Makefile
new file mode 100644
index 0000000..37a8af0
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Makefile
@@ -0,0 +1,21 @@
+# Perl modules for Configure
+
+DIRS+=ucw/perl/UCW/Configure
+EXTRA_RUNDIRS+=lib/perl5/UCW/Configure
+UCW_CONFIGURE_PERL_MODULES=$(addsuffix .pm, C Doc Paths Pkg Build Perl)
+CONFIGURE_MODULES=$(addprefix $(o)/ucw/perl/UCW/Configure/,$(UCW_CONFIGURE_PERL_MODULES))
+PROGS+=$(CONFIGURE_MODULES)
+
+$(CONFIGURE_MODULES) : PERL_MODULE_DIR=UCW/Configure
+
+INSTALL_TARGETS+=install-perl-ucw-configure
+
+# XXX: This is a hack. UCW::Configure is a part of the build system,
+# not of LibUCW proper. Nevertheless, we should avoid moving things
+# around in point releases, so we are keeping it here with a special
+# installation target.
+install-perl-ucw-configure:
+	install -d -m 755 $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/Configure
+	install -m 644 $(s)/ucw/perl/UCW/Configure.pm $(DESTDIR)$(INSTALL_PERL_DIR)/UCW
+	install -m 644 $(addprefix $(s)/ucw/perl/UCW/Configure/,$(UCW_CONFIGURE_PERL_MODULES)) $(DESTDIR)$(INSTALL_PERL_DIR)/UCW/Configure
+.PHONY: install-perl-ucw-configure
diff --git a/libucw/ucw/perl/UCW/Configure/Paths.pm b/libucw/ucw/perl/UCW/Configure/Paths.pm
new file mode 100644
index 0000000..d03c90d
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Paths.pm
@@ -0,0 +1,58 @@
+# UCW Library configuration system: installation paths
+# (c) 2005--2009 Martin Mares <mj@ucw.cz>
+# (c) 2006 Robert Spalek <robert@ucw.cz>
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+package UCW::Configure::Paths;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+Log "Determining installation prefix ... ";
+if (IsSet("CONFIG_LOCAL")) {
+	if (IsSet("CONFIG_RELATIVE_PATHS")) {
+		Log("local build with relative paths\n");
+		Set("INSTALL_PREFIX", "");
+	}
+	else {
+		Log("local build with absolute paths\n");
+		my $cwd = `pwd`; Fail("Cannot get current working directory") if $?;
+		chomp $cwd;
+		Set("INSTALL_PREFIX", "$cwd/run/");
+	}
+	Set("INSTALL_USR_PREFIX", Get("INSTALL_PREFIX"));
+	Set("INSTALL_VAR_PREFIX", Get("INSTALL_PREFIX"));
+} else {
+	Set("PREFIX", "/usr/local") unless IsSet("PREFIX");
+	my $ipx = Get("PREFIX");
+	$ipx =~ s{/$}{};
+	Set("INSTALL_PREFIX", "$ipx/");
+	my $upx = ($ipx eq "" ? "/usr/" : "$ipx/");
+	Set("INSTALL_USR_PREFIX", $upx);
+	$upx =~ s{^/usr\b}{/var};
+	Set("INSTALL_VAR_PREFIX", $upx);
+	Log(Get("PREFIX") . "\n");
+}
+
+Set('CONFIG_DIR', 'etc') unless IsSet('CONFIG_DIR');
+Set('INSTALL_CONFIG_DIR', Get('INSTALL_PREFIX') . Get('CONFIG_DIR'));
+Set('INSTALL_BIN_DIR', Get('INSTALL_USR_PREFIX') . 'bin');
+Set('INSTALL_SBIN_DIR', Get('INSTALL_USR_PREFIX') . 'sbin');
+Set('INSTALL_LIB_DIR', Get('INSTALL_USR_PREFIX') . 'lib');
+Set('INSTALL_INCLUDE_DIR', Get('INSTALL_USR_PREFIX') . 'include');
+Set('INSTALL_PKGCONFIG_DIR', Get('INSTALL_USR_PREFIX') . 'lib/pkgconfig');
+Set('INSTALL_SHARE_DIR', Get('INSTALL_USR_PREFIX') . 'share');
+Set('INSTALL_MAN_DIR', Get('INSTALL_USR_PREFIX') . 'share/man');
+Set('INSTALL_LOG_DIR', Get('INSTALL_VAR_PREFIX') . 'log');
+Set('INSTALL_STATE_DIR', Get('INSTALL_VAR_PREFIX') . 'lib');
+Set('INSTALL_RUN_DIR', Get('INSTALL_VAR_PREFIX') . 'run');
+Set('INSTALL_DOC_DIR', Get('INSTALL_USR_PREFIX') . 'share/doc');
+Set('INSTALL_PERL_DIR', Get('INSTALL_LIB_DIR') . '/perl5');
+
+# Remember PKG_CONFIG_PATH used for building, so that it will be propagated to
+# pkg-config's run locally in the makefiles.
+Set("PKG_CONFIG_PATH", $ENV{"PKG_CONFIG_PATH"}) if defined $ENV{"PKG_CONFIG_PATH"};
+
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/Perl.pm b/libucw/ucw/perl/UCW/Configure/Perl.pm
new file mode 100644
index 0000000..5c1b83f
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Perl.pm
@@ -0,0 +1,24 @@
+# UCW Library configuration system: Perl paths
+# (c) 2017 Martin Mares <mj@ucw.cz>
+
+package UCW::Configure::Perl;
+use UCW::Configure;
+
+use strict;
+use warnings;
+use Config;
+
+Log "Determining Perl module path ... ";
+my $prefix = $Config{installprefix};
+$prefix .= '/' unless $prefix =~ m{/$};
+my $lib = substr($Config{installvendorlib}, length $prefix);
+Set('INSTALL_PERL_DIR', Get('INSTALL_USR_PREFIX') . $lib);
+Log Get('INSTALL_PERL_DIR') . "\n";
+
+Log "Determining Perl arch-dependent module path ... ";
+my $archlib = substr($Config{installvendorarch}, length $prefix);
+Set('INSTALL_PERL_ARCH_DIR', Get('INSTALL_USR_PREFIX') . $archlib);
+Log Get('INSTALL_PERL_ARCH_DIR') . "\n";
+
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Configure/Pkg.pm b/libucw/ucw/perl/UCW/Configure/Pkg.pm
new file mode 100644
index 0000000..a31d616
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Configure/Pkg.pm
@@ -0,0 +1,128 @@
+# UCW Library configuration system: pkg-config and friends
+# (c) 2008 Martin Mares <mj@ucw.cz>
+# (c) 2017 Pavel Charvat <pchar@ucw.cz>
+
+package UCW::Configure::Pkg;
+use UCW::Configure;
+
+use strict;
+use warnings;
+
+require Exporter;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(&TryCmd &PkgConfig &TrivConfig);
+
+sub TryCmd($) {
+	my ($cmd) = @_;
+	my $res = `$cmd`;
+	defined $res or return;
+	chomp $res;
+	return $res unless $?;
+	return;
+}
+
+sub maybe_manually($) {
+	my ($n) = @_;
+	if (IsGiven($n)) {
+		if (Get("$n")) { Log "YES (set manually)\n"; }
+		else { Log "NO (set manually)\n"; }
+		return 1;
+	}
+	return 0;
+}
+
+sub PkgConfigTool() {
+	Log "Checking for pkg-config ... ";
+	if (!maybe_manually("CONFIG_HAVE_PKGCONFIG")) {
+		my $ver = TryCmd("pkg-config --version 2>/dev/null");
+		if (!defined $ver) {
+			Log("NONE\n");
+			Set("CONFIG_HAVE_PKGCONFIG", 0);
+		} else {
+			Log("YES: version $ver\n");
+			Set("CONFIG_HAVE_PKGCONFIG", 1);
+			Set("CONFIG_VER_PKGCONFIG", $ver);
+		}
+	}
+	return Get("CONFIG_HAVE_PKGCONFIG");
+}
+
+sub PkgConfig($@) {
+	my $pkg = shift @_;
+	my %opts = @_;
+	my $upper = $pkg; $upper =~ tr/a-z/A-Z/; $upper =~ s/[^0-9A-Z]+/_/g;
+	PkgConfigTool() unless IsSet("CONFIG_HAVE_PKGCONFIG");
+	Log "Checking for package $pkg ... ";
+	maybe_manually("CONFIG_HAVE_$upper") and return Get("CONFIG_HAVE_$upper");
+	if (!Get("CONFIG_HAVE_PKGCONFIG")) {
+		Log("NONE: pkg-config missing\n");
+		return 0;
+	}
+	my $pc = "pkg-config";
+	if (defined($opts{path})) {
+		$pc = "PKG_CONFIG_PATH=$opts{path} $pc";
+	}
+	if (defined($opts{args})) {
+		$pc = "$pc $opts{args}";
+	}
+	my $ver = TryCmd("$pc --modversion $pkg 2>/dev/null");
+	if (!defined $ver) {
+		Log("NONE\n");
+		return 0;
+	}
+	if (defined($opts{minversion})) {
+		my $min = $opts{minversion};
+		if (!defined TryCmd("$pc --atleast-version=$min $pkg")) {
+			Log("NO: version $ver is too old (need >= $min)\n");
+			return 0;
+		}
+	}
+	Log("YES: version $ver\n");
+	Set("CONFIG_HAVE_$upper" => 1);
+	Set("CONFIG_VER_$upper" => $ver);
+	my $cf = TryCmd("$pc --cflags $pkg");
+	Set("${upper}_CFLAGS" => $cf) if defined $cf;
+	my $lf = TryCmd("$pc --libs $pkg");
+	Set("${upper}_LIBS" => $lf) if defined $lf;
+	return 1;
+}
+
+sub ver_norm($) {
+	my ($v) = @_;
+	return join(".", map { sprintf("%05s", $_) } split(/\./, $v));
+}
+
+sub TrivConfig($@) {
+	my $pkg = shift @_;
+	my %opts = @_;
+	my $upper = $pkg; $upper =~ tr/a-z/A-Z/; $upper =~ s/[^0-9A-Z]+/_/g;
+	Log "Checking for package $pkg ... ";
+	maybe_manually("CONFIG_HAVE_$upper") and return Get("CONFIG_HAVE_$upper");
+	my $pc = $opts{script};
+	my $ver = TryCmd("$pc --version 2>/dev/null");
+	if (!defined $ver) {
+		Log("NONE\n");
+		return 0;
+	}
+	if (defined($opts{minversion})) {
+		my $min = $opts{minversion};
+		if (ver_norm($ver) lt ver_norm($min)) {
+			Log("NO: version $ver is too old (need >= $min)\n");
+			return 0;
+		}
+	}
+	Log("YES: version $ver\n");
+	Set("CONFIG_HAVE_$upper" => 1);
+	Set("CONFIG_VER_$upper" => $ver);
+
+	my $want = $opts{want};
+	defined $want or $want = ["cflags", "libs"];
+	for my $w (@$want) {
+		my $uw = $w; $uw =~ tr/a-z-/A-Z_/;
+		my $cf = TryCmd("$pc --$w");
+		Set("${upper}_${uw}" => $cf) if defined $cf;
+	}
+	return 1;
+}
+# We succeeded
+1;
diff --git a/libucw/ucw/perl/UCW/Log.pm b/libucw/ucw/perl/UCW/Log.pm
new file mode 100644
index 0000000..6b1fa1f
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Log.pm
@@ -0,0 +1,34 @@
+#
+#	Perl module for Logging
+#
+#	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+#
+
+package UCW::Log;
+
+use lib 'lib/perl5';
+use strict;
+use warnings;
+use POSIX;
+use Exporter;
+
+our $version = 1.0;
+our @ISA = qw(Exporter);
+our @EXPORT = ();
+our %EXPORT_TAGS = ( all => [qw(&Log &Die)]);
+our @EXPORT_OK = (@{$EXPORT_TAGS{'all'}});
+
+my $Prog = (reverse split(/\//, $0))[0];
+
+sub Log {
+  my $level = shift;
+  my $text = join(' ', @_);
+  print STDERR $level, strftime(" %Y-%m-%d %H:%M:%S ", localtime()), "[$Prog] ", $text, "\n";
+}
+
+sub Die {
+  Log('!', @_);
+  exit 1;
+}
+
+1;
diff --git a/libucw/ucw/perl/UCW/Makefile b/libucw/ucw/perl/UCW/Makefile
new file mode 100644
index 0000000..41e44f1
--- /dev/null
+++ b/libucw/ucw/perl/UCW/Makefile
@@ -0,0 +1,16 @@
+# More Perl modules
+
+DIRS+=ucw/perl/UCW
+EXTRA_RUNDIRS+=lib/perl5/UCW
+UCW_PERL_MODULES=$(addsuffix .pm,Config Log CGI)
+# XXX: Configure.pm omitted intentionally, see install-perl-ucw-configure
+PROGS+=$(addprefix $(o)/ucw/perl/UCW/,$(UCW_PERL_MODULES))
+
+include $(s)/ucw/perl/UCW/CGI/Makefile
+include $(s)/ucw/perl/UCW/Configure/Makefile
+
+UCW_PERL_INSTALL+=install-perl-ucw-base
+install-perl-ucw-base:
+	install -d -m 755 $(DESTDIR)$(INSTALL_PERL_DIR)/UCW
+	install -m 644 $(addprefix $(s)/ucw/perl/UCW/,$(UCW_PERL_MODULES)) $(DESTDIR)$(INSTALL_PERL_DIR)/UCW
+.PHONY: install-perl-ucw-base
diff --git a/libucw/ucw/perl/Ulimit/MANIFEST b/libucw/ucw/perl/Ulimit/MANIFEST
new file mode 100644
index 0000000..b015b4a
--- /dev/null
+++ b/libucw/ucw/perl/Ulimit/MANIFEST
@@ -0,0 +1,6 @@
+Makefile
+Makefile.PL
+MANIFEST
+Ulimit.pm
+Ulimit.xs
+lib/UCW/.exists
diff --git a/libucw/ucw/perl/Ulimit/Makefile b/libucw/ucw/perl/Ulimit/Makefile
new file mode 100644
index 0000000..348fd9e
--- /dev/null
+++ b/libucw/ucw/perl/Ulimit/Makefile
@@ -0,0 +1,31 @@
+# Makefile for the Ulimit Perl module  (c) 2003 Tomas Valla <tom@ucw.cz>
+
+DIRS+=ucw/perl/Ulimit/arch/auto/UCW/Ulimit
+ULIMIT_DIR=ucw/perl/Ulimit
+
+PROGS+=$(o)/ucw/perl/Ulimit/Ulimit.pm
+
+extras:: $(o)/ucw/perl/Ulimit/arch/auto/UCW/Ulimit/Ulimit.$(SOEXT)
+
+$(o)/ucw/perl/Ulimit/arch/auto/UCW/Ulimit/Ulimit.$(SOEXT): $(o)/$(ULIMIT_DIR)/Ulimit.xs $(o)/$(ULIMIT_DIR)/Ulimit.pm $(o)/$(ULIMIT_DIR)/Makefile
+	$(M)MAKE $@
+	$(Q)cd $(o)/$(ULIMIT_DIR) && $(MAKE) -f Makefile $(MAKESILENT)
+	$(Q)touch $@
+	$(Q)cp $@ run/$(DATADIR)/
+
+$(o)/$(ULIMIT_DIR)/Makefile: $(o)/$(ULIMIT_DIR)/Makefile.PL
+	$(M)PREPARE $@
+	$(Q)cd $(o)/$(ULIMIT_DIR) && perl Makefile.PL
+
+$(o)/$(ULIMIT_DIR)/Ulimit.xs: $(s)/$(ULIMIT_DIR)/Ulimit.xs
+	$(Q)cp $^ $@
+
+$(o)/$(ULIMIT_DIR)/Makefile.PL: $(s)/$(ULIMIT_DIR)/Makefile.PL
+	$(Q)cp $^ $@
+
+UCW_PERL_INSTALL+=install-perl-ucw-ulimit
+install-perl-ucw-ulimit:
+	install -d -m 755 $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/UCW/ $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/auto/UCW/
+	install -m 644 $(s)/$(ULIMIT_DIR)/Ulimit.pm $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/UCW/
+	install -m 644 $(o)/ucw/perl/Ulimit/arch/auto/UCW/Ulimit/Ulimit.$(SOEXT) $(DESTDIR)$(INSTALL_PERL_ARCH_DIR)/auto/UCW/
+.PHONY: install-perl-ucw-ulimit
diff --git a/libucw/ucw/perl/Ulimit/Makefile.PL b/libucw/ucw/perl/Ulimit/Makefile.PL
new file mode 100644
index 0000000..1f5ae5a
--- /dev/null
+++ b/libucw/ucw/perl/Ulimit/Makefile.PL
@@ -0,0 +1,9 @@
+# Makefile for Perl MakeMaker  (c) 2003 Tomas Valla <tom@ucw.cz>
+
+use ExtUtils::MakeMaker;
+WriteMakefile(
+    'NAME'		=> 'UCW::Ulimit',
+    'VERSION_FROM'	=> 'Ulimit.pm',
+    'INST_LIB'		=> 'lib',
+    'INST_ARCHLIB'	=> 'arch',
+);
diff --git a/libucw/ucw/perl/Ulimit/Ulimit.pm b/libucw/ucw/perl/Ulimit/Ulimit.pm
new file mode 100644
index 0000000..8497dfa
--- /dev/null
+++ b/libucw/ucw/perl/Ulimit/Ulimit.pm
@@ -0,0 +1,48 @@
+# Perl module for setting process limits
+#
+# (c) 2003 Tomas Valla <tom@ucw.cz>
+#
+# This software may be freely distributed and used according to the terms
+# of the GNU Lesser General Public License.
+#
+#
+#
+# Interface:
+#   UCW::Ulimit::setlimit( $resource, $softlimit, $hardlimit)
+#   UCW::Ulimit::getlimit( $resource, $softlimit, $hardlimit)
+#
+# setlimit sets limit to values supplied in softlimit and hardlimit
+# getlimit reads limits into softlimit and hardlimit
+# $resource constants are defined below
+#
+
+package UCW::Ulimit;
+
+use 5.006;
+use strict;
+use warnings;
+
+require DynaLoader;
+
+our @ISA = qw(DynaLoader);
+unshift @DynaLoader::dl_library_path, "lib";
+
+our $CPU = 0;
+our $FSIZE = 1;
+our $DATA = 2;
+our $STACK = 3;
+our $CORE = 4;
+our $RSS = 5;
+our $NPROC = 6;
+our $NOFILE = 7;
+our $MEMLOCK = 8;
+our $AS = 9;
+
+our $VERSION = '0.01';
+
+bootstrap UCW::Ulimit $VERSION;
+
+# Preloaded methods go here.
+
+1;
+__END__
diff --git a/libucw/ucw/perl/Ulimit/Ulimit.xs b/libucw/ucw/perl/Ulimit/Ulimit.xs
new file mode 100644
index 0000000..5290cf1
--- /dev/null
+++ b/libucw/ucw/perl/Ulimit/Ulimit.xs
@@ -0,0 +1,87 @@
+/*
+ * PerlXS module for managing process limits
+ *
+ * (c) 2003 Tomas Valla <tom@ucw.cz>
+ */
+
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+#include <sys/resource.h>
+#include <unistd.h>
+
+
+MODULE = UCW::Ulimit		PACKAGE = UCW::Ulimit
+
+PROTOTYPES: ENABLED
+
+int
+setlimit(IN int resource, IN int soft, IN int hard)
+CODE:
+	struct rlimit rl;
+	int r;
+
+	switch(resource) {
+	case 0:
+		r = RLIMIT_CPU; break;
+	case 1:
+		r = RLIMIT_FSIZE; break;
+	case 2:
+		r = RLIMIT_DATA; break;
+	case 3:
+		r = RLIMIT_STACK; break;
+	case 4:
+		r = RLIMIT_CORE; break;
+	case 5:
+		r = RLIMIT_RSS; break;
+	case 6:
+		r = RLIMIT_NPROC; break;
+	case 7:
+		r = RLIMIT_NOFILE; break;
+	case 8:
+		r = RLIMIT_MEMLOCK; break;
+	case 9:
+		r = RLIMIT_AS; break;
+	}
+	rl.rlim_cur = soft;
+	rl.rlim_max = hard;
+	RETVAL = setrlimit(r, &rl);
+OUTPUT:
+	RETVAL
+
+
+int
+getlimit(IN int resource, OUT int soft, OUT int hard)
+CODE:
+	struct rlimit rl;
+	int r;
+
+	switch(resource) {
+	case 0:
+		r = RLIMIT_CPU; break;
+	case 1:
+		r = RLIMIT_FSIZE; break;
+	case 2:
+		r = RLIMIT_DATA; break;
+	case 3:
+		r = RLIMIT_STACK; break;
+	case 4:
+		r = RLIMIT_CORE; break;
+	case 5:
+		r = RLIMIT_RSS; break;
+	case 6:
+		r = RLIMIT_NPROC; break;
+	case 7:
+		r = RLIMIT_NOFILE; break;
+	case 8:
+		r = RLIMIT_MEMLOCK; break;
+	case 9:
+		r = RLIMIT_AS; break;
+	}
+
+	RETVAL = getrlimit(r, &rl);
+	soft = rl.rlim_cur;
+	hard = rl.rlim_max;
+OUTPUT:
+	RETVAL
diff --git a/libucw/ucw/prime.c b/libucw/ucw/prime.c
new file mode 100644
index 0000000..a1ac86d
--- /dev/null
+++ b/libucw/ucw/prime.c
@@ -0,0 +1,79 @@
+/*
+ *	UCW Library -- Prime Number Tests
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/prime.h>
+
+static int				/* Sequential search */
+__isprime(uint x)			/* We know x != 2 && x != 3 */
+{
+  uint test = 5;
+
+  if (x == 5)
+    return 1;
+  for(;;)
+    {
+      if (!(x % test))
+	return 0;
+      if (x / test <= test)
+	return 1;
+      test += 2;			/* 6k+1 */
+      if (!(x % test))
+	return 0;
+      if (x / test <= test)
+	return 1;
+      test += 4;			/* 6k-1 */
+    }
+}
+
+int
+isprime(uint x)
+{
+  if (x < 5)
+    return (x == 2 || x == 3);
+  switch (x % 6)
+    {
+    case 1:
+    case 5:
+      return __isprime(x);
+    default:
+      return 0;
+    }
+}
+
+uint
+nextprime(uint x)			/* Returns some prime greater than x */
+{
+  x += 5 - (x % 6);			/* x is 6k-1 */
+  for(;;)
+    {
+      x += 2;				/* 6k+1 */
+      if (__isprime(x))
+	return x;
+      x += 4;				/* 6k-1 */
+      if (__isprime(x))
+	return x;
+    }
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main(int argc, char **argv)
+{
+  uint k = atol(argv[1]);
+  printf("%d is%s prime\n", k, isprime(k) ? "" : "n't");
+  printf("Next prime is %d\n", nextprime(k));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/prime.h b/libucw/ucw/prime.h
new file mode 100644
index 0000000..eff04d0
--- /dev/null
+++ b/libucw/ucw/prime.h
@@ -0,0 +1,59 @@
+/*
+ *	The UCW Library -- Prime numbers
+ *
+ *	(c) 2008 Michal Vaner <vorner@ucw.cz>
+ *
+ *	Code taken from ucw/lib.h by:
+ *
+ *	(c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *	(c) 2005 Tomas Valla <tom@ucw.cz>
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_PRIME_H
+#define _UCW_PRIME_H
+
+#include <ucw/lib.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define isprime ucw_isprime
+#define next_table_prime ucw_next_table_prime
+#define nextprime ucw_nextprime
+#define prev_table_prime ucw_prev_table_prime
+#endif
+
+/* prime.c */
+
+/**
+ * Return a non-zero value iff @x is a prime number.
+ * The time complexity is `O(sqrt(x))`.
+ **/
+int isprime(uint x);
+
+/**
+ * Return some prime greater than @x. The function does not checks overflows, but it should
+ * be safe at least for @x lower than `1U << 31`.
+ * If the Cramer's conjecture is true, it should have complexity `O(sqrt(x) * log(x)^2)`.
+ **/
+uint nextprime(uint x);
+
+/* primetable.c */
+
+/**
+ * Quickly lookup a precomputed table to return a prime number greater than @x.
+ * Returns zero if there is no such prime (we guarantee the existance of at
+ * least one prime greater than `1U << 31` in the table).
+ **/
+uint next_table_prime(uint x);
+
+/**
+ * Quickly lookup a precomputed table to return a prime number smaller than @x.
+ * Returns zero if @x is smaller than `7`.
+ **/
+uint prev_table_prime(uint x);
+
+#endif // _UCW_PRIME_H
diff --git a/libucw/ucw/primetable.c b/libucw/ucw/primetable.c
new file mode 100644
index 0000000..54f0fc8
--- /dev/null
+++ b/libucw/ucw/primetable.c
@@ -0,0 +1,165 @@
+/*
+ *	UCW Library -- Prime Number Table
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/prime.h>
+#include <ucw/binsearch.h>
+
+/* A table of odd primes, each is about 1.2 times the previous one */
+static uint prime_table[] = {
+  3,
+  7,
+  13,
+  19,
+  29,
+  37,
+  53,
+  67,
+  89,
+  109,
+  137,
+  173,
+  211,
+  263,
+  331,
+  409,
+  499,
+  601,
+  727,
+  877,
+  1061,
+  1279,
+  1543,
+  1861,
+  2239,
+  2689,
+  3229,
+  3877,
+  4657,
+  5623,
+  6761,
+  8123,
+  9767,
+  11731,
+  14083,
+  16903,
+  20287,
+  24359,
+  29243,
+  35099,
+  42131,
+  50581,
+  60703,
+  72859,
+  87433,
+  104933,
+  125927,
+  151121,
+  181361,
+  217643,
+  261223,
+  313471,
+  376171,
+  451411,
+  541699,
+  650059,
+  780119,
+  936151,
+  1123391,
+  1348111,
+  1617739,
+  1941293,
+  2329559,
+  2795477,
+  3354581,
+  4025507,
+  4830619,
+  5796797,
+  6956203,
+  8347483,
+  10017011,
+  12020431,
+  14424539,
+  17309471,
+  20771371,
+  24925661,
+  29910821,
+  35892991,
+  43071601,
+  51685939,
+  62023139,
+  74427803,
+  89313379,
+  107176057,
+  128611313,
+  154333591,
+  185200339,
+  222240413,
+  266688509,
+  320026249,
+  384031507,
+  460837813,
+  553005391,
+  663606499,
+  796327811,
+  955593439,
+  1146712139,
+  1376054569,
+  1651265507,
+  1981518631,
+  2377822387,
+  2853386881,
+  3424064269,
+  4108877153,
+  4294967291
+};
+
+#define NPRIMES ARRAY_SIZE(prime_table)
+
+uint
+next_table_prime(uint x)
+{
+  if (x >= prime_table[NPRIMES-1])
+    return 0;
+  else
+    return prime_table[BIN_SEARCH_FIRST_GE(prime_table, NPRIMES, x+1)];
+}
+
+uint
+prev_table_prime(uint x)
+{
+  int i = BIN_SEARCH_FIRST_GE(prime_table, NPRIMES, x);
+  return i ? prime_table[i-1] : 0;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+#if 0		/* Generate the table */
+  uint x = 3, xx;
+  do
+    {
+      printf("  %u,\n", x);
+      xx = x;
+      x = nextprime(1.2*x);
+    }
+  while (x > xx);
+#else
+  for (int i=1; i<=100; i++)
+    printf("%d\t%d\t%d\n", i, next_table_prime(i), prev_table_prime(i));
+  for (uint i=0xfffffff0; i; i++)
+    printf("%u\t%u\t%u\n", i, next_table_prime(i), prev_table_prime(i));
+  return 0;
+#endif
+}
+
+#endif
diff --git a/libucw/ucw/process.h b/libucw/ucw/process.h
new file mode 100644
index 0000000..080685b
--- /dev/null
+++ b/libucw/ucw/process.h
@@ -0,0 +1,47 @@
+/*
+ *	UCW Library -- Processes
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_PROCESS_H
+#define _UCW_PROCESS_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define echo_command ucw_echo_command
+#define echo_command_v ucw_echo_command_v
+#define exec_command ucw_exec_command
+#define exec_command_v ucw_exec_command_v
+#define format_exit_status ucw_format_exit_status
+#define getproctitle ucw_getproctitle
+#define run_command ucw_run_command
+#define run_command_v ucw_run_command_v
+#define setproctitle ucw_setproctitle
+#define setproctitle_init ucw_setproctitle_init
+#endif
+
+/* proctitle.c */
+
+// Must be called before parsing of arguments
+void setproctitle_init(int argc, char **argv);
+void setproctitle(const char *msg, ...) FORMAT_CHECK(printf,1,2);
+char *getproctitle(void);
+
+/* exitstatus.c */
+
+#define EXIT_STATUS_MSG_SIZE 64
+int format_exit_status(char *msg, int stat);
+
+/* runcmd.c */
+
+int run_command(const char *cmd, ...);
+void NONRET exec_command(const char *cmd, ...);
+void echo_command(char *buf, int size, const char *cmd, ...);
+int run_command_v(const char *cmd, va_list args);
+void NONRET exec_command_v(const char *cmd, va_list args);
+void echo_command_v(char *buf, int size, const char *cmd, va_list args);
+
+#endif	/* !_UCW_PROCESS_H */
diff --git a/libucw/ucw/proctitle.c b/libucw/ucw/proctitle.c
new file mode 100644
index 0000000..82a0b8e
--- /dev/null
+++ b/libucw/ucw/proctitle.c
@@ -0,0 +1,97 @@
+/*
+ *	UCW Library -- Setting of Process Title
+ *
+ *	(c) 2001--2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/process.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <errno.h>
+
+static char **spt_argv;
+static char *spt_start, *spt_end;
+
+void
+setproctitle_init(int argc, char **argv)
+{
+#ifdef CONFIG_LINUX
+  int i, len;
+  char **env, **oldenv, *t;
+
+  spt_argv = argv;
+
+  /* Create a backup copy of environment */
+  oldenv = __environ;
+  len = 0;
+  for (i=0; oldenv[i]; i++)
+    len += strlen(oldenv[i]) + 1;
+  __environ = env = xmalloc(sizeof(char *)*(i+1));
+  t = xmalloc(len);
+  for (i=0; oldenv[i]; i++)
+    {
+      env[i] = t;
+      len = strlen(oldenv[i]) + 1;
+      memcpy(t, oldenv[i], len);
+      t += len;
+    }
+  env[i] = NULL;
+
+  /* Scan for consecutive free space */
+  spt_start = spt_end = argv[0];
+  for (i=0; i<argc; i++)
+    if (!i || spt_end+1 == argv[i])
+      spt_end = argv[i] + strlen(argv[i]);
+  for (i=0; oldenv[i]; i++)
+    if (spt_end+1 == oldenv[i])
+      spt_end = oldenv[i] + strlen(oldenv[i]);
+
+  /* Copy all arguments */
+  for (i=0; i<argc; i++)
+    argv[i] = xstrdup(argv[i]);
+
+  /* Recalculate program_invocation_name, otherwise syslog() will be confused. */
+  char *name = argv[0];
+  program_invocation_name = name;
+  char *p = strrchr(name, '/');
+  if (p)
+    program_invocation_short_name = p + 1;
+  else
+    program_invocation_short_name = name;
+#endif
+}
+
+void
+setproctitle(const char *msg, ...)
+{
+  va_list args;
+  byte buf[256];
+  int n;
+
+  va_start(args, msg);
+  if (spt_end > spt_start)
+    {
+      n = vsnprintf(buf, sizeof(buf), msg, args);
+      if (n >= (int) sizeof(buf) || n < 0)
+	sprintf(buf, "<too-long>");
+      n = spt_end - spt_start;
+      strncpy(spt_start, buf, n);
+      spt_start[n] = 0;
+      spt_argv[0] = spt_start;
+      spt_argv[1] = NULL;
+    }
+  va_end(args);
+}
+
+char *
+getproctitle(void)
+{
+  return (spt_start < spt_end) ? spt_start : NULL;
+}
diff --git a/libucw/ucw/random-fast.c b/libucw/ucw/random-fast.c
new file mode 100644
index 0000000..7ba3181
--- /dev/null
+++ b/libucw/ucw/random-fast.c
@@ -0,0 +1,650 @@
+/*
+ *	UCW Library -- Fast pseudo-random generator
+ *
+ *	(c) 2020--2022 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/random.h>
+#include <ucw/threads.h>
+#include <ucw/unaligned.h>
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+// Select exactly one of these pseudo-random generators:
+//#define FASTRAND_USE_PCG
+//#define FASTRAND_USE_SPLITMIX
+#define FASTRAND_USE_XOROSHIRO
+//#define FASTRAND_USE_LIBC_SVID
+
+/**
+ * FASTRAND_USE_PCG
+ *
+ * References:
+ * -- https://en.wikipedia.org/wiki/Permuted_congruential_generator
+ * -- https://www.pcg-random.org/
+ * -- "PCG: A Family of Simple Fast Space-Efficient Statistically Good Algorithms for Random Number Generation",
+ *    2014, Melissa E. O’Neill
+ *
+ * Notes:
+ * -- Simple and fast generator with good statistical properties.
+ * -- We use a constant increment and 64->32bit XSH RR output function.
+ **/
+
+#define FASTRAND_PCG_MUL 6364136223846793005LLU
+#define FASTRAND_PCG_INC 1442695040888963407LLU
+
+/**
+ * FASTRAND_USE_SPLITMIX
+ *
+ * References:
+ * -- http://prng.di.unimi.it/splitmix64.c  (public, no copyright)
+ * -- http://docs.oracle.com/javase/8/docs/api/java/util/SplittableRandom.html
+ * -- "Fast Splittable Pseudorandom Number Generators",
+ *    2014, Guy L. Steele Jr., Doug Lea, Christine H. Flood
+ *
+ * Notes:
+ * -- Each 64 bit number is generated exactly once in a cycle,
+ *    so we only use half of it -> 32 bit output.
+ **/
+
+/**
+ * FASTRAND_USE_XOROSHIRO
+ *
+ * References:
+ * -- http://prng.di.unimi.it/  (examples are public, no copyright)
+ * -- "Scrambled Linear Pseudorandom Number Generators",
+ *    2019, David Blackman, Sebastiano Vigna
+ *
+ * Notes:
+ * -- A family of very fast generators. Good statistical properties,
+ *    some variants just have problems with lowest bits.
+ * -- We support more xo(ro)shiro variants, see the options below.
+ **/
+
+// Engine: xoroshiro 128, xoshiro 256
+#define FASTRAND_XOROSHIRO_SIZE 128
+
+// Scrambler: 1 (+), 2 (++), 3 (**)
+#define FASTRAND_XOROSHIRO_SCRAMBLER 1
+
+// If defined, we only use the highest 60 bits from each 64 bit number;
+// useful especially for the weakest '+' scrambler. Even if not
+// we prefer higher bits where trivial.
+#undef FASTRAND_XOROSHIRO_ONLY_HIGHER
+
+/**
+ * FASTRAND_USE_LIBC_SVID
+ * -- mrand48_r()
+ * -- libc SVID generator
+ **/
+
+struct fastrand {
+#ifdef FASTRAND_USE_PCG
+  u64 pcg_state;			// PCG generator's current state
+#endif
+
+#ifdef FASTRAND_USE_SPLITMIX
+  u64 splitmix_state;
+#endif
+
+#ifdef FASTRAND_USE_XOROSHIRO
+  u64 xoroshiro_state[FASTRAND_XOROSHIRO_SIZE / 64];
+#endif
+
+#ifdef FASTRAND_USE_LIBC_SVID
+  struct drand48_data svid_data;	// SVID generator's state structure
+#endif
+
+  bool inited;				// Is seeded?
+  fastrand_seed_t seed_value;		// Initial seed value; useful for reproducible debugging
+};
+
+/*** Common helpers ***/
+
+// GCC should optimize these to a single instruction
+
+static inline u32 fastrand_ror32(u32 x, uint r)
+{
+  return (x >> r) | (x << (-r & 31));
+}
+
+static inline u64 fastrand_rol64(u64 x, uint r)
+{
+  return (x << r) | (x >> (-r & 63));
+}
+
+/*** PCG random generator ***/
+
+#ifdef FASTRAND_USE_PCG
+#define FASTRAND_ONE_BITS 32
+
+static inline u32 fastrand_one(struct fastrand *c)
+{
+  u64 s = c->pcg_state;
+  uint r = s >> 59;
+  c->pcg_state = s * FASTRAND_PCG_MUL + FASTRAND_PCG_INC;
+  u32 x = ((s >> 18) ^ s) >> 27;
+  return fastrand_ror32(x, r);
+}
+
+static void fastrand_init(struct fastrand *c)
+{
+  c->pcg_state = c->seed_value + FASTRAND_PCG_INC;
+  (void) fastrand_one(c);
+  DBG("RANDOM: Initialized PCG random generator, seed=0x%jx", (uintmax_t)c->seed_value);
+}
+#endif
+
+/*** splitmix64 generator ***/
+
+// A helper; used also for seeding xoroshiro
+static inline u64 fastrand_splitmix64_next(u64 *state)
+{
+  u64 z = (*state += 0x9e3779b97f4a7c15LLU);
+  z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9LLU;
+  z = (z ^ (z >> 27)) * 0x94d049bb133111ebLLU;
+  return z ^ (z >> 31);
+}
+
+#ifdef FASTRAND_USE_SPLITMIX
+#define FASTRAND_ONE_BITS 32
+
+static void fastrand_init(struct fastrand *c)
+{
+  c->splitmix_state = c->seed_value;
+  DBG("RANDOM: Initialized splitmix64 random generator, seed=0x%jx", (uintmax_t)c->seed_value);
+}
+
+static inline u32 fastrand_one(struct fastrand *c)
+{
+  return fastrand_splitmix64_next(&c->splitmix_state);
+}
+#endif
+
+/*** xoroshiro variants ***/
+
+#ifdef FASTRAND_USE_XOROSHIRO
+#ifdef FASTRAND_XOROSHIRO_ONLY_HIGHER
+#  define FASTRAND_ONE_BITS 60
+#else
+#  define FASTRAND_ONE_BITS 64
+#  define FASTRAND_PREFER_HIGHER
+#endif
+
+static void fastrand_init(struct fastrand *c)
+{
+  u64 x = c->seed_value;
+  for (uint i = 0; i < ARRAY_SIZE(c->xoroshiro_state); i++)
+    c->xoroshiro_state[i] = fastrand_splitmix64_next(&x);
+  if (unlikely(!c->xoroshiro_state[0]))
+    c->xoroshiro_state[0] = 1;
+  DBG("RANDOM: Initialized xoroshiro random generator, seed=0x%jx, size=%u, scrambler=%u",
+    (uintmax_t)c->seed_value, FASTRAND_XOROSHIRO_SIZE, FASTRAND_XOROSHIRO_SCRAMBLER);
+}
+
+static inline u64 fastrand_one(struct fastrand *c)
+{
+  u64 result;
+  u64 *s = c->xoroshiro_state;
+
+#if FASTRAND_XOROSHIRO_SIZE == 128
+  u64 s0 = s[0];
+  u64 s1 = s[1];
+#if FASTRAND_XOROSHIRO_SCRAMBLER == 1
+  result = s0 + s1;
+  uint ra = 24, rb = 16, rc = 37;
+#elif FASTRAND_XOROSHIRO_SCRAMBLER == 2
+  result = fastrand_rol64(s0 + s1, 17) + s0;
+  uint ra = 49, rb = 21, rc = 28;
+#elif FASTRAND_XOROSHIRO_SCRAMBLER == 3
+  result = fastrand_rol64(s0 * 5, 7) * 9;
+  uint ra = 24, rb = 16, rc = 37;
+#else
+#  error "Unsupported xoroshiro parameters"
+#endif
+  s[0] = fastrand_rol64(s0, ra) ^ s1 ^ (s1 << rb);
+  s[1] = fastrand_rol64(s1, rc);
+
+#elif FASTRAND_XOROSHIRO_SIZE == 256
+#if FASTRAND_XOROSHIRO_SCRAMBLER == 1
+  result = s[0] + s[3];
+#elif FASTRAND_XOROSHIRO_SCRAMBLER == 2
+  result = fastrand_rol64(s[0] + s[3], 23) + s[0];
+#elif FASTRAND_XOROSHIRO_SCRAMBLER == 3
+  result = fastrand_rol64(s[1] * 5, 7) * 9;
+#else
+#  error "Unsupported xoroshiro parameters"
+#endif
+  u64 t = s[1] << 17;
+  s[2] ^= s[0];
+  s[3] ^= s[1];
+  s[1] ^= s[2];
+  s[0] ^= s[3];
+  s[2] ^= t;
+  s[3] = fastrand_rol64(s[3], 45);
+#else
+#  error "Unsupported xoroshiro parameters"
+#endif
+
+#ifdef FASTRAND_XOROSHIRO_ONLY_HIGHER
+  result >>= 4;
+#endif
+  return result;
+}
+
+#endif
+
+/*** Libc SVID generator ***/
+
+#ifdef FASTRAND_USE_LIBC_SVID
+#define FASTRAND_ONE_BITS 32
+
+static void fastrand_init(struct fastrand *c)
+{
+  DBG("RANDOM: Initialized libc SVID random generator, seed=0x%jx", (uintmax_t)c->seed_value);
+  if (srand48_r(c->seed_value, &c->svid_data) < 0)
+    die("RANDOM: Failed to call srand48_r(): %m");
+}
+
+#ifdef LOCAL_DEBUG
+static NONRET void fastrand_mrand48_r_failed(void)
+{
+  die("RANDOM: Failed to call mrand48_r(): %m");
+}
+#endif
+
+static inline u32 fastrand_one(struct fastrand *c)
+{
+  long int r;
+#ifdef LOCAL_DEBUG
+  if (unlikely(mrand48_r(&c->svid_data, &r) < 0))
+    fastrand_mrand48_r_failed();
+#else
+  (void) mrand48_r(&c->svid_data, &r);
+#endif
+  return r;
+}
+
+#endif
+
+/*** Interface for creating/deleting/setting contexts ***/
+
+struct fastrand *fastrand_new(void)
+{
+  struct fastrand *c = xmalloc_zero(sizeof(*c));
+  return c;
+}
+
+void fastrand_delete(struct fastrand *c)
+{
+  ASSERT(c);
+  xfree(c);
+}
+
+void fastrand_set_seed(struct fastrand *c, fastrand_seed_t seed)
+{
+  c->seed_value = seed;
+  c->inited = true;
+  fastrand_init(c);
+}
+
+fastrand_seed_t fastrand_gen_seed_value(void)
+{
+  // Prefer kernel's urandom if getrandom() syscall is available.
+  u64 val;
+  if (strongrand_getrandom_mem_try(&val, sizeof(val)))
+    return val;
+
+  // Generate a seed value as a mixture of:
+  // -- current time
+  // -- process id to deal with frequent fork() or startups
+  // -- counter to deal with multiple contexts, for example in threaded application
+  static u64 static_counter;
+  ucwlib_lock();
+  val = (static_counter += 0x1927a7639274162dLLU);
+  ucwlib_unlock();
+  val += getpid();
+  struct timeval tv;
+  if (gettimeofday(&tv, NULL) < 0)
+    die("RANDOM: Failed to call gettimeofday(): %m");
+  val += (u64)(tv.tv_sec * 1000000LL + tv.tv_usec) * 0x5a03173d83f78347LLU;
+  return val;
+}
+
+fastrand_seed_t fastrand_gen_seed(struct fastrand *c)
+{
+  fastrand_seed_t seed = fastrand_gen_seed_value();
+  fastrand_set_seed(c, seed);
+  return seed;
+}
+
+bool fastrand_has_seed(struct fastrand *c)
+{
+  return c->inited;
+}
+
+void fastrand_reset(struct fastrand *c)
+{
+  c->inited = false;
+}
+
+#if 1
+// XXX: Adds some overhead, but probably worth it
+#define FASTRAND_CHECK_SEED(c) do { if (unlikely(!(c)->inited)) fastrand_check_seed_failed(); } while (0)
+static NONRET void fastrand_check_seed_failed(void)
+{
+  ASSERT(0);
+}
+#else
+#define FASTRAND_CHECK_SEED(c) do { } while (0)
+#endif
+
+/*** Reading interface ***/
+
+// We assume 32-64 bit output of fastrand_one().
+// For 32 bits fastrand_one() can return u32 type, otherwise it must be u64.
+COMPILE_ASSERT(fastrand_one_range, FASTRAND_ONE_BITS >= 32 && FASTRAND_ONE_BITS <= 64);
+
+#if FASTRAND_ONE_BITS == 32
+#define FASTRAND_ONE_MAX UINT32_MAX
+#else
+#define FASTRAND_ONE_MAX (UINT64_MAX >> (64 - FASTRAND_ONE_BITS))
+#endif
+
+static inline u32 fastrand_u32_helper(struct fastrand *c)
+{
+#if FASTRAND_ONE_BITS > 32 && defined(FASTRAND_PREFER_HIGHER)
+  return fastrand_one(c) >> (FASTRAND_ONE_BITS - 32);
+#else
+  return fastrand_one(c);
+#endif
+}
+
+u32 fastrand_u32(struct fastrand *c)
+{
+  FASTRAND_CHECK_SEED(c);
+  return fastrand_u32_helper(c);
+}
+
+u64 fastrand_u64(struct fastrand *c)
+{
+  FASTRAND_CHECK_SEED(c);
+#if FASTRAND_ONE_BITS < 64
+  return ((u64)fastrand_one(c) << FASTRAND_ONE_BITS) | fastrand_one(c);
+#else
+  return fastrand_one(c);
+#endif
+}
+
+u64 fastrand_bits_u64(struct fastrand *c, uint bits)
+{
+#ifdef LOCAL_DEBUG
+  ASSERT(bits <= 64);
+#endif
+  // Notice that we never rotate an integer by all its bits (forbidden by C standard).
+  FASTRAND_CHECK_SEED(c);
+#if FASTRAND_ONE_BITS == 64
+  if (!bits)
+    return 0;
+  return fastrand_one(c) >> (FASTRAND_ONE_BITS - bits);
+#else
+  u64 r = fastrand_one(c);
+  if (bits <= FASTRAND_ONE_BITS)
+    return r >> (FASTRAND_ONE_BITS - bits);
+  return (r << (bits - FASTRAND_ONE_BITS)) | (fastrand_one(c) >> (2 * FASTRAND_ONE_BITS - bits));
+#endif
+}
+
+/*
+ * fastrand_max() and variants
+ *
+ * Algorithm 1:
+ *
+ * We can return r % bound from uniformly generated i-bit number r,
+ * but only if:
+ *   r - r % bound + bound <= 2^i
+ *   r - r % bound <= 2^i-1 - bound + 1    -- no risk of integer overflow
+ *   r - r % bound <= (2^i-1 + 1) - bound  -- can temporarily overflow
+ *
+ * Then r fits to a complete interval in the i-bit range
+ * and results should be uniformly distributed.
+ *
+ * If r is too high, we simply generate a different r and repeat
+ * the whole process. The probability is < 50% for any bound <= 2^i
+ * (with worst case bound == 2^i / 2 + 1), so the average number
+ * of iterations is < 2.
+ *
+ *
+ * Algorithm 2 (without any division in many cases, but needs big multiplication):
+ * ("Fast Random Integer Generation in an Interval", 2019, Daniel Lemier)
+ *
+ * Let bound < 2^i. Then for j in [0, bound) each interval [j * 2^i + 2^i % bound, (j + 1) * 2^i)
+ * contains the same number of multiples [0, 1 * bound, 2 * bound, ..., 2^i * bound),
+ * exactly 2^i / bound (rounded down) of them.
+ *
+ * Therefore if we have a random i-bit number r and r * bound fits to one of these intervals,
+ * we can immediately return (r * bound) / 2^i (index of that interval) and results should be
+ * correctly distributed. If we are lucky and r fits to even smaller interval
+ * [j * 2^i + bound, (j + 1) * 2^i], we can check that very quickly without any division.
+ *
+ * Probability of multiple iterations is again < 50%.
+ * Probability of division-less check is (2^i - bound) / 2^i.
+ *
+ *
+ * Algorithm 3 (always without divisions or multiplications, but needs more iterations):
+ *
+ * Let 2^(i-1) <= bound < 2^i. Then i-bit random number r has at least 50% probability
+ * to be lower than bound, when we can simply return it.
+ * Can be useful for very fast fastrand_one() like xoroshiro128+.
+ */
+
+#define FASTRAND_MAX_U32_ALGORITHM 2
+#define FASTRAND_MAX_U64_ALGORITHM 3
+
+static inline u32 fastrand_max_u32_helper(struct fastrand *c, u32 bound)
+{
+  // Variant for bound <= UINT32_MAX.
+  // This is the most common case -> we optimize it and inline the code to both fastrand_max() and fastrand_max_u64().
+
+#if FASTRAND_MAX_U32_ALGORITHM == 1
+  while (1)
+    {
+      u32 r = fastrand_u32_helper(c);
+      u32 x = r % bound;
+      if (r - x <= (u32)-bound)
+	return x;
+#if 1
+      // Possible optimization for unlucky cases
+      u32 y = r - x;
+      do
+	r = fastrand_u32_helper(c);
+      while (r >= y);
+      return r % bound;
+#endif
+    }
+
+#elif FASTRAND_MAX_U32_ALGORITHM == 2
+  u32 r = fastrand_u32_helper(c);
+  u64 m = (u64)r * bound;
+  u32 l = (u32)m;
+  if (l < bound)
+    {
+      u32 t = (u32)-bound;
+#if 1
+      // This condition can decrease the probability of division to <= 50% even in worst case and also optimize bad cases.
+      if (t < bound)
+	{
+	  // Implies l < t % bound, so we don't need to check it before switching to completely different loop.
+	  do
+	    r = fastrand_u32_helper(c);
+	  while (r >= bound);
+	  return r;
+	}
+#endif
+      t = t % bound;
+      while (l < t)
+	{
+	  r = fastrand_u32_helper(c);
+	  m = (u64)r * bound;
+	  l = (u32)m;
+	}
+    }
+  return m >> 32;
+
+#elif FASTRAND_MAX_U32_ALGORITHM == 3
+  // XXX: Probably could be optimized with __builtin_clz()
+  u32 r, y = bound - 1;
+  y |= y >> 1;
+  y |= y >> 2;
+  y |= y >> 4;
+  y |= y >> 8;
+  y |= y >> 16;
+  do
+    r = fastrand_u32_helper(c) & y;
+  while (r >= bound);
+  return r;
+
+#else
+#  error Invalid FASTRAND_MAX_U32_ALGORITHM
+#endif
+}
+
+static u64 fastrand_max_u64_helper(struct fastrand *c, u64 bound)
+{
+  // Less common case -> compromise between speed and size
+#if FASTRAND_MAX_U64_ALGORITHM == 1
+  while (1)
+    {
+      u64 r = fastrand_one(c);
+      u64 m = FASTRAND_ONE_MAX;
+#if FASTRAND_ONE_BITS < 64
+      if (bound > m + 1)
+	{
+	  r = (r << FASTRAND_ONE_BITS) | fastrand_one(c);
+	  m = (m << FASTRAND_ONE_BITS) | FASTRAND_ONE_MAX;
+	}
+#endif
+      u64 x = r % bound;
+      if (r - x <= m + 1 - bound)
+	return x;
+    }
+
+#elif FASTRAND_MAX_U64_ALGORITHM == 3
+  u64 r, y = bound - 1;
+  y |= y >> 1;
+  y |= y >> 2;
+  y |= y >> 4;
+  y |= y >> 8;
+  y |= y >> 16;
+  y |= y >> 32;
+  do
+    {
+      r = fastrand_one(c);
+#if FASTRAND_ONE_BITS < 64
+      if (y > FASTRAND_ONE_MAX)
+	r = (r << FASTRAND_ONE_BITS) | fastrand_one(c);
+#endif
+      r &= y;
+    }
+  while (r >= bound);
+  return r;
+#else
+#  error Invalid FASTRAND_MAX_U64_ALGORITHM
+#endif
+}
+
+uint fastrand_max(struct fastrand *c, uint bound)
+{
+  FASTRAND_CHECK_SEED(c);
+#if UINT32_MAX < UINT_MAX
+  if (bound <= UINT32_MAX)
+    return fastrand_max_u32_helper(c, bound);
+  else
+    return fastrand_max_u64_helper(c, bound);
+#else
+  return fastrand_max_u32_helper(c, bound);
+#endif
+}
+
+u64 fastrand_max_u64(struct fastrand *c, u64 bound)
+{
+  FASTRAND_CHECK_SEED(c);
+  if (bound <= UINT32_MAX)
+    return fastrand_max_u32_helper(c, bound);
+  else
+    return fastrand_max_u64_helper(c, bound);
+}
+
+void fastrand_mem(struct fastrand *c, void *ptr, size_t size)
+{
+  // XXX: Could be optimized to aligned assignments instead of put_u32/64, but it
+  // would be quite complex to make it deterministic (for same seed and any @ptr)
+  // and large sizes are not used often anyway.
+  FASTRAND_CHECK_SEED(c);
+  byte *p = ptr;
+#if FASTRAND_ONE_BITS < 64
+  for (size_t n = size >> 2; n--; p += 4)
+    put_u32(p, fastrand_u32_helper(c));
+  if (size &= 3)
+    {
+      u32 x = fastrand_u32_helper(c);
+#else
+  for (size_t n = size >> 3; n--; p += 8)
+    put_u64(p, fastrand_one(c));
+  if (size &= 7)
+    {
+      u64 x = fastrand_one(c);
+#endif
+      while (size--)
+	{
+	  *p++ = x;
+	  x >>= 8;
+	}
+    }
+}
+
+double fastrand_double(struct fastrand *c)
+{
+  // Generate 52 random bits
+  FASTRAND_CHECK_SEED(c);
+  u64 r = fastrand_one(c);
+#if FASTRAND_ONE_BITS >= 52
+  r >>= FASTRAND_ONE_BITS - 52;
+#else
+  // Do we want to generate doubles with full 52 precision?
+#if 0
+  r = (r << (52 - FASTRAND_ONE_BITS)) | (fastrand_one(c) >> (2 * FASTRAND_ONE_BITS - 52));
+#else
+  r <<= 52 - FASTRAND_ONE_BITS;
+#endif
+#endif
+
+  // With standard IEC 60559 / IEEE 754 format, we can directly store @r as a double
+  // from range [1.0, 2.0) and subtract 1.0.
+  // But the alternative with multiplication is often faster anyway.
+#if 0 && defined(__STDC_IEC_559__)
+  union {
+    u64 u;
+    double d;
+  } tmp;
+  ASSERT(sizeof(double) == 8 && sizeof(tmp) == 8);
+  tmp.u = (0x3ffLLU << 52) | r;
+  return tmp.d - 1.0;
+#elif 1
+  static const double mul = 1.0 / (1LLU << 52);
+  return r * mul;
+#else
+  return ldexp(r, -52);
+#endif
+}
diff --git a/libucw/ucw/random-legacy.c b/libucw/ucw/random-legacy.c
new file mode 100644
index 0000000..07afddf
--- /dev/null
+++ b/libucw/ucw/random-legacy.c
@@ -0,0 +1,74 @@
+/*
+ *	UCW Library -- Unbiased Random Numbers
+ *
+ *	(c) 1998--2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2020 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/random.h>
+
+#include <stdlib.h>
+
+/* We expect the random generator in libc to give at least 30 bits of randomness */
+COMPILE_ASSERT(RAND_MAX_RANGE_TEST, RAND_MAX >= (1 << 30)-1);
+
+void
+random_set_seed(uint seed)
+{
+  srandom(seed);
+}
+
+uint
+random_gen_seed(void)
+{
+  uint seed = fastrand_gen_seed_value();
+  random_set_seed(seed);
+  return seed;
+}
+
+uint
+random_u32(void)
+{
+  return (random() & 0xffff) | ((random() & 0xffff) << 16);
+}
+
+uint
+random_max(uint max)
+{
+  uint r, l;
+
+  ASSERT(max <= (1 << 30));
+  l = (RAND_MAX + 1U) - ((RAND_MAX + 1U) % max);
+  do
+    r = random();
+  while (r >= l);
+  return r % max;
+}
+
+u64
+random_u64(void)
+{
+  return
+    ((u64)(random() & 0xffff) << 48) |
+    ((u64)(random() & 0xffffff) << 24) |
+    (random() & 0xffffff);
+}
+
+u64
+random_max_u64(u64 max)
+{
+  if (max < (1 << 30))
+    return random_max(max);
+
+  u64 r, l, m;
+  m = 0xffffffffffffffff;
+  l = m - (m % max);
+  do
+    r = random_u64();
+  while (r >= l);
+  return r % max;
+}
diff --git a/libucw/ucw/random-strong.c b/libucw/ucw/random-strong.c
new file mode 100644
index 0000000..4391b73
--- /dev/null
+++ b/libucw/ucw/random-strong.c
@@ -0,0 +1,286 @@
+/*
+ *	UCW Library -- Strong random generator
+ *
+ *	(c) 2020--2022 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/random.h>
+#include <ucw/threads.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#ifdef CONFIG_UCW_GETRANDOM
+#include <sys/random.h>
+#endif
+
+/*** getrandom() helpers ***/
+
+#ifdef CONFIG_UCW_GETRANDOM
+static bool strongrand_getrandom_detect(void)
+{
+  static int static_detected;
+  int detected;
+  ucwlib_lock();
+  detected = static_detected;
+  if (detected)
+    {
+      ucwlib_unlock();
+      return detected > 0;
+    }
+  byte buf[1];
+  int err;
+  while (1)
+    {
+      int n = getrandom(buf, 1, GRND_NONBLOCK);
+      if (n >= 0)
+	{
+	  ASSERT(n == 1);
+	  detected = 1;
+	  break;
+	}
+      else if (errno != EINTR)
+	{
+	  err = errno;
+	  detected = -1;
+	  break;
+	}
+    }
+  static_detected = detected;
+  ucwlib_unlock();
+  if (detected > 0)
+    {
+      DBG("RANDOM: Kernel supports getrandom()");
+      return true;
+    }
+  else if (err == ENOSYS)
+    {
+      DBG("RANDOM: Kernel does not support getrandom()");
+      return false;
+    }
+  else
+    {
+      // We print an error also for EAGAIN -- for urandom it should be possible only during early boot.
+      msg(L_ERROR, "RANDOM: Failed to call getrandom(): %s -> assuming no support", strerror(err));
+      return false;
+    }
+}
+
+bool strongrand_getrandom_mem_try(void *buf, size_t size)
+{
+  if (!strongrand_getrandom_detect())
+    return false;
+  while (size)
+    {
+      ssize_t n = getrandom(buf, size, 0);
+      if (n < 0)
+	{
+	  if (errno == EINTR)
+	    continue;
+	  die("RANDOM: Failed to call getrandom(): %m");
+	}
+      buf = (byte *)buf + n;
+      size -= n;
+    }
+  return true;
+}
+#else
+bool strongrand_getrandom_mem_try(void *buf UNUSED, size_t size UNUSED)
+{
+  return false;
+}
+#endif
+
+/*** Generic interface ***/
+
+void strongrand_close(struct strongrand *c)
+{
+  if (c && c->close)
+    c->close(c);
+}
+
+void strongrand_reset(struct strongrand *c)
+{
+  if (c->reset)
+    c->reset(c);
+}
+
+void strongrand_mem(struct strongrand *c, void *ptr, size_t size)
+{
+  ASSERT(c->read);
+  while (size)
+    {
+      int n = MIN(size, 0x7fffffff);
+      c->read(c, ptr, n);
+      size -= n;
+      ptr = (byte *)ptr + n;
+    }
+}
+
+/*** Kernel random source ***/
+
+struct strongrand_std {
+  struct strongrand sr;
+  int fd;		// Non-negative descriptor or special STRONGRAND_FD_x value
+  uint flags;		// STRONGRAND_STD_x
+  uint buf_size;	// Size of @buf or 0
+  uint buf_avail;	// Remaining buffered bytes, <= @buf_size
+  pid_t last_pid;	// Last known process id; maintained with STRONGRAND_STD_x_RESET
+  byte buf[];		// Buffered randomness
+};
+
+// Use getrandom()
+#define STRONGRAND_FD_KERNEL_GETRANDOM -1
+
+// Not yet open /dev/[u]random
+#define STRONGRAND_FD_KERNEL_DEVICE -2
+
+static void strongrand_std_close(struct strongrand *sr)
+{
+  struct strongrand_std *srs = (struct strongrand_std *)sr;
+  if (srs->fd >= 0)
+    close(srs->fd);
+  DBG("RANDOM[%s]: Closed", sr->name);
+  xfree(srs);
+}
+
+static void strongrand_std_reset(struct strongrand *sr)
+{
+  struct strongrand_std *srs = (struct strongrand_std *)sr;
+  srs->buf_avail = 0;
+}
+
+static void strongrand_std_open_device(struct strongrand_std *srs)
+{
+  ASSERT(srs->fd == STRONGRAND_FD_KERNEL_DEVICE);
+  ASSERT(srs->flags & (STRONGRAND_STD_URANDOM | STRONGRAND_STD_RANDOM));
+  const char *path = (srs->flags & STRONGRAND_STD_URANDOM) ? "/dev/urandom" : "/dev/random";
+  int fd = open(path, O_RDONLY);
+  if (fd < 0)
+    die("RANDOM[%s]: Cannot open %s: %m", srs->sr.name, path);
+  srs->fd = fd;
+  DBG("RANDOM[%s]: Opened device, path=%s, fd=%d", srs->sr.name, path, fd);
+}
+
+static void strongrand_std_read_unbuffered(struct strongrand *sr, byte *ptr, int size)
+{
+  struct strongrand_std *srs = (struct strongrand_std *)sr;
+#ifdef CONFIG_UCW_GETRANDOM
+  if (srs->fd == STRONGRAND_FD_KERNEL_GETRANDOM)
+    {
+      while (size)
+	{
+	  int n = getrandom(ptr, size, (srs->flags & STRONGRAND_STD_RANDOM) ? GRND_RANDOM : 0);
+	  if (n < 0)
+	    {
+	      if (errno == EINTR || errno == EAGAIN)
+		continue;
+	      die("RANDOM[%s]: Failed to read %u bytes with getrandom(): %m", srs->sr.name, size);
+	    }
+	  DBG("RANDOM[%s]: Read %u bytes with getrandom()", srs->sr.name, n);
+	  ASSERT(n <= size);
+	  ptr += n;
+	  size -= n;
+	}
+      return;
+    }
+#endif
+  if (srs->fd < 0)
+    {
+      ASSERT(srs->flags & STRONGRAND_STD_DELAYED);
+      strongrand_std_open_device(srs);
+    }
+  while (size)
+    {
+      int n = read(srs->fd, ptr, size);
+      if (n < 0)
+	{
+	  if (errno == EINTR || errno == EAGAIN)
+	    continue;
+	  die("RANDOM[%s]: Failed to read %u bytes: %m", srs->sr.name, size);
+	}
+      ASSERT(n <= size);
+      DBG("RANDOM[%s]: Read %u bytes", srs->sr.name, n);
+      ptr += n;
+      size -= n;
+    }
+}
+
+static void strongrand_std_read_buffered(struct strongrand *sr, byte *ptr, int size)
+{
+  struct strongrand_std *srs = (struct strongrand_std *)sr;
+  if (srs->flags & (STRONGRAND_STD_AUTO_RESET | STRONGRAND_STD_ASSERT_RESET))
+    {
+      pid_t pid = getpid();
+      if (pid != srs->last_pid)
+	{
+	  DBG("RANDOM[%s]: Detected changed pid from %u to %u", sr->name, (uint)srs->last_pid, (uint)pid);
+	  srs->last_pid = pid;
+	  if (srs->flags & STRONGRAND_STD_ASSERT_RESET)
+	    ASSERT(!srs->buf_avail); // Note: Does not catch all cases of wrong usage (already read multiples of buf_size)
+	  srs->buf_avail = 0;
+	}
+    }
+  while (size)
+    {
+      if (!srs->buf_avail)
+	{
+	  DBG("RANDOM[%s]: Refilling buffer", srs->sr.name);
+	  strongrand_std_read_unbuffered(sr, srs->buf, srs->buf_size);
+	  srs->buf_avail = srs->buf_size;
+	}
+      uint n = MIN(srs->buf_avail, (uint)size);
+      memcpy(ptr, srs->buf + (srs->buf_size - srs->buf_avail), n);
+      srs->buf_avail -= n;
+      size -= n;
+      ptr += n;
+    }
+}
+
+static struct strongrand *strongrand_std_open_internal(int fd, const char *name, uint flags, uint buf_size)
+{
+  struct strongrand_std *srs = xmalloc(sizeof(*srs) + buf_size);
+  bzero(srs, sizeof(*srs));
+  srs->sr.name = name;
+  srs->sr.close = strongrand_std_close;
+  srs->sr.reset = buf_size ? strongrand_std_reset : NULL;
+  srs->sr.read = buf_size ? strongrand_std_read_buffered : strongrand_std_read_unbuffered;
+  srs->fd = fd;
+  srs->flags = flags;
+  srs->buf_size = buf_size;
+  if (flags & (STRONGRAND_STD_AUTO_RESET | STRONGRAND_STD_ASSERT_RESET))
+    srs->last_pid = getpid();
+  return &srs->sr;
+}
+
+struct strongrand *strongrand_std_open(uint flags, uint buf_size)
+{
+  const char *name;
+  if (flags & STRONGRAND_STD_URANDOM)
+    {
+      ASSERT(!(flags & STRONGRAND_STD_RANDOM));
+      name = "urandom";
+    }
+  else
+    {
+      ASSERT(flags & STRONGRAND_STD_RANDOM);
+      name = "random";
+    }
+#ifdef CONFIG_UCW_GETRANDOM
+  if (strongrand_getrandom_detect())
+    return strongrand_std_open_internal(STRONGRAND_FD_KERNEL_GETRANDOM, name, flags, buf_size);
+#endif
+  struct strongrand *sr = strongrand_std_open_internal(STRONGRAND_FD_KERNEL_DEVICE, name, flags, buf_size);
+  if (!(flags & STRONGRAND_STD_DELAYED))
+    strongrand_std_open_device((struct strongrand_std *)sr);
+  return sr;
+}
diff --git a/libucw/ucw/random-test.c b/libucw/ucw/random-test.c
new file mode 100644
index 0000000..59d54b6
--- /dev/null
+++ b/libucw/ucw/random-test.c
@@ -0,0 +1,257 @@
+/*
+ *	UCW Library -- Random numbers: Testing
+ *
+ *	(c) 2020--2022 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/random.h>
+#include <ucw/opt.h>
+#include <ucw/time.h>
+
+#include <errno.h>
+#include <float.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+static int o_test_fast;
+static int o_test_strong;
+
+static double o_bench_scale = 1.0;
+static int o_bench_only_safe;
+static int o_bench_all;
+static int o_bench_libs;
+static int o_bench_legacy;
+static int o_bench_fast;
+static int o_bench_strong;
+
+static struct opt_section options = {
+  OPT_ITEMS {
+    OPT_HELP("Usage: random-test <options>"),
+    OPT_HELP(""),
+    OPT_HELP("Options:"),
+    OPT_HELP_OPTION,
+    OPT_BOOL(0, "test-fast", o_test_fast, 0, "\tTest fast random generator"),
+    OPT_BOOL(0, "test-strong", o_test_strong, 0, "\tTest strong random generator"),
+    OPT_BOOL(0, "bench-all", o_bench_all, 0, "\tBench everything"),
+    OPT_BOOL(0, "bench-libs", o_bench_libs, 0, "\tBench libc"),
+    OPT_BOOL(0, "bench-legacy", o_bench_legacy, 0, "\tBench legacy interface"),
+    OPT_BOOL(0, "bench-fast", o_bench_fast, 0, "\tBench fast random generator"),
+    OPT_BOOL(0, "bench-strong", o_bench_strong, 0, "\tBench strong random generator"),
+    OPT_DOUBLE(0, "bench-scale", o_bench_scale, OPT_REQUIRED_VALUE, "<scale>\tIncrease/decrease the length of benchmark (default: 1.0)"),
+    OPT_BOOL(0, "bench-only-safe", o_bench_only_safe, 0, "\tDon't benchmark too verbose or risky functions"),
+    OPT_END,
+  }
+};
+
+#define TEST(x) do { if (unlikely(!(x))) test_failed(#x, __LINE__); } while (0)
+static NONRET void test_failed(const char *check, uint line)
+{
+  msg(L_FATAL, "TEST: Failed at line %u: TEST(%s)", line, check);
+  abort();
+}
+
+static void test_fast(void)
+{
+  struct fastrand *r = fastrand_new();
+  fastrand_gen_seed(r);
+  for (uint i = 0; i < 5000; i++)
+    {
+      u64 x, y;
+
+      TEST((x = fastrand_max(r, 33)) <= 32);
+      TEST((y = fastrand_bits(r, x)) < (1LLU << x));
+
+      TEST((x = fastrand_max(r, 65)) <= 64);
+      TEST((y = fastrand_bits_u64(r, x)) <= ((x == 64) ? UINT64_MAX : (1LLU << x) - 1));
+
+      x = fastrand_u32(r) ? : 1;
+      TEST((y = fastrand_max(r, x)) < x);
+      x = fastrand_u64(r) ? : 1;
+      TEST((y = fastrand_max_u64(r, x)) < x);
+
+      double d;
+      d = fastrand_double(r);
+      TEST(d >= 0.0 - DBL_EPSILON && d < 1.0 + DBL_EPSILON);
+    }
+  fastrand_delete(r);
+  printf("OK\n");
+}
+
+static void test_strong(void)
+{
+  byte buf[100];
+  for (uint j = 0; j < 2; j++)
+    {
+      struct strongrand *r = strongrand_std_open(STRONGRAND_STD_URANDOM, (j == 0) ? 0 : 128);
+      for (uint i = 1; i <= 100; i++)
+	{
+	  strongrand_mem(r, buf, i);
+	  if (i % 10 == 0)
+	    strongrand_reset(r);
+	}
+      strongrand_close(r);
+    }
+  printf("OK\n");
+}
+
+#define BENCH(func) BENCH_SLOW(1, func)
+#define BENCH_SLOW(mult, func) \
+  do { \
+    timestamp_t bench_timer; \
+    init_timer(&bench_timer); \
+    for (uint bench_i = 50000000 * o_bench_scale / (mult) / 4; bench_i--; ) \
+      { func; func; func; func; } \
+    msg(L_INFO, "%7u %s", (mult) * get_timer(&bench_timer), #func); \
+  } while (0)
+
+static void bench_libs(void)
+{
+  uint seed = time(NULL) + getpid();
+
+  uint iso_state = seed;
+  srand(seed);
+
+  u64 bsd_buf[128 / 8];
+  struct random_data bsd_data;
+  bsd_data.state = NULL;
+  if (initstate_r(seed, (char *)bsd_buf, sizeof(bsd_buf), &bsd_data) < 0)
+    die("initstate_r(): %m");
+
+  u64 bsd_buf2[128 / 8];
+  errno = 0;
+  initstate(seed, (char *)bsd_buf2, sizeof(bsd_buf2));
+  if (errno)
+    die("initstate(): %m");
+
+  struct drand48_data svid_data;
+  if (srand48_r(seed, &svid_data) < 0)
+    die("srand48_r(): %m");
+  srand48(seed);
+
+  int32_t int32_res;
+  long int long_res;
+
+  msg(L_INFO, "Benchmarking libc ISO generator");
+  BENCH_SLOW(100, srand(seed));
+  BENCH(rand());
+  BENCH(rand_r(&iso_state));
+
+  msg(L_INFO, "Benchmarking libc BSD generator");
+  BENCH_SLOW(100, srandom(seed));
+  BENCH(random());
+  BENCH(random_r(&bsd_data, &int32_res));
+
+  msg(L_INFO, "Benchmarking libc SVID generator");
+  BENCH(srand48(seed));
+  BENCH(mrand48());
+  BENCH(mrand48_r(&svid_data, &long_res));
+}
+
+static void bench_legacy(void)
+{
+  msg(L_INFO, "Benchmarking ucw legacy generator");
+  srand(time(NULL) + getpid());
+  BENCH(random_u32());
+  BENCH(random_u64());
+  BENCH(random_max(1000000));
+  BENCH(random_max_u64(1000000));
+  BENCH_SLOW(2, random_max_u64(1000000000000LL));
+  BENCH_SLOW(2, random_max_u64((1LLU << 63) - 1)); // It uses slightly suboptimal intervals, so +0 is still a bad case
+  BENCH_SLOW(4, random_max_u64((1LLU << 63) + 1));
+  BENCH_SLOW(2, random_max(1 + random_max(1000000)));
+  BENCH_SLOW(4, random_max_u64(1 + random_max_u64(1000000000000LL)));
+}
+
+static void bench_fast(void)
+{
+  msg(L_INFO, "Benchmarking fast random generator");
+  struct fastrand *r = fastrand_new();
+
+  if (!o_bench_only_safe)
+    {
+      // Can produce huge log with LOCAL_DEBUG
+      uint seed = time(NULL) + getpid();
+      BENCH_SLOW(100, fastrand_gen_seed(r));
+      BENCH_SLOW(100, fastrand_set_seed(r, seed));
+    }
+
+  fastrand_gen_seed(r);
+
+  BENCH(fastrand_bits(r, 1));
+  BENCH(fastrand_bits(r, 32));
+  BENCH(fastrand_bits_u64(r, 64));
+  BENCH(fastrand_u32(r));
+  BENCH(fastrand_u64(r));
+  BENCH(fastrand_max(r, 1000000));
+  BENCH(fastrand_max(r, (1U << 30) + 0));
+  BENCH(fastrand_max(r, (1U << 30) + 1)); // Worst case for 31 bit generators (typical RAND_MAX)
+  BENCH(fastrand_max(r, (1U << 31) + 0));
+  BENCH(fastrand_max(r, (1U << 31) + 1)); // Worst case for 32 bit generators
+  BENCH(fastrand_max_u64(r, 1000000));
+  BENCH_SLOW(2, fastrand_max_u64(r, 1000000000000LL));
+  BENCH_SLOW(2, fastrand_max_u64(r, (1LLU << 63) + 0));
+  BENCH_SLOW(4, fastrand_max_u64(r, (1LLU << 63) + 1));
+  BENCH_SLOW(2, fastrand_max(r, 1 + fastrand_max(r, 1000000)));
+  BENCH_SLOW(4, fastrand_max_u64(r, 1 + fastrand_max_u64(r, 1000000000000LL)));
+  BENCH_SLOW(4, fastrand_double(r));
+
+  byte buf[1000];
+  BENCH(fastrand_mem(r, buf, 1));
+  BENCH(fastrand_mem(r, buf, 4));
+  BENCH_SLOW(10, fastrand_mem(r, buf, 100));
+  BENCH_SLOW(100, fastrand_mem(r, buf, 1000));
+
+  fastrand_delete(r);
+}
+
+static void bench_strong(void)
+{
+  byte buf[100];
+  struct strongrand *r;
+
+  msg(L_INFO, "Benchmarking unbuffered strong random generator");
+  r = strongrand_std_open(STRONGRAND_STD_URANDOM, 0);
+  BENCH_SLOW(50, strongrand_mem(r, buf, 1));
+  BENCH_SLOW(200, strongrand_mem(r, buf, 100));
+  strongrand_close(r);
+
+  msg(L_INFO, "Benchmarking buffered strong random generator");
+  r = strongrand_std_open(STRONGRAND_STD_URANDOM, 128);
+  BENCH_SLOW(50, strongrand_mem(r, buf, 1));
+  BENCH_SLOW(200, strongrand_mem(r, buf, 100));
+  strongrand_close(r);
+
+  msg(L_INFO, "Benchmarking buffered strong random generator with autoreset");
+  r = strongrand_std_open(STRONGRAND_STD_URANDOM | STRONGRAND_STD_AUTO_RESET, 128);
+  BENCH_SLOW(50, strongrand_mem(r, buf, 1));
+  BENCH_SLOW(200, strongrand_mem(r, buf, 100));
+  strongrand_close(r);
+}
+
+int main(int argc UNUSED, char **argv)
+{
+  cf_def_file = INSTALL_CONFIG_DIR "/common";
+  opt_parse(&options, argv + 1);
+
+  if (o_test_fast)
+    test_fast();
+  if (o_test_strong)
+    test_strong();
+
+  if (o_bench_all || o_bench_libs)
+    bench_libs();
+  if (o_bench_all || o_bench_legacy)
+    bench_legacy();
+  if (o_bench_all || o_bench_fast)
+    bench_fast();
+  if (o_bench_all || o_bench_strong)
+    bench_strong();
+
+  return 0;
+}
diff --git a/libucw/ucw/random-test.t b/libucw/ucw/random-test.t
new file mode 100644
index 0000000..0027f60
--- /dev/null
+++ b/libucw/ucw/random-test.t
@@ -0,0 +1,7 @@
+Name:	random-fast
+Run:	../obj/ucw/random-test --test-fast
+Out:	OK
+
+Name:	random-strong
+Run:	../obj/ucw/random-test --test-strong
+Out:	OK
diff --git a/libucw/ucw/random.h b/libucw/ucw/random.h
new file mode 100644
index 0000000..dfe7494
--- /dev/null
+++ b/libucw/ucw/random.h
@@ -0,0 +1,173 @@
+/*
+ *	The UCW Library -- Random numbers
+ *
+ *	(c) 2020--2022 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_RANDOM_H
+#define _UCW_RANDOM_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define fastrand_new ucw_fastrand_new
+#define fastrand_delete ucw_fastrand_delete
+#define fastrand_set_seed ucw_fastrand_set_seed
+#define fastrand_gen_seed_value ucw_fastrand_gen_seed_value
+#define fastrand_gen_seed ucw_fastrand_gen_seed
+#define fastrand_has_seed ucw_fastrand_has_seed
+#define fastrand_reset ucw_fastrand_reset
+#define fastrand_u32 ucw_fastrand_u32
+#define fastrand_u64 ucw_fastrand_u64
+#define fastrand_bits_u64 ucw_fastrand_bits_u64
+#define fastrand_max ucw_fastrand_max
+#define fastrand_max_u64 ucw_fastrand_max_u64
+#define fastrand_mem ucw_fastrand_mem
+#define fastrand_double ucw_fastrand_double
+#define strongrand_close ucw_strongrand_close
+#define strongrand_reset ucw_strongrand_reset
+#define strongrand_mem ucw_strongrand_mem
+#define strongrand_std_open ucw_strongrand_std_open
+#define strongrand_getrandom_mem_try ucw_strongrand_getrandom_mem_try
+#endif
+
+/* random-fast.c */
+
+/**
+ * Context structure for a fast pseudo-random generator.
+ * Useful for generating numbers in randomized algorithms, but not in critical things like cryptography.
+ * The library is generally thread-safe, but each context must be used by at most one thread at one time.
+ * Also be careful with fork() if you want to avoid the same numbers in subprocesses.
+ **/
+struct fastrand;
+
+/**
+ * Type for a seed value. Beware that some generators are only able to use the lowest 32 bits.
+ **/
+typedef u64 fastrand_seed_t;
+
+/**
+ * Allocate a new context. Should be paired with fastrand_delete().
+ * Don't forget to supply a seed before started to read randomness.
+ **/
+struct fastrand *fastrand_new(void);
+void fastrand_delete(struct fastrand *c);
+
+/** (Re)seed the context with given value. **/
+void fastrand_set_seed(struct fastrand *c, fastrand_seed_t seed);
+
+/**
+ * Generate a seed for fastrand_set_seed().
+ *
+ * Since glibc 2.25 and kernel 3.17, we use getrandom() syscall
+ * to read kernel's urandom.
+ *
+ * Otherwise we mix these things:
+ * -- current time
+ * -- process id to deal with frequent fork() or startups
+ * -- counter to deal with multiple contexts, for example in threaded application
+ **/
+fastrand_seed_t fastrand_gen_seed_value(void);
+
+/** (Re)seed the context with fastrand_gen_seed_value(). **/
+fastrand_seed_t fastrand_gen_seed(struct fastrand *c);
+
+/** Is the context seeded? **/
+bool fastrand_has_seed(struct fastrand *c);
+
+/** Reset the context to its initial state. Useful after a fork() to assert forgotten reseed. **/
+void fastrand_reset(struct fastrand *c);
+
+/** Uniformly generate 32 random bits. **/
+u32 fastrand_u32(struct fastrand *c);
+
+/** Uniformly generate 64 random bits. **/
+u64 fastrand_u64(struct fastrand *c);
+
+/** Uniformly generate [0, 64] random bits. **/
+u64 fastrand_bits_u64(struct fastrand *c, uint bits);
+
+/** Uniformly generate [0, 8*sizeof(uint)] random bits. **/
+static inline uint fastrand_bits(struct fastrand *c, uint bits)
+{
+  return fastrand_bits_u64(c, bits);
+}
+
+/** Uniformly generate a random number from range [0, bound-1], where @bound is [1, UINT_MAX]. **/
+uint fastrand_max(struct fastrand *c, uint bound);
+
+/** Uniformly generate a random number from range [0, bound-1], where @bound is [1, UINT64_MAX]. **/
+u64 fastrand_max_u64(struct fastrand *c, u64 bound);
+
+/** Generate @size random bytes. **/
+void fastrand_mem(struct fastrand *c, void *ptr, size_t size);
+
+/** Uniformly generate a random number from range [0.0, 1.0) + possible inaccuracies from basic floating point operations. **/
+double fastrand_double(struct fastrand *c);
+
+/* random-strong.c */
+
+/**
+ * Context structure for a strong random generator.
+ * Useful for things like generating random ids or cryptography.
+ * The library is generally thread-safe, but each context must be used by at most one thread at one time.
+ *
+ * Also be careful with fork(). Unless said otherwise, it's forbidden to use the context
+ * in a forked child, we can even assert changes of pid. See strongrand_reset() if you
+ * need that.
+ **/
+struct strongrand {
+  const char *name;				/* (mandatory) Context name for logging. */
+  void (*read)(struct strongrand *sr, byte *ptr, int size); /* (mandatory) Generate @size random bytes. */
+  void (*close)(struct strongrand *sr);		/* Called from strongrand_close(). */
+  void (*reset)(struct strongrand *sr);		/* Called from strongrand_reset(). */
+};
+
+/** Close a previously opened context. **/
+void strongrand_close(struct strongrand *c);
+
+/**
+ * If you want to use the same context in multiple forked subprocesses, you must
+ * call this function after the fork() to flush any buffered randomness.
+ * Some future back-ends could use it for even more things, for example
+ * to re-connect somewhere.
+ **/
+void strongrand_reset(struct strongrand *sr);
+
+/** Generate @size random bytes. **/
+void strongrand_mem(struct strongrand *c, void *ptr, size_t size);
+
+/**
+ * Open kernel's random generator.
+ * Requires exactly one of these flags, among others:
+ * -- STRONGRAND_STD_URANDOM
+ * -- STRONGRAND_STD_RANDOM
+ *
+ * Since glibc 2.25 and kernel 3.17, we use getrandom() syscall,
+ * otherwise we open and read from "/dev/[u]random" device.
+ *
+ * @buf_size can be 0 for unbuffered reading.
+ *
+ * STRONGRAND_STD_x_RESET flags are only useful for buffered reading.
+ *
+ * If at least one of the following conditions are met, strongrand_reset()
+ * after fork() is not necessary:
+ * -- zero @buf_size
+ * -- STRONGRAND_STD_AUTO_RESET flag
+ * -- no read since open or last reset (empty buffer)
+ **/
+struct strongrand *strongrand_std_open(uint flags, uint buf_size);
+
+enum strongrand_std_flags {
+  STRONGRAND_STD_URANDOM = 0x1,		// Use kernel's "urandom" source.
+  STRONGRAND_STD_RANDOM = 0x2,		// Use kernel's "random" source.
+  STRONGRAND_STD_DELAYED = 0x4,		// Delay non-trivial initializations like opening file descriptor to first read.
+  STRONGRAND_STD_AUTO_RESET = 0x8,	// Automatically do strongrand_reset() after changes of getpid(); adds overhead to each read.
+  STRONGRAND_STD_ASSERT_RESET = 0x10,	// Assert correct usage of strongrand_reset() after changes of getpid(); for debugging.
+};
+
+// Internals
+bool strongrand_getrandom_mem_try(void *buf, size_t size);
+
+#endif
diff --git a/libucw/ucw/redblack-test.c b/libucw/ucw/redblack-test.c
new file mode 100644
index 0000000..6ec1b9f
--- /dev/null
+++ b/libucw/ucw/redblack-test.c
@@ -0,0 +1,253 @@
+/*
+ *	Test of red-black trees
+ *
+ *	(c) 2002, Robert Spalek <robert@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/fastbuf.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+struct my1_node
+{
+	int key;
+	int x;
+};
+
+static void my_dump_key(struct fastbuf *fb, struct my1_node *n)
+{
+	char tmp[20];
+	sprintf(tmp, "key=%d ", n->key);
+	bputs(fb, tmp);
+}
+
+static void my_dump_data(struct fastbuf *fb, struct my1_node *n)
+{
+	char tmp[20];
+	sprintf(tmp, "x=%d ", n->x);
+	bputs(fb, tmp);
+}
+
+#define TREE_NODE struct my1_node
+#define TREE_PREFIX(x) my_##x
+#define TREE_KEY_ATOMIC key
+#define TREE_WANT_CLEANUP
+#define TREE_WANT_LOOKUP
+#define TREE_WANT_DELETE
+#define TREE_WANT_ITERATOR
+#define TREE_WANT_DUMP
+#define TREE_CONSERVE_SPACE
+#define TREE_AUTO_POOL 4096
+#include "redblack.h"
+
+static void my_check_order(struct fastbuf *fb, struct my_tree *t)
+{
+	int last_key = 0x80000000;
+	TREE_FOR_ALL(my, t, n)
+	{
+		ASSERT(n->key >= last_key);
+		last_key = n->key;
+		if (fb)
+		{
+			char tmp[30];
+			sprintf(tmp, "%d -> %d\n", n->key, n->x);
+			bputs(fb, tmp);
+		}
+	}
+	TREE_END_FOR;
+	if (fb)
+		bflush(fb);
+}
+
+struct my2_node
+{
+	char key[1];
+};
+
+static void my2_dump_key(struct fastbuf *fb, struct my2_node *n)
+{
+	bputs(fb, "key=");
+	bputs(fb, n->key);
+	bputc(fb, ' ');
+}
+
+static void my2_dump_data(struct fastbuf *fb UNUSED, struct my2_node *n UNUSED)
+{
+}
+
+#define TREE_NODE struct my2_node
+#define TREE_PREFIX(x) my2_##x
+#define TREE_KEY_ENDSTRING key
+#define TREE_NOCASE
+#define TREE_WANT_CLEANUP
+#define TREE_WANT_NEW
+#define TREE_WANT_SEARCH
+#define TREE_WANT_REMOVE
+#define TREE_WANT_FIND_NEXT
+#define TREE_WANT_ITERATOR
+#define TREE_WANT_DUMP
+#define TREE_CONSERVE_SPACE
+#define TREE_AUTO_POOL 4096
+#include "redblack.h"
+
+static void random_string(char *txt, uint max_len)
+{
+	uint len = random() % max_len;
+	uint j;
+	for (j=0; j<len; j++)
+		txt[j] = random() % 96 + 32;
+	txt[len] = 0;
+}
+
+static char *options = CF_SHORT_OPTS "vn:a";
+
+static char *help = "\
+Usage: test1.bin <options>\n\
+Options:\n"
+CF_USAGE
+"-v\tSet verbose mode\n\
+-n num\tNumber of inserted nodes\n\
+-a\tProbe some ASSERTs\n\
+";
+
+static void NONRET
+usage(void)
+{
+	fputs(help, stderr);
+	exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+	int verbose = 0, number = 1000, asserts = 0;
+	int opt;
+	struct fastbuf *fb, *dump_fb;
+	struct my_tree t;
+	struct my2_tree t2;
+	int i;
+	cf_def_file = NULL;
+	log_init(argv[0]);
+	while ((opt = cf_getopt(argc, argv, options, CF_NO_LONG_OPTS, NULL)) >= 0)
+		switch (opt)
+		{
+			case 'v':
+				verbose++;
+				break;
+			case 'n':
+				number = atoi(optarg);
+				break;
+			case 'a':
+				asserts++;
+				break;
+			default:
+				usage();
+				break;
+		}
+	if (optind < argc)
+		usage();
+	fb = bfdopen(1, 4096);
+	if (verbose > 1)
+		dump_fb = fb;
+	else
+		dump_fb = NULL;
+
+	my_init(&t);
+	for (i=0; i<number; i++)
+		my_lookup(&t, random() % 1000000)->x = i;
+	my_dump(dump_fb, &t);
+	my_check_order(dump_fb, &t);
+	if (asserts)
+	{
+		my_new(&t, 1);
+		my_new(&t, 1);
+	}
+	my_cleanup(&t);
+	if (verbose > 0)
+		bputs(fb, "Load test passed\n");
+
+	my_init(&t);
+	for (i=0; i<100; i++)
+	{
+		my_new(&t, i)->x = i;
+		my_dump(dump_fb, &t);
+	}
+	for (i=0; i<100; i++)
+	{
+		int a = i/10, b = i%10, j = a*10 + (b + a) % 10;
+		int res UNUSED = my_delete(&t, j);
+		ASSERT(res);
+		my_dump(dump_fb, &t);
+	}
+	my_cleanup(&t);
+	if (verbose > 0)
+		bputs(fb, "Sequential adding and deleting passed\n");
+
+	my_init(&t);
+	for (i=0; i<997; i++)
+	{
+		my_new(&t, i*238 % 997)->x = i;
+		my_dump(NULL, &t);
+	}
+	my_dump(dump_fb, &t);
+	i = 0;
+	TREE_FOR_ALL(my, &t, n)
+	{
+		ASSERT(n->key == i);
+		i++;
+	}
+	TREE_END_FOR;
+	ASSERT(i == 997);
+	for (i=0; i<997; i++)
+	{
+		int res UNUSED = my_delete(&t, i*111 % 997);
+		ASSERT(res);
+		my_dump(NULL, &t);
+	}
+	my_dump(dump_fb, &t);
+	my_cleanup(&t);
+	if (verbose > 0)
+		bputs(fb, "Complete tree passed\n");
+
+	my2_init(&t2);
+	for (i=0; i<number; i++)
+	{
+		char txt[30];
+		random_string(txt, 30);
+		my2_new(&t2, txt);
+	}
+	my2_dump(dump_fb, &t2);
+	TREE_FOR_ALL(my2, &t2, n)
+	{
+		my2_node *tmp;
+		int count = 0;
+		for (tmp=n; tmp; tmp = my2_find_next(tmp))
+			count++;
+		if (dump_fb)
+		{
+			char txt[20];
+			bputs(dump_fb, n->key);
+			sprintf(txt, ": %d\n", count);
+			bputs(dump_fb, txt);
+		}
+	}
+	TREE_END_FOR;
+	while (t2.count > 0)
+	{
+		char txt[30];
+		my2_node *n;
+		random_string(txt, 30);
+		n = my2_search(&t2, txt);
+		ASSERT(n);
+		my2_remove(&t2, n);
+	}
+	my2_dump(dump_fb, &t2);
+	my2_cleanup(&t2);
+	if (verbose > 0)
+		bputs(fb, "String test passed\n");
+
+	bclose(fb);
+	return 0;
+}
diff --git a/libucw/ucw/redblack-test.t b/libucw/ucw/redblack-test.t
new file mode 100644
index 0000000..d9aec08
--- /dev/null
+++ b/libucw/ucw/redblack-test.t
@@ -0,0 +1,3 @@
+# Test for the redblack module
+
+Run:	../obj/ucw/redblack-test
diff --git a/libucw/ucw/redblack.h b/libucw/ucw/redblack.h
new file mode 100644
index 0000000..a77ee77
--- /dev/null
+++ b/libucw/ucw/redblack.h
@@ -0,0 +1,1109 @@
+/*
+ *	UCW Library -- Red-black trees
+ *
+ *	(c) 2002--2005, Robert Spalek <robert@ucw.cz>
+ *
+ *	Skeleton based on hash-tables by:
+ *
+ *	(c) 2002, Martin Mares <mj@ucw.cz>
+ *
+ */
+
+/*
+ * Data structure description:
+ *
+ * A red-black tree is a binary search tree, where records are stored
+ * in nodes (may be also leaves).  Every node has a colour.  The
+ * following restrictions hold:
+ *
+ * - a parent of a red node is black
+ * - every path from the root to a node with less than 2 children
+ *   contains the same number of black nodes
+ *
+ * A usual interpretation is, that leaves are intervals between records
+ * and contain no data.  Every leaf is black.  This is equivalent, but
+ * saves the space.
+ */
+
+/*
+ *  This is not a normal header file, it's a generator of red-black trees.
+ *  Each time you include it with parameters set in the corresponding
+ *  preprocessor macros, it generates a tree structure with the parameters
+ *  given.
+ *
+ *  You need to specify:
+ *
+ *  TREE_NODE		data type where a node dwells (usually a struct).
+ *  TREE_PREFIX(x)	macro to add a name prefix (used on all global names
+ *			defined by the tree generator).
+ *
+ *  Then decide on type of keys:
+ *
+ *  TREE_KEY_ATOMIC=f	use node->f as a key of an atomic type (i.e.,
+ *			a type which can be compared using '>', `==', and '<')
+ *			& TREE_ATOMIC_TYPE (defaults to int).
+ *  | TREE_KEY_STRING=f	use node->f as a string key, allocated
+ *			separately from the rest of the node.
+ *  | TREE_KEY_ENDSTRING=f use node->f as a string key, allocated
+ *			automatically at the end of the node struct
+ *			(to be declared as "char f[1]" at the end).
+ *  | TREE_KEY_COMPLEX	use a multi-component key; as the name suggests,
+ *			the passing of parameters is a bit complex then.
+ *			The TREE_KEY_COMPLEX(x) macro should expand to
+ *			`x k1, x k2, ... x kn' and you should also define:
+ *    & TREE_KEY_DECL	declaration of function parameters in which key
+ *			should be passed to all tree operations.
+ *			That is, `type1 k1, type2 k2, ... typen kn'.
+ *			With complex keys, TREE_GIVE_CMP is mandatory.
+ *
+ *  Then specify what operations you request (all names are automatically
+ *  prefixed by calling TREE_PREFIX):
+ *
+ *  <always defined>	init() -- initialize the tree.
+ *  TREE_WANT_CLEANUP	cleanup() -- deallocate the tree.
+ *  TREE_WANT_FIND	node *find(key) -- find first node with the specified
+ *			key, return NULL if no such node exists.
+ *  TREE_WANT_FIND_NEXT	node *find_next(node *start) -- find next node with the
+ *			specified key, return NULL if no such node exists.
+ *			Implies TREE_DUPLICATES.
+ *  TREE_WANT_SEARCH	node *search(key) -- find the node with the specified
+ *			or, if it does not exist, the nearest one.
+ *  TREE_WANT_SEARCH_DOWN node *search_down(key) -- find either the node with
+ *                      specified value, or if it does not exist, the node
+ *                      with nearest smaller value.
+ *  TREE_WANT_SEARCH_UP	node *search_up(key) -- find either the node with
+ *                      specified value, or if it does not exist, the node
+ *                      with nearest greater value.
+ *  TREE_WANT_BOUNDARY	node *boundary(uint direction) -- finds smallest
+ *			(direction==0) or largest (direction==1) node.
+ *  TREE_WANT_ADJACENT	node *adjacent(node *, uint direction) -- finds next
+ *			(direction==1) or previous (direction==0) node.
+ *  TREE_WANT_NEW	node *new(key) -- create new node with given key.
+ *			If it already exists, it is created as the last one.
+ *  TREE_WANT_LOOKUP	node *lookup(key) -- find node with given key,
+ *			if it doesn't exist, create it. Defining
+ *			TREE_GIVE_INIT_DATA is strongly recommended.
+ *  TREE_WANT_DELETE	int delete(key) -- delete and deallocate node
+ *			with a given key. Returns success.
+ *  TREE_WANT_REMOVE	remove(node *) -- delete and deallocate given node.
+ *
+ *  TREE_WANT_DUMP	dump() -- dumps the whole tree to stdout
+ *
+ *  You can also supply several functions:
+ *
+ *  TREE_GIVE_CMP	int cmp(key1, key2) -- return -1, 0, and 1 according to
+ *			the relation of keys.  By default, we use <, ==, > for
+ *			atomic types and either strcmp or strcasecmp for
+ *			strings.
+ *  TREE_GIVE_EXTRA_SIZE int extra_size(key) -- returns how many bytes after the
+ *			node should be allocated for dynamic data. Default=0
+ *			or length of the string with TREE_KEY_ENDSTRING.
+ *  TREE_GIVE_INIT_KEY	void init_key(node *,key) -- initialize key in a newly
+ *			created node. Defaults: assignment for atomic keys
+ *			and static strings, strcpy for end-allocated strings.
+ *  TREE_GIVE_INIT_DATA	void init_data(node *) -- initialize data fields in a
+ *			newly created node. Very useful for lookup operations.
+ *  TREE_GIVE_ALLOC	void *alloc(uint size) -- allocate space for
+ *			a node. By default, xmalloc() is used unless overridden
+ *			by TREE_AUTO_POOL.
+ *			void free(void *) -- the converse.
+ *
+ *  ... and a couple of extra parameters:
+ *
+ *  TREE_NOCASE		string comparisons should be case-insensitive.
+ *  TREE_ATOMIC_TYPE=t	Atomic values are of type `t' instead of int.
+ *  TREE_USE_POOL=pool	Allocate all nodes from given mempool. Please keep
+ *			in mind that deleted/removed nodes cannot be freed.
+ *  TREE_AUTO_POOL=size	Automatically allocate nodes from an internal memory
+ *			pool of a given block size. This is either an eltpool
+ *			(for fixed-size nodes), or a mempool for variable-sized
+ *			ones (in this case, deletes/removes are not deallocated).
+ *  TREE_GLOBAL		Functions are exported (i.e., not static).
+ *  TREE_CONSERVE_SPACE	Use as little space as possible at the price of a
+ *			little slowdown.
+ *  TREE_DUPLICATES	Records with duplicate keys are allowed.
+ *  TREE_MAX_DEPTH	Maximal depth of a tree (for stack allocation).
+ *
+ *  If you set TREE_WANT_ITERATOR, you also get a iterator macro at no
+ *  extra charge:
+ *
+ *  TREE_FOR_ALL(tree_prefix, tree_pointer, variable)
+ *    {
+ *      // node *variable gets declared automatically
+ *      do_something_with_node(variable);
+ *      // use TREE_BREAK and TREE_CONTINUE instead of break and continue
+ *	// you must not alter contents of the tree here
+ *    }
+ *  TREE_END_FOR;
+ *
+ *  Then include <ucw/redblack.h> and voila, you have a tree suiting all your
+ *  needs (at least those which you've revealed :) ).
+ *
+ *  After including this file, all parameter macros are automatically
+ *  undef'd.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#if !defined(TREE_NODE) || !defined(TREE_PREFIX)
+#error Some of the mandatory configuration macros are missing.
+#endif
+
+#define P(x) TREE_PREFIX(x)
+
+/* Declare buckets and the tree.  */
+
+typedef TREE_NODE P(node);
+
+#if defined(TREE_WANT_FIND_NEXT) || defined(TREE_WANT_ADJACENT) || defined(TREE_WANT_ITERATOR) || defined(TREE_WANT_REMOVE)
+#	define TREE_STORE_PARENT
+#endif
+
+#ifdef TREE_AUTO_POOL
+#	if defined(TREE_GIVE_EXTRA_SIZE) || defined(TREE_KEY_ENDSTRING)
+#		define TREE_AUTO_MEMPOOL
+#		include <ucw/mempool.h>
+#	else
+#		define TREE_AUTO_ELTPOOL
+#		include <ucw/eltpool.h>
+#	endif
+#endif
+
+typedef struct P(bucket) {
+	struct P(bucket) *son[2];
+#ifdef TREE_STORE_PARENT
+	struct P(bucket) *parent;
+#endif
+#if !defined(TREE_CONSERVE_SPACE) && (defined(TREE_GIVE_EXTRA_SIZE) || defined(TREE_KEY_ENDSTRING))
+	uint red_flag:1;
+#endif
+	P(node) n;
+#if !defined(TREE_CONSERVE_SPACE) && !defined(TREE_GIVE_EXTRA_SIZE) && !defined(TREE_KEY_ENDSTRING)
+	uint red_flag:1;
+#endif
+} P(bucket);
+
+struct P(tree) {
+	uint count;
+	uint height;			/* of black nodes */
+	P(bucket) *root;
+#ifdef TREE_AUTO_MEMPOOL
+	struct mempool *mp;
+#endif
+#ifdef TREE_AUTO_ELTPOOL
+	struct eltpool *ep;
+#endif
+};
+
+typedef struct P(stack_entry) {
+	P(bucket) *buck;
+	uint son;
+} P(stack_entry);
+
+#define T struct P(tree)
+
+/* Preset parameters */
+
+#if defined(TREE_KEY_ATOMIC)
+
+#define TREE_KEY(x) x TREE_KEY_ATOMIC
+
+#ifndef TREE_ATOMIC_TYPE
+#	define TREE_ATOMIC_TYPE int
+#endif
+#define TREE_KEY_DECL TREE_ATOMIC_TYPE TREE_KEY()
+
+#ifndef TREE_GIVE_CMP
+#	define TREE_GIVE_CMP
+	static inline int P(cmp) (TREE_ATOMIC_TYPE x, TREE_ATOMIC_TYPE y)
+	{
+		if (x < y)
+			return -1;
+		else if (x > y)
+			return 1;
+		else
+			return 0;
+	}
+#endif
+
+#ifndef TREE_GIVE_INIT_KEY
+#	define TREE_GIVE_INIT_KEY
+	static inline void P(init_key) (P(node) *n, TREE_ATOMIC_TYPE k)
+	{ TREE_KEY(n->) = k; }
+#endif
+
+#elif defined(TREE_KEY_STRING) || defined(TREE_KEY_ENDSTRING)
+
+#ifdef TREE_KEY_STRING
+#	define TREE_KEY(x) x TREE_KEY_STRING
+#	ifndef TREE_GIVE_INIT_KEY
+#		define TREE_GIVE_INIT_KEY
+		static inline void P(init_key) (P(node) *n, char *k)
+		{ TREE_KEY(n->) = k; }
+#	endif
+#else
+#	define TREE_KEY(x) x TREE_KEY_ENDSTRING
+#	define TREE_GIVE_EXTRA_SIZE
+	static inline int P(extra_size) (char *k)
+	{ return strlen(k); }
+#	ifndef TREE_GIVE_INIT_KEY
+#		define TREE_GIVE_INIT_KEY
+		static inline void P(init_key) (P(node) *n, char *k)
+		{ strcpy(TREE_KEY(n->), k); }
+#	endif
+#endif
+#define TREE_KEY_DECL char *TREE_KEY()
+
+#ifndef TREE_GIVE_CMP
+#	define TREE_GIVE_CMP
+	static inline int P(cmp) (char *x, char *y)
+	{
+#		ifdef TREE_NOCASE
+			return strcasecmp(x,y);
+#		else
+			return strcmp(x,y);
+#		endif
+	}
+#endif
+
+#elif defined(TREE_KEY_COMPLEX)
+
+#define TREE_KEY(x) TREE_KEY_COMPLEX(x)
+
+#else
+#error You forgot to set the tree key type.
+#endif
+
+#ifndef TREE_CONSERVE_SPACE
+	static inline uint P(red_flag) (P(bucket) *node)
+	{ return node->red_flag; }
+	static inline void P(set_red_flag) (P(bucket) *node, uint flag)
+	{ node->red_flag = flag; }
+	static inline P(bucket) * P(tree_son) (P(bucket) *node, uint id)
+	{ return node->son[id]; }
+	static inline void P(set_tree_son) (P(bucket) *node, uint id, P(bucket) *son)
+	{ node->son[id] = son; }
+#else
+	/* Pointers are aligned, hence we can use lower bits.  */
+	static inline uint P(red_flag) (P(bucket) *node)
+	{ return ((uintptr_t) node->son[0]) & 1L; }
+	static inline void P(set_red_flag) (P(bucket) *node, uint flag)
+	{ node->son[0] = (void*) ( (((uintptr_t) node->son[0]) & ~1L) | (flag & 1L) ); }
+	static inline P(bucket) * P(tree_son) (P(bucket) *node, uint id)
+	{ return (void *) (((uintptr_t) node->son[id]) & ~1L); }
+	static inline void P(set_tree_son) (P(bucket) *node, uint id, P(bucket) *son)
+	{ node->son[id] = (void *) ((uintptr_t) son | (((uintptr_t) node->son[id]) & 1L) ); }
+#endif
+
+/* Defaults for missing parameters.  */
+
+#ifndef TREE_GIVE_CMP
+#error Unable to determine how to compare two keys.
+#endif
+
+#ifdef TREE_GIVE_EXTRA_SIZE
+/* This trickery is needed to avoid `unused parameter' warnings */
+#	define TREE_EXTRA_SIZE P(extra_size)
+#else
+/*
+ *  Beware, C macros are expanded iteratively, not recursively,
+ *  hence we get only a _single_ argument, although the expansion
+ *  of TREE_KEY contains commas.
+ */
+#	define TREE_EXTRA_SIZE(x) 0
+#endif
+
+#ifndef TREE_GIVE_INIT_KEY
+#	error Unable to determine how to initialize keys.
+#endif
+
+#ifndef TREE_GIVE_INIT_DATA
+static inline void P(init_data) (P(node) *n UNUSED)
+{
+}
+#endif
+
+#include <stdlib.h>
+
+#ifndef TREE_GIVE_ALLOC
+#	ifdef TREE_USE_POOL
+		static inline void * P(alloc) (T *t UNUSED, uint size)
+		{ return mp_alloc_fast(TREE_USE_POOL, size); }
+		static inline void P(free) (T *t UNUSED, void *x UNUSED)
+		{ }
+#	elif defined(TREE_AUTO_MEMPOOL)
+		static inline void * P(alloc) (T *t, uint size)
+		{ return mp_alloc_fast(t->mp, size); }
+		static inline void P(free) (T *t UNUSED, void *x UNUSED)
+		{ }
+#	elif defined(TREE_AUTO_ELTPOOL)
+		static inline void * P(alloc) (T *t, uint size)
+		{ ASSERT(size == sizeof(P(bucket))); return ep_alloc(t->ep); }
+		static inline void P(free) (T *t, void *x)
+		{ ep_free(t->ep, x); }
+#	else
+		static inline void * P(alloc) (T *t UNUSED, uint size)
+		{ return xmalloc(size); }
+
+		static inline void P(free) (T *t UNUSED, void *x)
+		{ xfree(x); }
+#	endif
+#endif
+
+#ifdef TREE_GLOBAL
+#	define TREE_STATIC
+#else
+#	define TREE_STATIC static
+#endif
+
+#ifndef TREE_MAX_DEPTH
+#	define TREE_MAX_DEPTH 64
+#endif
+
+#if defined(TREE_WANT_FIND_NEXT) && !defined(TREE_DUPLICATES)
+#	define TREE_DUPLICATES
+#endif
+
+#ifdef TREE_WANT_LOOKUP
+#ifndef TREE_WANT_FIND
+#	define TREE_WANT_FIND
+#endif
+#ifndef TREE_WANT_NEW
+#	define TREE_WANT_NEW
+#endif
+#endif
+
+/* Now the operations */
+
+TREE_STATIC void P(init) (T *t)
+{
+	t->count = t->height = 0;
+	t->root = NULL;
+#ifdef TREE_AUTO_MEMPOOL
+	t->mp = mp_new(TREE_AUTO_POOL);
+#endif
+#ifdef TREE_AUTO_ELTPOOL
+	t->ep = ep_new(sizeof(P(bucket)), (TREE_AUTO_POOL + sizeof(P(bucket)) - 1) / sizeof(P(bucket)));
+#endif
+}
+
+#ifdef TREE_WANT_CLEANUP
+static void P(cleanup_subtree) (T *t, P(bucket) *node)
+{
+	if (!node)
+		return;
+	P(cleanup_subtree) (t, P(tree_son) (node, 0));
+	P(cleanup_subtree) (t, P(tree_son) (node, 1));
+	P(free) (t, node);
+	t->count--;
+}
+
+TREE_STATIC void P(cleanup) (T *t)
+{
+	P(cleanup_subtree) (t, t->root);
+	ASSERT(!t->count);
+	t->height = 0;
+#ifdef TREE_AUTO_MEMPOOL
+	mp_delete(t->mp);
+	t->mp = NULL;
+#endif
+#ifdef TREE_AUTO_ELTPOOL
+	ep_delete(t->ep);
+	t->ep = NULL;
+#endif
+}
+#endif
+
+static uint P(fill_stack) (P(stack_entry) *stack, uint max_depth, P(bucket) *node, TREE_KEY_DECL, uint son_id UNUSED)
+{
+	uint i;
+	stack[0].buck = node;
+	for (i=0; stack[i].buck; i++)
+	{
+		int cmp;
+		cmp = P(cmp) (TREE_KEY(), TREE_KEY(stack[i].buck->n.));
+		if (cmp == 0)
+			break;
+		else if (cmp < 0)
+			stack[i].son = 0;
+		else
+			stack[i].son = 1;
+		ASSERT(i+1 < max_depth);
+		stack[i+1].buck = P(tree_son) (stack[i].buck, stack[i].son);
+	}
+#ifdef TREE_DUPLICATES
+	if (stack[i].buck)
+	{
+		uint idx;
+		/* Find first/last of equal keys according to son_id.  */
+		idx = P(fill_stack) (stack+i+1, max_depth-i-1,
+			P(tree_son) (stack[i].buck, son_id), TREE_KEY(), son_id);
+		if (stack[i+1+idx].buck)
+		{
+			stack[i].son = son_id;
+			i = i+1+idx;
+		}
+	}
+#endif
+	stack[i].son = 10;
+	return i;
+}
+
+#ifdef TREE_WANT_FIND
+TREE_STATIC P(node) * P(find) (T *t, TREE_KEY_DECL)
+{
+	P(stack_entry) stack[TREE_MAX_DEPTH];
+	uint depth;
+	depth = P(fill_stack) (stack, TREE_MAX_DEPTH, t->root, TREE_KEY(), 0);
+	return stack[depth].buck ? &stack[depth].buck->n : NULL;
+}
+#endif
+
+#ifdef TREE_WANT_SEARCH_DOWN
+TREE_STATIC P(node) * P(search_down) (T *t, TREE_KEY_DECL)
+{
+	P(node) *last_right=NULL;
+	P(bucket) *node=t->root;
+	while(node)
+	{
+		int cmp;
+		cmp = P(cmp) (TREE_KEY(), TREE_KEY(node->n.));
+		if (cmp == 0)
+			return &node->n;
+		else if (cmp < 0)
+			node=P(tree_son) (node, 0);
+		else
+		{
+			last_right=&node->n;
+			node=P(tree_son) (node, 1);
+		}
+	}
+	return last_right;
+}
+#endif
+
+#ifdef TREE_WANT_SEARCH_UP
+TREE_STATIC P(node) * P(search_up) (T *t, TREE_KEY_DECL)
+{
+	P(node) *last_left=NULL;
+	P(bucket) *node=t->root;
+	while(node)
+	{
+		int cmp;
+		cmp = P(cmp) (TREE_KEY(), TREE_KEY(node->n.));
+		if (cmp == 0)
+			return &node->n;
+		else if (cmp > 0)
+			node=P(tree_son) (node, 1);
+		else
+		{
+			last_left=&node->n;
+			node=P(tree_son) (node, 0);
+		}
+	}
+	return last_left;
+}
+#endif
+
+#ifdef TREE_WANT_BOUNDARY
+TREE_STATIC P(node) * P(boundary) (T *t, uint direction)
+{
+	P(bucket) *n = t->root, *ns;
+	if (!n)
+		return NULL;
+	else
+	{
+		uint son = !!direction;
+		while ((ns = P(tree_son) (n, son)))
+			n = ns;
+		return &n->n;
+	}
+}
+#endif
+
+#ifdef TREE_STORE_PARENT
+TREE_STATIC P(node) * P(adjacent) (P(node) *start, uint direction)
+{
+	P(bucket) *node = SKIP_BACK(P(bucket), n, start);
+	P(bucket) *next = P(tree_son) (node, direction);
+	if (next)
+	{
+		while (1)
+		{
+			node = P(tree_son) (next, 1 - direction);
+			if (!node)
+				break;
+			next = node;
+		}
+	}
+	else
+	{
+		next = node->parent;
+		while (next && node == P(tree_son) (next, direction))
+		{
+			node = next;
+			next = node->parent;
+		}
+		if (!next)
+			return NULL;
+		ASSERT(node == P(tree_son) (next, 1 - direction));
+	}
+	return &next->n;
+}
+#endif
+
+#if defined(TREE_DUPLICATES) || defined(TREE_WANT_DELETE) || defined(TREE_WANT_REMOVE)
+static int P(find_next_node) (P(stack_entry) *stack, uint max_depth, uint direction)
+{
+	uint depth = 0;
+	if (stack[0].buck)
+	{
+		ASSERT(depth+1 < max_depth);
+		stack[depth].son = direction;
+		stack[depth+1].buck = P(tree_son) (stack[depth].buck, direction);
+		depth++;
+		while (stack[depth].buck)
+		{
+			ASSERT(depth+1 < max_depth);
+			stack[depth].son = 1 - direction;
+			stack[depth+1].buck = P(tree_son) (stack[depth].buck, 1 - direction);
+			depth++;
+		}
+	}
+	return depth;
+}
+#endif
+
+#ifdef TREE_WANT_FIND_NEXT
+TREE_STATIC P(node) * P(find_next) (P(node) *start)
+{
+	P(node) *next = P(adjacent) (start, 1);
+	if (next && P(cmp) (TREE_KEY(start->), TREE_KEY(next->)) == 0)
+		return next;
+	else
+		return NULL;
+
+}
+#endif
+
+#ifdef TREE_WANT_SEARCH
+TREE_STATIC P(node) * P(search) (T *t, TREE_KEY_DECL)
+{
+	P(stack_entry) stack[TREE_MAX_DEPTH];
+	uint depth;
+	depth = P(fill_stack) (stack, TREE_MAX_DEPTH, t->root, TREE_KEY(), 0);
+	if (!stack[depth].buck)
+	{
+		if (depth > 0)
+			depth--;
+		else
+			return NULL;
+	}
+	return &stack[depth].buck->n;
+}
+#endif
+
+#if 0
+#define TREE_TRACE(txt...) do { printf(txt); fflush(stdout); } while (0)
+#else
+#define TREE_TRACE(txt...)
+#endif
+
+static inline P(bucket) * P(rotation) (P(bucket) *node, uint son_id)
+{
+	/* Destroys red_flag's in node, son.  Returns new root.  */
+	P(bucket) *son = P(tree_son) (node, son_id);
+	TREE_TRACE("Rotation (node %d, son %d), direction %d\n", node->n.key, son->n.key, son_id);
+	node->son[son_id] = P(tree_son) (son, 1-son_id);
+	son->son[1-son_id] = node;
+#ifdef TREE_STORE_PARENT
+	if (node->son[son_id])
+		node->son[son_id]->parent = node;
+	son->parent = node->parent;
+	node->parent = son;
+#endif
+	return son;
+}
+
+static void P(rotate_after_insert) (T *t, P(stack_entry) *stack, uint depth)
+{
+	P(bucket) *node;
+	P(bucket) *parent, *grand, *uncle;
+	int s1, s2;
+try_it_again:
+	node = stack[depth].buck;
+	ASSERT(P(red_flag) (node));
+	/* At this moment, node became red.  The paths sum have
+	 * been preserved, but we have to check the parental
+	 * condition.  */
+	if (depth == 0)
+	{
+		ASSERT(t->root == node);
+		return;
+	}
+	parent = stack[depth-1].buck;
+	if (!P(red_flag) (parent))
+		return;
+	if (depth == 1)
+	{
+		ASSERT(t->root == parent);
+		P(set_red_flag) (parent, 0);
+		t->height++;
+		return;
+	}
+	grand = stack[depth-2].buck;
+	ASSERT(!P(red_flag) (grand));
+	/* The parent is also red, the grandparent exists and it
+	 * is black.  */
+	s1 = stack[depth-1].son;
+	s2 = stack[depth-2].son;
+	uncle = P(tree_son) (grand, 1-s2);
+	if (uncle && P(red_flag) (uncle))
+	{
+		/* Red parent and uncle, black grandparent.
+		 * Exchange and try another iteration. */
+		P(set_red_flag) (parent, 0);
+		P(set_red_flag) (uncle, 0);
+		P(set_red_flag) (grand, 1);
+		depth -= 2;
+		TREE_TRACE("Swapping colours (parent %d, uncle %d, grand %d), passing thru\n", parent->n.key, uncle->n.key, grand->n.key);
+		goto try_it_again;
+	}
+	/* Black uncle and grandparent, we need to rotate.  Test
+	 * the direction.  */
+	if (s1 == s2)
+	{
+		node = P(rotation) (grand, s2);
+		P(set_red_flag) (parent, 0);
+		P(set_red_flag) (grand, 1);
+	}
+	else
+	{
+		grand->son[s2] = P(rotation) (parent, s1);
+		node = P(rotation) (grand, s2);
+		P(set_red_flag) (grand, 1);
+		P(set_red_flag) (parent, 1);
+		P(set_red_flag) (node, 0);
+	}
+	if (depth >= 3)
+		P(set_tree_son) (stack[depth-3].buck, stack[depth-3].son, node);
+	else
+		t->root = node;
+}
+
+#ifdef TREE_WANT_NEW
+TREE_STATIC P(node) * P(new) (T *t, TREE_KEY_DECL)
+{
+	P(stack_entry) stack[TREE_MAX_DEPTH];
+	P(bucket) *added;
+	uint depth;
+	depth = P(fill_stack) (stack, TREE_MAX_DEPTH, t->root, TREE_KEY(), 1);
+#ifdef TREE_DUPLICATES
+	/* It is the last found value, hence everything in the right subtree is
+	 * strongly _bigger_.  */
+	depth += P(find_next_node) (stack+depth, TREE_MAX_DEPTH-depth, 1);
+#endif
+	ASSERT(!stack[depth].buck);
+	/* We are in a leaf, hence we can easily append a new leaf to it.  */
+	added = P(alloc) (t, sizeof(struct P(bucket)) + TREE_EXTRA_SIZE(TREE_KEY()) );
+	added->son[0] = added->son[1] = NULL;
+	stack[depth].buck = added;
+	if (depth > 0)
+	{
+#ifdef TREE_STORE_PARENT
+		added->parent = stack[depth-1].buck;
+#endif
+		P(set_tree_son) (stack[depth-1].buck, stack[depth-1].son, added);
+	}
+	else
+	{
+#ifdef TREE_STORE_PARENT
+		added->parent = NULL;
+#endif
+		t->root = added;
+	}
+	P(set_red_flag) (added, 1);	/* Set it red to not disturb the path sum.  */
+	P(init_key) (&added->n, TREE_KEY());
+	P(init_data) (&added->n);
+	t->count++;
+	/* Let us reorganize the red_flag's and the structure of the tree.  */
+	P(rotate_after_insert) (t, stack, depth);
+	return &added->n;
+}
+#endif
+
+#ifdef TREE_WANT_LOOKUP
+TREE_STATIC P(node) * P(lookup) (T *t, TREE_KEY_DECL)
+{
+	P(node) *node;
+	node = P(find) (t, TREE_KEY());
+	if (node)
+		return node;
+	return P(new) (t, TREE_KEY());
+}
+#endif
+
+#if defined(TREE_WANT_REMOVE) || defined(TREE_WANT_DELETE)
+static void P(rotate_after_delete) (T *t, P(stack_entry) *stack, int depth)
+{
+	uint iteration = 0;
+	P(bucket) *parent, *sibling, *instead;
+	uint parent_red, del_son, sibl_red;
+missing_black:
+	if (depth < 0)
+	{
+		t->height--;
+		return;
+	}
+	parent = stack[depth].buck;
+	parent_red = P(red_flag) (parent);
+	del_son = stack[depth].son;
+	/* For the 1st iteration: we have deleted parent->son[del_son], which
+	 * was a black node with no son.  Hence there is one mising black
+	 * vertex in that path, which we are going to fix now.
+	 *
+	 * For other iterations: in that path, there is also missing a black
+	 * node.  */
+	if (!iteration)
+		ASSERT(!P(tree_son) (parent, del_son));
+	sibling = P(tree_son) (parent, 1-del_son);
+	ASSERT(sibling);
+	sibl_red = P(red_flag) (sibling);
+	instead = NULL;
+	if (!sibl_red)
+	{
+		P(bucket) *son[2];
+		uint red[2];
+		son[0] = P(tree_son) (sibling, 0);
+		son[1] = P(tree_son) (sibling, 1);
+		red[0] = son[0] ? P(red_flag) (son[0]) : 0;
+		red[1] = son[1] ? P(red_flag) (son[1]) : 0;
+		if (!red[0] && !red[1])
+		{
+			P(set_red_flag) (sibling, 1);
+			P(set_red_flag) (parent, 0);
+			if (parent_red)
+				return;
+			else
+			{
+				depth--;
+				iteration++;
+				TREE_TRACE("Swapping colours (parent %d, sibling %d), passing thru\n", parent->n.key, sibling->n.key);
+				goto missing_black;
+			}
+		} else if (!red[del_son])
+		{
+			instead = P(rotation) (parent, 1-del_son);
+			P(set_red_flag) (instead, parent_red);
+			P(set_red_flag) (parent, 0);
+			P(set_red_flag) (son[1-del_son], 0);
+		} else /* red[del_son] */
+		{
+			parent->son[1-del_son] = P(rotation) (sibling, del_son);
+			instead = P(rotation) (parent, 1-del_son);
+			P(set_red_flag) (instead, parent_red);
+			P(set_red_flag) (parent, 0);
+			P(set_red_flag) (sibling, 0);
+		}
+	} else /* sibl_red */
+	{
+		P(bucket) *grand[2], *son;
+		uint red[2];
+		ASSERT(!parent_red);
+		son = P(tree_son) (sibling, del_son);
+		ASSERT(son && !P(red_flag) (son));
+		grand[0] = P(tree_son) (son, 0);
+		grand[1] = P(tree_son) (son, 1);
+		red[0] = grand[0] ? P(red_flag) (grand[0]) : 0;
+		red[1] = grand[1] ? P(red_flag) (grand[1]) : 0;
+		if (!red[0] && !red[1])
+		{
+			instead = P(rotation) (parent, 1-del_son);
+			P(set_red_flag) (instead, 0);
+			P(set_red_flag) (parent, 0);
+			P(set_red_flag) (son, 1);
+		}
+		else if (!red[del_son])
+		{
+			parent->son[1-del_son] = P(rotation) (sibling, del_son);
+			instead = P(rotation) (parent, 1-del_son);
+			P(set_red_flag) (instead, 0);
+			P(set_red_flag) (parent, 0);
+			P(set_red_flag) (sibling, 1);
+			P(set_red_flag) (grand[1-del_son], 0);
+		} else /* red[del_son] */
+		{
+			sibling->son[del_son] = P(rotation) (son, del_son);
+			parent->son[1-del_son] = P(rotation) (sibling, del_son);
+			instead = P(rotation) (parent, 1-del_son);
+			P(set_red_flag) (instead, 0);
+			P(set_red_flag) (parent, 0);
+			P(set_red_flag) (sibling, 1);
+			P(set_red_flag) (son, 0);
+		}
+	}
+	/* We have performed all desired rotations and need to store the new
+	 * pointer to the subtree.  */
+	ASSERT(instead);
+	if (depth > 0)
+		P(set_tree_son) (stack[depth-1].buck, stack[depth-1].son, instead);
+	else
+		t->root = instead;
+}
+
+static void P(remove_by_stack) (T *t, P(stack_entry) *stack, uint depth)
+{
+	P(bucket) *node = stack[depth].buck;
+	P(bucket) *son;
+	uint i;
+	for (i=0; i<depth; i++)
+		ASSERT(P(tree_son) (stack[i].buck, stack[i].son) == stack[i+1].buck);
+	if (P(tree_son) (node, 0) && P(tree_son) (node, 1))
+	{
+		P(bucket) *xchg;
+		uint flag_node, flag_xchg;
+		uint d = P(find_next_node) (stack+depth, TREE_MAX_DEPTH-depth, 1);
+
+		ASSERT(d >= 2);
+		d--;
+		xchg = stack[depth+d].buck;
+		flag_node = P(red_flag) (node);
+		flag_xchg = P(red_flag) (xchg);
+		ASSERT(!P(tree_son) (xchg, 0));
+		son = P(tree_son) (xchg, 1);
+		stack[depth].buck = xchg;	/* Magic iff d == 1.  */
+		stack[depth+d].buck = node;
+		xchg->son[0] = P(tree_son) (node, 0);
+		xchg->son[1] = P(tree_son) (node, 1);
+		if (depth > 0)
+			P(set_tree_son) (stack[depth-1].buck, stack[depth-1].son, xchg);
+		else
+			t->root = xchg;
+		node->son[0] = NULL;
+		node->son[1] = son;
+		P(set_tree_son) (stack[depth+d-1].buck, stack[depth+d-1].son, node);
+#ifdef TREE_STORE_PARENT
+		xchg->parent = depth > 0 ? stack[depth-1].buck : NULL;
+		xchg->son[0]->parent = xchg;
+		xchg->son[1]->parent = xchg;
+		node->parent = stack[depth+d-1].buck;
+		if (son)
+			son->parent = node;
+#endif
+		P(set_red_flag) (xchg, flag_node);
+		P(set_red_flag) (node, flag_xchg);
+		depth += d;
+	}
+	else if (P(tree_son) (node, 0))
+		son = P(tree_son) (node, 0);
+	else
+		son = P(tree_son) (node, 1);
+	/* At this moment, stack[depth].buck == node and it has at most one son
+	 * and it is stored in the variable son.  */
+	t->count--;
+	if (depth > 0)
+	{
+		P(set_tree_son) (stack[depth-1].buck, stack[depth-1].son, son);
+#ifdef TREE_STORE_PARENT
+		if (son)
+			son->parent = stack[depth-1].buck;
+#endif
+	}
+	else
+	{
+		t->root = son;
+#ifdef TREE_STORE_PARENT
+		if (son)
+			son->parent = NULL;
+#endif
+	}
+	if (P(red_flag) (node))
+	{
+		ASSERT(!son);
+		return;
+	}
+	P(free)(t, node);
+	/* We have deleted a black node.  */
+	if (son)
+	{
+		ASSERT(P(red_flag) (son));
+		P(set_red_flag) (son, 0);
+		return;
+	}
+	P(rotate_after_delete) (t, stack, (int) depth - 1);
+}
+#endif
+
+#ifdef TREE_WANT_REMOVE
+TREE_STATIC void P(remove) (T *t, P(node) *Node)
+{
+	P(stack_entry) stack[TREE_MAX_DEPTH];
+	P(bucket) *node = SKIP_BACK(P(bucket), n, Node);
+	uint depth = 0, i;
+	stack[0].buck = node;
+	stack[0].son = 10;
+	while (node->parent)
+	{
+		depth++;
+		ASSERT(depth < TREE_MAX_DEPTH);
+		stack[depth].buck = node->parent;
+		stack[depth].son = P(tree_son) (node->parent, 0) == node ? 0 : 1;
+		node = node->parent;
+	}
+	for (i=0; i<(depth+1)/2; i++)
+	{
+		P(stack_entry) tmp = stack[i];
+		stack[i] = stack[depth-i];
+		stack[depth-i] = tmp;
+	}
+	P(remove_by_stack) (t, stack, depth);
+}
+#endif
+
+#ifdef TREE_WANT_DELETE
+TREE_STATIC int P(delete) (T *t, TREE_KEY_DECL)
+{
+	P(stack_entry) stack[TREE_MAX_DEPTH];
+	uint depth;
+	depth = P(fill_stack) (stack, TREE_MAX_DEPTH, t->root, TREE_KEY(), 1);
+	if (stack[depth].buck)
+	{
+		P(remove_by_stack) (t, stack, depth);
+		return 1;
+	}
+	else
+		return 0;
+}
+#endif
+
+#ifdef TREE_WANT_DUMP
+static void P(dump_subtree) (struct fastbuf *fb, T *t, P(bucket) *node, P(bucket) *parent, int cmp_res, int level, uint black)
+{
+	uint flag;
+	int i;
+	if (!node)
+	{
+		ASSERT(black == t->height);
+		return;
+	}
+	flag = P(red_flag) (node);
+#ifdef TREE_STORE_PARENT
+	ASSERT(node->parent == parent);
+#endif
+	if (parent)
+	{
+		ASSERT(!flag || !P(red_flag) (parent));
+		cmp_res *= P(cmp) (TREE_KEY(node->n.), TREE_KEY(parent->n.));
+#ifdef TREE_DUPLICATES
+		ASSERT(cmp_res >= 0);
+#else
+		ASSERT(cmp_res > 0);
+#endif
+	}
+	P(dump_subtree) (fb, t, P(tree_son) (node, 0), node, -1, level+1, black + (1-flag));
+	if (fb)
+	{
+		char tmp[20];
+		for (i=0; i<level; i++)
+			bputs(fb, "  ");
+		sprintf(tmp, "L%d %c\t", level, flag ? 'R' : 'B');
+		bputs(fb, tmp);
+		P(dump_key) (fb, &node->n);
+		P(dump_data) (fb, &node->n);
+		bputs(fb, "\n");
+	}
+	P(dump_subtree) (fb, t, P(tree_son) (node, 1), node, +1, level+1, black + (1-flag));
+}
+
+TREE_STATIC void P(dump) (struct fastbuf *fb, T *t)
+{
+	if (fb)
+	{
+		char tmp[50];
+		sprintf(tmp, "Tree of %d nodes and height %d\n", t->count, t->height);
+		bputs(fb, tmp);
+	}
+	P(dump_subtree) (fb, t, t->root, NULL, 0, 0, 0);
+	if (fb)
+	{
+		bputs(fb, "\n");
+		bflush(fb);
+	}
+}
+#endif
+
+/* And the iterator */
+
+#ifdef TREE_WANT_ITERATOR
+static P(node) * P(first_node) (T *t, uint direction)
+{
+	P(bucket) *node = t->root, *prev = NULL;
+	while (node)
+	{
+		prev = node;
+		node = P(tree_son) (node, direction);
+	}
+	return prev ? &prev->n : NULL;
+}
+
+#ifndef TREE_FOR_ALL
+
+#define TREE_FOR_ALL(t_px, t_ptr, t_var)						\
+do											\
+{											\
+	GLUE_(t_px,node) *t_var = GLUE_(t_px,first_node)(t_ptr, 0);			\
+	for (; t_var; t_var = GLUE_(t_px,adjacent)(t_var, 1))				\
+	{
+#define TREE_END_FOR } } while(0)
+#define TREE_BREAK break
+#define TREE_CONTINUE continue
+
+#endif
+#endif
+
+/* Finally, undefine all the parameters */
+
+#undef P
+#undef T
+
+#undef TREE_NODE
+#undef TREE_PREFIX
+#undef TREE_KEY_ATOMIC
+#undef TREE_KEY_STRING
+#undef TREE_KEY_ENDSTRING
+#undef TREE_KEY_COMPLEX
+#undef TREE_KEY_DECL
+#undef TREE_WANT_CLEANUP
+#undef TREE_WANT_FIND
+#undef TREE_WANT_FIND_NEXT
+#undef TREE_WANT_SEARCH
+#undef TREE_WANT_SEARCH_DOWN
+#undef TREE_WANT_SEARCH_UP
+#undef TREE_WANT_BOUNDARY
+#undef TREE_WANT_ADJACENT
+#undef TREE_WANT_NEW
+#undef TREE_WANT_LOOKUP
+#undef TREE_WANT_DELETE
+#undef TREE_WANT_REMOVE
+#undef TREE_WANT_DUMP
+#undef TREE_WANT_ITERATOR
+#undef TREE_GIVE_CMP
+#undef TREE_GIVE_EXTRA_SIZE
+#undef TREE_GIVE_INIT_KEY
+#undef TREE_GIVE_INIT_DATA
+#undef TREE_GIVE_ALLOC
+#undef TREE_NOCASE
+#undef TREE_ATOMIC_TYPE
+#undef TREE_USE_POOL
+#undef TREE_STATIC
+#undef TREE_CONSERVE_SPACE
+#undef TREE_DUPLICATES
+#undef TREE_MAX_DEPTH
+#undef TREE_STORE_PARENT
+#undef TREE_KEY
+#undef TREE_EXTRA_SIZE
+#undef TREE_TRACE
+#undef TREE_AUTO_POOL
+#undef TREE_AUTO_MEMPOOL
+#undef TREE_AUTO_ELTPOOL
diff --git a/libucw/ucw/regex.c b/libucw/ucw/regex.c
new file mode 100644
index 0000000..131620b
--- /dev/null
+++ b/libucw/ucw/regex.c
@@ -0,0 +1,351 @@
+/*
+ *	UCW Library -- Interface to Regular Expression Libraries
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2001 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+#include <ucw/hashfunc.h>
+#include <ucw/regex.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef CONFIG_UCW_POSIX_REGEX
+
+/* POSIX regular expression library */
+
+#include <regex.h>
+
+struct regex {
+  regex_t rx;
+  regmatch_t matches[10];
+};
+
+regex *
+rx_compile(const char *p, int icase)
+{
+  regex *r = xmalloc_zero(sizeof(regex));
+
+  int err = regcomp(&r->rx, p, REG_EXTENDED | (icase ? REG_ICASE : 0));
+  if (err)
+    {
+      char msg[256];
+      regerror(err, &r->rx, msg, sizeof(msg)-1);
+      /* regfree(&r->rx) not needed */
+      die("Error parsing regular expression `%s': %s", p, msg);
+    }
+  return r;
+}
+
+void
+rx_free(regex *r)
+{
+  regfree(&r->rx);
+  xfree(r);
+}
+
+int
+rx_match(regex *r, const char *s)
+{
+  int err = regexec(&r->rx, s, 10, r->matches, 0);
+  if (!err)
+    {
+      /* regexec doesn't support anchored expressions, so we have to check ourselves that the full string is matched */
+      return !(r->matches[0].rm_so || s[r->matches[0].rm_eo]);
+    }
+  else if (err == REG_NOMATCH)
+    return 0;
+  else if (err == REG_ESPACE)
+    die("Regex matching ran out of memory");
+  else
+    die("Regex matching failed with unknown error %d", err);
+}
+
+int
+rx_subst(regex *r, const char *by, const char *src, char *dest, uint destlen)
+{
+  char *end = dest + destlen - 1;
+
+  if (!rx_match(r, src))
+    return 0;
+
+  while (*by)
+    {
+      if (*by == '\\')
+	{
+	  by++;
+	  if (*by >= '0' && *by <= '9')	/* \0 gets replaced by entire pattern */
+	    {
+	      uint j = *by++ - '0';
+	      if (j <= r->rx.re_nsub && r->matches[j].rm_so >= 0)
+		{
+		  const char *s = src + r->matches[j].rm_so;
+		  uint i = r->matches[j].rm_eo - r->matches[j].rm_so;
+		  if (dest + i >= end)
+		    return -1;
+		  memcpy(dest, s, i);
+		  dest += i;
+		  continue;
+		}
+	    }
+	}
+      if (dest < end)
+	*dest++ = *by++;
+      else
+	return -1;
+    }
+  *dest = 0;
+  return 1;
+}
+
+#elif defined(CONFIG_UCW_PCRE)
+
+/* PCRE library */
+
+#include <pcre.h>
+
+struct regex {
+  pcre *rx;
+  pcre_extra *extra;
+  uint match_array_size;
+  uint real_matches;
+  int matches[0];			/* (max_matches+1) pairs (pos,len) plus some workspace */
+};
+
+regex *
+rx_compile(const char *p, int icase)
+{
+  const char *err;
+  int errpos, match_array_size, eno;
+
+  pcre *rx = pcre_compile(p, PCRE_ANCHORED | PCRE_EXTRA | (icase ? PCRE_CASELESS : 0), &err, &errpos, NULL);
+  if (!rx)
+    die("Error parsing regular expression `%s': %s at position %d", p, err, errpos);
+  eno = pcre_fullinfo(rx, NULL, PCRE_INFO_CAPTURECOUNT, &match_array_size);
+  if (eno)
+    die("Internal error: pcre_fullinfo() failed with error %d", eno);
+  match_array_size = 3*(match_array_size+1);
+  regex *r = xmalloc_zero(sizeof(regex) + match_array_size * sizeof(int));
+  r->rx = rx;
+  r->match_array_size = match_array_size;
+  r->extra = pcre_study(r->rx, 0, &err);
+  if (err)
+    die("Error studying regular expression `%s': %s", p, err);
+  return r;
+}
+
+void
+rx_free(regex *r)
+{
+  xfree(r->rx);
+  xfree(r->extra);
+  xfree(r);
+}
+
+int
+rx_match(regex *r, const char *s)
+{
+  int len = str_len(s);
+  int err = pcre_exec(r->rx, r->extra, s, len, 0, 0, r->matches, r->match_array_size);
+  if (err >= 0)
+    {
+      r->real_matches = err;
+      /* need to check that the full string matches */
+      return !(r->matches[0] || s[r->matches[1]]);
+    }
+  else if (err == PCRE_ERROR_NOMATCH)
+    return 0;
+  else if (err == PCRE_ERROR_NOMEMORY)
+    die("Regex matching ran out of memory");
+  else
+    die("Regex matching failed with unknown error %d", err);
+}
+
+int
+rx_subst(regex *r, const char *by, const char *src, char *dest, uint destlen)
+{
+  char *end = dest + destlen - 1;
+
+  if (!rx_match(r, src))
+    return 0;
+
+  while (*by)
+    {
+      if (*by == '\\')
+	{
+	  by++;
+	  if (*by >= '0' && *by <= '9')	/* \0 gets replaced by entire pattern */
+	    {
+	      uint j = *by++ - '0';
+	      if (j < r->real_matches && r->matches[2*j] >= 0)
+		{
+		  const char *s = src + r->matches[2*j];
+		  uint i = r->matches[2*j+1] - r->matches[2*j];
+		  if (dest + i >= end)
+		    return -1;
+		  memcpy(dest, s, i);
+		  dest += i;
+		  continue;
+		}
+	    }
+	}
+      if (dest < end)
+	*dest++ = *by++;
+      else
+	return -1;
+    }
+  *dest = 0;
+  return 1;
+}
+
+#else
+
+/* BSD regular expression library */
+
+#include <regex.h>
+
+#define INITIAL_MEM 1024		/* Initial space allocated for each pattern */
+#define CHAR_SET_SIZE 256		/* How many characters in the character set.  */
+
+struct regex {
+  struct re_pattern_buffer buf;
+  struct re_registers regs;		/* Must not change between re_match() calls */
+  int len_cache;
+};
+
+regex *
+rx_compile(const char *p, int icase)
+{
+  regex *r = xmalloc_zero(sizeof(regex));
+  const char *msg;
+
+  r->buf.buffer = xmalloc(INITIAL_MEM);
+  r->buf.allocated = INITIAL_MEM;
+  if (icase)
+    {
+      uint i;
+      r->buf.translate = xmalloc (CHAR_SET_SIZE);
+      /* Map uppercase characters to corresponding lowercase ones.  */
+      for (i = 0; i < CHAR_SET_SIZE; i++)
+        r->buf.translate[i] = Cupcase(i);
+    }
+  else
+    r->buf.translate = NULL;
+  re_set_syntax(RE_SYNTAX_POSIX_EXTENDED);
+  msg = re_compile_pattern(p, strlen(p), &r->buf);
+  if (!msg)
+    return r;
+  die("Error parsing pattern `%s': %s", p, msg);
+}
+
+void
+rx_free(regex *r)
+{
+  xfree(r->buf.buffer);
+  if (r->buf.translate)
+    xfree(r->buf.translate);
+  xfree(r);
+}
+
+int
+rx_match(regex *r, const char *s)
+{
+  int len = strlen(s);
+
+  r->len_cache = len;
+  if (re_match(&r->buf, s, len, 0, &r->regs) < 0)
+    return 0;
+  if (r->regs.start[0] || r->regs.end[0] != len) /* XXX: Why regex doesn't enforce implicit "^...$" ? */
+    return 0;
+  return 1;
+}
+
+int
+rx_subst(regex *r, const char *by, const char *src, char *dest, uint destlen)
+{
+  char *end = dest + destlen - 1;
+
+  if (!rx_match(r, src))
+    return 0;
+
+  while (*by)
+    {
+      if (*by == '\\')
+	{
+	  by++;
+	  if (*by >= '0' && *by <= '9')	/* \0 gets replaced by entire pattern */
+	    {
+	      uint j = *by++ - '0';
+	      if (j < r->regs.num_regs)
+		{
+		  const char *s = src + r->regs.start[j];
+		  uint i = r->regs.end[j] - r->regs.start[j];
+		  if (r->regs.start[j] > r->len_cache || r->regs.end[j] > r->len_cache)
+		    return -1;
+		  if (dest + i >= end)
+		    return -1;
+		  memcpy(dest, s, i);
+		  dest += i;
+		  continue;
+		}
+	    }
+	}
+      if (dest < end)
+	*dest++ = *by++;
+      else
+	return -1;
+    }
+  *dest = 0;
+  return 1;
+}
+
+#endif
+
+#ifdef TEST
+
+int main(int argc, char **argv)
+{
+  regex *r;
+  char buf1[4096], buf2[4096];
+  int opt_i = 0;
+
+  if (!strcmp(argv[1], "-i"))
+    {
+      opt_i = 1;
+      argv++;
+      argc--;
+    }
+  r = rx_compile(argv[1], opt_i);
+  while (fgets(buf1, sizeof(buf1), stdin))
+    {
+      char *p = strchr(buf1, '\n');
+      if (p)
+	*p = 0;
+      if (argc == 2)
+	{
+	  if (rx_match(r, buf1))
+	    puts("MATCH");
+	  else
+	    puts("NO MATCH");
+	}
+      else
+	{
+	  int i = rx_subst(r, argv[2], buf1, buf2, sizeof(buf2));
+	  if (i < 0)
+	    puts("OVERFLOW");
+	  else if (!i)
+	    puts("NO MATCH");
+	  else
+	    puts(buf2);
+	}
+    }
+  rx_free(r);
+}
+
+#endif
diff --git a/libucw/ucw/regex.h b/libucw/ucw/regex.h
new file mode 100644
index 0000000..9929889
--- /dev/null
+++ b/libucw/ucw/regex.h
@@ -0,0 +1,28 @@
+/*
+ *	UCW Library -- Interface to Regular Expression Libraries
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2001 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_REGEX_H
+#define _UCW_REGEX_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define rx_compile ucw_rx_compile
+#define rx_free ucw_rx_free
+#define rx_match ucw_rx_match
+#define rx_subst ucw_rx_subst
+#endif
+
+typedef struct regex regex;
+
+regex *rx_compile(const char *r, int icase);
+void rx_free(regex *r);
+int rx_match(regex *r, const char *s);
+int rx_subst(regex *r, const char *by, const char *src, char *dest, uint destlen);
+
+#endif
diff --git a/libucw/ucw/regex.t b/libucw/ucw/regex.t
new file mode 100644
index 0000000..f4876d7
--- /dev/null
+++ b/libucw/ucw/regex.t
@@ -0,0 +1,65 @@
+# Tests for the regex module
+
+Run:	../obj/ucw/regex-t 'a.*b.*c'
+In:	abc
+	ajkhkbbbbbc
+	Aabc
+Out:	MATCH
+	MATCH
+	NO MATCH
+
+Run:	../obj/ucw/regex-t -i 'a.*b.*c'
+In:	aBc
+	ajkhkbBBBBC
+	Aabc
+Out:	MATCH
+	MATCH
+	MATCH
+
+Run:	../obj/ucw/regex-t -i '(ahoj|nebo)'
+In:	Ahoj
+	nEBo
+	ahoja
+	(ahoj|nebo)
+Out:	MATCH
+	MATCH
+	NO MATCH
+	NO MATCH
+
+Run:	../obj/ucw/regex-t '\(ahoj\)'
+In:	(ahoj)
+	ahoj
+Out:	MATCH
+	NO MATCH
+
+Run:	../obj/ucw/regex-t '(.*b)*'
+In:	ababababab
+	ababababababababababababababababababababababababababababa
+Out:	MATCH
+	NO MATCH
+
+Run:	../obj/ucw/regex-t '(.*)((aabb)|cc)(b.*)' '\1<\3>\4'
+In:	aaabbb
+	aabbccb
+	abcabc
+	aaccbb
+Out:	a<aabb>b
+	aabb<>b
+	NO MATCH
+	aa<>bb
+
+Run:	../obj/ucw/regex-t '.*\?(.*&)*([a-z_]*sess[a-z_]*|random|sid|S_ID|rnd|timestamp|referer)=.*'
+In:	/nemecky/ubytovani/hotel.php?sort=&cislo=26&mena=EUR&typ=Hotel&luz1=ANO&luz2=ANO&luz3=&luz4=&luz5=&maxp1=99999&maxp2=99999&maxp3=99999&maxp4=99999&maxp5=99999&apart=&rada=8,9,10,11,19,22,26,27,28,29,3&cislo=26&mena=EUR&typ=Hotel&luz1=ANO&luz2=ANO&luz3=&luz4=&luz5=&maxp1=99999&maxp2=99999&maxp3=99999&maxp4=99999&maxp5=99999&apart=&rada=8,9,10,11,19,22,26,27,28,29,3&cislo=26&mena=EUR&typ=Hotel&luz1=ANO&luz2=ANO&luz3=&luz4=&luz5=&maxp1=99999&maxp2=99999&maxp3=99999&maxp4=99999&maxp5=99999&apart=&rada=8,9,10,11,19,22,26,27,28,29,3
+	/test...?f=1&s=3&sid=123&q=3&
+Out:	NO MATCH
+	MATCH
+
+Run:	../obj/ucw/regex-t '.*[0-9a-f]{8,16}.*'
+In:	abcdabcdabcd
+	aaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	asddajlkdkajlqwepoiequwiouio
+	000001111p101010101010q12032
+Out:	MATCH
+	MATCH
+	NO MATCH
+	MATCH
diff --git a/libucw/ucw/res-eltpool.c b/libucw/ucw/res-eltpool.c
new file mode 100644
index 0000000..bd2192a
--- /dev/null
+++ b/libucw/ucw/res-eltpool.c
@@ -0,0 +1,54 @@
+/*
+ *	The UCW Library -- Resources for Memory Pools
+ *
+ *	(c) 2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+#include <ucw/eltpool.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void
+ep_res_free(struct resource *r)
+{
+  ep_delete(r->priv);
+}
+
+static void
+ep_res_dump(struct resource *r, uint indent UNUSED)
+{
+  printf(" pool=%p\n", r->priv);
+}
+
+static const struct res_class ep_res_class = {
+  .name = "eltpool",
+  .dump = ep_res_dump,
+  .free = ep_res_free,
+};
+
+struct resource *
+res_eltpool(struct eltpool *mp)
+{
+  return res_new(&ep_res_class, mp);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct respool *rp = rp_new("test", NULL);
+  rp_switch(rp);
+  res_eltpool(ep_new(16, 256));
+  rp_dump(rp, 0);
+  rp_delete(rp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/res-fd.c b/libucw/ucw/res-fd.c
new file mode 100644
index 0000000..15f6281
--- /dev/null
+++ b/libucw/ucw/res-fd.c
@@ -0,0 +1,52 @@
+/*
+ *	The UCW Library -- Resources for File Descriptors
+ *
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+
+#include <stdio.h>
+#include <unistd.h>
+
+static void
+fd_res_free(struct resource *r)
+{
+  close((int)(intptr_t) r->priv);
+}
+
+static void
+fd_res_dump(struct resource *r, uint indent UNUSED)
+{
+  printf(" fd=%d\n", (int)(intptr_t) r->priv);
+}
+
+static const struct res_class fd_res_class = {
+  .name = "fd",
+  .dump = fd_res_dump,
+  .free = fd_res_free,
+};
+
+struct resource *
+res_for_fd(int fd)
+{
+  return res_new(&fd_res_class, (void*)(intptr_t) fd);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct respool *rp = rp_new("test", NULL);
+  rp_switch(rp);
+  res_for_fd(1);
+  rp_dump(rp, 0);
+  rp_delete(rp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/res-mem.c b/libucw/ucw/res-mem.c
new file mode 100644
index 0000000..dffb8a8
--- /dev/null
+++ b/libucw/ucw/res-mem.c
@@ -0,0 +1,87 @@
+/*
+ *	The UCW Library -- Resources for Memory Blocks
+ *
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct res_mem {
+  struct resource r;
+  size_t size;			// Just for sake of readable resource dumps
+};
+
+static void
+mem_res_free(struct resource *r)
+{
+  xfree(r->priv);
+}
+
+static void
+mem_res_dump(struct resource *r, uint indent UNUSED)
+{
+  struct res_mem *rm = (struct res_mem *) r;
+  printf(" size=%zu, ptr=%p\n", rm->size, r->priv);
+}
+
+static const struct res_class mem_res_class = {
+  .name = "mem",
+  .dump = mem_res_dump,
+  .free = mem_res_free,
+  .res_size = sizeof(struct res_mem),
+};
+
+void *
+res_malloc(size_t size, struct resource **ptr)
+{
+  void *p = xmalloc(size);
+  struct resource *r = res_new(&mem_res_class, p);
+  ((struct res_mem *) r) -> size = size;
+  if (ptr)
+    *ptr = r;
+  return p;
+}
+
+void *
+res_malloc_zero(size_t size, struct resource **ptr)
+{
+  void *p = res_malloc(size, ptr);
+  bzero(p, size);
+  return p;
+}
+
+void *
+res_realloc(struct resource *r, size_t size)
+{
+  struct res_mem *rm = (struct res_mem *) r;
+  r->priv = xrealloc(r->priv, size);
+  rm->size = size;
+  return r->priv;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct respool *rp = rp_new("test", NULL);
+  rp_switch(rp);
+  struct resource *r;
+  char *p = res_malloc(3, &r);
+  p[0] = p[1] = p[2] = 1;
+  rp_dump(rp, 0);
+  p = res_realloc(r, 5);
+  p[3] = p[4] = 2;
+  rp_dump(rp, 0);
+  rp_delete(rp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/res-mempool.c b/libucw/ucw/res-mempool.c
new file mode 100644
index 0000000..df6269d
--- /dev/null
+++ b/libucw/ucw/res-mempool.c
@@ -0,0 +1,54 @@
+/*
+ *	The UCW Library -- Resources for Memory Pools
+ *
+ *	(c) 2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void
+mp_res_free(struct resource *r)
+{
+  mp_delete(r->priv);
+}
+
+static void
+mp_res_dump(struct resource *r, uint indent UNUSED)
+{
+  printf(" pool=%p\n", r->priv);
+}
+
+static const struct res_class mp_res_class = {
+  .name = "mempool",
+  .dump = mp_res_dump,
+  .free = mp_res_free,
+};
+
+struct resource *
+res_mempool(struct mempool *mp)
+{
+  return res_new(&mp_res_class, mp);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct respool *rp = rp_new("test", NULL);
+  rp_switch(rp);
+  res_mempool(mp_new(4096));
+  rp_dump(rp, 0);
+  rp_delete(rp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/res-subpool.c b/libucw/ucw/res-subpool.c
new file mode 100644
index 0000000..f0a112c
--- /dev/null
+++ b/libucw/ucw/res-subpool.c
@@ -0,0 +1,72 @@
+/*
+ *	The UCW Library -- Resources for Sub-pools
+ *
+ *	(c) 2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+
+#include <stdio.h>
+
+static void
+subpool_res_free(struct resource *r)
+{
+  struct respool *rp = r->priv;
+  rp->subpool_of = NULL;
+  rp_delete(rp);
+}
+
+static void
+subpool_res_detach(struct resource *r)
+{
+  struct respool *rp = r->priv;
+  rp->subpool_of = NULL;
+}
+
+static void
+subpool_res_dump(struct resource *r, uint indent)
+{
+  printf(":\n");
+  rp_dump(r->priv, indent);
+}
+
+static const struct res_class subpool_res_class = {
+  .name = "subpool",
+  .dump = subpool_res_dump,
+  .detach = subpool_res_detach,
+  .free = subpool_res_free,
+};
+
+struct resource *
+res_subpool(struct respool *rp)
+{
+  ASSERT(!rp->subpool_of);
+  struct resource *r = res_new(&subpool_res_class, rp);
+  ASSERT(r->rpool != rp);		// Avoid simple loops
+  rp->subpool_of = r;
+  return r;
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct respool *rp = rp_new("interior", NULL);
+  struct respool *rp2 = rp_new("exterior", NULL);
+  rp_switch(rp);
+  res_malloc(10, NULL);
+  rp_switch(rp2);
+  res_malloc(7, NULL);
+  res_subpool(rp);
+  rp_dump(rp2, 0);
+  // rp_delete(rp);
+  // rp_dump(rp2, 0);
+  rp_delete(rp2);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/resource.c b/libucw/ucw/resource.c
new file mode 100644
index 0000000..72c664e
--- /dev/null
+++ b/libucw/ucw/resource.c
@@ -0,0 +1,185 @@
+/*
+ *	The UCW Library -- Resource Pools
+ *
+ *	(c) 2008--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/resource.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
+struct respool *
+rp_new(const char *name, struct mempool *mp)
+{
+  struct respool *rp;
+
+  if (mp)
+    {
+      rp = mp_alloc_zero(mp, sizeof(*rp));
+      rp->mpool = mp;
+    }
+  else
+    rp = xmalloc_zero(sizeof(*rp));
+  clist_init(&rp->resources);
+  rp->name = name;
+  rp->default_res_flags = RES_FLAG_TEMP;
+  return rp;
+}
+
+static void
+rp_free(struct respool *rp)
+{
+  if (rp->subpool_of)
+    res_detach(rp->subpool_of);
+  if (!rp->mpool)
+    xfree(rp);
+  if (rp_current() == rp)
+    rp_switch(NULL);
+}
+
+void
+rp_delete(struct respool *rp)
+{
+  struct resource *r;
+  while (r = clist_tail(&rp->resources))
+    {
+      ASSERT(r->rpool == rp);
+      res_free(r);
+    }
+  rp_free(rp);
+}
+
+void
+rp_detach(struct respool *rp)
+{
+  struct resource *r;
+  while (r = clist_head(&rp->resources))
+    {
+      ASSERT(r->rpool == rp);
+      res_detach(r);
+    }
+  rp_free(rp);
+}
+
+void
+rp_commit(struct respool *rp)
+{
+  struct resource *r;
+  while (r = clist_head(&rp->resources))
+    {
+      ASSERT(r->rpool == rp);
+      if (r->flags & RES_FLAG_TEMP)
+	res_free(r);
+      else
+	res_detach(r);
+    }
+  rp_free(rp);
+}
+
+void
+rp_dump(struct respool *rp, uint indent)
+{
+  printf("%*sResource pool %s at %p (%s)%s:\n",
+	 indent, "",
+	 (rp->name ? : "(noname)"),
+	 rp,
+	 (rp->mpool ? "mempool-based" : "freestanding"),
+	 (rp->subpool_of ? " (subpool)" : "")
+	 );
+  CLIST_FOR_EACH(struct resource *, r, rp->resources)
+    res_dump(r, indent+4);
+}
+
+struct resource *
+res_alloc(const struct res_class *rc)
+{
+  struct respool *rp = rp_current();
+  ASSERT(rp);
+  uint size = (rc->res_size ? : sizeof(struct resource));
+  struct resource *r;
+  if (rp->mpool)
+    {
+      r = mp_alloc_fast(rp->mpool, size);
+      r->flags = 0;
+    }
+  else
+    {
+      r = xmalloc(size);
+      r->flags = RES_FLAG_XFREE;
+    }
+  res_add(r);
+  return r;
+}
+
+void
+res_add(struct resource *r)
+{
+  struct respool *rp = rp_current();
+  ASSERT(rp);
+  r->rpool = rp;
+  clist_add_tail(&rp->resources, &r->n);
+  r->flags &= ~RES_FLAG_TEMP;
+  r->flags |= rp->default_res_flags & RES_FLAG_TEMP;
+}
+
+void
+res_drop(struct resource *r)
+{
+  clist_remove(&r->n);
+  if (r->flags & RES_FLAG_XFREE)
+    xfree(r);
+}
+
+void
+res_detach(struct resource *r)
+{
+  if (!r)
+    return;
+  if (r->rclass->detach)
+    r->rclass->detach(r);
+  res_drop(r);
+}
+
+void
+res_free(struct resource *r)
+{
+  if (!r)
+    return;
+  if (r->rclass->free)
+    r->rclass->free(r);
+  res_drop(r);
+}
+
+void
+res_dump(struct resource *r, uint indent)
+{
+  printf("%*s%p %s %s", indent, "", r, ((r->flags & RES_FLAG_TEMP) ? "TEMP" : "PERM"), r->rclass->name);
+  if (r->rclass->dump)
+    r->rclass->dump(r, indent+4);
+  else
+    putchar('\n');
+}
+
+#ifdef TEST
+
+#include <ucw/fastbuf.h>
+
+int main(void)
+{
+  // struct mempool *mp = mp_new(4096);
+  struct respool *rp = rp_new("test", NULL);
+  rp_switch(rp);
+  struct fastbuf *f = bfdopen_shared(1, 0);
+  rp_dump(rp, 0);
+  bputsn(f, "Hello, all worlds!");
+  bclose(f);
+  rp_delete(rp);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/resource.h b/libucw/ucw/resource.h
new file mode 100644
index 0000000..a2783a7
--- /dev/null
+++ b/libucw/ucw/resource.h
@@ -0,0 +1,214 @@
+/*
+ *	The UCW Library -- Resource Pools
+ *
+ *	(c) 2008--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_RESPOOL_H
+#define _UCW_RESPOOL_H
+
+#include <ucw/clists.h>
+#include <ucw/threads.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define res_add ucw_res_add
+#define res_alloc ucw_res_alloc
+#define res_detach ucw_res_detach
+#define res_drop ucw_res_drop
+#define res_dump ucw_res_dump
+#define res_eltpool ucw_res_eltpool
+#define res_for_fd ucw_res_for_fd
+#define res_free ucw_res_free
+#define res_malloc ucw_res_malloc
+#define res_malloc_zero ucw_res_malloc_zero
+#define res_mempool ucw_res_mempool
+#define res_realloc ucw_res_realloc
+#define res_subpool ucw_res_subpool
+#define rp_commit ucw_rp_commit
+#define rp_delete ucw_rp_delete
+#define rp_detach ucw_rp_detach
+#define rp_dump ucw_rp_dump
+#define rp_new ucw_rp_new
+#endif
+
+/**
+ * A resource pool. It contains a name of the pool (which is printed
+ * in all debugging dumps, otherwise it is not used) and a bunch of
+ * fields for internal use.
+ **/
+struct respool {
+  clist resources;
+  const char *name;
+  struct mempool *mpool;				// If set, resources are allocated from the mempool, otherwise by xmalloc()
+  struct resource *subpool_of;
+  uint default_res_flags;				// RES_FLAG_xxx for newly allocated resources
+};
+
+/**
+ * Each resource is represented by this structure. It is linked to a resource
+ * pool it belongs to. It contains a pointer to a resource class (which describes how to
+ * handle the resource) and data private to the resource class.
+ **/
+struct resource {
+  cnode n;
+  struct respool *rpool;
+  uint flags;						// RES_FLAG_xxx
+  const struct res_class *rclass;
+  void *priv;						// Private to the class
+  // More data specific for the particular class can follow
+};
+
+/** Resource flags **/
+enum resource_flags {
+  RES_FLAG_TEMP = 1,					// Resource is temporary
+  RES_FLAG_XFREE = 2,					// Resource structure needs to be deallocated by xfree()
+};
+
+/**
+ * Creates a new resource pool. If a memory pool is given, meta-data of all resources
+ * will be allocated from this pool. Otherwise, they will be malloc'ed.
+ **/
+struct respool *rp_new(const char *name, struct mempool *mp);
+
+void rp_delete(struct respool *rp);			/** Deletes a resource pool, freeing all resources. **/
+void rp_detach(struct respool *rp);			/** Deletes a resource pool, detaching all resources. **/
+void rp_commit(struct respool *rp);			/** Deletes a resource pool. Temporary resources are freed, stable resources are detached. **/
+void rp_dump(struct respool *rp, uint indent);		/** Prints out a debugging dump of a pool to stdout. **/
+
+/** Returns a pointer to the currently active resource pool or NULL, if none exists. **/
+static inline struct respool *rp_current(void)
+{
+  return ucwlib_thread_context()->current_respool;
+}
+
+/**
+ * Makes the given resource pool active; returns a pointer to the previously active pool
+ * or NULL, if there was none. Calling with @rp equal to NULL deactivates the pool.
+ **/
+static inline struct respool *rp_switch(struct respool *rp)
+{
+  struct ucwlib_context *ctx = ucwlib_thread_context();
+  struct respool *orp = ctx->current_respool;
+  ctx->current_respool = rp;
+  return orp;
+}
+
+struct resource *res_alloc(const struct res_class *rc) LIKE_MALLOC;	// Dies if there is no pool active
+
+void res_dump(struct resource *r, uint indent);		/** Prints out a debugging dump of the resource to stdout. **/
+
+/**
+ * Frees a resource, unlinking it from its pool.
+ * When called with a NULL pointer, it does nothing, but safely.
+ **/
+void res_free(struct resource *r);
+
+/**
+ * Unlinks a resource from a pool and releases its meta-data. However, the resource itself is kept.
+ * When called with a NULL pointer, it does nothing, but safely.
+ **/
+void res_detach(struct resource *r);
+
+/** Marks a resource as temporary (sets @RES_FLAG_TEMP). **/
+static inline void res_temporary(struct resource *r)
+{
+  r->flags |= RES_FLAG_TEMP;
+}
+
+/** Marks a resource as permanent (clears @RES_FLAG_TEMP). **/
+static inline void res_permanent(struct resource *r)
+{
+  r->flags &= RES_FLAG_TEMP;
+}
+
+/***
+ * === Resource classes
+ *
+ * A resource class describes how to handle a particular type of resources.
+ * Most importantly, it defines a set of (optional) callbacks for performing operations
+ * on the resources:
+ *
+ * * dump() should print a description of the resource used for debugging
+ *   to the standard output. The description should end with a newline character
+ *   and in case of a multi-line description, the subsequent lines should be
+ *   indented by @indent spaces.
+ * * free() frees the resource; the struct resource is freed automatically afterwards.
+ * * detach() breaks the link between the struct resource and the real resource;
+ *   the struct resource is freed automatically afterwards, while the resource
+ *   continues to live.
+ *
+ * The following functions are intended for use by the resource classes only.
+ ***/
+
+/** The structure describing a resource class. **/
+struct res_class {
+  const char *name;					// The name of the class (included in debugging dumps)
+  void (*detach)(struct resource *r);			// The callbacks
+  void (*free)(struct resource *r);
+  void (*dump)(struct resource *r, uint indent);
+  uint res_size;						// Size of the resource structure (0=default)
+};
+
+/**
+ * Initialize a pre-allocated buffer to the specific class of resource, setting its private data to @priv.
+ * This resource can be added to the current pool by @res_add().
+ **/
+static inline struct resource *res_init(struct resource *r, const struct res_class *rc, void *priv)
+{
+  r->flags = 0;
+  r->rclass = rc;
+  r->priv = priv;
+  return r;
+}
+
+/**
+ * Links a pre-initialized resource to the active pool.
+ **/
+void res_add(struct resource *r);
+
+/**
+ * Unlinks a resource from a pool and releases its meta-data. Unlike @res_detach(),
+ * it does not invoke any callbacks. The caller must make sure that no references to
+ * the meta-data remain, so this is generally safe only inside resource class code.
+ **/
+void res_drop(struct resource *r);
+
+/**
+ * Creates a new resource of the specific class, setting its private data to @priv.
+ * Dies if no resource pool is active.
+ **/
+static inline struct resource *res_new(const struct res_class *rc, void *priv)
+{
+  struct resource *r = res_alloc(rc);
+  r->rclass = rc;
+  r->priv = priv;
+  return r;
+}
+
+/***
+ * === Pre-defined resource classes
+ ***/
+
+struct resource *res_for_fd(int fd);			/** Creates a resource that closes a given file descriptor. **/
+
+void *res_malloc(size_t size, struct resource **ptr) LIKE_MALLOC;	/** Allocates memory and creates a resource for it. **/
+void *res_malloc_zero(size_t size, struct resource **ptr) LIKE_MALLOC;	/** Allocates zero-initialized memory and creates a resource for it. **/
+void *res_realloc(struct resource *res, size_t size);			/** Re-allocates memory obtained by @res_malloc() or @res_malloc_zero(). **/
+
+/**
+ * Converts the resource pool @rp to a resource inside the current resource pool (i.e., its sub-pool).
+ * You can delete the sub-pool either by freeing this resource, or by calling
+ * @rp_delete() on it, which removes the resource automatically.
+ **/
+struct resource *res_subpool(struct respool *rp);
+
+struct mempool;
+struct resource *res_mempool(struct mempool *mp);			/** Creates a resource for the specified <<mempool:,memory pool>>. **/
+
+struct eltpool;
+struct resource *res_eltpool(struct eltpool *ep);			/** Creates a resource for the specified <<eltpool:,element pool>>. **/
+
+#endif
diff --git a/libucw/ucw/runcmd.c b/libucw/ucw/runcmd.c
new file mode 100644
index 0000000..fcc7546
--- /dev/null
+++ b/libucw/ucw/runcmd.c
@@ -0,0 +1,135 @@
+/*
+ *	UCW Library -- Running of Commands
+ *
+ *	(c) 2004 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/process.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <alloca.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+void NONRET
+exec_command_v(const char *cmd, va_list args)
+{
+  va_list cargs;
+  va_copy(cargs, args);
+  int cnt = 2;
+  char *arg;
+  while (arg = va_arg(cargs, char *))
+    cnt++;
+  va_end(cargs);
+  char **argv = alloca(sizeof(char *) * cnt);
+  argv[0] = (char *)cmd;
+  cnt = 1;
+  va_copy(cargs, args);
+  while (arg = va_arg(cargs, char *))
+    argv[cnt++] = arg;
+  va_end(cargs);
+  argv[cnt] = NULL;
+  execv(cmd, argv);
+  char echo[256];
+  echo_command_v(echo, sizeof(echo), cmd, args);
+  msg(L_ERROR, "Cannot execute %s: %m", echo);
+  exit(255);
+}
+
+int
+run_command_v(const char *cmd, va_list args)
+{
+  pid_t p = fork();
+  if (p < 0)
+    {
+      msg(L_ERROR, "fork() failed: %m");
+      return 0;
+    }
+  else if (!p)
+    exec_command_v(cmd, args);
+  else
+    {
+      int stat;
+      char status_msg[EXIT_STATUS_MSG_SIZE];
+      p = waitpid(p, &stat, 0);
+      if (p < 0)
+	die("waitpid() failed: %m");
+      if (format_exit_status(status_msg, stat))
+	{
+	  char echo[256];
+	  echo_command_v(echo, sizeof(echo), cmd, args);
+	  msg(L_ERROR, "`%s' failed: %s", echo, status_msg);
+	  return 0;
+	}
+      return 1;
+    }
+}
+
+void
+echo_command_v(char *buf, int size, const char *cmd, va_list args)
+{
+  char *limit = buf + size - 4;
+  char *p = buf;
+  const char *arg = cmd;
+  do
+    {
+      int l = strlen(arg);
+      if (p != buf && p < limit)
+	*p++ = ' ';
+      if (p+l > limit)
+	{
+	  memcpy(p, arg, limit-p);
+	  strcpy(limit, "...");
+	  return;
+	}
+      memcpy(p, arg, l);
+      p += l;
+    }
+  while (arg = va_arg(args, char *));
+  *p = 0;
+}
+
+int
+run_command(const char *cmd, ...)
+{
+  va_list args;
+  va_start(args, cmd);
+  int e = run_command_v(cmd, args);
+  va_end(args);
+  return e;
+}
+
+void NONRET
+exec_command(const char *cmd, ...)
+{
+  va_list args;
+  va_start(args, cmd);
+  exec_command_v(cmd, args);
+}
+
+void
+echo_command(char *buf, int len, const char *cmd, ...)
+{
+  va_list args;
+  va_start(args, cmd);
+  echo_command_v(buf, len, cmd, args);
+  va_end(args);
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  char msg[1024];
+  echo_command(msg, sizeof(msg), "/bin/echo", "datel", "strakapoud", NULL);
+  msg(L_INFO, "Running <%s>", msg);
+  run_command("/bin/echo", "datel", "strakapoud", NULL);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/semaphore.h b/libucw/ucw/semaphore.h
new file mode 100644
index 0000000..7b211f8
--- /dev/null
+++ b/libucw/ucw/semaphore.h
@@ -0,0 +1,64 @@
+/*
+ *	The UCW Library -- POSIX semaphores wrapper
+ *
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SEMAPHORE_H
+#define _UCW_SEMAPHORE_H
+
+#include <semaphore.h>
+
+#ifdef CONFIG_DARWIN
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <ucw/fastbuf.h> // For the temp_file_name
+
+/* In Darwin, sem_init() is unfortunately not implemented and the guide
+ * recommends emulating it using sem_open().  */
+
+static inline sem_t *sem_alloc(void)
+{
+  char buf[TEMP_FILE_NAME_LEN];
+  int mode, retry = 10;
+  sem_t *sem;
+  do
+    {
+      temp_file_name(buf, &mode);
+      sem = sem_open(buf, mode | O_CREAT, 0777, 0);
+    }
+  while (sem == (sem_t*) SEM_FAILED && errno == EEXIST && retry --);
+  ASSERT(sem != (sem_t*) SEM_FAILED);
+  return sem;
+}
+
+static inline void sem_free(sem_t *sem)
+{
+  sem_close(sem);
+}
+
+#else
+
+static inline sem_t *sem_alloc(void)
+{
+  sem_t *sem = xmalloc(sizeof(sem_t));
+  int res = sem_init(sem, 0, 0);
+  ASSERT(!res);
+  return sem;
+}
+
+static inline void sem_free(sem_t *sem)
+{
+  sem_destroy(sem);
+  xfree(sem);
+}
+
+#endif
+
+#endif
diff --git a/libucw/ucw/sha1-hmac.c b/libucw/ucw/sha1-hmac.c
new file mode 100644
index 0000000..b52011b
--- /dev/null
+++ b/libucw/ucw/sha1-hmac.c
@@ -0,0 +1,108 @@
+/*
+ *	HMAC-SHA1 Message Authentication Code (RFC 2202)
+ *
+ *	(c) 2008--2009 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/sha1.h>
+
+#include <string.h>
+
+void
+sha1_hmac_init(sha1_hmac_context *hd, const byte *key, uint keylen)
+{
+  byte keybuf[SHA1_BLOCK_SIZE], buf[SHA1_BLOCK_SIZE];
+
+  // Hash the key if necessary
+  if (keylen <= SHA1_BLOCK_SIZE)
+    {
+      memcpy(keybuf, key, keylen);
+      bzero(keybuf + keylen, SHA1_BLOCK_SIZE - keylen);
+    }
+  else
+    {
+      sha1_hash_buffer(keybuf, key, keylen);
+      bzero(keybuf + SHA1_SIZE, SHA1_BLOCK_SIZE - SHA1_SIZE);
+    }
+
+  // Initialize the inner digest
+  sha1_init(&hd->ictx);
+  for (int i=0; i < SHA1_BLOCK_SIZE; i++)
+    buf[i] = keybuf[i] ^ 0x36;
+  sha1_update(&hd->ictx, buf, SHA1_BLOCK_SIZE);
+
+  // Initialize the outer digest
+  sha1_init(&hd->octx);
+  for (int i=0; i < SHA1_BLOCK_SIZE; i++)
+    buf[i] = keybuf[i] ^ 0x5c;
+  sha1_update(&hd->octx, buf, SHA1_BLOCK_SIZE);
+}
+
+void
+sha1_hmac_update(sha1_hmac_context *hd, const byte *data, uint datalen)
+{
+  // Just update the inner digest
+  sha1_update(&hd->ictx, data, datalen);
+}
+
+byte *sha1_hmac_final(sha1_hmac_context *hd)
+{
+  // Finish the inner digest
+  byte *isha = sha1_final(&hd->ictx);
+
+  // Finish the outer digest
+  sha1_update(&hd->octx, isha, SHA1_SIZE);
+  return sha1_final(&hd->octx);
+}
+
+void
+sha1_hmac(byte *outbuf, const byte *key, uint keylen, const byte *data, uint datalen)
+{
+  sha1_hmac_context hd;
+  sha1_hmac_init(&hd, key, keylen);
+  sha1_hmac_update(&hd, data, datalen);
+  byte *osha = sha1_hmac_final(&hd);
+  memcpy(outbuf, osha, SHA1_SIZE);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <ucw/string.h>
+
+static uint rd(char *dest)
+{
+  char buf[1024];
+  if (!fgets(buf, sizeof(buf), stdin))
+    die("fgets()");
+  *strchr(buf, '\n') = 0;
+  if (buf[0] == '0' && buf[1] == 'x')
+    {
+      const char *e = hex_to_mem(dest, buf+2, 1024, 0);
+      ASSERT(!*e);
+      return (e-buf-2)/2;
+    }
+  else
+    {
+      strcpy(dest, buf);
+      return strlen(dest);
+    }
+}
+
+int main(void)
+{
+  char key[1024], data[1024];
+  byte hmac[SHA1_SIZE];
+  uint kl = rd(key);
+  uint dl = rd(data);
+  sha1_hmac(hmac, key, kl, data, dl);
+  mem_to_hex(data, hmac, SHA1_SIZE, 0);
+  puts(data);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/sha1.c b/libucw/ucw/sha1.c
new file mode 100644
index 0000000..58129af
--- /dev/null
+++ b/libucw/ucw/sha1.c
@@ -0,0 +1,310 @@
+/*
+ *	SHA-1 Hash Function (FIPS 180-1, RFC 3174)
+ *
+ *	Based on the code from libgcrypt-1.2.3, which is
+ *	Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+ *
+ *	Adaptation for libucw:
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/sha1.h>
+#include <ucw/unaligned.h>
+
+#include <string.h>
+
+void
+sha1_init(sha1_context *hd)
+{
+  hd->h0 = 0x67452301;
+  hd->h1 = 0xefcdab89;
+  hd->h2 = 0x98badcfe;
+  hd->h3 = 0x10325476;
+  hd->h4 = 0xc3d2e1f0;
+  hd->nblocks = 0;
+  hd->count = 0;
+}
+
+/*
+ * Transform the message X which consists of 16 32-bit-words
+ */
+static void
+transform(sha1_context *hd, const byte *data)
+{
+  u32 a,b,c,d,e,tm;
+  u32 x[16];
+
+  /* Get values from the chaining vars. */
+  a = hd->h0;
+  b = hd->h1;
+  c = hd->h2;
+  d = hd->h3;
+  e = hd->h4;
+
+#ifdef CPU_BIG_ENDIAN
+  memcpy( x, data, 64 );
+#else
+  {
+    for (int i=0; i<16; i++)
+      x[i] = get_u32_be(data+4*i);
+  }
+#endif
+
+
+#define K1  0x5A827999L
+#define K2  0x6ED9EBA1L
+#define K3  0x8F1BBCDCL
+#define K4  0xCA62C1D6L
+#define F1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )
+#define F2(x,y,z)   ( x ^ y ^ z )
+#define F3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )
+#define F4(x,y,z)   ( x ^ y ^ z )
+
+
+#define M(i) ( tm =   x[i&0x0f] ^ x[(i-14)&0x0f] \
+		    ^ x[(i-8)&0x0f] ^ x[(i-3)&0x0f] \
+	       , (x[i&0x0f] = ROL(tm, 1)) )
+
+#define R(a,b,c,d,e,f,k,m)  do { e += ROL( a, 5 )     \
+				      + f( b, c, d )  \
+				      + k	      \
+				      + m;	      \
+				 b = ROL( b, 30 );    \
+			       } while(0)
+  R( a, b, c, d, e, F1, K1, x[ 0] );
+  R( e, a, b, c, d, F1, K1, x[ 1] );
+  R( d, e, a, b, c, F1, K1, x[ 2] );
+  R( c, d, e, a, b, F1, K1, x[ 3] );
+  R( b, c, d, e, a, F1, K1, x[ 4] );
+  R( a, b, c, d, e, F1, K1, x[ 5] );
+  R( e, a, b, c, d, F1, K1, x[ 6] );
+  R( d, e, a, b, c, F1, K1, x[ 7] );
+  R( c, d, e, a, b, F1, K1, x[ 8] );
+  R( b, c, d, e, a, F1, K1, x[ 9] );
+  R( a, b, c, d, e, F1, K1, x[10] );
+  R( e, a, b, c, d, F1, K1, x[11] );
+  R( d, e, a, b, c, F1, K1, x[12] );
+  R( c, d, e, a, b, F1, K1, x[13] );
+  R( b, c, d, e, a, F1, K1, x[14] );
+  R( a, b, c, d, e, F1, K1, x[15] );
+  R( e, a, b, c, d, F1, K1, M(16) );
+  R( d, e, a, b, c, F1, K1, M(17) );
+  R( c, d, e, a, b, F1, K1, M(18) );
+  R( b, c, d, e, a, F1, K1, M(19) );
+  R( a, b, c, d, e, F2, K2, M(20) );
+  R( e, a, b, c, d, F2, K2, M(21) );
+  R( d, e, a, b, c, F2, K2, M(22) );
+  R( c, d, e, a, b, F2, K2, M(23) );
+  R( b, c, d, e, a, F2, K2, M(24) );
+  R( a, b, c, d, e, F2, K2, M(25) );
+  R( e, a, b, c, d, F2, K2, M(26) );
+  R( d, e, a, b, c, F2, K2, M(27) );
+  R( c, d, e, a, b, F2, K2, M(28) );
+  R( b, c, d, e, a, F2, K2, M(29) );
+  R( a, b, c, d, e, F2, K2, M(30) );
+  R( e, a, b, c, d, F2, K2, M(31) );
+  R( d, e, a, b, c, F2, K2, M(32) );
+  R( c, d, e, a, b, F2, K2, M(33) );
+  R( b, c, d, e, a, F2, K2, M(34) );
+  R( a, b, c, d, e, F2, K2, M(35) );
+  R( e, a, b, c, d, F2, K2, M(36) );
+  R( d, e, a, b, c, F2, K2, M(37) );
+  R( c, d, e, a, b, F2, K2, M(38) );
+  R( b, c, d, e, a, F2, K2, M(39) );
+  R( a, b, c, d, e, F3, K3, M(40) );
+  R( e, a, b, c, d, F3, K3, M(41) );
+  R( d, e, a, b, c, F3, K3, M(42) );
+  R( c, d, e, a, b, F3, K3, M(43) );
+  R( b, c, d, e, a, F3, K3, M(44) );
+  R( a, b, c, d, e, F3, K3, M(45) );
+  R( e, a, b, c, d, F3, K3, M(46) );
+  R( d, e, a, b, c, F3, K3, M(47) );
+  R( c, d, e, a, b, F3, K3, M(48) );
+  R( b, c, d, e, a, F3, K3, M(49) );
+  R( a, b, c, d, e, F3, K3, M(50) );
+  R( e, a, b, c, d, F3, K3, M(51) );
+  R( d, e, a, b, c, F3, K3, M(52) );
+  R( c, d, e, a, b, F3, K3, M(53) );
+  R( b, c, d, e, a, F3, K3, M(54) );
+  R( a, b, c, d, e, F3, K3, M(55) );
+  R( e, a, b, c, d, F3, K3, M(56) );
+  R( d, e, a, b, c, F3, K3, M(57) );
+  R( c, d, e, a, b, F3, K3, M(58) );
+  R( b, c, d, e, a, F3, K3, M(59) );
+  R( a, b, c, d, e, F4, K4, M(60) );
+  R( e, a, b, c, d, F4, K4, M(61) );
+  R( d, e, a, b, c, F4, K4, M(62) );
+  R( c, d, e, a, b, F4, K4, M(63) );
+  R( b, c, d, e, a, F4, K4, M(64) );
+  R( a, b, c, d, e, F4, K4, M(65) );
+  R( e, a, b, c, d, F4, K4, M(66) );
+  R( d, e, a, b, c, F4, K4, M(67) );
+  R( c, d, e, a, b, F4, K4, M(68) );
+  R( b, c, d, e, a, F4, K4, M(69) );
+  R( a, b, c, d, e, F4, K4, M(70) );
+  R( e, a, b, c, d, F4, K4, M(71) );
+  R( d, e, a, b, c, F4, K4, M(72) );
+  R( c, d, e, a, b, F4, K4, M(73) );
+  R( b, c, d, e, a, F4, K4, M(74) );
+  R( a, b, c, d, e, F4, K4, M(75) );
+  R( e, a, b, c, d, F4, K4, M(76) );
+  R( d, e, a, b, c, F4, K4, M(77) );
+  R( c, d, e, a, b, F4, K4, M(78) );
+  R( b, c, d, e, a, F4, K4, M(79) );
+
+  /* Update chaining vars. */
+  hd->h0 += a;
+  hd->h1 += b;
+  hd->h2 += c;
+  hd->h3 += d;
+  hd->h4 += e;
+}
+
+
+/*
+ * Update the message digest with the contents
+ * of INBUF with length INLEN.
+ */
+void
+sha1_update(sha1_context *hd, const byte *inbuf, uint inlen)
+{
+  if( hd->count == 64 )  /* flush the buffer */
+    {
+      transform( hd, hd->buf );
+      hd->count = 0;
+      hd->nblocks++;
+    }
+  if( !inbuf )
+    return;
+
+  if( hd->count )
+    {
+      for( ; inlen && hd->count < 64; inlen-- )
+        hd->buf[hd->count++] = *inbuf++;
+      sha1_update( hd, NULL, 0 );
+      if( !inlen )
+        return;
+    }
+
+  while( inlen >= 64 ) 
+    {
+      transform( hd, inbuf );
+      hd->count = 0;
+      hd->nblocks++;
+      inlen -= 64;
+      inbuf += 64;
+    }
+  for( ; inlen && hd->count < 64; inlen-- )
+    hd->buf[hd->count++] = *inbuf++;
+}
+
+
+/*
+ * The routine final terminates the computation and
+ * returns the digest.
+ * The handle is prepared for a new cycle, but adding bytes to the
+ * handle will the destroy the returned buffer.
+ * Returns: 20 bytes representing the digest.
+ */
+
+byte *
+sha1_final(sha1_context *hd)
+{
+  u32 t, msb, lsb;
+  byte *p;
+
+  sha1_update(hd, NULL, 0); /* flush */;
+
+  t = hd->nblocks;
+  /* multiply by 64 to make a byte count */
+  lsb = t << 6;
+  msb = t >> 26;
+  /* add the count */
+  t = lsb;
+  if( (lsb += hd->count) < t )
+    msb++;
+  /* multiply by 8 to make a bit count */
+  t = lsb;
+  lsb <<= 3;
+  msb <<= 3;
+  msb |= t >> 29;
+
+  if( hd->count < 56 )  /* enough room */
+    {
+      hd->buf[hd->count++] = 0x80; /* pad */
+      while( hd->count < 56 )
+        hd->buf[hd->count++] = 0;  /* pad */
+    }
+  else  /* need one extra block */
+    {
+      hd->buf[hd->count++] = 0x80; /* pad character */
+      while( hd->count < 64 )
+        hd->buf[hd->count++] = 0;
+      sha1_update(hd, NULL, 0);  /* flush */;
+      memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
+    }
+  /* append the 64 bit count */
+  hd->buf[56] = msb >> 24;
+  hd->buf[57] = msb >> 16;
+  hd->buf[58] = msb >>  8;
+  hd->buf[59] = msb	   ;
+  hd->buf[60] = lsb >> 24;
+  hd->buf[61] = lsb >> 16;
+  hd->buf[62] = lsb >>  8;
+  hd->buf[63] = lsb	   ;
+  transform( hd, hd->buf );
+
+  p = hd->buf;
+#define X(a) do { put_u32_be(p, hd->h##a); p += 4; } while(0)
+  X(0);
+  X(1);
+  X(2);
+  X(3);
+  X(4);
+#undef X
+
+  return hd->buf;
+}
+
+/*
+ * Shortcut function which puts the hash value of the supplied buffer
+ * into outbuf which must have a size of 20 bytes.
+ */
+void
+sha1_hash_buffer(byte *outbuf, const byte *buffer, uint length)
+{
+  sha1_context hd;
+
+  sha1_init(&hd);
+  sha1_update(&hd, buffer, length);
+  memcpy(outbuf, sha1_final(&hd), SHA1_SIZE);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <unistd.h>
+#include <ucw/string.h>
+
+int main(void)
+{
+  sha1_context hd;
+  byte buf[3];
+  int cnt;
+
+  sha1_init(&hd);
+  while ((cnt = read(0, buf, sizeof(buf))) > 0)
+    sha1_update(&hd, buf, cnt);
+
+  char text[SHA1_HEX_SIZE];
+  mem_to_hex(text, sha1_final(&hd), SHA1_SIZE, 0);
+  puts(text);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/sha1.h b/libucw/ucw/sha1.h
new file mode 100644
index 0000000..563bbb3
--- /dev/null
+++ b/libucw/ucw/sha1.h
@@ -0,0 +1,94 @@
+/*
+ *	SHA-1 Hash Function (FIPS 180-1, RFC 3174)
+ *
+ *	(c) 2008--2009 Martin Mares <mj@ucw.cz>
+ *
+ *	Based on the code from libgcrypt-1.2.3, which was:
+ *
+ *	Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SHA1_H
+#define _UCW_SHA1_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define sha1_final ucw_sha1_final
+#define sha1_hash_buffer ucw_sha1_hash_buffer
+#define sha1_hmac ucw_sha1_hmac
+#define sha1_hmac_final ucw_sha1_hmac_final
+#define sha1_hmac_init ucw_sha1_hmac_init
+#define sha1_hmac_update ucw_sha1_hmac_update
+#define sha1_init ucw_sha1_init
+#define sha1_update ucw_sha1_update
+#endif
+
+/**
+ * Internal SHA1 state.
+ * You should use it just as an opaque handle only.
+ */
+typedef struct {
+  u32 h0,h1,h2,h3,h4;
+  u32 nblocks;
+  byte buf[64];
+  int count;
+} sha1_context;
+
+void sha1_init(sha1_context *hd); /** Initialize new algorithm run in the @hd context. **/
+/**
+ * Push another @inlen bytes of data pointed to by @inbuf onto the
+ * SHA1 hash currently in @hd. You can call this any times you want on
+ * the same hash (and you do not need to reinitialize it by
+ * @sha1_init()). It has the same effect as concatenating all the data
+ * together and passing them at once.
+ */
+void sha1_update(sha1_context *hd, const byte *inbuf, uint inlen);
+/**
+ * No more @sha1_update() calls will be done. This terminates the hash
+ * and returns a pointer to it.
+ *
+ * Note that the pointer points into data in the @hd context. If it ceases
+ * to exist, the pointer becomes invalid.
+ *
+ * To convert the hash to its usual hexadecimal representation, see
+ * <<string:mem_to_hex()>>.
+ */
+byte *sha1_final(sha1_context *hd);
+
+/**
+ * A convenience one-shot function for SHA1 hash.
+ * It is equivalent to this snippet of code:
+ *
+ *  sha1_context hd;
+ *  sha1_init(&hd);
+ *  sha1_update(&hd, buffer, length);
+ *  memcpy(outbuf, sha1_final(&hd), SHA1_SIZE);
+ */
+void sha1_hash_buffer(byte *outbuf, const byte *buffer, uint length);
+
+/**
+ * SHA1 HMAC message authentication. If you provide @key and @data,
+ * the result will be stored in @outbuf.
+ */
+void sha1_hmac(byte *outbuf, const byte *key, uint keylen, const byte *data, uint datalen);
+
+/**
+ * The HMAC also exists in a stream version in a way analogous to the
+ * plain SHA1. Pass this as a context.
+ */
+typedef struct {
+  sha1_context ictx;
+  sha1_context octx;
+} sha1_hmac_context;
+
+void sha1_hmac_init(sha1_hmac_context *hd, const byte *key, uint keylen);	/** Initialize HMAC with context @hd and the given key. See sha1_init(). */
+void sha1_hmac_update(sha1_hmac_context *hd, const byte *data, uint datalen);	/** Hash another @datalen bytes of data. See sha1_update(). */
+byte *sha1_hmac_final(sha1_hmac_context *hd);					/** Terminate the HMAC and return a pointer to the allocated hash. See sha1_final(). */
+
+#define SHA1_SIZE 20 /** Size of the SHA1 hash in its binary representation **/
+#define SHA1_HEX_SIZE 41 /** Buffer length for a string containing SHA1 in hexadecimal format. **/
+#define SHA1_BLOCK_SIZE 64 /** SHA1 splits input to blocks of this size. **/
+
+#endif
diff --git a/libucw/ucw/sha1.t b/libucw/ucw/sha1.t
new file mode 100644
index 0000000..5c47604
--- /dev/null
+++ b/libucw/ucw/sha1.t
@@ -0,0 +1,65 @@
+# Tests of the SHA1 module
+
+Name:	SHA1-1
+Run:	echo -n "abc" | ../obj/ucw/sha1-t
+Out:	a9993e364706816aba3e25717850c26c9cd0d89d
+
+Name:	SHA1-2
+Run:	echo -n "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" | ../obj/ucw/sha1-t
+Out:	84983e441c3bd26ebaae4aa1f95129e5e54670f1
+
+# Tests of SHA-1 HMAC specified in RFC 2202
+
+Name:	HMAC1
+Run:	../obj/ucw/sha1-hmac-t
+In:	0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
+	Hi There
+Out:	b617318655057264e28bc0b6fb378c8ef146be00
+
+Name:	HMAC2
+Run:	../obj/ucw/sha1-hmac-t
+In:	Jefe
+	what do ya want for nothing?
+Out:	effcdf6ae5eb2fa2d27416d5f184df9c259a7c79
+
+Name:	HMAC3
+Run:	../obj/ucw/sha1-hmac-t
+In:	0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+Out:	125d7342b9ac11cd91a39af48aa17b4f63f175d3
+
+Name:	HMAC4
+Run:	../obj/ucw/sha1-hmac-t
+In:	0x0102030405060708090a0b0c0d0e0f10111213141516171819
+	0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd
+Out:	4c9007f4026250c6bc8414f9bf50c86c2d7235da
+
+Name:	HMAC5
+Run:	../obj/ucw/sha1-hmac-t
+In:	0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c
+	Test With Truncation
+Out:	4c1a03424b55e07fe7f27be1d58bb9324a9a5a04
+
+Name:	HMAC6
+Run:	../obj/ucw/sha1-hmac-t
+In:	0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	Test Using Larger Than Block-Size Key - Hash Key First
+Out:	aa4ae5e15272d00e95705637ce8a3b55ed402112
+
+Name:	HMAC7
+Run:	../obj/ucw/sha1-hmac-t
+In:	0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data
+Out:	e8e99d0f45237d786d6bbaa7965c7808bbff1a91
+
+Name:	HMAC8
+Run:	../obj/ucw/sha1-hmac-t
+In:	0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	Test Using Larger Than Block-Size Key - Hash Key First
+Out:	aa4ae5e15272d00e95705637ce8a3b55ed402112
+
+Name:	HMAC9
+Run:	../obj/ucw/sha1-hmac-t
+In:	0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data
+Out:	e8e99d0f45237d786d6bbaa7965c7808bbff1a91
diff --git a/libucw/ucw/shell/Makefile b/libucw/ucw/shell/Makefile
new file mode 100644
index 0000000..62774c3
--- /dev/null
+++ b/libucw/ucw/shell/Makefile
@@ -0,0 +1,20 @@
+# Support routines for shell scripts
+
+DIRS+=ucw/shell
+UCW_SHELL_PROGS=$(addprefix $(o)/ucw/shell/ucw-,config logger logoutput)
+PROGS+=$(UCW_SHELL_PROGS)
+DATAFILES+=$(o)/ucw/shell/libucw.sh
+
+$(o)/ucw/shell/ucw-config: $(o)/ucw/shell/ucw-config.o $(LIBUCW)
+$(o)/ucw/shell/ucw-logger: $(o)/ucw/shell/ucw-logger.o $(LIBUCW)
+$(o)/ucw/shell/ucw-logoutput: $(o)/ucw/shell/ucw-logoutput.o $(LIBUCW)
+
+TESTS+=$(addprefix $(o)/ucw/shell/,config.test)
+
+$(o)/ucw/shell/config.test: $(o)/ucw/shell/ucw-config
+
+INSTALL_TARGETS+=install-ucw-shell
+install-ucw-shell:
+	install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
+	install -m 755 $(UCW_SHELL_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
+.PHONY: install-ucw-shell
diff --git a/libucw/ucw/shell/config.t b/libucw/ucw/shell/config.t
new file mode 100644
index 0000000..fdcfc85
--- /dev/null
+++ b/libucw/ucw/shell/config.t
@@ -0,0 +1,39 @@
+# Tests for configuration parser
+
+Run:	../obj/ucw/shell/ucw-config -C/dev/null -S 'sec1{int1=23; long1=1234567812345678; long2=4321; str1="s1"; str2="s2"}' 'sec1 {#int1; ##long1; -str1; str2; #int2=123; ##long2=1234; #int3=0x10; #int4; $dbl1=001.100; $dbl2}; sec2{str3}'
+Out:	CF_sec1_int1='23'
+	CF_sec1_long1='1234567812345678'
+	CF_sec1_str2='s2'
+	CF_sec1_int2='123'
+	CF_sec1_long2='4321'
+	CF_sec1_int3='16'
+	CF_sec1_int4='0'
+	CF_sec1_dbl1='1.1'
+	CF_sec1_dbl2='0'
+	CF_sec2_str3=''
+
+Run:	../obj/ucw/shell/ucw-config -C/dev/null -S 'sec1{list1 1 a1 b1; list1:clear; list1 2 a2 b2 3 a3 b3}' 'sec1 {@list1 {#int1; str1; -str2}}'
+Out:	CF_sec1_list1_int1[1]='2'
+	CF_sec1_list1_str1[1]='a2'
+	CF_sec1_list1_int1[2]='3'
+	CF_sec1_list1_str1[2]='a3'
+
+Run:	../obj/ucw/shell/ucw-config -C/dev/null -S 'sec1{ar1 a b c d; ar1 a b c; ar2 1 2; ar3 1.1}' 'sec1 {ar1[]; #ar2[2]; $ar3[-2]}'
+Out:	CF_sec1_ar1[1]='a'
+	CF_sec1_ar1[2]='b'
+	CF_sec1_ar1[3]='c'
+	CF_sec1_ar2[1]='1'
+	CF_sec1_ar2[2]='2'
+	CF_sec1_ar3[1]='1.1'
+
+Run:	../obj/ucw/shell/ucw-config -C/dev/null -S 'sec1{list1 {str1=1; list2=a b c}; list1 {str1=2; list2=d e}}' 'sec1 {@list1 {str1; @list2{str2}}}'
+Out:	CF_sec1_list1_str1[1]='1'
+	CF_sec1_list1_list2_str2[1]='a'
+	CF_sec1_list1_list2_str2[2]='b'
+	CF_sec1_list1_list2_str2[3]='c'
+	CF_sec1_list1_str1[2]='2'
+	CF_sec1_list1_list2_str2[4]='d'
+	CF_sec1_list1_list2_str2[5]='e'
+
+Run:	../obj/ucw/shell/ucw-config -C/dev/null 'sec{str=a'\''b"c'\''d"\\e'\''f"g}'
+Out:	CF_sec_str='ab"cd\e'\''fg'
diff --git a/libucw/ucw/shell/libucw.sh b/libucw/ucw/shell/libucw.sh
new file mode 100644
index 0000000..143e431
--- /dev/null
+++ b/libucw/ucw/shell/libucw.sh
@@ -0,0 +1,42 @@
+# The UCW Library -- Shell Functions
+# (c) 2005 Martin Mares <mj@ucw.cz>
+#
+# This software may be freely distributed and used according to the terms
+# of the GNU Lesser General Public License.
+
+UCW_CF=
+while [ "${1:0:2}" = "-C" -o "${1:0:2}" = "-S" ] ; do
+	if [ -z "${1:2:1}" ] ; then
+		UCW_CF="$UCW_CF $1 $2"
+		shift 2
+	else
+		UCW_CF="$UCW_CF $1"
+		shift 1
+	fi
+done
+
+function log # msg
+{
+	bin/ucw-logger $UCW_PROGNAME I "$1"
+}
+
+function errlog # msg
+{
+	bin/ucw-logger $UCW_PROGNAME E "$1"
+}
+
+function warnlog # msg
+{
+	bin/ucw-logger $UCW_PROGNAME E "$1"
+}
+
+function die # msg
+{
+	bin/ucw-logger $UCW_PROGNAME ! "$1"
+	exit 1
+}
+
+function parse-config # section vars...
+{
+	eval `bin/ucw-config$UCW_CF "$@"`
+}
diff --git a/libucw/ucw/shell/ucw-config.c b/libucw/ucw/shell/ucw-config.c
new file mode 100644
index 0000000..667796d
--- /dev/null
+++ b/libucw/ucw/shell/ucw-config.c
@@ -0,0 +1,435 @@
+/*
+ *	UCW Library -- Shell Interface to Configuration Files
+ *
+ *	(c) 2002--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2006 Robert Spalek <robert@ucw.cz>
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	Once we were using this beautiful Shell version, but it turned out
+ *	that it doesn't work with nested config files:
+ *
+ *		eval `sed <cf/sherlock '/^#/d;/^ *$/d;s/ \+$//;
+ *		h;s@[^ 	]*@@;x;s@[ 	].*@@;y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;G;s/\n//;
+ *		/^\[SECTION\]/,/^\[/ {; /^[A-Z]/ { s/^\([^ 	]\+\)[ 	]*\(.*\)$/SH_\1="\2"/; p; }; };
+ *		d;'`
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/getopt.h>
+#include <ucw/conf-internal.h>
+#include <ucw/clists.h>
+#include <ucw/mempool.h>
+#include <ucw/chartype.h>
+#include <ucw/bbuf.h>
+#include <ucw/string.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <alloca.h>
+
+static void
+help(void)
+{
+  fputs("\n\
+Usage: ucw-config [-C<configfile>] [-S<section>.<option>=<value>] <sections>\n\
+\n\
+<sections>\t<section>[;<sections>]\n\
+<section>\t[!]<name>{[<items>]}\n\
+<items>\t\t[-]<item>[;<items>]\n\
+<item>\t\t<static> | <array> | <list>\n\
+<static>\t<type><name>[=<value>]\n\
+<list>\t\t@<name>{[<items>]}\n\
+<array>\t\t<type><name><left-bracket>[<number>]<right-bracket>\n\
+<value>\t\t[a-zA-Z0-9.-/]* | 'string without single quotes'<value> | \"c-like string\"<value>\n\
+\n\
+Types:\n\
+<empty>\t\tString\n\
+#\t\t32-bit integer\n\
+##\t\t64-bit integer\n\
+$\t\tFloating point number\n\
+\n\
+Modifiers:\n\
+!\t\tReport unknown items as errors\n\
+-\t\tDo not dump item's value\n\
+", stderr);
+  exit(1);
+}
+
+union value {
+  void *v_ptr;
+  int v_int;
+  u64 v_u64;
+  double v_double;
+  clist list;
+};
+
+#define FLAG_HIDE		0x1
+#define FLAG_NO_UNKNOWN		0x2
+
+struct item {
+  cnode node;
+  uint flags;
+  struct cf_item cf;
+  union value value;
+  uint index;
+};
+
+struct section {
+  struct item item;
+  clist list;
+  uint count;
+  uint size;
+};
+
+static struct mempool *pool;
+static clist sections;
+static byte *pos;
+
+static void
+parse_white(void)
+{
+  while (Cspace(*pos))
+    pos++;
+}
+
+static void
+parse_char(byte c)
+{
+  if (*pos++ != c)
+    die("Missing '%c'", c);
+}
+
+static byte *
+parse_name(void)
+{
+  byte *name = pos;
+  while (Cword(*pos))
+    pos++;
+  uint len = pos - name;
+  if (!len)
+    die("Expected item/section name");
+  byte *buf = mp_alloc(pool, len + 1);
+  memcpy(buf, name, len);
+  buf[len] = 0;
+  return buf;
+}
+
+static void
+parse_section(struct section *section)
+{
+#define TRY(x) do{ byte *_err=(x); if (_err) die("%s", _err); }while(0)
+  for (uint sep = 0; ; sep = 1)
+    {
+      parse_white();
+      if (!*pos || *pos == '}')
+	break;
+      if (sep)
+	parse_char(';');
+      parse_white();
+
+      struct item *item;
+
+      if (*pos == '@')
+        {
+	  pos++;
+	  struct section *sec = mp_alloc_zero(pool, sizeof(*sec));
+	  sec->size = sizeof(cnode);
+	  clist_init(&sec->list);
+	  item = &sec->item;
+	  item->cf.name = parse_name();
+	  item->cf.cls = CC_LIST;
+	  item->cf.number = 1;
+	  parse_white();
+	  parse_char('{');
+	  parse_section(sec);
+	  parse_char('}');
+	}
+      else
+        {
+	  item = mp_alloc_zero(pool, sizeof(*item));
+	  if (*pos == '-')
+	    {
+	      item->flags |= FLAG_HIDE;
+	      pos++;
+	    }
+	  item->cf.cls = CC_STATIC;
+	  item->cf.number = 1;
+	  switch (*pos)
+	    {
+	      case '#':
+		if (*++pos == '#')
+		  {
+		    pos++;
+		    item->cf.type = CT_U64;
+		  }
+		else
+		  item->cf.type = CT_INT;
+		break;
+	      case '$':
+		pos++;
+		item->cf.type = CT_DOUBLE;
+		break;
+	      default:
+		if (!Cword(*pos))
+		  die("Invalid type syntax");
+		item->cf.type = CT_STRING;
+		break;
+	    }
+	  parse_white();
+	  item->cf.name = parse_name();
+	  parse_white();
+	  if (*pos == '[')
+	    {
+	      pos++;
+	      parse_white();
+	      item->cf.cls = CC_DYNAMIC;
+	      byte *num = pos;
+	      while (*pos && *pos != ']')
+		pos++;
+	      if (!*pos)
+		die("Missing ']'");
+	      *pos++ = 0;
+	      if (!*num)
+		item->cf.number = CF_ANY_NUM;
+	      else
+	        {
+		  int inum;
+		  TRY(cf_parse_int(num, &inum));
+		  if (!inum)
+		    die("Invalid array length");
+		  item->cf.number = inum;
+		}
+	      parse_white();
+	    }
+	  if (*pos == '=')
+	    {
+	      pos++;
+	      parse_white();
+	      if (section->item.cf.cls == CC_LIST)
+		die("List items can not have default values");
+	      if (item->cf.cls == CC_DYNAMIC)
+		die("Arrays can not have default values");
+	      byte *def = pos, *d = def;
+	      while (*pos != ';' && *pos != '}' && !Cspace(*pos))
+	        {
+		  if (*pos == '\'')
+		    {
+		      pos++;
+		      while (*pos != '\'')
+		        {
+			  if (!*pos)
+			    die("Unterminated string");
+			  *d++ = *pos++;
+			}
+		      pos++;
+		    }
+		  else if (*pos == '"')
+		    {
+		      pos++;
+		      byte *start = d;
+		      uint esc = 0;
+		      while (*pos != '"' || esc)
+		        {
+			  if (!*pos)
+			    die("Unterminated string");
+			  if (*pos == '\\')
+			    esc ^= 1;
+			  else
+			    esc = 0;
+			  *d++ = *pos++;
+			}
+		      pos++;
+		      *d = 0;
+		      d = str_unesc(start, start);
+		    }
+		  else
+		    *d++ = *pos++;
+		}
+	      uint len = d - def;
+	      byte *buf = mp_alloc(pool, len + 1);
+	      memcpy(buf, def, len);
+	      buf[len] = 0;
+	      switch (item->cf.type)
+	        {
+		  case CT_STRING:
+		    item->value.v_ptr = buf;
+		    break;
+		  case CT_INT:
+		    TRY(cf_parse_int(buf, &item->value.v_int));
+		    break;
+		  case CT_U64:
+		    TRY(cf_parse_u64(buf, &item->value.v_u64));
+		    break;
+		  case CT_DOUBLE:
+		    TRY(cf_parse_double(buf, &item->value.v_double));
+		    break;
+		  default:
+		    ASSERT(0);
+		}
+	    }
+	}
+      if (section->item.cf.cls == CC_LIST)
+        {
+          item->cf.ptr = (void *)(uintptr_t)section->size;
+          section->size += sizeof(union value);
+        }
+      else
+        item->cf.ptr = &item->value;
+      clist_add_tail(&section->list, &item->node);
+      section->count++;
+    }
+#undef TRY
+}
+
+static void
+parse_outer(void)
+{
+  for (uint sep = 0; ; sep = 1)
+    {
+      parse_white();
+      if (!*pos)
+	break;
+      if (sep)
+	parse_char(';');
+      parse_white();
+      struct section *sec = mp_alloc_zero(pool, sizeof(*sec));
+      if (*pos == '!')
+        {
+	  pos++;
+	  sec->item.flags |= FLAG_NO_UNKNOWN;
+	}
+      sec->item.cf.name = parse_name();
+      parse_white();
+      parse_char('{');
+      clist_add_tail(&sections, &sec->item.node);
+      clist_init(&sec->list);
+      parse_section(sec);
+      parse_char('}');
+    }
+}
+
+static struct cf_section *
+generate_section(struct section *section)
+{
+  struct cf_section *sec = mp_alloc_zero(pool, sizeof(*sec));
+  if (section->item.cf.cls == CC_LIST)
+    sec->size = section->size;
+  struct cf_item *c = sec->cfg = mp_alloc_zero(pool, sizeof(struct cf_item) * (section->count + 1));
+  CLIST_FOR_EACH(struct item *, item, section->list)
+    {
+      *c = item->cf;
+      if (c->cls == CC_LIST)
+	c->u.sec = generate_section((struct section *)item);
+      c++;
+    }
+  c->cls = CC_END;
+  return sec;
+}
+
+static bb_t path;
+
+static void
+dump_value(uint array, struct item *item, void *v)
+{
+  byte buf[128], *value = buf;
+  if (!array)
+    printf("CF_%s_%s='", path.ptr, item->cf.name);
+  else
+    printf("CF_%s_%s[%u]='", path.ptr, item->cf.name, ++item->index);
+  switch (item->cf.type)
+    {
+      case CT_INT:
+        sprintf(buf, "%d", *(int *)v);
+        break;
+      case CT_U64:
+        sprintf(buf, "%llu", (long long) *(u64 *)v);
+	break;
+      case CT_DOUBLE:
+	sprintf(buf, "%g", *(double *)v);
+	break;
+      case CT_STRING:
+        if (*(byte **)v)
+          value = *(byte **)v;
+        else
+          *value = 0;
+        break;
+      default:
+        ASSERT(0);
+    }
+  while (*value) {
+    if (*value == '\'')
+      printf("'\\''");
+    else
+      putchar(*value);
+    value++;
+  }
+  printf("'\n");
+}
+
+static void
+dump_item(struct item *item, void *ptr, uint path_len)
+{
+  if (item->flags & FLAG_HIDE)
+    return;
+  byte *val = (byte *)((uintptr_t)ptr + (uintptr_t)item->cf.ptr);
+  if (item->cf.cls == CC_LIST)
+    {
+      uint len = strlen(item->cf.name);
+      bb_grow(&path, path_len + len + 1);
+      path.ptr[path_len] = '_';
+      memcpy(path.ptr + path_len + 1, item->cf.name, len);
+      CLIST_FOR_EACH(cnode *, ptr2, *(clist *)val)
+        CLIST_FOR_EACH(struct item *, item2, ((struct section *)item)->list)
+          dump_item(item2, ptr2, path_len + len + 1);
+    }
+  else
+    {
+      bb_grow(&path, path_len + 1)[path_len] = 0;
+      if (item->cf.cls == CC_STATIC)
+	dump_value(!!ptr, item, val);
+      else
+        {
+	  val = *(void **)val;
+	  uint len = DARY_LEN(val);
+	  uint size = cf_type_size(item->cf.type, NULL);
+	  for (uint i = 0; i < len; i++, val += size)
+	    dump_value(1, item, val);
+	}
+    }
+}
+
+int main(int argc, char **argv)
+{
+  log_init("ucw-config");
+  if (argc < 2)
+    help();
+  pos = argv[argc - 1];
+  argv[argc - 1] = NULL;
+
+  pool = mp_new(0x1000);
+  clist_init(&sections);
+  parse_outer();
+  CLIST_FOR_EACH(struct section *, sec, sections)
+    cf_declare_section(sec->item.cf.name, generate_section(sec), !(sec->item.flags & FLAG_NO_UNKNOWN));
+
+  if (cf_getopt(argc - 1, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) != -1)
+    help();
+
+  bb_init(&path);
+  CLIST_FOR_EACH(struct section *, section, sections)
+    {
+      uint len = strlen(section->item.cf.name);
+      memcpy(bb_grow(&path, len), section->item.cf.name, len);
+      CLIST_FOR_EACH(struct item *, item, section->list)
+        dump_item(item, NULL, len);
+    }
+  bb_done(&path);
+
+  return 0;
+}
+
diff --git a/libucw/ucw/shell/ucw-logger.c b/libucw/ucw/shell/ucw-logger.c
new file mode 100644
index 0000000..1ef5f68
--- /dev/null
+++ b/libucw/ucw/shell/ucw-logger.c
@@ -0,0 +1,50 @@
+/*
+ *	UCW Library Utilities -- A Simple Logger for use in shell scripts
+ *
+ *	(c) 2001--2009 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+
+#include <stdio.h>
+#include <string.h>
+
+int
+main(int argc, char **argv)
+{
+  byte buf[1024], *c;
+
+  log_init("ucw-logger");
+  if (argc < 3 || argc > 4 || strlen(argv[2]) != 1)
+    die("Usage: ucw-logger [<logname>:]<progname> <level> [<text>]");
+  if (c = strchr(argv[1], ':'))
+    {
+      *c++ = 0;
+      log_init(c);
+      log_file(argv[1]);
+    }
+  else
+    log_init(argv[1]);
+
+  uint level = 0;
+  while (level < L_MAX && LS_LEVEL_LETTER(level) != argv[2][0])
+    level++;
+  if (level >= L_MAX)
+    die("Unknown logging level `%s'", argv[2]);
+
+  if (argc > 3)
+    msg(level, "%s", argv[3]);
+  else
+    while (fgets(buf, sizeof(buf), stdin))
+      {
+	c = strchr(buf, '\n');
+	if (c)
+	  *c = 0;
+	msg(level, "%s", buf);
+      }
+  return 0;
+}
diff --git a/libucw/ucw/shell/ucw-logoutput.c b/libucw/ucw/shell/ucw-logoutput.c
new file mode 100644
index 0000000..61e9f32
--- /dev/null
+++ b/libucw/ucw/shell/ucw-logoutput.c
@@ -0,0 +1,468 @@
+/*
+ *	UCW Library Utilities -- A Simple Logger for use in shell scripts
+ *
+ *	(c) 2001--2009 Martin Mares <mj@ucw.cz>
+ *      (c) 2011 Tomas Ebenlendr <ebik@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/mainloop.h>
+#include <ucw/clists.h>
+#include <ucw/getopt.h>
+#include <ucw/conf.h>
+#include <ucw/process.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+
+static uint max_line = 1024;
+static int launch_finish_messages = 1;
+static int nonzero_status_message = 1;
+
+static struct cf_section cfsec_logoutput = {
+  CF_ITEMS {
+    CF_UINT("LineMax", &max_line),
+    CF_END
+  }
+};
+
+static clist filedescriptors;
+
+struct fds {
+  cnode node;
+  int pipe[2];
+  int fdnum;
+  uint level;
+  int long_continue;
+  struct main_rec_io rio;
+};
+
+static void
+close_fd(struct fds *fd)
+{
+  rec_io_del(&fd->rio);
+  close(fd->fdnum);
+  clist_remove(&fd->node);
+  if (clist_empty(&filedescriptors))
+    main_shut_down();
+}
+
+
+static void
+do_msg (struct fds *fd, char *l_msg, int long_continue)
+{
+  msg(fd->level, "%s%s", (fd->long_continue ? "... " : ""), l_msg);
+  fd->long_continue = long_continue;
+}
+
+static uint
+handle_read(struct main_rec_io *r)
+{
+  char buf[max_line + 5];
+  byte *eol = memchr((char *)r->read_rec_start + r->read_prev_avail, '\n', r->read_avail - r->read_prev_avail);
+  if (eol == NULL) {
+    if (r->read_avail >= max_line) {
+      memcpy(buf, r->read_rec_start, max_line);
+      memcpy(buf + max_line, " ...", 5);
+      do_msg(r->data, buf, 1);
+      return max_line;
+    } else
+      return 0;
+  }
+  *eol = 0;
+  byte *b = r->read_rec_start;
+  while ((uint)(eol - b) > max_line) {
+    char cc = b[max_line];
+    b[max_line]=0;
+    do_msg(r->data, b, 1);
+    b[max_line]=cc;
+    b+=max_line;
+  }
+  do_msg(r->data, (char *)b, 0);
+  return eol - r->read_rec_start + 1;
+}
+
+static int
+handle_notify(struct main_rec_io *r, int status)
+{
+  struct fds *fd = r->data;
+  switch (status) {
+    case RIO_ERR_READ:
+    case RIO_EVENT_EOF:
+      if (r->read_avail) {
+        char buf[max_line + 10];
+        memcpy(buf, r->read_rec_start, r->read_avail);
+        memcpy(buf + r->read_avail, " [no eol]", 10);
+        do_msg(r->data, buf, 0);
+      } else if (fd->long_continue) {
+	do_msg(r->data, "[no eol]", 0);
+      }
+      close_fd(fd);
+      return HOOK_DONE;
+    default:
+      ASSERT(0);
+  }
+  return HOOK_IDLE;
+}
+
+
+static void
+add_level_fd(int fdnum, int level)
+{
+  struct fds *fd = xmalloc_zero(sizeof(*fd));
+  fd->level = level;
+  fd->pipe[0] = -1;
+  fd->pipe[1] = -1;
+  fd->fdnum = fdnum;
+  fd->rio.read_handler = handle_read;
+  fd->rio.data = fd;
+  fd->rio.notify_handler = handle_notify;
+  fd->long_continue = 0;
+  clist_add_tail(&filedescriptors, &fd->node);
+}
+
+static int
+xdup(int fd)
+{
+  int rfd = dup(fd);
+  if (rfd == -1)
+    die("Cannot dup(): %m");
+  DBG("  Dup(%i) -> %i", fd, rfd);
+  return rfd;
+}
+
+static int
+xdup2(int fd1, int fd2)
+{
+  int rfd = dup2(fd1, fd2);
+  if (rfd == -1)
+    die("Cannot dup2(): %m");
+  DBG("  Dup2(%i, %i) -> %i", fd1, fd2, rfd);
+  return rfd;
+}
+
+static void
+xdupavoid(int *fd1, int fd2)
+{
+  DBG("Dupavoid: !%i -> %i", fd2, *fd1);
+  int ofd = *fd1;
+  if (ofd == fd2) {
+    *fd1 = xdup(ofd);
+    DBG("  Close: %i", ofd);
+    close(ofd);
+  }
+}
+
+static void
+xdupto(int *fd1, int fd2)
+{
+  DBG("Dupto: %i -> %i", *fd1, fd2);
+  if (*fd1 == fd2)
+    return;
+  DBG("  Close: %i", fd2);
+  close(fd2);
+  xdup2(*fd1, fd2);
+  DBG("  Close: %i", *fd1);
+  close(*fd1);
+  *fd1 = fd2;
+}
+
+static void
+set_cloexec_flag(int fd, int value)
+{
+  int flags = fcntl(fd, F_GETFD, 0);
+  if (flags < 0)
+    die("fcntl(..., F_GETFD, ...) : %m");
+  flags = (value) ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC;
+  if (fcntl(fd, F_SETFD, flags) < 0)
+    die("fcntl(..., F_SETFD, ...) : %m");
+}
+
+/* The "+" stands for end at first argument (i.e. do not parse options after
+   first argument.) */
+#define MY_SHORT_OPTS "+" CF_SHORT_OPTS "f:n:l:ih"
+const struct option my_long_opts[] = {
+  CF_LONG_OPTS
+  { "help", 0, 0, 'h'},
+  { "input", 0, 0, 'i'},
+  { "logfile", 1, 0, 'f'},
+  { "logname", 1, 0, 'n'},
+  { "descriptor", 1, 0, 'l'},
+  { "nv", 0, 0, 'q'},
+  { "nonverbose", 0, 0, 'q'},
+  { "non-verbose", 0, 0, 'q'},
+  { "non_verbose", 0, 0, 'q'},
+  { "silent", 0, 0, 's'},
+  { NULL, 0, 0, 0}
+};
+
+#undef CF_USAGE_TAB
+#define CF_USAGE_TAB "\t   "
+static char usage[] =
+  "Usage:\n"
+  "ucw-logoutput -h|--help\t\t   This help.\n"
+  "ucw-logoutput <options> -i|--input   Read file descriptors and log them.\n"
+  "\t\t\t\t   default: stdin at level I.\n"
+  "ucw-logoutput <opts> [--] <cmd> [arguments for cmd ...]\n"
+  "\t\t\t\t   Open file descriptors for writing for command <cmd> and log them.\n"
+  "\t\t\t\t   default: stdout:I, stderr:W.\n\n"
+  "Options:\n"
+  CF_USAGE
+  "-n, --logname <name>\t\t   Use <name> as program name in logs.\n"
+  "-l, --descriptor <fdnum>:<level>   Open file descriptor <fdnum> and log it at level <level> (replaces defaults).\n"
+  "-f, --logfile <logfile>\t\t   Log to file <logfile>.\n"
+  "-q, --nv, --nonverbose\t\t   Suppress launching and successful finish messages.\n"
+  "-s, --silent\t\t\t   Suppress launching message and all finish messages.\n"
+  "\t\t\t\t   (i.e., no warning if it terminates with a nonzero exit code or by a signal)\n";
+
+int
+main(int argc, char **argv)
+{
+  int register_default = 1;
+  int loginput = 0;
+  char *logfile = NULL;
+  char *logname = NULL;
+  struct fds *stderrfd = NULL;
+  int help = 0;
+
+  log_init("ucw-logoutput");
+  clist_init(&filedescriptors);
+  cf_declare_section("LogOutput", &cfsec_logoutput, 0);
+
+  while (1) {
+    int opt = cf_getopt(argc, argv, MY_SHORT_OPTS, my_long_opts, NULL);
+    switch (opt) {
+      case -1:
+	goto opt_done;
+
+      case 'h':
+	help = 1;
+	break;
+
+      case 'i':
+	loginput = 1;
+	break;
+
+      case 'f':
+	logfile = optarg;
+	break;
+
+      case 'n':
+	logname = optarg;
+	break;
+
+      case 'l':
+	{
+	  char *c = optarg;
+
+	  register_default = 0;
+	  int fdnum = 0;
+	  int parseerror = 0;
+	  if ( (c[0]<'0') || (c[0] > '9') )
+	    parseerror = 1;
+	  while ( (!parseerror) && (c[0] >= '0') && (c[0] <= '9') )
+	    { fdnum = fdnum*10 + c[0] - '0'; c++; }
+	  if ( (!parseerror) && (c[0] != ':') )
+	    parseerror = 1;
+	  c++;
+	  if ( (!parseerror) && (c[0] == 0) )
+	    parseerror = 1;
+	  if ( (!parseerror) && (c[1] != 0) )
+	    parseerror = 1;
+	  if (parseerror) die("Bad argument `%s' to -l, expects number:letter.", optarg);
+
+	  uint level = 0;
+	  while (level < L_MAX && LS_LEVEL_LETTER(level) != c[0])
+	    level++;
+	  if (level >= L_MAX)
+	    die("Unknown logging level `%s'", c);
+
+	  add_level_fd(fdnum, level);
+	}
+	break;
+
+      case 's':
+	nonzero_status_message = 0;
+	/* fallthrough */
+      case 'q':
+	launch_finish_messages = 0;
+	break;
+
+      default:
+	optind--;
+	goto opt_done;
+    }
+  }
+opt_done:
+
+  if (!help) {
+    if (loginput && (optind < argc))
+      die("No cmd is allowed for -i. Use -h for help.");
+
+    if ((!loginput) && (optind >= argc)) {
+      msg(L_FATAL, "Either command or --input expected.");
+      help = 2;
+    }
+  }
+  if (help) {
+    if (write(2, usage, sizeof(usage)) < 0) {
+    }
+    return (help == 1) ? 0 : 1;
+  }
+
+  if (register_default) {
+    if (loginput) {
+      add_level_fd(0, L_INFO);
+    } else {
+      add_level_fd(1, L_INFO);
+      add_level_fd(2, L_WARN);
+    }
+  }
+
+  if (loginput) {
+    /* Just check, that we don't want open stderr for reading. */
+    CLIST_FOR_EACH(struct fds *, fd, filedescriptors) {
+      if (fd->fdnum == 2)
+        die("Stderr is reserved for output");
+    }
+  } else {
+    /* Open all filedescriptors and their duplicates. */
+    CLIST_FOR_EACH(struct fds *, fd, filedescriptors) {
+      CLIST_FOR_EACH(struct fds *, fdcheck, filedescriptors) {
+        /* We do a dummy check for collisions of filedescriptors. */
+        if (fdcheck == fd)
+	  break;
+        if (fdcheck->fdnum == fd->fdnum) {
+          die("Duplicate filedescriptor %i", fd->fdnum);
+        }
+        xdupavoid(fdcheck->pipe + 0, fd->fdnum);
+        xdupavoid(fdcheck->pipe + 1, fd->fdnum);
+      }
+      if (pipe(fd->pipe) == -1)
+        die("Cannot create pipe: %m");
+      DBG("Pipe [%i, %i] for %i", fd->pipe[0], fd->pipe[1], fd->fdnum);
+      xdupavoid(fd->pipe + 0, fd->fdnum);
+
+      if (fd->fdnum == 2) {
+        stderrfd = fd; //We need to redirect stderr later.
+      } else {
+        xdupto(fd->pipe + 1, fd->fdnum);
+      }
+      DBG("---> [%i, %i] for %i", fd->pipe[0], fd->pipe[1], fd->fdnum);
+      set_cloexec_flag(fd->pipe[0], 1);
+      set_cloexec_flag(fd->pipe[1], 0);
+    }
+  }
+
+  /* Initialize main loop. */
+  main_init();
+
+  CLIST_FOR_EACH(struct fds *, fd, filedescriptors) {
+    /* Our pipe is created, let fd->fdnum be the reading end. */
+    if (!loginput)
+      fd->fdnum = fd->pipe[0];
+    fd->rio.read_rec_max = max_line + 1;
+    rec_io_add(&fd->rio, fd->fdnum);
+  }
+
+  int pid = -1;
+  if (!loginput) {
+    /* Launch the child and close filedescriptors. */
+    pid = fork();
+    if (pid == -1)
+      die("Cannot fork: %m");
+    if (pid == 0 ) {
+      /* Child */
+
+      /* Move stderr where it should be. */
+      if (stderrfd)
+        xdupto(stderrfd->pipe + 1, 2);
+
+      execvp(argv[optind], argv + optind);
+      if (stderrfd) {
+        /* We translate stderr, just print. */
+        perror("Cannot exec child");
+        return 127;
+      }
+      /* No stderr translation: use logging function. */
+      die("Cannot exec child: %m");
+    }
+
+    /* Close writing filedescriptors. */
+    CLIST_FOR_EACH(struct fds *, fd, filedescriptors) {
+      close(fd->pipe[1]);
+    }
+  }
+
+  /* Open logfile or stderr. */
+  if (logfile) {
+    log_file(logfile);
+    close(2);
+  }
+
+  if (!loginput) {
+    /* Inform about launching of the command. */
+    int buflen = 0;
+    for (int i = optind; i < argc; i++) buflen += strlen(argv[i]) + 1;
+    char *buf = xmalloc(buflen);
+    char *buf2 = buf;
+    for (int i = optind; i < argc; i++) {
+      strcpy(buf2, argv[i]);
+      buf2 += strlen(argv[i]);
+      buf2[0] = ' ';
+      buf2++;
+    }
+    buf2[-1] = 0;
+
+    if (launch_finish_messages)
+      msg(L_INFO, "Launching command: %s", buf);
+  }
+
+  /* Set logname. */
+  if (logname)
+    log_init(logname);
+  else if (!loginput)
+    log_init(argv[optind]);
+
+  /* Start reading from pipes. */
+  CLIST_FOR_EACH(struct fds *, fd, filedescriptors)
+    rec_io_start_read(&fd->rio);
+  main_loop();
+
+  if (!loginput) {
+    /* Unset logname. */
+    log_init("ucw-logoutput");
+
+    /* Wait for status of the child and inform about finish. */
+    int status;
+    char buf[256];
+
+    while (waitpid(pid, &status, 0) == -1) {
+      if (errno != EINTR)
+        die("Cannot wait for child: %m");
+    }
+
+    if (format_exit_status(buf, status)) {
+      if (nonzero_status_message)
+	msg(L_WARN, "Child %s", buf);
+      return WIFEXITED(status) ? WEXITSTATUS(status) : 127;
+    } else {
+      if (launch_finish_messages)
+	msg(L_INFO, "Child terminated successfully.");
+      return 0;
+    }
+  }
+
+  return 0;
+}
diff --git a/libucw/ucw/sighandler.c b/libucw/ucw/sighandler.c
new file mode 100644
index 0000000..2182e0c
--- /dev/null
+++ b/libucw/ucw/sighandler.c
@@ -0,0 +1,65 @@
+/*
+ *	UCW Library -- Catching of signals and calling callback functions
+ *
+ *	(c) 2004, Robert Spalek <robert@ucw.cz>
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/threads.h>
+#include <ucw/sighandler.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+static int sig_handler_nest[NSIG];
+static struct sigaction sig_handler_old[NSIG];
+
+static void
+signal_handler_internal(int sig)
+{
+  struct ucwlib_context *ctx = ucwlib_thread_context();
+  if (!ctx->signal_handlers || !ctx->signal_handlers[sig] || ctx->signal_handlers[sig](sig))
+    abort();
+}
+
+void
+handle_signal(int signum)
+{
+  ucwlib_lock();
+  if (!sig_handler_nest[signum]++)
+    {
+      struct sigaction act;
+      bzero(&act, sizeof(act));
+      act.sa_handler = signal_handler_internal;
+      act.sa_flags = SA_NODEFER;
+      if (sigaction(signum, &act, &sig_handler_old[signum]) < 0)
+	die("sigaction: %m");
+    }
+  ucwlib_unlock();
+}
+
+void
+unhandle_signal(int signum)
+{
+  ucwlib_lock();
+  ASSERT(sig_handler_nest[signum]);
+  if (!--sig_handler_nest[signum])
+    {
+      if (sigaction(signum, &sig_handler_old[signum], NULL) < 0)
+	die("sigaction: %m");
+    }
+  ucwlib_unlock();
+}
+
+ucw_sighandler_t
+set_signal_handler(int signum, ucw_sighandler_t newh)
+{
+  struct ucwlib_context *ctx = ucwlib_thread_context();
+  if (!ctx->signal_handlers)
+    ctx->signal_handlers = xmalloc_zero(NSIG * sizeof(ucw_sighandler_t));
+  ucw_sighandler_t old = ctx->signal_handlers[signum];
+  ctx->signal_handlers[signum] = newh;
+  return old;
+}
diff --git a/libucw/ucw/sighandler.h b/libucw/ucw/sighandler.h
new file mode 100644
index 0000000..e59fbae
--- /dev/null
+++ b/libucw/ucw/sighandler.h
@@ -0,0 +1,25 @@
+/*
+ *	UCW Library -- Signal Handling
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SIGHANDLER_H
+#define _UCW_SIGHANDLER_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define handle_signal ucw_handle_signal
+#define set_signal_handler ucw_set_signal_handler
+#define unhandle_signal ucw_unhandle_signal
+#endif
+
+typedef int (*ucw_sighandler_t)(int);	// gets signum, returns nonzero if abort() should be called
+
+void handle_signal(int signum);
+void unhandle_signal(int signum);
+ucw_sighandler_t set_signal_handler(int signum, ucw_sighandler_t newh);
+
+#endif	/* !_UCW_SIGHANDLER_H */
diff --git a/libucw/ucw/signames.c b/libucw/ucw/signames.c
new file mode 100644
index 0000000..bf2f199
--- /dev/null
+++ b/libucw/ucw/signames.c
@@ -0,0 +1,170 @@
+/*
+ *	A List of Signal Names
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/signames.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+
+struct sig_name {
+  const char name[11];
+  byte number;
+};
+
+#define S(sig) { #sig, sig }
+
+static const struct sig_name sig_names[] = {
+#ifdef SIGABRT
+	S(SIGABRT),
+#endif
+#ifdef SIGALRM
+	S(SIGALRM),
+#endif
+#ifdef SIGBUS
+	S(SIGBUS),
+#endif
+#ifdef SIGCHLD
+	S(SIGCHLD),
+#endif
+#ifdef SIGCONT
+	S(SIGCONT),
+#endif
+#ifdef SIGFPE
+	S(SIGFPE),
+#endif
+#ifdef SIGHUP
+	S(SIGHUP),
+#endif
+#ifdef SIGILL
+	S(SIGILL),
+#endif
+#ifdef SIGINT
+	S(SIGINT),
+#endif
+#ifdef SIGIO
+	S(SIGIO),
+#endif
+#ifdef SIGIOT
+	S(SIGIOT),
+#endif
+#ifdef SIGKILL
+	S(SIGKILL),
+#endif
+#ifdef SIGPIPE
+	S(SIGPIPE),
+#endif
+#ifdef SIGPOLL
+	S(SIGPOLL),
+#endif
+#ifdef SIGPROF
+	S(SIGPROF),
+#endif
+#ifdef SIGPWR
+	S(SIGPWR),
+#endif
+#ifdef SIGQUIT
+	S(SIGQUIT),
+#endif
+#ifdef SIGSEGV
+	S(SIGSEGV),
+#endif
+#ifdef SIGSTKFLT
+	S(SIGSTKFLT),
+#endif
+#ifdef SIGSTOP
+	S(SIGSTOP),
+#endif
+#ifdef SIGSYS
+	S(SIGSYS),
+#endif
+#ifdef SIGTERM
+	S(SIGTERM),
+#endif
+#ifdef SIGTRAP
+	S(SIGTRAP),
+#endif
+#ifdef SIGTSTP
+	S(SIGTSTP),
+#endif
+#ifdef SIGTTIN
+	S(SIGTTIN),
+#endif
+#ifdef SIGTTOU
+	S(SIGTTOU),
+#endif
+#ifdef SIGURG
+	S(SIGURG),
+#endif
+#ifdef SIGUSR1
+	S(SIGUSR1),
+#endif
+#ifdef SIGUSR2
+	S(SIGUSR2),
+#endif
+#ifdef SIGVTALRM
+	S(SIGVTALRM),
+#endif
+#ifdef SIGWINCH
+	S(SIGWINCH),
+#endif
+#ifdef SIGXCPU
+	S(SIGXCPU),
+#endif
+#ifdef SIGXFSZ
+	S(SIGXFSZ),
+#endif
+};
+
+int
+sig_name_to_number(const char *name)
+{
+  for (uint i=0; i < ARRAY_SIZE(sig_names); i++)
+    if (!strcmp(sig_names[i].name, name))
+      return sig_names[i].number;
+  return -1;
+}
+
+const char *
+sig_number_to_name(int number)
+{
+  for (uint i=0; i < ARRAY_SIZE(sig_names); i++)
+    if (sig_names[i].number == number)
+      return sig_names[i].name;
+  return NULL;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  char c[256];
+  while (fgets(c, sizeof(c), stdin))
+    {
+      char *e = strchr(c, '\n');
+      if (e)
+	*e = 0;
+      if (c[0] == '#')
+	{
+	  const char *name = sig_number_to_name(atoi(c+1));
+	  puts(name ? : "?");
+	}
+      else
+	{
+	  int num = sig_name_to_number(c);
+	  if (num < 0)
+	    puts("?");
+	  else
+	    printf("%d\n", num);
+	}
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/signames.h b/libucw/ucw/signames.h
new file mode 100644
index 0000000..e492298
--- /dev/null
+++ b/libucw/ucw/signames.h
@@ -0,0 +1,39 @@
+/*
+ *	A List of Signal Names
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ */
+
+#ifndef _UCW_SIGNAMES_H
+#define _UCW_SIGNAMES_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define sig_name_to_number ucw_sig_name_to_number
+#define sig_number_to_name ucw_sig_number_to_name
+#endif
+
+/***
+ * POSIX lacks facilities for conversion between signal names
+ * and signal numbers. They are available in LibUCW, but please
+ * be aware that some signals might be missing on your system.
+ * If they do, please notify LibUCW maintainers.
+ *
+ * The GNU C Library provides `strsignal()` with similar function,
+ * but it returns human-readable strings like "Segmentation fault".
+ ***/
+
+/**
+ * Converts signal name to the corresponding number.
+ * Returns -1 if not found.
+ **/
+int sig_name_to_number(const char *name);
+
+/**
+ * Converts signal number to the corresponding name.
+ * If more names are known for the given signal, one of them
+ * is considered canonical and preferred.
+ * Returns NULL if not found.
+ **/
+const char *sig_number_to_name(int number);
+
+#endif
diff --git a/libucw/ucw/signames.t b/libucw/ucw/signames.t
new file mode 100644
index 0000000..5765693
--- /dev/null
+++ b/libucw/ucw/signames.t
@@ -0,0 +1,20 @@
+# Tests for signames.c
+
+Name:	Name -> number
+Run:	../obj/ucw/signames-t
+In:	SIGKILL
+	SIGSEGV
+	sigterm
+Out:	9
+	11
+	?
+
+Name:	Number -> name
+Run:	../obj/ucw/signames-t
+In:	#9
+	#11
+	#0
+Out:	SIGKILL
+	SIGSEGV
+	?
+
diff --git a/libucw/ucw/simple-lists.c b/libucw/ucw/simple-lists.c
new file mode 100644
index 0000000..25326d4
--- /dev/null
+++ b/libucw/ucw/simple-lists.c
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- Linked Lists of Simple Items
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/conf.h>
+#include <ucw/simple-lists.h>
+
+simp_node *
+simp_append(struct mempool *mp, clist *l)
+{
+  simp_node *n = mp_alloc_fast(mp, sizeof(*n));
+  clist_add_tail(l, &n->n);
+  return n;
+}
+
+simp2_node *
+simp2_append(struct mempool *mp, clist *l)
+{
+  simp2_node *n = mp_alloc_fast(mp, sizeof(*n));
+  clist_add_tail(l, &n->n);
+  return n;
+}
+
+/* Configuration sections for common lists */
+
+struct cf_section cf_string_list_config = {
+  CF_TYPE(simp_node),
+  CF_ITEMS {
+    CF_STRING("String", PTR_TO(simp_node, s)),
+    CF_END
+  }
+};
+
+struct cf_section cf_2string_list_config = {
+  CF_TYPE(simp2_node),
+  CF_ITEMS {
+    CF_STRING("Src", PTR_TO(simp2_node, s1)),
+    CF_STRING("Dest", PTR_TO(simp2_node, s2)),
+    CF_END
+  }
+};
diff --git a/libucw/ucw/simple-lists.h b/libucw/ucw/simple-lists.h
new file mode 100644
index 0000000..6022758
--- /dev/null
+++ b/libucw/ucw/simple-lists.h
@@ -0,0 +1,85 @@
+/*
+ *	UCW Library -- Linked Lists of Simple Items
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SIMPLE_LISTS_H
+#define _UCW_SIMPLE_LISTS_H
+
+#include <ucw/clists.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define cf_2string_list_config ucw_cf_2string_list_config
+#define cf_string_list_config ucw_cf_string_list_config
+#define simp2_append ucw_simp2_append
+#define simp_append ucw_simp_append
+#endif
+
+/***
+ * To simplify very common usage of circular linked links, whose nodes can hold only one or two trivial values,
+ * we define some generic node types, called the simple nodes.
+ *
+ * To avoid some type casts, values in simple nodes are defined as unions of most frequent types.
+ ***/
+
+/**
+ * Simple node with one value.
+ **/
+typedef struct simp_node {
+  cnode n;
+  union {
+    char *s;
+    void *p;
+    int i;
+    uint u;
+  };
+} simp_node;
+
+/**
+ * Simple node with two values.
+ **/
+typedef struct simp2_node {
+  cnode n;
+  union {
+    char *s1;
+    void *p1;
+    int i1;
+    uint u1;
+  };
+  union {
+    char *s2;
+    void *p2;
+    int i2;
+    uint u2;
+  };
+} simp2_node;
+
+struct mempool;
+
+/**
+ * Allocate a new one-value node on memory pool @mp and insert it to @l. The value is undefined and should be changed afterwards.
+ **/
+simp_node *simp_append(struct mempool *mp, clist *l);
+
+/**
+ * Allocate a new two-value node on memory pool @mp and insert it to @l. The values are undefined and should be changed afterwards.
+ **/
+simp2_node *simp2_append(struct mempool *mp, clist *l);
+
+/* Configuration sections */
+
+/**
+ * Default definition of the configuration section with one-value string node. Identifier of the value is `String`.
+ **/
+extern struct cf_section cf_string_list_config;
+
+/**
+ * Default definition of the configuration section with two-value string node. Identifiers of the values are `Src` and `Dest`.
+ **/
+extern struct cf_section cf_2string_list_config;
+
+#endif
diff --git a/libucw/ucw/slists.c b/libucw/ucw/slists.c
new file mode 100644
index 0000000..7fb63ad
--- /dev/null
+++ b/libucw/ucw/slists.c
@@ -0,0 +1,86 @@
+/*
+ *	UCW Library -- Single-Linked Lists
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/slists.h>
+
+static inline snode *
+slist_raw_prev(slist *l, snode *n)
+{
+  snode *m = &l->head;
+  while (m)
+    {
+      if (n == m->next)
+	return m;
+      m = m->next;
+    }
+  ASSERT(0);
+}
+
+void *
+slist_prev(slist *l, snode *n)
+{
+  snode *p = slist_raw_prev(l, n);
+  return (p == &l->head) ? NULL : p;
+}
+
+void
+slist_insert_before(slist *l, snode *what, snode *before)
+{
+  what->next = before;
+  slist_raw_prev(l, before)->next = what;
+}
+
+void
+slist_remove(slist *l, snode *n)
+{
+  if (n)
+    {
+      snode *p = slist_raw_prev(l, n);
+      slist_remove_after(l, p);
+    }
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <alloca.h>
+
+int main(void)
+{
+  slist l;
+
+  struct x {
+    snode n;
+    int val;
+  };
+
+  slist_init(&l);
+  for (int i=1; i<=10; i++)
+    {
+      struct x *x = alloca(sizeof(*x));
+      x->val = i;
+      if (i % 2)
+	slist_add_head(&l, &x->n);
+      else
+	slist_add_tail(&l, &x->n);
+    }
+
+  struct x *x, *prev;
+  SLIST_WALK_DELSAFE(x, l, prev)
+    if (x->val == 5)
+      slist_remove_after(&l, &prev->n);
+    else if (x->val == 6)
+      slist_remove(&l, &x->n);
+  SLIST_FOR_EACH(struct x *, x, l)
+    printf("%d/", x->val);
+  putchar('\n');
+}
+
+#endif
diff --git a/libucw/ucw/slists.h b/libucw/ucw/slists.h
new file mode 100644
index 0000000..a9eb996
--- /dev/null
+++ b/libucw/ucw/slists.h
@@ -0,0 +1,233 @@
+/*
+ *	UCW Library -- Single-Linked Lists
+ *
+ *	(c) 2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2017 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SLISTS_H
+#define _UCW_SLISTS_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define slist_insert_before ucw_slist_insert_before
+#define slist_prev ucw_slist_prev
+#define slist_remove ucw_slist_remove
+#endif
+
+/**
+ * Common header for list nodes.
+ **/
+typedef struct snode {
+  struct snode *next;
+} snode;
+
+/**
+ * Single-linked list.
+ **/
+typedef struct slist {
+  struct snode head, *last;
+} slist;
+
+/**
+ * Initialize a new single-linked list. Must be called before any other function.
+ **/
+static inline void slist_init(slist *l)
+{
+  l->head.next = l->last = NULL;
+}
+
+/**
+ * Return the first node of @l or NULL if @l is empty.
+ **/
+static inline void *slist_head(slist *l)
+{
+  return l->head.next;
+}
+
+/**
+ * Return the last node of @l or NULL if @l is empty.
+ **/
+static inline void *slist_tail(slist *l)
+{
+  return l->last;
+}
+
+/**
+ * Find the next node to @n or NULL if @n is the last one.
+ **/
+static inline void *slist_next(snode *n)
+{
+  return n->next;
+}
+
+/**
+ * Return a non-zero value iff @l is empty.
+ **/
+static inline int slist_empty(slist *l)
+{
+  return !l->head.next;
+}
+
+/**
+ * Insert a new node in front of all other nodes.
+ **/
+static inline void slist_add_head(slist *l, snode *n)
+{
+  n->next = l->head.next;
+  l->head.next = n;
+  if (!l->last)
+    l->last = n;
+}
+
+/**
+ * Insert a new node after all other nodes.
+ **/
+static inline void slist_add_tail(slist *l, snode *n)
+{
+  if (l->last)
+    l->last->next = n;
+  else
+    l->head.next = n;
+  n->next = NULL;
+  l->last = n;
+}
+
+/**
+ * Insert a new node just after the node @after. To insert a new head, use @slist_add_head() instead.
+ **/
+static inline void slist_insert_after(slist *l, snode *what, snode *after)
+{
+  what->next = after->next;
+  after->next = what;
+  if (!what->next)
+    l->last = what;
+}
+
+/**
+ * Quickly remove the node next to @after. The node may not exist.
+ **/
+static inline void slist_remove_after(slist *l, snode *after)
+{
+  snode *n = after->next;
+  if (n)
+    {
+      after->next = n->next;
+      if (l->last == n)
+        l->last = (after == &l->head) ? NULL : after;
+    }
+}
+
+/**
+ * Remove the first node in @l. The list can be empty.
+ **/
+static inline void *slist_remove_head(slist *l)
+{
+  snode *n = slist_head(l);
+  if (n)
+    slist_remove_after(l, &l->head);
+  return n;
+}
+
+/* Loops */
+
+/**
+ * Loop over all nodes in the @list and perform the next C statement on them. The current node is stored in @n which must be defined before as pointer to any type.
+ * The list should not be changed during this loop command.
+ **/
+#define SLIST_WALK(n,list) for(n=(void*)(list).head.next; (n); (n)=(void*)((snode*)(n))->next)
+
+/**
+ * Same as @SLIST_WALK(), but allows removal of the current node. This macro requires one more variable to store the pointer to the previous node (useful for @slist_remove_after()).
+ **/
+#define SLIST_WALK_DELSAFE(n,list,prev) for((prev)=(void*)&(list).head; (n)=(void*)((snode*)prev)->next; (prev)=(((snode*)(prev))->next==(snode*)(n) ? (void*)(n) : (void*)(prev)))
+
+/**
+ * Same as @SLIST_WALK(), but it defines the variable for the current node in place. @type should be a pointer type.
+ **/
+#define SLIST_FOR_EACH(type,n,list) for(type n=(void*)(list).head.next; n; n=(void*)((snode*)(n))->next)
+
+/* Non-trivial functions */
+
+/**
+ * Find the previous node to @n or NULL if @n is the first one. Beware linear time complexity.
+ **/
+void *slist_prev(slist *l, snode *n);
+
+/**
+ * Insert a new node just before the node @before. To insert a new tail, use @slist_add_tail(). Beware linear time complexity.
+ **/
+void slist_insert_before(slist *l, snode *what, snode *before);
+
+/**
+ * Remove node @n. Beware linear time complexity.
+ **/
+void slist_remove(slist *l, snode *n);
+
+/**
+ * Remove the last node in @l. The list can be empty.
+ **/
+static inline void slist_remove_tail(slist *l)
+{
+  slist_remove(l, l->last);
+}
+
+/**
+ * Merge two lists by inserting the list @what in front of all other nodes in a different list @l.
+ * The first list is then cleared.
+ **/
+static inline void slist_add_list_head(slist *l, slist *what)
+{
+  if (!slist_empty(what))
+    {
+      if (!slist_empty(l))
+	what->last->next = l->head.next;
+      else
+	l->last = what->last;
+      l->head.next = what->head.next;
+      slist_init(what);
+    }
+}
+
+/**
+ * Merge two lists by inserting the list @what after all other nodes in a different list @l.
+ * The first list is then cleared.
+ **/
+static inline void slist_add_list_tail(slist *l, slist *what)
+{
+  if (!slist_empty(what))
+    {
+      if (!slist_empty(l))
+	l->last->next = what->head.next;
+      else
+	l->head.next = what->head.next;
+      l->last = what->last;
+      slist_init(what);
+    }
+}
+
+/**
+ * Move all items from a source list to a destination list. The source list
+ * becomes empty, the original contents of the destination list are destroyed.
+ **/
+static inline void slist_move(slist *to, slist *from)
+{
+  to->head.next = from->head.next;
+  to->last = from->last;
+  slist_init(from);
+}
+
+/**
+ * Compute the number of nodes in @l. Beware linear time complexity.
+ **/
+static inline uint slist_size(slist *l)
+{
+  uint i = 0;
+  SLIST_FOR_EACH(snode *, n, *l)
+    i++;
+  return i;
+}
+
+#endif
diff --git a/libucw/ucw/slists.t b/libucw/ucw/slists.t
new file mode 100644
index 0000000..cb1b58f
--- /dev/null
+++ b/libucw/ucw/slists.t
@@ -0,0 +1,4 @@
+# Test for slists module
+
+Run:	../obj/ucw/slists-t
+Out:	9/7/3/1/2/4/8/10/
diff --git a/libucw/ucw/sorter/Makefile b/libucw/ucw/sorter/Makefile
new file mode 100644
index 0000000..970ff8e
--- /dev/null
+++ b/libucw/ucw/sorter/Makefile
@@ -0,0 +1,24 @@
+# Makefile for the UCW Sorter (c) 2007 Martin Mares <mj@ucw.cz>
+
+DIRS+=ucw/sorter
+
+LIBUCW_MODS+=$(addprefix sorter/, config govern sbuck array)
+LIBUCW_SORTER_INCLUDES=$(addprefix sorter/, array.h array-simple.h common.h s-fixint.h \
+	s-internal.h s-multiway.h s-radix.h s-twoway.h sorter.h)
+LIBUCW_INCLUDES+=$(LIBUCW_SORTER_INCLUDES)
+
+ifdef CONFIG_UCW_DEBUG_TOOLS
+PROGS+=$(o)/ucw/sorter/sort-test
+include $(s)/ucw/sorter/debug/Makefile
+endif
+
+TESTS+=$(o)/ucw/sorter/sort-test.test
+
+$(o)/ucw/sorter/sort-test.test: $(o)/ucw/sorter/sort-test
+$(o)/ucw/sorter/sort-test: $(o)/ucw/sorter/sort-test.o $(LIBUCW)
+
+INSTALL_API_TARGETS+=install-ucw-sorter-api
+install-ucw-sorter-api:
+	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/sorter
+	install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_SORTER_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/sorter/
+.PHONY: install-ucw-sorter-api
diff --git a/libucw/ucw/sorter/TODO b/libucw/ucw/sorter/TODO
new file mode 100644
index 0000000..18f885d
--- /dev/null
+++ b/libucw/ucw/sorter/TODO
@@ -0,0 +1,15 @@
+Cleanups:
+o  Log messages should show both original and new size of the data. The speed
+   should be probably calculated from the former.
+o  Buffer sizing in shep-export.
+
+Improvements:
+o  When quicksorting a large input (especially in threaded case), invest more
+   time to picking a good pivot.
+o  Overlay presorter I/O with internal sorting.
+
+Users of ucw/sorter/array.h which might use radix-sorting:
+indexer/chewer.c
+indexer/lexfreq.c
+indexer/mkgraph.c
+indexer/reftexts.c
diff --git a/libucw/ucw/sorter/array-simple.h b/libucw/ucw/sorter/array-simple.h
new file mode 100644
index 0000000..aa9b780
--- /dev/null
+++ b/libucw/ucw/sorter/array-simple.h
@@ -0,0 +1,191 @@
+/*
+ *	UCW Library -- Universal Simple Array Sorter
+ *
+ *	(c) 2003--2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This is not a normal header file, it's a generator of sorting
+ *  routines.  Each time you include it with parameters set in the
+ *  corresponding preprocessor macros, it generates an array sorter
+ *  with the parameters given.
+ *
+ *  You might wonder why the heck do we implement our own array sorter
+ *  instead of using qsort(). The primary reason is that qsort handles
+ *  only continuous arrays, but we need to sort array-like data structures
+ *  where the only way to access elements is by using an indexing macro.
+ *  Besides that, we are more than 2 times faster.
+ *
+ *  So much for advocacy, there are the parameters (those marked with [*]
+ *  are mandatory):
+ *
+ *  ASORT_PREFIX(x) [*]	add a name prefix (used on all global names
+ *			defined by the sorter)
+ *  ASORT_KEY_TYPE  [*]	data type of a single array entry key
+ *  ASORT_ELT(i)	returns the key of i-th element; if this macro is not
+ *			defined, the function gets a pointer to an array to be sorted
+ *  ASORT_LT(x,y)	x < y for ASORT_KEY_TYPE (default: "x<y")
+ *  ASORT_SWAP(i,j)	swap i-th and j-th element (default: assume _ELT
+ *			is an l-value and swap just the keys)
+ *  ASORT_THRESHOLD	threshold for switching between quicksort and insertsort
+ *  ASORT_EXTRA_ARGS	extra arguments for the sort function (they are always
+ *			visible in all the macros supplied above), starts with comma
+ *
+ *  After including this file, a function ASORT_PREFIX(sort)(uint array_size)
+ *  or ASORT_PREFIX(sort)(ASORT_KEY_TYPE *array, uint array_size) [if ASORT_ELT
+ *  is not defined] is declared and all parameter macros are automatically
+ *  undef'd.
+ */
+
+#ifndef ASORT_LT
+#define ASORT_LT(x,y) ((x) < (y))
+#endif
+
+#ifndef ASORT_SWAP
+#define ASORT_SWAP(i,j) do { ASORT_KEY_TYPE tmp = ASORT_ELT(i); ASORT_ELT(i)=ASORT_ELT(j); ASORT_ELT(j)=tmp; } while (0)
+#endif
+
+#ifndef ASORT_THRESHOLD
+#define ASORT_THRESHOLD 8		/* Guesswork and experimentation */
+#endif
+
+#ifndef ASORT_EXTRA_ARGS
+#define ASORT_EXTRA_ARGS
+#endif
+
+#ifndef ASORT_ELT
+#define ASORT_ARRAY_ARG ASORT_KEY_TYPE *array,
+#define ASORT_ELT(i) array[i]
+#else
+#define ASORT_ARRAY_ARG
+#endif
+
+/**
+ * The generated sorting function. If `ASORT_ELT` macro is not provided, the
+ * @ASORT_ARRAY_ARG is equal to `ASORT_KEY_TYPE *array` and is the array to be
+ * sorted. If the macro is provided, this parameter is omitted. In that case,
+ * you can sort global variables or pass your structure by @ASORT_EXTRA_ARGS.
+ **/
+static void ASORT_PREFIX(sort)(ASORT_ARRAY_ARG uint array_size ASORT_EXTRA_ARGS)
+{
+  struct stk { int l, r; } stack[8*sizeof(uint)];
+  int l, r, left, right, m;
+  uint sp = 0;
+  ASORT_KEY_TYPE pivot;
+
+  if (array_size <= 1)
+    return;
+
+  /* QuickSort with optimizations a'la Sedgewick, but stop at ASORT_THRESHOLD */
+
+  left = 0;
+  right = array_size - 1;
+  for(;;)
+    {
+      l = left;
+      r = right;
+      m = (l+r)/2;
+      if (ASORT_LT(ASORT_ELT(m), ASORT_ELT(l)))
+	ASORT_SWAP(l,m);
+      if (ASORT_LT(ASORT_ELT(r), ASORT_ELT(m)))
+	{
+	  ASORT_SWAP(m,r);
+	  if (ASORT_LT(ASORT_ELT(m), ASORT_ELT(l)))
+	    ASORT_SWAP(l,m);
+	}
+      pivot = ASORT_ELT(m);
+      do
+	{
+	  while (ASORT_LT(ASORT_ELT(l), pivot))
+	    l++;
+	  while (ASORT_LT(pivot, ASORT_ELT(r)))
+	    r--;
+	  if (l < r)
+	    {
+	      ASORT_SWAP(l,r);
+	      l++;
+	      r--;
+	    }
+	  else if (l == r)
+	    {
+	      l++;
+	      r--;
+	    }
+	}
+      while (l <= r);
+      if ((r - left) >= ASORT_THRESHOLD && (right - l) >= ASORT_THRESHOLD)
+	{
+	  /* Both partitions ok => push the larger one */
+	  if ((r - left) > (right - l))
+	    {
+	      stack[sp].l = left;
+	      stack[sp].r = r;
+	      left = l;
+	    }
+	  else
+	    {
+	      stack[sp].l = l;
+	      stack[sp].r = right;
+	      right = r;
+	    }
+	  sp++;
+	}
+      else if ((r - left) >= ASORT_THRESHOLD)
+	{
+	  /* Left partition OK, right undersize */
+	  right = r;
+	}
+      else if ((right - l) >= ASORT_THRESHOLD)
+	{
+	  /* Right partition OK, left undersize */
+	  left = l;
+	}
+      else
+	{
+	  /* Both partitions undersize => pop */
+	  if (!sp)
+	    break;
+	  sp--;
+	  left = stack[sp].l;
+	  right = stack[sp].r;
+	}
+    }
+
+  /*
+   * We have a partially sorted array, finish by insertsort. Inspired
+   * by qsort() in GNU libc.
+   */
+
+  /* Find minimal element which will serve as a barrier */
+  r = MIN(array_size, ASORT_THRESHOLD);
+  m = 0;
+  for (l=1; l<r; l++)
+    if (ASORT_LT(ASORT_ELT(l),ASORT_ELT(m)))
+      m = l;
+  ASORT_SWAP(0,m);
+
+  /* Insertion sort */
+  for (m=1; m<(int)array_size; m++)
+    {
+      l=m;
+      while (ASORT_LT(ASORT_ELT(m),ASORT_ELT(l-1)))
+	l--;
+      while (l < m)
+	{
+	  ASORT_SWAP(l,m);
+	  l++;
+	}
+    }
+}
+
+#undef ASORT_PREFIX
+#undef ASORT_KEY_TYPE
+#undef ASORT_ELT
+#undef ASORT_LT
+#undef ASORT_SWAP
+#undef ASORT_THRESHOLD
+#undef ASORT_EXTRA_ARGS
+#undef ASORT_ARRAY_ARG
diff --git a/libucw/ucw/sorter/array.c b/libucw/ucw/sorter/array.c
new file mode 100644
index 0000000..49a4f02
--- /dev/null
+++ b/libucw/ucw/sorter/array.c
@@ -0,0 +1,475 @@
+/*
+ *	UCW Library -- Optimized Array Sorter
+ *
+ *	(c) 2003--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/sorter/common.h>
+
+#include <string.h>
+#include <alloca.h>
+
+#define ASORT_MIN_SHIFT 2
+
+#define ASORT_TRACE(x...) ASORT_XTRACE(1, x)
+#define ASORT_XTRACE(level, x...) do { if (sorter_trace_array >= level) msg(L_DEBUG, x); } while(0)
+
+static void
+asort_radix(struct asort_context *ctx, void *array, void *buffer, uint num_elts, uint hash_bits, uint swapped_output)
+{
+  // swap_output == 0 if result should be returned in `array', otherwise in `buffer'
+  uint buckets = (1 << ctx->radix_bits);
+  uint shift = (hash_bits > ctx->radix_bits) ? (hash_bits - ctx->radix_bits) : 0;
+  uint cnt[buckets];
+
+#if 0
+  static int reported[64];
+  if (!reported[hash_bits]++)
+#endif
+  DBG(">>> n=%u h=%d s=%d sw=%d", num_elts, hash_bits, shift, swapped_output);
+
+  bzero(cnt, sizeof(cnt));
+  ctx->radix_count(array, num_elts, cnt, shift);
+
+  uint pos = 0;
+  for (uint i=0; i<buckets; i++)
+    {
+      uint j = cnt[i];
+      cnt[i] = pos;
+      pos += j;
+    }
+  ASSERT(pos == num_elts);
+
+  ctx->radix_split(array, buffer, num_elts, cnt, shift);
+  pos = 0;
+  for (uint i=0; i<buckets; i++)
+    {
+      uint n = cnt[i] - pos;
+      if (n < ctx->radix_threshold || shift < ASORT_MIN_SHIFT)
+	{
+	  ctx->quicksort(buffer, n);
+	  if (!swapped_output)
+	    memcpy(array, buffer, n * ctx->elt_size);
+	}
+      else
+	asort_radix(ctx, buffer, array, n, shift, !swapped_output);
+      array += n * ctx->elt_size;
+      buffer += n * ctx->elt_size;
+      pos = cnt[i];
+    }
+}
+
+#ifdef CONFIG_UCW_THREADS
+
+#include <ucw/threads.h>
+#include <ucw/workqueue.h>
+#include <ucw/eltpool.h>
+
+static uint asort_threads_use_count;
+static uint asort_threads_ready;
+static struct worker_pool asort_thread_pool;
+
+static uint
+rs_estimate_stack(void)
+{
+  // Stack space needed by the recursive radix-sorter
+  uint ctrsize = sizeof(uint) * (1 << CONFIG_UCW_RADIX_SORTER_BITS);
+  uint maxdepth = (64 / CONFIG_UCW_RADIX_SORTER_BITS) + 1;
+  return ctrsize * maxdepth;
+}
+
+void
+asort_start_threads(uint run)
+{
+  ucwlib_lock();
+  asort_threads_use_count++;
+  if (run && !asort_threads_ready)
+    {
+      // XXX: If somebody overrides the radix-sorter parameters to insane values,
+      // he also should override the stack size to insane values.
+      asort_thread_pool.stack_size = ucwlib_thread_stack_size + rs_estimate_stack();
+      asort_thread_pool.num_threads = sorter_threads;
+      ASORT_TRACE("Initializing thread pool (%d threads, %dK stack)", sorter_threads, asort_thread_pool.stack_size >> 10);
+      worker_pool_init(&asort_thread_pool);
+      asort_threads_ready = 1;
+    }
+  ucwlib_unlock();
+}
+
+void
+asort_stop_threads(void)
+{
+  ucwlib_lock();
+  if (!--asort_threads_use_count && asort_threads_ready)
+    {
+      ASORT_TRACE("Shutting down thread pool");
+      worker_pool_cleanup(&asort_thread_pool);
+      asort_threads_ready = 0;
+    }
+  ucwlib_unlock();
+}
+
+struct qs_work {
+  struct work w;
+  struct asort_context *ctx;
+  void *array;
+  uint num_elts;
+  int left, right;
+#define LR_UNDEF -100
+};
+
+static void
+qs_handle_work(struct worker_thread *thr UNUSED, struct work *ww)
+{
+  struct qs_work *w = (struct qs_work *) ww;
+  struct asort_context *ctx = w->ctx;
+
+  DBG("Thread %d: got %u elts", thr->id, w->num_elts);
+  if (w->num_elts < ctx->thread_threshold)
+    {
+      ctx->quicksort(w->array, w->num_elts);
+      w->left = w->right = LR_UNDEF;
+    }
+  else
+    ctx->quicksplit(w->array, w->num_elts, &w->left, &w->right);
+  DBG("Thread %d: returning l=%u r=%u", thr->id, w->left, w->right);
+}
+
+static struct qs_work *
+qs_alloc_work(struct asort_context *ctx)
+{
+  struct qs_work *w = ep_alloc(ctx->eltpool);
+  w->w.priority = 0;
+  w->w.go = qs_handle_work;
+  w->ctx = ctx;
+  return w;
+}
+
+static void
+threaded_quicksort(struct asort_context *ctx)
+{
+  struct work_queue q;
+  struct qs_work *v, *w;
+
+  asort_start_threads(1);
+  work_queue_init(&asort_thread_pool, &q);
+  ctx->eltpool = ep_new(sizeof(struct qs_work), 1000);
+
+  w = qs_alloc_work(ctx);
+  w->array = ctx->array;
+  w->num_elts = ctx->num_elts;
+  work_submit(&q, &w->w);
+
+  while (v = (struct qs_work *) work_wait(&q))
+    {
+      if (v->left != LR_UNDEF)
+	{
+	  if (v->right > 0)
+	    {
+	      w = qs_alloc_work(ctx);
+	      w->array = v->array;
+	      w->num_elts = v->right + 1;
+	      w->w.priority = v->w.priority + 1;
+	      work_submit(&q, &w->w);
+	    }
+	  if (v->left < (int)v->num_elts - 1)
+	    {
+	      w = qs_alloc_work(ctx);
+	      w->array = v->array + v->left * ctx->elt_size;
+	      w->num_elts = v->num_elts - v->left;
+	      w->w.priority = v->w.priority + 1;
+	      work_submit(&q, &w->w);
+	    }
+	}
+      ep_free(ctx->eltpool, v);
+    }
+
+  ep_delete(ctx->eltpool);
+  work_queue_cleanup(&q);
+  asort_stop_threads();
+}
+
+struct rs_work {
+  struct work w;
+  struct asort_context *ctx;
+  void *array, *buffer;		// Like asort_radix().
+  uint num_elts;
+  uint shift;
+  uint swap_output;
+  uint cnt[0];
+};
+
+static void
+rs_count(struct worker_thread *thr UNUSED, struct work *ww)
+{
+  struct rs_work *w = (struct rs_work *) ww;
+
+  DBG("Thread %d: Counting %u items, shift=%d", thr->id, w->num_elts, w->shift);
+  w->ctx->radix_count(w->array, w->num_elts, w->cnt, w->shift);
+  DBG("Thread %d: Counting done", thr->id);
+}
+
+static void
+rs_split(struct worker_thread *thr UNUSED, struct work *ww)
+{
+  struct rs_work *w = (struct rs_work *) ww;
+
+  DBG("Thread %d: Splitting %u items, shift=%d", thr->id, w->num_elts, w->shift);
+  w->ctx->radix_split(w->array, w->buffer, w->num_elts, w->cnt, w->shift);
+  DBG("Thread %d: Splitting done", thr->id);
+}
+
+static void
+rs_finish(struct worker_thread *thr UNUSED, struct work *ww)
+{
+  struct rs_work *w = (struct rs_work *) ww;
+
+  if (thr)
+    DBG("Thread %d: Finishing %u items, shift=%d", thr->id, w->num_elts, w->shift);
+  if (w->shift < ASORT_MIN_SHIFT || w->num_elts < w->ctx->radix_threshold)
+    {
+      w->ctx->quicksort(w->array, w->num_elts);
+      if (w->swap_output)
+	memcpy(w->buffer, w->array, w->num_elts * w->ctx->elt_size);
+    }
+  else
+    asort_radix(w->ctx, w->array, w->buffer, w->num_elts, w->shift, w->swap_output);
+  if (thr)
+    DBG("Thread %d: Finishing done", thr->id);
+}
+
+static void
+rs_wait_small(struct asort_context *ctx)
+{
+  struct rs_work *w;
+
+  while (w = (struct rs_work *) work_wait(ctx->rs_work_queue))
+    {
+      DBG("Reaping small chunk of %u items", w->num_elts);
+      ep_free(ctx->eltpool, w);
+    }
+}
+
+static void
+rs_radix(struct asort_context *ctx, void *array, void *buffer, uint num_elts, uint hash_bits, uint swapped_output)
+{
+  uint buckets = (1 << ctx->radix_bits);
+  uint shift = (hash_bits > ctx->radix_bits) ? (hash_bits - ctx->radix_bits) : 0;
+  uint cnt[buckets];
+  uint blksize = num_elts / sorter_threads;
+  DBG(">>> n=%u h=%d s=%d blk=%u sw=%d", num_elts, hash_bits, shift, blksize, swapped_output);
+
+  // If there are any small chunks in progress, wait for them to finish
+  rs_wait_small(ctx);
+
+  // Start parallel counting
+  void *iptr = array;
+  for (uint i=0; i<sorter_threads; i++)
+    {
+      struct rs_work *w = ctx->rs_works[i];
+      w->w.priority = 0;
+      w->w.go = rs_count;
+      w->ctx = ctx;
+      w->array = iptr;
+      w->buffer = buffer;
+      w->num_elts = blksize;
+      if (i == sorter_threads-1)
+	w->num_elts += num_elts % sorter_threads;
+      w->shift = shift;
+      iptr += w->num_elts * ctx->elt_size;
+      bzero(w->cnt, sizeof(uint) * buckets);
+      work_submit(ctx->rs_work_queue, &w->w);
+    }
+
+  // Get bucket sizes from the counts
+  bzero(cnt, sizeof(cnt));
+  for (uint i=0; i<sorter_threads; i++)
+    {
+      struct rs_work *w = (struct rs_work *) work_wait(ctx->rs_work_queue);
+      ASSERT(w);
+      for (uint j=0; j<buckets; j++)
+	cnt[j] += w->cnt[j];
+    }
+
+  // Calculate bucket starts
+  uint pos = 0;
+  for (uint i=0; i<buckets; i++)
+    {
+      uint j = cnt[i];
+      cnt[i] = pos;
+      pos += j;
+    }
+  ASSERT(pos == num_elts);
+
+  // Start parallel splitting
+  for (uint i=0; i<sorter_threads; i++)
+    {
+      struct rs_work *w = ctx->rs_works[i];
+      w->w.go = rs_split;
+      for (uint j=0; j<buckets; j++)
+	{
+	  uint k = w->cnt[j];
+	  w->cnt[j] = cnt[j];
+	  cnt[j] += k;
+	}
+      work_submit(ctx->rs_work_queue, &w->w);
+    }
+  ASSERT(cnt[buckets-1] == num_elts);
+
+  // Wait for splits to finish
+  while (work_wait(ctx->rs_work_queue))
+    ;
+
+  // Recurse on buckets
+  pos = 0;
+  for (uint i=0; i<buckets; i++)
+    {
+      uint n = cnt[i] - pos;
+      if (!n)
+	continue;
+      if (n < ctx->thread_threshold || shift < ASORT_MIN_SHIFT)
+	{
+	  struct rs_work *w = ep_alloc(ctx->eltpool);
+	  w->w.priority = 0;
+	  w->w.go = rs_finish;
+	  w->ctx = ctx;
+	  w->array = buffer;
+	  w->buffer = array;
+	  w->num_elts = n;
+	  w->shift = shift;
+	  w->swap_output = !swapped_output;
+	  if (n < ctx->thread_chunk)
+	    {
+	      DBG("Sorting block %u+%u inline", pos, n);
+	      rs_finish(NULL, &w->w);
+	      ep_free(ctx->eltpool, w);
+	    }
+	  else
+	    {
+	      DBG("Scheduling block %u+%u", pos, n);
+	      work_submit(ctx->rs_work_queue, &w->w);
+	    }
+	}
+      else
+	rs_radix(ctx, buffer, array, n, shift, !swapped_output);
+      pos = cnt[i];
+      array += n * ctx->elt_size;
+      buffer += n * ctx->elt_size;
+    }
+}
+
+static void
+threaded_radixsort(struct asort_context *ctx, uint swap)
+{
+  struct work_queue q;
+
+  asort_start_threads(1);
+  work_queue_init(&asort_thread_pool, &q);
+
+  // Prepare work structures for counting and splitting.
+  // We use big_alloc(), because we want to avoid cacheline aliasing between threads.
+  ctx->rs_work_queue = &q;
+  ctx->rs_works = alloca(sizeof(struct rs_work *) * sorter_threads);
+  for (uint i=0; i<sorter_threads; i++)
+    ctx->rs_works[i] = big_alloc(sizeof(struct rs_work) + sizeof(uint) * (1 << ctx->radix_bits));
+
+  // Prepare a pool for all remaining small bits which will be sorted on background.
+  ctx->eltpool = ep_new(sizeof(struct rs_work), 1000);
+
+  // Do the big splitting
+  rs_radix(ctx, ctx->array, ctx->buffer, ctx->num_elts, ctx->hash_bits, swap);
+  for (uint i=0; i<sorter_threads; i++)
+    big_free(ctx->rs_works[i], sizeof(struct rs_work) + sizeof(uint) * (1 << ctx->radix_bits));
+
+  // Finish the small blocks
+  rs_wait_small(ctx);
+
+  ASSERT(!ctx->eltpool->num_allocated);
+  ep_delete(ctx->eltpool);
+  work_queue_cleanup(&q);
+  asort_stop_threads();
+}
+
+#else
+
+void asort_start_threads(uint run UNUSED) { }
+void asort_stop_threads(void) { }
+
+#endif
+
+static uint
+predict_swap(struct asort_context *ctx)
+{
+  uint bits = ctx->radix_bits;
+  uint elts = ctx->num_elts;
+  uint swap = 0;
+
+  while (elts >= ctx->radix_threshold && bits >= ASORT_MIN_SHIFT)
+    {
+      DBG("Predicting pass: %u elts, %d bits", elts, bits);
+      swap = !swap;
+      elts >>= ctx->radix_bits;
+      bits = MAX(bits, ctx->radix_bits) - ctx->radix_bits;
+    }
+  return swap;
+}
+
+void
+asort_run(struct asort_context *ctx)
+{
+  ctx->thread_threshold = MIN(sorter_thread_threshold / ctx->elt_size, ~0U);
+  ctx->thread_chunk = MIN(sorter_thread_chunk / ctx->elt_size, ~0U);
+  ctx->radix_threshold = MIN(sorter_radix_threshold / ctx->elt_size, ~0U);
+
+  ASORT_TRACE("Array-sorting %u items per %u bytes, hash_bits=%d", ctx->num_elts, ctx->elt_size, ctx->hash_bits);
+  ASORT_XTRACE(2, "Limits: thread_threshold=%u, thread_chunk=%u, radix_threshold=%u",
+	ctx->thread_threshold, ctx->thread_chunk, ctx->radix_threshold);
+  uint allow_threads UNUSED = (sorter_threads > 1 &&
+			      ctx->num_elts >= ctx->thread_threshold &&
+			      !(sorter_debug & SORT_DEBUG_ASORT_NO_THREADS));
+
+  if (ctx->num_elts < ctx->radix_threshold ||
+      ctx->hash_bits <= ASORT_MIN_SHIFT ||
+      !ctx->radix_split ||
+      (sorter_debug & SORT_DEBUG_ASORT_NO_RADIX))
+    {
+#ifdef CONFIG_UCW_THREADS
+      if (allow_threads)
+	{
+	  ASORT_XTRACE(2, "Decided to use parallel quicksort");
+	  threaded_quicksort(ctx);
+	}
+      else
+#endif
+	{
+	  ASORT_XTRACE(2, "Decided to use sequential quicksort");
+	  ctx->quicksort(ctx->array, ctx->num_elts);
+	}
+    }
+  else
+    {
+      uint swap = predict_swap(ctx);
+#ifdef CONFIG_UCW_THREADS
+      if (allow_threads)
+	{
+	  ASORT_XTRACE(2, "Decided to use parallel radix-sort (swap=%d)", swap);
+	  threaded_radixsort(ctx, swap);
+	}
+      else
+#endif
+	{
+	  ASORT_XTRACE(2, "Decided to use sequential radix-sort (swap=%d)", swap);
+	  asort_radix(ctx, ctx->array, ctx->buffer, ctx->num_elts, ctx->hash_bits, swap);
+	}
+      if (swap)
+	ctx->array = ctx->buffer;
+    }
+
+  ASORT_XTRACE(2, "Array-sort finished");
+}
diff --git a/libucw/ucw/sorter/array.h b/libucw/ucw/sorter/array.h
new file mode 100644
index 0000000..1efb3b9
--- /dev/null
+++ b/libucw/ucw/sorter/array.h
@@ -0,0 +1,336 @@
+/*
+ *	UCW Library -- Optimized Array Sorter
+ *
+ *	(c) 2003--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This is a generator of routines for sorting huge arrays, similar to the one
+ *  in ucw/sorter/array-simple.h. It cannot handle discontiguous arrays, but it is able
+ *  to employ radix-sorting if a monotone hash function is available and also
+ *  use several threads in parallel on SMP systems (this assumes that all
+ *  callbacks you provide are thread-safe).
+ *
+ *  It is usually called internally by the generic shorter machinery, but
+ *  you are free to use it explicitly if you need.
+ *
+ *  So much for advocacy, there are the parameters (those marked with [*]
+ *  are mandatory):
+ *
+ *  ASORT_PREFIX(x) [*]	add a name prefix (used on all global names
+ *			defined by the sorter)
+ *  ASORT_KEY_TYPE  [*]	data type of a single array entry key
+ *  ASORT_LT(x,y)	x < y for ASORT_KEY_TYPE (default: "x<y")
+ *  ASORT_HASH(x)	a monotone hash function (safisfying hash(x) < hash(y) => x<y)
+ *  ASORT_LONG_HASH	hashes are 64-bit numbers (default is 32 bits)
+ *
+ *  Fine-tuning parameters: (if you really insist)
+ *
+ *  ASORT_THRESHOLD	threshold for switching between quicksort and insertsort
+ *  ASORT_RADIX_BITS	how many bits of the hash functions are to be used at once for
+ *			radix-sorting.
+ *
+ *  After including this file, a function
+ *	ASORT_KEY_TYPE *ASORT_PREFIX(sort)(ASORT_KEY_TYPE *array, uint num_elts [, ASORT_KEY_TYPE *buf, uint hash_bits])
+ *  is declared and all parameter macros are automatically undef'd. Here `buf' is an
+ *  auxiliary buffer of the same size as the input array, required whenever radix
+ *  sorting should be used, and `hash_bits' is the number of significant bits returned
+ *  by the hash function. If the buffer is specified, the sorting function returns either
+ *  a pointer to the input array or to the buffer, depending on where the result is stored.
+ *  If you do not use hashing, these parameters should be omitted.
+ */
+
+#include <ucw/sorter/common.h>
+
+#define Q(x) ASORT_PREFIX(x)
+
+typedef ASORT_KEY_TYPE Q(key);
+
+#ifndef ASORT_LT
+#define ASORT_LT(x,y) ((x) < (y))
+#endif
+
+#ifndef ASORT_SWAP
+#define ASORT_SWAP(i,j) do { Q(key) tmp = array[i]; array[i]=array[j]; array[j]=tmp; } while (0)
+#endif
+
+#ifndef ASORT_THRESHOLD
+#define ASORT_THRESHOLD 8		/* Guesswork and experimentation */
+#endif
+
+#ifndef ASORT_RADIX_BITS
+#define ASORT_RADIX_BITS CONFIG_UCW_RADIX_SORTER_BITS
+#endif
+#define ASORT_RADIX_MASK ((1 << (ASORT_RADIX_BITS)) - 1)
+
+/* QuickSort with optimizations a'la Sedgewick, inspired by qsort() from GNU libc. */
+
+static void Q(quicksort)(void *array_ptr, uint num_elts)
+{
+  Q(key) *array = array_ptr;
+  struct stk { int l, r; } stack[8*sizeof(uint)];
+  int l, r, left, right, m;
+  uint sp = 0;
+  Q(key) pivot;
+
+  if (num_elts <= 1)
+    return;
+
+  left = 0;
+  right = num_elts - 1;
+  for(;;)
+    {
+      l = left;
+      r = right;
+      m = (l+r)/2;
+      if (ASORT_LT(array[m], array[l]))
+	ASORT_SWAP(l,m);
+      if (ASORT_LT(array[r], array[m]))
+	{
+	  ASORT_SWAP(m,r);
+	  if (ASORT_LT(array[m], array[l]))
+	    ASORT_SWAP(l,m);
+	}
+      pivot = array[m];
+      do
+	{
+	  while (ASORT_LT(array[l], pivot))
+	    l++;
+	  while (ASORT_LT(pivot, array[r]))
+	    r--;
+	  if (l < r)
+	    {
+	      ASORT_SWAP(l,r);
+	      l++;
+	      r--;
+	    }
+	  else if (l == r)
+	    {
+	      l++;
+	      r--;
+	    }
+	}
+      while (l <= r);
+      if ((r - left) >= ASORT_THRESHOLD && (right - l) >= ASORT_THRESHOLD)
+	{
+	  /* Both partitions ok => push the larger one */
+	  if ((r - left) > (right - l))
+	    {
+	      stack[sp].l = left;
+	      stack[sp].r = r;
+	      left = l;
+	    }
+	  else
+	    {
+	      stack[sp].l = l;
+	      stack[sp].r = right;
+	      right = r;
+	    }
+	  sp++;
+	}
+      else if ((r - left) >= ASORT_THRESHOLD)
+	{
+	  /* Left partition OK, right undersize */
+	  right = r;
+	}
+      else if ((right - l) >= ASORT_THRESHOLD)
+	{
+	  /* Right partition OK, left undersize */
+	  left = l;
+	}
+      else
+	{
+	  /* Both partitions undersize => pop */
+	  if (!sp)
+	    break;
+	  sp--;
+	  left = stack[sp].l;
+	  right = stack[sp].r;
+	}
+    }
+
+  /*
+   * We have a partially sorted array, finish by insertsort. Inspired
+   * by qsort() in GNU libc.
+   */
+
+  /* Find minimal element which will serve as a barrier */
+  r = MIN(num_elts, ASORT_THRESHOLD);
+  m = 0;
+  for (l=1; l<r; l++)
+    if (ASORT_LT(array[l], array[m]))
+      m = l;
+  ASORT_SWAP(0,m);
+
+  /* Insertion sort */
+  for (m=1; m<(int)num_elts; m++)
+    {
+      l=m;
+      while (ASORT_LT(array[m], array[l-1]))
+	l--;
+      while (l < m)
+	{
+	  ASORT_SWAP(l,m);
+	  l++;
+	}
+    }
+}
+
+/* Just the splitting part of QuickSort */
+
+static void Q(quicksplit)(void *array_ptr, uint num_elts, int *leftp, int *rightp)
+{
+  Q(key) *array = array_ptr;
+  int l, r, m;
+  Q(key) pivot;
+
+  l = 0;
+  r = num_elts - 1;
+  m = (l+r)/2;
+  if (ASORT_LT(array[m], array[l]))
+    ASORT_SWAP(l,m);
+  if (ASORT_LT(array[r], array[m]))
+    {
+      ASORT_SWAP(m,r);
+      if (ASORT_LT(array[m], array[l]))
+	ASORT_SWAP(l,m);
+    }
+  pivot = array[m];
+  do
+    {
+      while (ASORT_LT(array[l], pivot))
+	l++;
+      while (ASORT_LT(pivot, array[r]))
+	r--;
+      if (l < r)
+	{
+	  ASORT_SWAP(l,r);
+	  l++;
+	  r--;
+	}
+      else if (l == r)
+	{
+	  l++;
+	  r--;
+	}
+    }
+  while (l <= r);
+  *leftp = l;
+  *rightp = r;
+}
+
+#ifdef ASORT_HASH
+
+static void Q(radix_count)(void *src_ptr, uint num_elts, uint *cnt, uint shift)
+{
+  Q(key) *src = src_ptr;
+  uint i;
+
+  switch (shift)
+    {
+#define RC(s) \
+    case s:								\
+      for (i=0; i<num_elts; i++)					\
+	cnt[ (ASORT_HASH(src[i]) >> s) & ASORT_RADIX_MASK ] ++;		\
+      break;								\
+
+#ifdef ASORT_LONG_HASH
+      RC(63); RC(62); RC(61); RC(60); RC(59); RC(58); RC(57); RC(56);
+      RC(55); RC(54); RC(53); RC(52); RC(51); RC(50); RC(49); RC(48);
+      RC(47); RC(46); RC(45); RC(44); RC(43); RC(42); RC(41); RC(40);
+      RC(39); RC(38); RC(37); RC(36); RC(35); RC(34); RC(33); RC(32);
+#endif
+      RC(31); RC(30); RC(29); RC(28); RC(27); RC(26); RC(25); RC(24);
+      RC(23); RC(22); RC(21); RC(20); RC(19); RC(18); RC(17); RC(16);
+      RC(15); RC(14); RC(13); RC(12); RC(11); RC(10); RC(9); RC(8);
+      RC(7); RC(6); RC(5); RC(4); RC(3); RC(2); RC(1); RC(0);
+    default:
+      ASSERT(0);
+    }
+#undef RC
+}
+
+static void Q(radix_split)(void *src_ptr, void *dest_ptr, uint num_elts, uint *ptrs, uint shift)
+{
+  Q(key) *src = src_ptr, *dest = dest_ptr;
+  uint i;
+
+  switch (shift)
+    {
+#define RS(s) \
+    case s:										\
+      for (i=0; i<num_elts; i++)							\
+	dest[ ptrs[ (ASORT_HASH(src[i]) >> s) & ASORT_RADIX_MASK ]++ ] = src[i];	\
+      break;
+
+#ifdef ASORT_LONG_HASH
+      RS(63); RS(62); RS(61); RS(60); RS(59); RS(58); RS(57); RS(56);
+      RS(55); RS(54); RS(53); RS(52); RS(51); RS(50); RS(49); RS(48);
+      RS(47); RS(46); RS(45); RS(44); RS(43); RS(42); RS(41); RS(40);
+      RS(39); RS(38); RS(37); RS(36); RS(35); RS(34); RS(33); RS(32);
+#endif
+      RS(31); RS(30); RS(29); RS(28); RS(27); RS(26); RS(25); RS(24);
+      RS(23); RS(22); RS(21); RS(20); RS(19); RS(18); RS(17); RS(16);
+      RS(15); RS(14); RS(13); RS(12); RS(11); RS(10); RS(9); RS(8);
+      RS(7); RS(6); RS(5); RS(4); RS(3); RS(2); RS(1); RS(0);
+    default:
+      ASSERT(0);
+    }
+#undef RS
+}
+
+#endif
+
+#ifdef ASORT_HASH
+#define ASORT_HASH_ARGS , Q(key) *buffer, uint hash_bits
+#else
+#define ASORT_HASH_ARGS
+#endif
+
+/**
+ * The generated function. The @array is the data to be sorted, @num_elts tells
+ * how many elements the array has.  If you did not provide `ASORT_HASH`, then
+ * the `ASORT_HASH_ARGS` is empty (there are only the two parameters in that
+ * case).  When you provide it, the function gains two more parameters in the
+ * `ASORT_HASH_ARGS` macro. They are `ASORT_KEY_TYPE *@buffer`, which must be a
+ * memory buffer of the same size as the input array, and `uint @hash_bits`,
+ * specifying how many significant bits the hash function returns.
+ *
+ * The function returns pointer to the sorted data, either the @array or the
+ * @buffer argument.
+ **/
+static ASORT_KEY_TYPE *ASORT_PREFIX(sort)(ASORT_KEY_TYPE *array, uint num_elts ASORT_HASH_ARGS)
+{
+  struct asort_context ctx = {
+    .array = array,
+    .num_elts = num_elts,
+    .elt_size = sizeof(Q(key)),
+    .quicksort = Q(quicksort),
+    .quicksplit = Q(quicksplit),
+#ifdef ASORT_HASH
+    .buffer = buffer,
+    .hash_bits = hash_bits,
+    .radix_count = Q(radix_count),
+    .radix_split = Q(radix_split),
+    .radix_bits = ASORT_RADIX_BITS,
+#endif
+  };
+  asort_run(&ctx);
+  return ctx.array;
+}
+
+#undef ASORT_HASH
+#undef ASORT_KEY_TYPE
+#undef ASORT_LONG_HASH
+#undef ASORT_LT
+#undef ASORT_PAGE_ALIGNED
+#undef ASORT_PREFIX
+#undef ASORT_RADIX_BITS
+#undef ASORT_RADIX_MASK
+#undef ASORT_SWAP
+#undef ASORT_THRESHOLD
+#undef ASORT_HASH_ARGS
+#undef Q
diff --git a/libucw/ucw/sorter/common.h b/libucw/ucw/sorter/common.h
new file mode 100644
index 0000000..423befc
--- /dev/null
+++ b/libucw/ucw/sorter/common.h
@@ -0,0 +1,188 @@
+/*
+ *	UCW Library -- Universal Sorter: Common Declarations
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_SORTER_COMMON_H
+#define _UCW_SORTER_COMMON_H
+
+#include <ucw/clists.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define asort_run ucw_asort_run
+#define asort_start_threads ucw_asort_start_threads
+#define asort_stop_threads ucw_asort_stop_threads
+#define sbuck_drop ucw_sbuck_drop
+#define sbuck_has_file ucw_sbuck_has_file
+#define sbuck_have ucw_sbuck_have
+#define sbuck_new ucw_sbuck_new
+#define sbuck_read ucw_sbuck_read
+#define sbuck_size ucw_sbuck_size
+#define sbuck_swap_out ucw_sbuck_swap_out
+#define sbuck_write ucw_sbuck_write
+#define sorter_add_radix_bits ucw_sorter_add_radix_bits
+#define sorter_alloc ucw_sorter_alloc
+#define sorter_alloc_buf ucw_sorter_alloc_buf
+#define sorter_bufsize ucw_sorter_bufsize
+#define sorter_debug ucw_sorter_debug
+#define sorter_fb_params ucw_sorter_fb_params
+#define sorter_free_buf ucw_sorter_free_buf
+#define sorter_max_multiway_bits ucw_sorter_max_multiway_bits
+#define sorter_max_radix_bits ucw_sorter_max_radix_bits
+#define sorter_min_multiway_bits ucw_sorter_min_multiway_bits
+#define sorter_min_radix_bits ucw_sorter_min_radix_bits
+#define sorter_prepare_buf ucw_sorter_prepare_buf
+#define sorter_radix_threshold ucw_sorter_radix_threshold
+#define sorter_run ucw_sorter_run
+#define sorter_small_fb_params ucw_sorter_small_fb_params
+#define sorter_small_input ucw_sorter_small_input
+#define sorter_stream_bufsize ucw_sorter_stream_bufsize
+#define sorter_thread_chunk ucw_sorter_thread_chunk
+#define sorter_thread_threshold ucw_sorter_thread_threshold
+#define sorter_threads ucw_sorter_threads
+#define sorter_trace ucw_sorter_trace
+#define sorter_trace_array ucw_sorter_trace_array
+#endif
+
+/* Configuration variables */
+extern uint sorter_trace, sorter_trace_array, sorter_stream_bufsize;
+extern uint sorter_debug, sorter_min_radix_bits, sorter_max_radix_bits, sorter_add_radix_bits;
+extern uint sorter_min_multiway_bits, sorter_max_multiway_bits;
+extern uint sorter_threads;
+extern u64 sorter_bufsize, sorter_small_input;
+extern u64 sorter_thread_threshold, sorter_thread_chunk, sorter_radix_threshold;
+extern struct fb_params sorter_fb_params, sorter_small_fb_params;
+
+#define SORT_TRACE(x...) do { if (sorter_trace) msg(L_DEBUG, x); } while(0)
+#define SORT_XTRACE(level, x...) do { if (sorter_trace >= level) msg(L_DEBUG, x); } while(0)
+
+enum sort_debug {
+  SORT_DEBUG_NO_PRESORT = 1,
+  SORT_DEBUG_NO_JOIN = 2,
+  SORT_DEBUG_KEEP_BUCKETS = 4,
+  SORT_DEBUG_NO_RADIX = 8,
+  SORT_DEBUG_NO_MULTIWAY = 16,
+  SORT_DEBUG_ASORT_NO_RADIX = 32,
+  SORT_DEBUG_ASORT_NO_THREADS = 64
+};
+
+struct sort_bucket;
+
+struct sort_context {
+  struct fastbuf *in_fb;
+  struct fastbuf *out_fb;
+  uint hash_bits;
+  u64 in_size;
+  struct fb_params *fb_params;
+
+  struct mempool *pool;
+  clist bucket_list;
+  void *big_buf;
+  size_t big_buf_size;
+
+  int (*custom_presort)(struct fastbuf *dest, void *buf, size_t bufsize);
+
+  // Take as much as possible from the source bucket, sort it in memory and dump to destination bucket.
+  // Return 1 if there is more data available in the source bucket.
+  int (*internal_sort)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only);
+
+  // Estimate how much input data from `b' will fit in the internal sorting buffer.
+  u64 (*internal_estimate)(struct sort_context *ctx, struct sort_bucket *b);
+
+  // Two-way split/merge: merge up to 2 source buckets to up to 2 destination buckets.
+  // Bucket arrays are NULL-terminated.
+  void (*twoway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket **outs);
+
+  // Multi-way merge: merge an arbitrary number of source buckets to a single destination bucket.
+  void (*multiway_merge)(struct sort_context *ctx, struct sort_bucket **ins, struct sort_bucket *out);
+
+  // Radix split according to hash function
+  void (*radix_split)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket **outs, uint bitpos, uint numbits);
+
+  // State variables of internal_sort
+  void *key_buf;
+  int more_keys;
+
+  // Timing
+  timestamp_t start_time;
+  uint last_pass_time;
+  uint total_int_time, total_pre_time, total_ext_time;
+};
+
+void sorter_run(struct sort_context *ctx);
+
+/* Buffers */
+
+void *sorter_alloc(struct sort_context *ctx, uint size);
+void sorter_prepare_buf(struct sort_context *ctx);
+void sorter_alloc_buf(struct sort_context *ctx);
+void sorter_free_buf(struct sort_context *ctx);
+
+/* Buckets */
+
+struct sort_bucket {
+  cnode n;
+  struct sort_context *ctx;
+  uint flags;
+  struct fastbuf *fb;
+  byte *filename;
+  u64 size;				// Size in bytes (not valid when writing)
+  uint runs;				// Number of runs, 0 if not sorted
+  uint hash_bits;			// Remaining bits of the hash function
+  byte *ident;				// Identifier used in debug messages
+};
+
+enum sort_bucket_flags {
+  SBF_FINAL = 1,			// This bucket corresponds to the final output file (always 1 run)
+  SBF_SOURCE = 2,			// Contains the source file (always 0 runs)
+  SBF_CUSTOM_PRESORT = 4,		// Contains source to read via custom presorter
+  SBF_OPEN_WRITE = 256,			// We are currently writing to the fastbuf
+  SBF_OPEN_READ = 512,			// We are reading from the fastbuf
+  SBF_DESTROYED = 1024,			// Already done with, no further references allowed
+  SBF_SWAPPED_OUT = 2048,		// Swapped out to a named file
+};
+
+struct sort_bucket *sbuck_new(struct sort_context *ctx);
+void sbuck_drop(struct sort_bucket *b);
+int sbuck_have(struct sort_bucket *b);
+int sbuck_has_file(struct sort_bucket *b);
+ucw_off_t sbuck_size(struct sort_bucket *b);
+struct fastbuf *sbuck_read(struct sort_bucket *b);
+struct fastbuf *sbuck_write(struct sort_bucket *b);
+void sbuck_swap_out(struct sort_bucket *b);
+
+/* Contexts and helper functions for the array sorter */
+
+struct asort_context {
+  // Interface between generic code in array.c and functions generated by array.h
+  void *array;				// Array to sort
+  void *buffer;				// Auxiliary buffer (required when radix-sorting)
+  uint num_elts;				// Number of elements in the array
+  uint elt_size;				// Bytes per element
+  uint hash_bits;			// Remaining bits of the hash function
+  uint radix_bits;			// How many bits to process in a single radix-sort pass
+  void (*quicksort)(void *array_ptr, uint num_elts);
+  void (*quicksplit)(void *array_ptr, uint num_elts, int *leftp, int *rightp);
+  void (*radix_count)(void *src_ptr, uint num_elts, uint *cnt, uint shift);
+  void (*radix_split)(void *src_ptr, void *dest_ptr, uint num_elts, uint *ptrs, uint shift);
+
+  // Used internally by array.c
+  struct rs_work **rs_works;
+  struct work_queue *rs_work_queue;
+  struct eltpool *eltpool;
+
+  // Configured limits translated from bytes to elements
+  uint thread_threshold;
+  uint thread_chunk;
+  uint radix_threshold;
+};
+
+void asort_run(struct asort_context *ctx);
+void asort_start_threads(uint run);
+void asort_stop_threads(void);
+
+#endif
diff --git a/libucw/ucw/sorter/config.c b/libucw/ucw/sorter/config.c
new file mode 100644
index 0000000..7bc4358
--- /dev/null
+++ b/libucw/ucw/sorter/config.c
@@ -0,0 +1,57 @@
+/*
+ *	UCW Library -- Universal Sorter: Configuration
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/fastbuf.h>
+#include <ucw/sorter/common.h>
+
+uint sorter_trace;
+uint sorter_trace_array;
+u64 sorter_bufsize = 65536;
+uint sorter_debug;
+uint sorter_min_radix_bits;
+uint sorter_max_radix_bits;
+uint sorter_add_radix_bits;
+uint sorter_min_multiway_bits;
+uint sorter_max_multiway_bits;
+uint sorter_threads;
+u64 sorter_thread_threshold = 1048576;
+u64 sorter_thread_chunk = 4096;
+u64 sorter_radix_threshold = 4096;
+struct fb_params sorter_fb_params;
+struct fb_params sorter_small_fb_params;
+u64 sorter_small_input;
+
+static struct cf_section sorter_config = {
+  CF_ITEMS {
+    CF_UINT("Trace", &sorter_trace),
+    CF_UINT("TraceArray", &sorter_trace_array),
+    CF_SECTION("FileAccess", &sorter_fb_params, &fbpar_cf),
+    CF_SECTION("SmallFileAccess", &sorter_fb_params, &fbpar_cf),
+    CF_U64("SmallInput", &sorter_small_input),
+    CF_U64("SortBuffer", &sorter_bufsize),
+    CF_UINT("Debug", &sorter_debug),
+    CF_UINT("MinRadixBits", &sorter_min_radix_bits),
+    CF_UINT("MaxRadixBits", &sorter_max_radix_bits),
+    CF_UINT("AddRadixBits", &sorter_add_radix_bits),
+    CF_UINT("MinMultiwayBits", &sorter_min_multiway_bits),
+    CF_UINT("MaxMultiwayBits", &sorter_max_multiway_bits),
+    CF_UINT("Threads", &sorter_threads),
+    CF_U64("ThreadThreshold", &sorter_thread_threshold),
+    CF_U64("ThreadChunk", &sorter_thread_chunk),
+    CF_U64("RadixThreshold", &sorter_radix_threshold),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR sorter_init_config(void)
+{
+  cf_declare_section("Sorter", &sorter_config, 0);
+}
diff --git a/libucw/ucw/sorter/debug/BENCH b/libucw/ucw/sorter/debug/BENCH
new file mode 100644
index 0000000..ad3a5f4
--- /dev/null
+++ b/libucw/ucw/sorter/debug/BENCH
@@ -0,0 +1,73 @@
+How retros runs on different hardware:
+
+# 32-bit Athlon 64, gcc-4.1
+mj@albireo:~/src/sh/dev-sorter/run$ bin/retros
+D 2006-11-23 23:17:36 [retros] memcpy: 212
+D 2006-11-23 23:17:44 [retros] qsort: 6947
+D 2006-11-23 23:17:48 [retros] arraysort: 3183
+D 2006-11-23 23:18:02 [retros] indirect qsort: 13116
+D 2006-11-23 23:18:24 [retros] indirect arraysort: 19176
+D 2006-11-23 23:18:30 [retros] radix1: 3755
+D 2006-11-23 23:18:34 [retros] radix1b: 3100
+D 2006-11-23 23:18:39 [retros] radix1c: 2777
+D 2006-11-23 23:18:43 [retros] radix1c-sse: 2602
+D 2006-11-23 23:18:47 [retros] radix1d: 2728
+D 2006-11-23 23:18:53 [retros] radix2: 4249
+D 2006-11-23 23:18:57 [retros] radix3: 2577
+D 2006-11-23 23:19:09 [retros] mergesort: 10399
+D 2006-11-23 23:19:16 [retros] samplesort: 5698
+D 2006-11-23 23:19:23 [retros] samplesort2: 5016
+
+# 32-bit P4 Xeon, gcc-3.4
+sherlock@sherlock3:~/sherlock-mj/run$ bin/retros
+D 2006-11-23 23:23:52 [retros] memcpy: 198
+D 2006-11-23 23:24:23 [retros] qsort: 30114
+D 2006-11-23 23:24:27 [retros] arraysort: 2882
+D 2006-11-23 23:24:43 [retros] indirect qsort: 15019
+D 2006-11-23 23:24:59 [retros] indirect arraysort: 13267
+D 2006-11-23 23:25:03 [retros] radix1: 1881
+D 2006-11-23 23:25:06 [retros] radix1b: 1442
+D 2006-11-23 23:25:08 [retros] radix1c: 1313
+D 2006-11-23 23:25:10 [retros] radix1c-sse: 1229
+D 2006-11-23 23:25:13 [retros] radix1d: 1324
+D 2006-11-23 23:25:17 [retros] radix2: 2598
+D 2006-11-23 23:25:19 [retros] radix3: 1419
+D 2006-11-23 23:25:25 [retros] mergesort: 4929
+D 2006-11-23 23:25:29 [retros] samplesort: 2742
+D 2006-11-23 23:25:33 [retros] samplesort2: 2350
+
+# 64-bit P4 Xeon, gcc-3.4
+sherlock@sherlock4:~/sherlock-3.10/run$ bin/retros
+D 2006-11-23 23:44:31 [retros] memcpy: 132
+D 2006-11-23 23:44:58 [retros] qsort: 26469
+D 2006-11-23 23:45:01 [retros] arraysort: 2307
+D 2006-11-23 23:45:12 [retros] indirect qsort: 10971
+D 2006-11-23 23:45:24 [retros] indirect arraysort: 10350
+D 2006-11-23 23:45:26 [retros] radix1: 1099
+D 2006-11-23 23:45:27 [retros] radix1b: 1052
+D 2006-11-23 23:45:29 [retros] radix1c: 1017
+D 2006-11-23 23:45:30 [retros] radix1c-sse: 1017
+D 2006-11-23 23:45:32 [retros] radix1d: 1016
+D 2006-11-23 23:45:34 [retros] radix2: 1661
+D 2006-11-23 23:45:36 [retros] radix3: 955
+D 2006-11-23 23:45:39 [retros] mergesort: 3302
+D 2006-11-23 23:45:42 [retros] samplesort: 2376
+D 2006-11-23 23:45:45 [retros] samplesort2: 1870
+
+# 64-bit Turion X2 TL52, gcc-4.1.1
+pchar@paja ~/prog/sherlock-dev-sorter/run $ bin/retros
+D 2006-11-24 00:32:38 [retros] memcpy: 93
+D 2006-11-24 00:32:46 [retros] qsort: 7530
+D 2006-11-24 00:32:50 [retros] arraysort: 2766
+D 2006-11-24 00:33:01 [retros] indirect qsort: 10543
+D 2006-11-24 00:33:13 [retros] indirect arraysort: 10169
+D 2006-11-24 00:33:16 [retros] radix1: 1319
+D 2006-11-24 00:33:18 [retros] radix1b: 1126
+D 2006-11-24 00:33:20 [retros] radix1c: 1084
+D 2006-11-24 00:33:22 [retros] radix1c-sse: 1126
+D 2006-11-24 00:33:24 [retros] radix1d: 1091
+D 2006-11-24 00:33:27 [retros] radix2: 2238
+D 2006-11-24 00:33:29 [retros] radix3: 1183
+D 2006-11-24 00:33:34 [retros] mergesort: 4036
+D 2006-11-24 00:33:37 [retros] samplesort: 2594
+D 2006-11-24 00:33:40 [retros] samplesort2: 2214
diff --git a/libucw/ucw/sorter/debug/Makefile b/libucw/ucw/sorter/debug/Makefile
new file mode 100644
index 0000000..e489e5b
--- /dev/null
+++ b/libucw/ucw/sorter/debug/Makefile
@@ -0,0 +1,10 @@
+# Tests related to the new sorter
+
+DIRS+=ucw/sorter/debug
+PROGS+=$(addprefix $(o)/ucw/sorter/debug/,radix-tune-bits radix-tune-thresh retros)
+
+$(o)/ucw/sorter/debug/retros: $(o)/ucw/sorter/debug/retros.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-file-test: $(o)/ucw/sorter/debug/radix-file-test.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-asio-test: $(o)/ucw/sorter/debug/radix-asio-test.o $(LIBUCW)
+$(o)/ucw/sorter/debug/radix-tune-bits: $(s)/ucw/sorter/debug/radix-tune-bits.sh
+$(o)/ucw/sorter/debug/radix-tune-thresh: $(s)/ucw/sorter/debug/radix-tune-thresh.sh
diff --git a/libucw/ucw/sorter/debug/radix-asio-test.c b/libucw/ucw/sorter/debug/radix-asio-test.c
new file mode 100644
index 0000000..2579227
--- /dev/null
+++ b/libucw/ucw/sorter/debug/radix-asio-test.c
@@ -0,0 +1,167 @@
+/*
+ *  An experiment with parallel reading and writing of files using ASIO.
+ *
+ *  (c) 2007 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/io.h>
+#include <ucw/asio.h>
+#include <ucw/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define COPY
+#define DIRECT O_DIRECT
+
+static timestamp_t timer;
+
+#define P_INIT do { cnt = 0; cnt_rep = 0; cnt_ms = 1; } while(0)
+#define P_UPDATE(cc) do { \
+  cnt += cc; \
+  if (cnt >= cnt_rep) { cnt_ms += get_timer(&timer); \
+    printf("%d of %d MB (%.2f MB/sec)\r", (int)(cnt >> 20), (int)(total_size >> 20), (double)cnt / 1048576 * 1000 / cnt_ms); \
+    fflush(stdout); cnt_rep += 1<<26; } } while(0)
+#define P_FINAL do { \
+  cnt_ms += get_timer(&timer); \
+  msg(L_INFO, "Spent %.3f sec (%.2f MB/sec)", (double)cnt_ms/1000, (double)cnt / 1048576 * 1000 / cnt_ms); \
+} while(0)
+
+static struct asio_queue io_queue;
+
+int main(int argc, char **argv)
+{
+  uint files, bufsize;
+  u64 total_size;
+  if (argc != 4 ||
+      cf_parse_int(argv[1], (int*) &files) ||
+      cf_parse_int(argv[2], (int*) &bufsize) ||
+      cf_parse_u64(argv[3], &total_size))
+    {
+      fprintf(stderr, "Usage: asio-test <nr-files> <bufsize> <totalsize>\n");
+      return 1;
+    }
+  u64 cnt, cnt_rep;
+  uint cnt_ms;
+  int fd[files];
+  byte name[files][16];
+  struct asio_request *req[files];
+
+  init_timer(&timer);
+
+  io_queue.buffer_size = bufsize;
+  io_queue.max_writebacks = 2;
+  asio_init_queue(&io_queue);
+
+#ifdef COPY
+  msg(L_INFO, "Creating input file");
+  int in_fd = ucw_open("tmp/ft-in", O_RDWR | O_CREAT | O_TRUNC | DIRECT, 0666);
+  ASSERT(in_fd >= 0);
+  ASSERT(!(total_size % bufsize));
+  P_INIT;
+  for (uint i=0; i<total_size/bufsize; i++)
+    {
+      struct asio_request *r = asio_get(&io_queue);
+      r->op = ASIO_WRITE_BACK;
+      r->fd = in_fd;
+      r->len = bufsize;
+      byte *xbuf = r->buffer;
+      for (uint j=0; j<bufsize; j++)
+	xbuf[j] = i+j;
+      asio_submit(r);
+      P_UPDATE(bufsize);
+    }
+  asio_sync(&io_queue);
+  lseek(in_fd, 0, SEEK_SET);
+  sync();
+  P_FINAL;
+#endif
+
+  msg(L_INFO, "Initializing output files");
+  for (uint i=0; i<files; i++)
+    {
+      sprintf(name[i], "tmp/ft-%d", i);
+      fd[i] = ucw_open(name[i], O_RDWR | O_CREAT | O_TRUNC | DIRECT, 0666);
+      if (fd[i] < 0)
+	die("Cannot create %s: %m", name[i]);
+    }
+  sync();
+  get_timer(&timer);
+
+  msg(L_INFO, "Writing %d MB to %d files in parallel with %d byte buffers", (int)(total_size >> 20), files, bufsize);
+  P_INIT;
+  for (uint i=0; i<files; i++)
+    req[i] = asio_get(&io_queue);
+  for (uint round=0; round<total_size/bufsize/files; round++)
+    {
+      for (uint i=0; i<files; i++)
+	{
+	  struct asio_request *r = req[i];
+#ifdef COPY
+	  struct asio_request *rr, *rd = asio_get(&io_queue);
+	  rd->op = ASIO_READ;
+	  rd->fd = in_fd;
+	  rd->len = bufsize;
+	  asio_submit(rd);
+	  rr = asio_wait(&io_queue);
+	  ASSERT(rr == rd && rd->status == (int)rd->len);
+	  memcpy(r->buffer, rd->buffer, bufsize);
+	  asio_put(rr);
+#else
+	  for (uint j=0; j<bufsize; j++)
+	    r->buffer[j] = round+i+j;
+#endif
+	  r->op = ASIO_WRITE_BACK;
+	  r->fd = fd[i];
+	  r->len = bufsize;
+	  asio_submit(r);
+	  P_UPDATE(bufsize);
+	  req[i] = asio_get(&io_queue);
+	}
+    }
+  for (uint i=0; i<files; i++)
+    asio_put(req[i]);
+  asio_sync(&io_queue);
+#ifdef COPY
+  close(in_fd);
+#endif
+  msg(L_INFO, "Syncing");
+  sync();
+  P_FINAL;
+
+  msg(L_INFO, "Reading the files sequentially");
+  P_INIT;
+  for (uint i=0; i<files; i++)
+    {
+      lseek(fd[i], 0, SEEK_SET);
+      for (uint round=0; round<total_size/bufsize/files; round++)
+	{
+	  struct asio_request *rr, *r = asio_get(&io_queue);
+	  r->op = ASIO_READ;
+	  r->fd = fd[i];
+	  r->len = bufsize;
+	  asio_submit(r);
+	  rr = asio_wait(&io_queue);
+	  ASSERT(rr == r && r->status == (int)bufsize);
+	  asio_put(r);
+	  P_UPDATE(bufsize);
+	}
+      close(fd[i]);
+    }
+  P_FINAL;
+
+  for (uint i=0; i<files; i++)
+    unlink(name[i]);
+#ifdef COPY
+  unlink("tmp/ft-in");
+#endif
+
+  asio_cleanup_queue(&io_queue);
+  msg(L_INFO, "Done");
+  return 0;
+}
diff --git a/libucw/ucw/sorter/debug/radix-file-test.c b/libucw/ucw/sorter/debug/radix-file-test.c
new file mode 100644
index 0000000..94d1595
--- /dev/null
+++ b/libucw/ucw/sorter/debug/radix-file-test.c
@@ -0,0 +1,131 @@
+/*
+ *  An experiment with parallel reading and writing of files.
+ *
+ *  (c) 2007 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/io.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define COPY
+#define DIRECT 0		// or O_DIRECT
+
+static timestamp_t timer;
+
+#define P_INIT do { cnt = 0; cnt_rep = 0; cnt_ms = 1; } while(0)
+#define P_UPDATE(cc) do { \
+  cnt += cc; \
+  if (cnt >= cnt_rep) { cnt_ms += get_timer(&timer); \
+    printf("%d of %d MB (%.2f MB/sec)\r", (int)(cnt >> 20), (int)(total_size >> 20), (double)cnt / 1048576 * 1000 / cnt_ms); \
+    fflush(stdout); cnt_rep += 1<<26; } } while(0)
+#define P_FINAL do { \
+  cnt_ms += get_timer(&timer); \
+  msg(L_INFO, "Spent %.3f sec (%.2f MB/sec)", (double)cnt_ms/1000, (double)cnt / 1048576 * 1000 / cnt_ms); \
+} while(0)
+
+int main(int argc, char **argv)
+{
+  uint files, bufsize;
+  u64 total_size;
+  if (argc != 4 ||
+      cf_parse_int(argv[1], (int*) &files) ||
+      cf_parse_int(argv[2], (int*) &bufsize) ||
+      cf_parse_u64(argv[3], &total_size))
+    {
+      fprintf(stderr, "Usage: file-test <nr-files> <bufsize> <totalsize>\n");
+      return 1;
+    }
+  u64 cnt, cnt_rep;
+  uint cnt_ms;
+  int fd[files];
+  byte *buf[files], name[files][16];
+  uint xbufsize = bufsize;					// Used for single-file I/O
+  byte *xbuf = big_alloc(xbufsize);
+
+  init_timer(&timer);
+
+#ifdef COPY
+  msg(L_INFO, "Creating input file");
+  int in_fd = ucw_open("tmp/ft-in", O_RDWR | O_CREAT | O_TRUNC | DIRECT, 0666);
+  ASSERT(in_fd >= 0);
+  ASSERT(!(total_size % xbufsize));
+  P_INIT;
+  for (uint i=0; i<total_size/xbufsize; i++)
+    {
+      for (uint j=0; j<xbufsize; j++)
+	xbuf[j] = i+j;
+      uint c = write(in_fd, xbuf, xbufsize);
+      ASSERT(c == xbufsize);
+      P_UPDATE(c);
+    }
+  lseek(in_fd, 0, SEEK_SET);
+  sync();
+  P_FINAL;
+#endif
+
+  msg(L_INFO, "Initializing output files");
+  for (uint i=0; i<files; i++)
+    {
+      sprintf(name[i], "tmp/ft-%d", i);
+      fd[i] = ucw_open(name[i], O_RDWR | O_CREAT | O_TRUNC | DIRECT, 0666);
+      if (fd[i] < 0)
+	die("Cannot create %s: %m", name[i]);
+      buf[i] = big_alloc(bufsize);
+    }
+  sync();
+  get_timer(&timer);
+
+  msg(L_INFO, "Writing %d MB to %d files in parallel with %d byte buffers", (int)(total_size >> 20), files, bufsize);
+  P_INIT;
+  for (uint r=0; r<total_size/bufsize/files; r++)
+    {
+      for (uint i=0; i<files; i++)
+	{
+#ifdef COPY
+	  uint ci = read(in_fd, buf[i], bufsize);
+	  ASSERT(ci == bufsize);
+#else
+	  for (uint j=0; j<bufsize; j++)
+	    buf[i][j] = r+i+j;
+#endif
+	  uint c = write(fd[i], buf[i], bufsize);
+	  ASSERT(c == bufsize);
+	  P_UPDATE(c);
+	}
+    }
+#ifdef COPY
+  close(in_fd);
+#endif
+  msg(L_INFO, "Syncing");
+  sync();
+  P_FINAL;
+
+  msg(L_INFO, "Reading the files sequentially");
+  P_INIT;
+  for (uint i=0; i<files; i++)
+    {
+      lseek(fd[i], 0, SEEK_SET);
+      for (uint r=0; r<total_size/xbufsize/files; r++)
+	{
+	  uint c = read(fd[i], xbuf, xbufsize);
+	  ASSERT(c == xbufsize);
+	  P_UPDATE(c);
+	}
+      close(fd[i]);
+    }
+  P_FINAL;
+
+  for (uint i=0; i<files; i++)
+    unlink(name[i]);
+#ifdef COPY
+  unlink("tmp/ft-in");
+#endif
+  msg(L_INFO, "Done");
+  return 0;
+}
diff --git a/libucw/ucw/sorter/debug/radix-tune-bits.sh b/libucw/ucw/sorter/debug/radix-tune-bits.sh
new file mode 100644
index 0000000..53cf6f0
--- /dev/null
+++ b/libucw/ucw/sorter/debug/radix-tune-bits.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+# An utility for tuning the LibUCW radix sorter
+# (c) 2007 Martin Mares <mj@ucw.cz>
+set -e
+UCW_PROGNAME="$0"
+. lib/libucw.sh
+
+# Path to LibUCW build directory
+[ -n "$BUILD" ] || BUILD=..
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to LibUCW build directory"
+
+# Find out sort buffer size
+parse-config 'Sorter{##SortBuffer}'
+SORTBUF=$CF_Sorter_SortBuffer
+[ "$SORTBUF" -gt 0 ] || die "Unable to determine SortBuffer"
+log "Detected sort buffer size $SORTBUF"
+
+# Size of the test -- should be slightly less than a half of SortBuffer
+SIZE=$(($SORTBUF/2 - 8192))
+log "Decided to benchmark sorting of $SIZE byte data"
+
+# Which bit widths we try
+WIDTHS="0 6 7 8 9 10 11 12 13 14"
+
+# Which RadixThresholds we try
+THRS="2000 4000 10000 20000 50000"
+
+# Which sort-test tests we try
+TESTS="2,5,8,15"
+
+# Check various bit widths of the radix sorter
+rm -f tmp/radix-*
+for W in $WIDTHS ; do
+	rm -f $BUILD/obj/ucw/sorter/sort-test{,.o}
+	if [ $W = 0 ] ; then
+		log "Compiling with no radix splits"
+		( cd $BUILD && make obj/ucw/sorter/sort-test )
+		OPT="-d32"
+	else
+		log "Compiling with $W-bit radix splits"
+		( cd $BUILD && make CEXTRA="-DFORCE_RADIX_BITS=$W" obj/ucw/sorter/sort-test )
+		OPT=
+	fi
+	for THR in $THRS ; do
+		log "Testing with RadixThreshold=$THR"
+		$BUILD/obj/ucw/sorter/sort-test -SThreads.DefaultStackSize=2M -SSorter.RadixThreshold=$THR -s$SIZE -t$TESTS $OPT -v 2>&1 | tee -a tmp/radix-$W
+	done
+done
+
+echo "thresh" >tmp/radix-thrs
+echo "test#" >tmp/radix-tests
+for THR in $THRS ; do
+	for TEST in `echo $TESTS | tr ',' ' '` ; do
+		echo $THR >>tmp/radix-thrs
+		echo $TEST >>tmp/radix-tests
+	done
+done
+
+FILES="tmp/radix-thrs tmp/radix-tests"
+for W in $WIDTHS ; do
+	a=tmp/radix-$W
+	echo >$a.out "$W bits"
+	sed 's/.* \([0-9.]\+\)s internal sorting.*/\1/;t;d' <$a >>$a.out
+	FILES="$FILES $a.out"
+done
+
+log "These are the results:"
+paste $FILES
diff --git a/libucw/ucw/sorter/debug/radix-tune-thresh.sh b/libucw/ucw/sorter/debug/radix-tune-thresh.sh
new file mode 100644
index 0000000..387d221
--- /dev/null
+++ b/libucw/ucw/sorter/debug/radix-tune-thresh.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# An utility for tuning the LibUCW radix sorter threshold
+# (c) 2007 Martin Mares <mj@ucw.cz>
+set -e
+UCW_PROGNAME="$0"
+. lib/libucw.sh
+
+# Path to LibUCW build directory
+[ -n "$BUILD" ] || BUILD=..
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to LibUCW build directory"
+
+# Find out sort buffer size
+parse-config 'Sorter{##SortBuffer}'
+SORTBUF=$CF_Sorter_SortBuffer
+[ "$SORTBUF" -gt 0 ] || die "Unable to determine SortBuffer"
+log "Detected sort buffer size $SORTBUF"
+
+# Find out radix-sorter width
+[ -f "$BUILD/obj/config.mk" ] || die "LibUCW source not configured"
+WIDTH=`sed <$BUILD/obj/config.mk 's/^CONFIG_UCW_RADIX_SORTER_BITS=\(.*\)/\1/;t;d'`
+[ -n "$WIDTH" ] || die "CONFIG_UCW_RADIX_SORTER_BITS not set (!?)"
+log "Detected radix-sorter width $WIDTH"
+
+# Maximum size of the test -- should be slightly less than a half of SortBuffer
+SIZE=$(($SORTBUF/2 - 8192))
+
+# Which sort-test test we try
+TEST="2"
+
+# Which thresholds we try
+THRS="16"
+T=$SIZE
+while [ $T -gt 100 ] ; do
+	THRS="$THRS $T"
+	T=$(($T/2))
+done
+
+if true ; then
+
+rm -f tmp/radix-*
+echo "sizes" >tmp/radix-sizes
+while [ $SIZE -gt 262144 ] ; do
+	echo $SIZE >>tmp/radix-sizes
+	for T in $THRS ; do
+		log "Trying size $SIZE with threshold $T"
+		$BUILD/obj/ucw/sorter/sort-test -SSorter.RadixThreshold=$T -s$SIZE -t$TEST -v 2>&1 | tee -a tmp/radix-$T
+	done
+	SIZE=$(($SIZE/2))
+done
+
+fi
+
+FILES=tmp/radix-sizes
+for T in $THRS ; do
+	a=tmp/radix-$T
+	echo >$a.out $T
+	sed 's/.* \([0-9.]\+\)s internal sorting.*/\1/;t;d' <$a >>$a.out
+	FILES="$FILES $a.out"
+done
+
+log "These are the results:"
+paste $FILES
diff --git a/libucw/ucw/sorter/debug/retros.c b/libucw/ucw/sorter/debug/retros.c
new file mode 100644
index 0000000..d48280e
--- /dev/null
+++ b/libucw/ucw/sorter/debug/retros.c
@@ -0,0 +1,764 @@
+/*
+ *  Experiments with various sorting algorithms
+ *
+ *  (c) 2007--2008 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/md5.h>
+#include <ucw/heap.h>
+#include <ucw/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/user.h>
+
+struct elt {
+  u32 key;
+  u32 ballast[3];
+};
+
+static struct elt *ary, *alt, **ind, *array0, *array1;
+static uint n = 10000000;
+static u32 sum;
+
+static struct elt *alloc_elts(uint n)
+{
+  return big_alloc(n * sizeof(struct elt));
+}
+
+static void free_elts(struct elt *a, uint n)
+{
+  big_free(a, n * sizeof(struct elt));
+}
+
+static int comp(const void *x, const void *y)
+{
+  const struct elt *xx = x, *yy = y;
+  return (xx->key < yy->key) ? -1 : (xx->key > yy->key) ? 1 : 0;
+}
+
+static int comp_ind(const void *x, const void *y)
+{
+  const struct elt * const *xx = x, * const *yy = y;
+  return comp(*xx, *yy);
+}
+
+#define ASORT_PREFIX(x) as_##x
+#define ASORT_KEY_TYPE u32
+#define ASORT_ELT(i) a[i].key
+#define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0)
+#define ASORT_EXTRA_ARGS , struct elt *a
+#include <ucw/sorter/array-simple.h>
+
+#define ASORT_PREFIX(x) asi_##x
+#define ASORT_KEY_TYPE u32
+#define ASORT_ELT(i) ind[i]->key
+#define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0)
+#include <ucw/sorter/array-simple.h>
+
+static void r1_sort(void)
+{
+  struct elt *from = ary, *to = alt, *tmp;
+#define BITS 8
+  uint cnt[1 << BITS];
+  for (uint sh=0; sh<32; sh+=BITS)
+    {
+      bzero(cnt, sizeof(cnt));
+      for (uint i=0; i<n; i++)
+	cnt[(from[i].key >> sh) & ((1 << BITS) - 1)]++;
+      uint pos = 0;
+      for (uint i=0; i<(1<<BITS); i++)
+	{
+	  uint c = cnt[i];
+	  cnt[i] = pos;
+	  pos += c;
+	}
+      ASSERT(pos == n);
+      for (uint i=0; i<n; i++)
+	to[cnt[(from[i].key >> sh) & ((1 << BITS) - 1)]++] = from[i];
+      ASSERT(cnt[(1 << BITS)-1] == n);
+      tmp=from, from=to, to=tmp;
+    }
+  ary = from;
+#undef BITS
+}
+
+static void r1b_sort(void)
+{
+  struct elt *from = ary, *to = alt, *tmp;
+#define BITS 8
+  uint cnt[1 << BITS], cnt2[1 << BITS];
+  for (uint sh=0; sh<32; sh+=BITS)
+    {
+      if (sh)
+	memcpy(cnt, cnt2, sizeof(cnt));
+      else
+	{
+	  bzero(cnt, sizeof(cnt));
+	  for (uint i=0; i<n; i++)
+	    cnt[(from[i].key >> sh) & ((1 << BITS) - 1)]++;
+	}
+      uint pos = 0;
+      for (uint i=0; i<(1<<BITS); i++)
+	{
+	  uint c = cnt[i];
+	  cnt[i] = pos;
+	  pos += c;
+	}
+      ASSERT(pos == n);
+      bzero(cnt2, sizeof(cnt2));
+      for (uint i=0; i<n; i++)
+	{
+	  cnt2[(from[i].key >> (sh + BITS)) & ((1 << BITS) - 1)]++;
+	  to[cnt[(from[i].key >> sh) & ((1 << BITS) - 1)]++] = from[i];
+	}
+      ASSERT(cnt[(1 << BITS)-1] == n);
+      tmp=from, from=to, to=tmp;
+    }
+  ary = from;
+#undef BITS
+}
+
+static void r1c_sort(void)
+{
+  uint cnt[256];
+  struct elt *ptrs[256], *x, *lim;
+
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    cnt[x++->key & 255]++;
+
+#define PTRS(start) x=start; for (uint i=0; i<256; i++) { ptrs[i]=x; x+=cnt[i]; }
+
+  PTRS(alt);
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 8) & 255]++;
+      *ptrs[x->key & 255]++ = *x;
+      x++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 16) & 255]++;
+      *ptrs[(x->key >> 8) & 255]++ = *x;
+      x++;
+    }
+
+  PTRS(alt);
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 24) & 255]++;
+      *ptrs[(x->key >> 16) & 255]++ = *x;
+      x++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  while (x < lim)
+    {
+      *ptrs[(x->key >> 24) & 255]++ = *x;
+      x++;
+    }
+#undef PTRS
+}
+
+#include <emmintrin.h>
+
+static inline void sse_copy_elt(struct elt *to, struct elt *from)
+{
+  __m128i m = _mm_load_si128((__m128i *) from);
+  _mm_store_si128((__m128i *) to, m);
+}
+
+static void r1c_sse_sort(void)
+{
+  uint cnt[256];
+  struct elt *ptrs[256], *x, *lim;
+
+  ASSERT(sizeof(struct elt) == 16);
+  ASSERT(!((uintptr_t)alt & 15));
+  ASSERT(!((uintptr_t)ary & 15));
+
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    cnt[x++->key & 255]++;
+
+#define PTRS(start) x=start; for (uint i=0; i<256; i++) { ptrs[i]=x; x+=cnt[i]; }
+
+  PTRS(alt);
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 8) & 255]++;
+      sse_copy_elt(ptrs[x->key & 255]++, x);
+      x++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 16) & 255]++;
+      sse_copy_elt(ptrs[(x->key >> 8) & 255]++, x);
+      x++;
+    }
+
+  PTRS(alt);
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 24) & 255]++;
+      sse_copy_elt(ptrs[(x->key >> 16) & 255]++, x);
+      x++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  while (x < lim)
+    {
+      sse_copy_elt(ptrs[(x->key >> 24) & 255]++, x);
+      x++;
+    }
+#undef PTRS
+}
+
+static void r1d_sort(void)
+{
+  uint cnt[256];
+  struct elt *ptrs[256], *x, *y, *lim;
+
+  ASSERT(!(n % 4));
+
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[x++->key & 255]++;
+      cnt[x++->key & 255]++;
+      cnt[x++->key & 255]++;
+      cnt[x++->key & 255]++;
+    }
+
+#define PTRS(start) x=start; for (uint i=0; i<256; i++) { ptrs[i]=x; x+=cnt[i]; }
+
+  PTRS(alt);
+  x = ary; y = ary+n/2; lim = ary + n/2;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 8) & 255]++;
+      cnt[(y->key >> 8) & 255]++;
+      *ptrs[x->key & 255]++ = *x;
+      *ptrs[y->key & 255]++ = *y;
+      x++, y++;
+      cnt[(x->key >> 8) & 255]++;
+      cnt[(y->key >> 8) & 255]++;
+      *ptrs[x->key & 255]++ = *x;
+      *ptrs[y->key & 255]++ = *y;
+      x++, y++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 16) & 255]++;
+      *ptrs[(x->key >> 8) & 255]++ = *x;
+      x++;
+      cnt[(x->key >> 16) & 255]++;
+      *ptrs[(x->key >> 8) & 255]++ = *x;
+      x++;
+    }
+
+  PTRS(alt);
+  x = ary; lim = ary + n;
+  bzero(cnt, sizeof(cnt));
+  while (x < lim)
+    {
+      cnt[(x->key >> 24) & 255]++;
+      *ptrs[(x->key >> 16) & 255]++ = *x;
+      x++;
+      cnt[(x->key >> 24) & 255]++;
+      *ptrs[(x->key >> 16) & 255]++ = *x;
+      x++;
+    }
+
+  PTRS(ary);
+  x = alt; lim = alt + n;
+  while (x < lim)
+    {
+      *ptrs[(x->key >> 24) & 255]++ = *x;
+      x++;
+      *ptrs[(x->key >> 24) & 255]++ = *x;
+      x++;
+    }
+#undef PTRS
+}
+
+static void r2_sort(void)
+{
+  struct elt *from = ary, *to = alt;
+#define BITS 14
+  uint cnt[1 << BITS];
+  bzero(cnt, sizeof(cnt));
+  for (uint i=0; i<n; i++)
+    cnt[(from[i].key >> (32 - BITS)) & ((1 << BITS) - 1)]++;
+  uint pos = 0;
+  for (uint i=0; i<(1<<BITS); i++)
+    {
+      uint c = cnt[i];
+      cnt[i] = pos;
+      pos += c;
+    }
+  ASSERT(pos == n);
+  for (uint i=0; i<n; i++)
+    to[cnt[(from[i].key >> (32 - BITS)) & ((1 << BITS) - 1)]++] = from[i];
+  ASSERT(cnt[(1 << BITS)-1] == n);
+
+  pos = 0;
+  for (uint i=0; i<(1 << BITS); i++)
+    {
+      as_sort(cnt[i] - pos, alt+pos);
+      pos = cnt[i];
+    }
+  ary = alt;
+#undef BITS
+}
+
+static void r3_sort(void)
+{
+#define BITS 10
+#define LEVELS 2
+#define BUCKS (1 << BITS)
+#define THRESHOLD 5000
+#define ODDEVEN 0
+
+  auto void r3(struct elt *from, struct elt *to, uint n, uint lev);
+  void r3(struct elt *from, struct elt *to, uint n, uint lev)
+  {
+    uint sh = 32 - lev*BITS;
+    uint cnt[BUCKS];
+    bzero(cnt, sizeof(cnt));
+    for (uint i=0; i<n; i++)
+      cnt[(from[i].key >> sh) & (BUCKS - 1)]++;
+    uint pos = 0;
+    for (uint i=0; i<BUCKS; i++)
+      {
+	uint c = cnt[i];
+	cnt[i] = pos;
+	pos += c;
+      }
+    ASSERT(pos == n);
+    for (uint i=0; i<n; i++)
+#if 1
+      to[cnt[(from[i].key >> sh) & (BUCKS - 1)]++] = from[i];
+#else
+      sse_copy_elt(&to[cnt[(from[i].key >> sh) & (BUCKS - 1)]++], &from[i]);
+#endif
+    pos = 0;
+    for (uint i=0; i<BUCKS; i++)
+      {
+	uint l = cnt[i]-pos;
+	if (lev >= LEVELS || l <= THRESHOLD)
+	  {
+	    as_sort(l, to+pos);
+	    if ((lev % 2) != ODDEVEN)
+	      memcpy(from+pos, to+pos, l * sizeof(struct elt));
+	  }
+	else
+	  r3(to+pos, from+pos, l, lev+1);
+	pos = cnt[i];
+      }
+  }
+
+  r3(ary, alt, n, 1);
+  if (ODDEVEN)
+    ary = alt;
+
+#undef ODDEVEN
+#undef THRESHOLD
+#undef BUCKS
+#undef LEVELS
+#undef BITS
+}
+
+static inline struct elt *mrg(struct elt *x, struct elt *xl, struct elt *y, struct elt *yl, struct elt *z)
+{
+  for (;;)
+    {
+      if (x->key <= y->key)
+	{
+	  *z++ = *x++;
+	  if (x >= xl)
+	    goto xend;
+	}
+      else
+	{
+	  *z++ = *y++;
+	  if (y >= yl)
+	    goto yend;
+	}
+    }
+
+ xend:
+  while (y < yl)
+    *z++ = *y++;
+  return z;
+
+ yend:
+  while (x < xl)
+    *z++ = *x++;
+  return z;
+}
+
+static void mergesort(void)
+{
+  struct elt *from, *to;
+  uint lev = 0;
+  if (1)
+    {
+      struct elt *x = ary, *z = alt, *last = ary + (n & ~1U);
+      while (x < last)
+	{
+	  if (x[0].key < x[1].key)
+	    *z++ = *x++, *z++ = *x++;
+	  else
+	    {
+	      *z++ = x[1];
+	      *z++ = x[0];
+	      x += 2;
+	    }
+	}
+      if (n % 2)
+	*z = *x;
+      lev++;
+    }
+  for (; (1U << lev) < n; lev++)
+    {
+      if (lev % 2)
+	from = alt, to = ary;
+      else
+	from = ary, to = alt;
+      struct elt *x, *z, *last;
+      x = from;
+      z = to;
+      last = from + n;
+      uint step = 1 << lev;
+      while (x + 2*step <= last)
+	{
+	  z = mrg(x, x+step, x+step, x+2*step, z);
+	  x += 2*step;
+	}
+      if (x + step < last)
+	mrg(x, x+step, x+step, last, z);
+      else
+	memcpy(z, x, (byte*)last - (byte*)x);
+    }
+  if (lev % 2)
+    ary = alt;
+}
+
+static void sampsort(uint n, struct elt *ar, struct elt *al, struct elt *dest, byte *wbuf)
+{
+#define WAYS 256
+  struct elt k[WAYS];
+  uint cnt[WAYS];
+  bzero(cnt, sizeof(cnt));
+  for (uint i=0; i<WAYS; i++)
+    k[i] = ar[random() % n];
+  as_sort(WAYS, k);
+  for (uint i=0; i<n; i++)
+    {
+      uint w = 0;
+#define FW(delta) if (ar[i].key > k[w+delta].key) w += delta
+      FW(128);
+      FW(64);
+      FW(32);
+      FW(16);
+      FW(8);
+      FW(4);
+      FW(2);
+      FW(1);
+      wbuf[i] = w;
+      cnt[w]++;
+    }
+  struct elt *y = al, *way[WAYS], *z;
+  for (uint i=0; i<WAYS; i++)
+    {
+      way[i] = y;
+      y += cnt[i];
+    }
+  ASSERT(y == al+n);
+  for (uint i=0; i<n; i++)
+    {
+      uint w = wbuf[i];
+      *way[w]++ = ar[i];
+    }
+  y = al;
+  z = ar;
+  for (uint i=0; i<WAYS; i++)
+    {
+      if (cnt[i] >= 1000)
+	sampsort(cnt[i], y, z, dest, wbuf);
+      else
+	{
+	  as_sort(cnt[i], y);
+	  if (al != dest)
+	    memcpy(z, y, cnt[i]*sizeof(struct elt));
+	}
+      y += cnt[i];
+      z += cnt[i];
+    }
+#undef FW
+#undef WAYS
+}
+
+static void samplesort(void)
+{
+  byte *aux = xmalloc(n);
+  sampsort(n, ary, alt, ary, aux);
+  xfree(aux);
+}
+
+static void sampsort2(uint n, struct elt *ar, struct elt *al, struct elt *dest, byte *wbuf)
+{
+#define WAYS 256
+  struct elt k[WAYS];
+  uint cnt[WAYS];
+  bzero(cnt, sizeof(cnt));
+  for (uint i=0; i<WAYS; i++)
+    k[i] = ar[random() % n];
+  as_sort(WAYS, k);
+  struct elt *k1 = ar, *k2 = ar+1, *kend = ar+n;
+  byte *ww = wbuf;
+  while (k2 < kend)
+    {
+      uint w1 = 0, w2 = 0;
+#define FW1(delta) if (k1->key > k[w1+delta].key) w1 += delta
+#define FW2(delta) if (k2->key > k[w2+delta].key) w2 += delta
+      FW1(128); FW2(128);
+      FW1(64);  FW2(64);
+      FW1(32);  FW2(32);
+      FW1(16);  FW2(16);
+      FW1(8);   FW2(8);
+      FW1(4);   FW2(4);
+      FW1(2);   FW2(2);
+      FW1(1);   FW2(1);
+      *ww++ = w1;
+      *ww++ = w2;
+      cnt[w1]++;
+      cnt[w2]++;
+      k1 += 2;
+      k2 += 2;
+    }
+  if (k1 < kend)
+    {
+      uint w1 = 0;
+      FW1(128); FW1(64); FW1(32); FW1(16);
+      FW1(8); FW1(4); FW1(2); FW1(1);
+      *ww++ = w1;
+      cnt[w1]++;
+    }
+  struct elt *y = al, *way[WAYS], *z;
+  for (uint i=0; i<WAYS; i++)
+    {
+      way[i] = y;
+      y += cnt[i];
+    }
+  ASSERT(y == al+n);
+  for (uint i=0; i<n; i++)
+    {
+      uint w = wbuf[i];
+      *way[w]++ = ar[i];
+    }
+  y = al;
+  z = ar;
+  for (uint i=0; i<WAYS; i++)
+    {
+      if (cnt[i] >= 1000)
+	sampsort2(cnt[i], y, z, dest, wbuf);
+      else
+	{
+	  as_sort(cnt[i], y);
+	  if (al != dest)
+	    memcpy(z, y, cnt[i]*sizeof(struct elt));
+	}
+      y += cnt[i];
+      z += cnt[i];
+    }
+#undef FW1
+#undef FW2
+#undef WAYS
+}
+
+static void samplesort2(void)
+{
+  byte *aux = xmalloc(n);
+  sampsort2(n, ary, alt, ary, aux);
+  xfree(aux);
+}
+
+static void heapsort(void)
+{
+#define H_LESS(_a,_b) ((_a).key > (_b).key)
+  struct elt *heap = ary-1;
+  HEAP_INIT(struct elt, heap, n, H_LESS, HEAP_SWAP);
+  uint nn = n;
+  while (nn)
+    HEAP_DELETE_MIN(struct elt, heap, nn, H_LESS, HEAP_SWAP);
+#undef H_LESS
+}
+
+static void heapsort_ind(void)
+{
+#define H_LESS(_a,_b) ((_a)->key > (_b)->key)
+  struct elt **heap = ind-1;
+  HEAP_INIT(struct elt *, heap, n, H_LESS, HEAP_SWAP);
+  uint nn = n;
+  while (nn)
+    HEAP_DELETE_MIN(struct elt *, heap, nn, H_LESS, HEAP_SWAP);
+#undef H_LESS
+}
+
+static void mk_ary(void)
+{
+  ary = array0;
+  alt = array1;
+  md5_context ctx;
+  md5_init(&ctx);
+  u32 block[16];
+  bzero(block, sizeof(block));
+
+  sum = 0;
+  for (uint i=0; i<n; i++)
+    {
+#if 1
+      if (!(i % 4))
+	{
+	  block[i%16] = i;
+	  md5_transform(ctx.buf, block);
+	}
+      ary[i].key = ctx.buf[i%4];
+#else
+      ary[i].key = i*(~0U/(n-1));
+#endif
+      for (uint j=1; j<sizeof(struct elt)/4; j++)
+	((u32*)&ary[i])[j] = ROL(ary[i].key, 3*j);
+      sum ^= ary[i].key;
+    }
+}
+
+static void chk_ary(void)
+{
+  u32 s = ary[0].key;
+  for (uint i=1; i<n; i++)
+    if (ary[i].key < ary[i-1].key)
+      die("Missorted at %d", i);
+    else
+      s ^= ary[i].key;
+  if (s != sum)
+    die("Corrupted");
+}
+
+static void mk_ind(void)
+{
+  mk_ary();
+  ind = xmalloc(sizeof(struct elt *) * n);
+  for (uint i=0; i<n; i++)
+    ind[i] = &ary[i];
+}
+
+static void chk_ind(void)
+{
+  u32 s = ind[0]->key;
+  for (uint i=1; i<n; i++)
+    if (ind[i]->key < ind[i-1]->key)
+      die("Missorted at %d", i);
+    else
+      s ^= ind[i]->key;
+  if (s != sum)
+    die("Corrupted");
+  xfree(ind);
+}
+
+int main(int argc, char **argv)
+{
+  log_init(argv[0]);
+
+  int opt;
+  uint op = 0;
+  while ((opt = cf_getopt(argc, argv, CF_SHORT_OPTS "1", CF_NO_LONG_OPTS, NULL)) >= 0)
+    switch (opt)
+      {
+      case '1':
+	op |= (1 << (opt - '0'));
+	break;
+      default:
+	die("usage?");
+      }
+
+  array0 = alloc_elts(n);
+  array1 = alloc_elts(n);
+  for (uint i=0; i<n; i++)
+    array0[i] = array1[i] = (struct elt) { 0 };
+
+  msg(L_INFO, "Testing with %u elements", n);
+
+  mk_ary();
+  timestamp_t timer;
+  init_timer(&timer);
+  for (uint i=0; i<5; i++)
+    {
+#if 1
+      memcpy(alt, ary, sizeof(struct elt) * n);
+      memcpy(ary, alt, sizeof(struct elt) * n);
+#else
+      for (uint j=0; j<n; j++)
+	alt[j] = ary[j];
+      for (uint j=0; j<n; j++)
+	ary[j] = alt[j];
+#endif
+    }
+  msg(L_DEBUG, "memcpy: %d", get_timer(&timer)/10);
+
+#define BENCH(type, name, func) mk_##type(); init_timer(&timer); func; msg(L_DEBUG, name ": %d", get_timer(&timer)); chk_##type()
+
+  BENCH(ary, "qsort", qsort(ary, n, sizeof(struct elt), comp));
+  BENCH(ary, "arraysort", as_sort(n, ary));
+  BENCH(ind, "indirect qsort", qsort(ind, n, sizeof(struct elt *), comp_ind));
+  BENCH(ind, "indirect arraysort", asi_sort(n));
+  BENCH(ary, "radix1", r1_sort());
+  BENCH(ary, "radix1b", r1b_sort());
+  BENCH(ary, "radix1c", r1c_sort());
+  BENCH(ary, "radix1c-sse", r1c_sse_sort());
+  BENCH(ary, "radix1d", r1d_sort());
+  BENCH(ary, "radix2", r2_sort());
+  BENCH(ary, "radix3", r3_sort());
+  BENCH(ary, "mergesort", mergesort());
+  BENCH(ary, "samplesort", samplesort());
+  BENCH(ary, "samplesort2", samplesort2());
+  BENCH(ary, "heapsort", heapsort());
+  BENCH(ind, "indirect heapsort", heapsort_ind());
+
+  free_elts(array0, n);
+  free_elts(array1, n);
+  return 0;
+}
diff --git a/libucw/ucw/sorter/govern.c b/libucw/ucw/sorter/govern.c
new file mode 100644
index 0000000..3e7cda7
--- /dev/null
+++ b/libucw/ucw/sorter/govern.c
@@ -0,0 +1,443 @@
+/*
+ *	UCW Library -- Universal Sorter: Governing Routines
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+#include <ucw/stkstring.h>
+#include <ucw/time.h>
+#include <ucw/sorter/common.h>
+
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+
+#define F_BSIZE(b) stk_fsize(sbuck_size(b))
+
+static void
+sorter_start_timer(struct sort_context *ctx)
+{
+  init_timer(&ctx->start_time);
+}
+
+static void
+sorter_stop_timer(struct sort_context *ctx, uint *account_to)
+{
+  ctx->last_pass_time = get_timer(&ctx->start_time);
+  *account_to += ctx->last_pass_time;
+}
+
+static uint
+sorter_speed(struct sort_context *ctx, u64 size)
+{
+  if (!size)
+    return 0;
+  if (!ctx->last_pass_time)
+    return 0;
+  return (uint)((double)size / (1<<20) * 1000 / ctx->last_pass_time);
+}
+
+static int
+sorter_presort(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only)
+{
+  sorter_alloc_buf(ctx);
+  if (in->flags & SBF_CUSTOM_PRESORT)
+    {
+      /*
+       *  The trick with automatic joining, which we use for the normal presorter,
+       *  is not necessary with the custom presorter, because the custom presorter
+       *  is never called in the middle of the sorted data.
+       */
+      struct fastbuf *f = sbuck_write(out);
+      out->runs++;
+      return ctx->custom_presort(f, ctx->big_buf, ctx->big_buf_size);
+    }
+  return ctx->internal_sort(ctx, in, out, out_only);
+}
+
+static struct sort_bucket *
+sbuck_join_to(struct sort_bucket *b, ucw_off_t *sizep)
+{
+  *sizep = 0;  // Not needed, just to silence false warnings in some compilers about uninitialized sizep (it's OK for NULL result)
+
+  if (sorter_debug & SORT_DEBUG_NO_JOIN)
+    return NULL;
+
+  struct sort_bucket *out = (struct sort_bucket *) b->n.prev;	// Such bucket is guaranteed to exist
+  if (!(out->flags & SBF_FINAL))
+    return NULL;
+  ASSERT(out->runs == 1);
+  *sizep = sbuck_size(out);
+  return out;
+}
+
+static ucw_off_t
+sbuck_ins_or_join(struct sort_bucket *b, cnode *list_pos, struct sort_bucket *join, ucw_off_t join_size)
+{
+  if (join && join->runs >= 2)
+    {
+      if (b)
+	sbuck_drop(b);
+      ASSERT(join->runs == 2);
+      join->runs--;
+      return sbuck_size(join) - join_size;
+    }
+  else if (b)
+    {
+      clist_insert_after(&b->n, list_pos);
+      return sbuck_size(b);
+    }
+  else
+    return 0;
+}
+
+static void
+sorter_join(struct sort_bucket *b)
+{
+  struct sort_bucket *join = (struct sort_bucket *) b->n.prev;
+  ASSERT(join->flags & SBF_FINAL);
+  ASSERT(b->runs == 1);
+
+  if (!sbuck_has_file(join))
+    {
+      // The final bucket doesn't have any file associated yet, so replace
+      // it with the new bucket.
+      SORT_XTRACE(3, "Replaced final bucket");
+      b->flags |= SBF_FINAL;
+      sbuck_drop(join);
+    }
+  else
+    {
+      SORT_TRACE("Copying to output file: %s", F_BSIZE(b));
+      struct fastbuf *src = sbuck_read(b);
+      struct fastbuf *dest = sbuck_write(join);
+      bbcopy(src, dest, ~0U);
+      sbuck_drop(b);
+    }
+}
+
+static void
+sorter_twoway(struct sort_context *ctx, struct sort_bucket *b)
+{
+  struct sort_bucket *ins[3] = { NULL }, *outs[3] = { NULL };
+  cnode *list_pos = b->n.prev;
+  ucw_off_t join_size;
+  struct sort_bucket *join = sbuck_join_to(b, &join_size);
+
+  if (!(sorter_debug & SORT_DEBUG_NO_PRESORT) || (b->flags & SBF_CUSTOM_PRESORT))
+    {
+      SORT_XTRACE(3, "%s", ((b->flags & SBF_CUSTOM_PRESORT) ? "Custom presorting" : "Presorting"));
+      sorter_start_timer(ctx);
+      ins[0] = sbuck_new(ctx);
+      if (!sorter_presort(ctx, b, ins[0], join ? : ins[0]))
+	{
+	  sorter_stop_timer(ctx, &ctx->total_pre_time);
+	  ucw_off_t size = sbuck_ins_or_join(ins[0], list_pos, join, join_size);
+	  SORT_XTRACE(((b->flags & SBF_SOURCE) ? 1 : 3), "Sorted in memory (%s, %dMB/s)", stk_fsize(size), sorter_speed(ctx, size));
+	  sbuck_drop(b);
+	  return;
+	}
+
+      ins[1] = sbuck_new(ctx);
+      int i = 1;
+      while (sorter_presort(ctx, b, ins[i], ins[i]))
+	i = 1-i;
+      sbuck_drop(b);
+      sorter_stop_timer(ctx, &ctx->total_pre_time);
+      SORT_TRACE("Presorting pass (%d+%d runs, %s+%s, %dMB/s)",
+		 ins[0]->runs, ins[1]->runs,
+		 F_BSIZE(ins[0]), F_BSIZE(ins[1]),
+		 sorter_speed(ctx, sbuck_size(ins[0]) + sbuck_size(ins[1])));
+    }
+  else
+    {
+      SORT_XTRACE(2, "Presorting disabled");
+      ins[0] = b;
+    }
+
+  SORT_XTRACE(3, "Main sorting");
+  uint pass = 0;
+  do {
+    ++pass;
+    sorter_start_timer(ctx);
+    if (ins[0]->runs <= 1 && ins[1]->runs <= 1 && join)
+      {
+	// This is guaranteed to produce a single run, so join if possible
+	outs[0] = join;
+	outs[1] = NULL;
+	ctx->twoway_merge(ctx, ins, outs);
+	ucw_off_t size = sbuck_ins_or_join(NULL, NULL, join, join_size);
+	sorter_stop_timer(ctx, &ctx->total_ext_time);
+	SORT_TRACE("Mergesort pass %d (final run, %s, %dMB/s)", pass, stk_fsize(size), sorter_speed(ctx, size));
+	sbuck_drop(ins[0]);
+	sbuck_drop(ins[1]);
+	return;
+      }
+    outs[0] = sbuck_new(ctx);
+    outs[1] = sbuck_new(ctx);
+    outs[2] = NULL;
+    ctx->twoway_merge(ctx, ins, outs);
+    sorter_stop_timer(ctx, &ctx->total_ext_time);
+    SORT_TRACE("Mergesort pass %d (%d+%d runs, %s+%s, %dMB/s)", pass,
+	       outs[0]->runs, outs[1]->runs,
+	       F_BSIZE(outs[0]), F_BSIZE(outs[1]),
+	       sorter_speed(ctx, sbuck_size(outs[0]) + sbuck_size(outs[1])));
+    sbuck_drop(ins[0]);
+    sbuck_drop(ins[1]);
+    memcpy(ins, outs, 3*sizeof(struct sort_bucket *));
+  } while (sbuck_have(ins[1]));
+
+  sbuck_drop(ins[1]);
+  clist_insert_after(&ins[0]->n, list_pos);
+}
+
+static void
+sorter_multiway(struct sort_context *ctx, struct sort_bucket *b)
+{
+  clist parts;
+  cnode *list_pos = b->n.prev;
+  ucw_off_t join_size;
+  struct sort_bucket *join = sbuck_join_to(b, &join_size);
+  uint trace_level = (b->flags & SBF_SOURCE) ? 1 : 3;
+
+  clist_init(&parts);
+  ASSERT(!(sorter_debug & SORT_DEBUG_NO_PRESORT));
+  SORT_XTRACE(3, "%s", ((b->flags & SBF_CUSTOM_PRESORT) ? "Custom presorting" : "Presorting"));
+  uint cont;
+  uint part_cnt = 0;
+  u64 total_size = 0;
+  sorter_start_timer(ctx);
+  do
+    {
+      struct sort_bucket *p = sbuck_new(ctx);
+      cont = sorter_presort(ctx, b, p, (!part_cnt && join) ? join : p);
+      if (sbuck_have(p))
+	{
+	  part_cnt++;
+	  clist_add_tail(&parts, &p->n);
+	  total_size += sbuck_size(p);
+	  sbuck_swap_out(p);
+	}
+      else
+	sbuck_drop(p);
+    }
+  while (cont);
+  sorter_stop_timer(ctx, &ctx->total_pre_time);
+  sorter_free_buf(ctx);
+  sbuck_drop(b);
+
+  if (part_cnt <= 1)
+    {
+      ucw_off_t size = sbuck_ins_or_join(clist_head(&parts), list_pos, (part_cnt ? NULL : join), join_size);
+      SORT_XTRACE(trace_level, "Sorted in memory (%s, %dMB/s)", stk_fsize(size), sorter_speed(ctx, size));
+      return;
+    }
+
+  SORT_TRACE("Multi-way presorting pass (%d parts, %s, %dMB/s)", part_cnt, stk_fsize(total_size), sorter_speed(ctx, total_size));
+
+  uint max_ways = 1 << sorter_max_multiway_bits;
+  struct sort_bucket *ways[max_ways+1];
+  SORT_XTRACE(3, "Starting up to %d-way merge", max_ways);
+  for (;;)
+    {
+      uint n = 0;
+      struct sort_bucket *p;
+      while (n < max_ways && (p = clist_head(&parts)))
+	{
+	  clist_remove(&p->n);
+	  ways[n++] = p;
+	}
+      ways[n] = NULL;
+      ASSERT(n > 1);
+
+      struct sort_bucket *out;
+      if (clist_empty(&parts) && join)
+	out = join;
+      else
+	out = sbuck_new(ctx);
+      sorter_start_timer(ctx);
+      ctx->multiway_merge(ctx, ways, out);
+      sorter_stop_timer(ctx, &ctx->total_ext_time);
+
+      for (uint i=0; i<n; i++)
+	sbuck_drop(ways[i]);
+
+      if (clist_empty(&parts))
+	{
+	  ucw_off_t size = sbuck_ins_or_join((join ? NULL : out), list_pos, join, join_size);
+	  SORT_TRACE("Multi-way merge completed (%d ways, %s, %dMB/s)", n, stk_fsize(size), sorter_speed(ctx, size));
+	  return;
+	}
+      else
+	{
+	  sbuck_swap_out(out);
+	  clist_add_tail(&parts, &out->n);
+	  SORT_TRACE("Multi-way merge pass (%d ways, %s, %dMB/s)", n, F_BSIZE(out), sorter_speed(ctx, sbuck_size(out)));
+	}
+    }
+}
+
+static void
+sorter_radix(struct sort_context *ctx, struct sort_bucket *b, uint bits)
+{
+  // Add more bits if requested and allowed.
+  bits = MIN(bits + sorter_add_radix_bits, sorter_max_radix_bits);
+
+  uint nbuck = 1 << bits;
+  SORT_XTRACE(3, "Running radix split on %s with hash %d bits of %d (expecting %s buckets)",
+	      F_BSIZE(b), bits, b->hash_bits, stk_fsize(sbuck_size(b) / nbuck));
+  sorter_free_buf(ctx);
+  sorter_start_timer(ctx);
+
+  struct sort_bucket **outs = alloca(nbuck * sizeof(struct sort_bucket *));
+  for (uint i=nbuck; i--; )
+    {
+      outs[i] = sbuck_new(ctx);
+      outs[i]->hash_bits = b->hash_bits - bits;
+      clist_insert_after(&outs[i]->n, &b->n);
+    }
+
+  ctx->radix_split(ctx, b, outs, b->hash_bits - bits, bits);
+
+  u64 min = ~(u64)0, max = 0, sum = 0;
+  for (uint i=0; i<nbuck; i++)
+    {
+      u64 s = sbuck_size(outs[i]);
+      min = MIN(min, s);
+      max = MAX(max, s);
+      sum += s;
+      if (nbuck > 4)
+	sbuck_swap_out(outs[i]);
+    }
+
+  sorter_stop_timer(ctx, &ctx->total_ext_time);
+  SORT_TRACE("Radix split (%d buckets, %s min, %s max, %s avg, %dMB/s)", nbuck,
+	     stk_fsize(min), stk_fsize(max), stk_fsize(sum / nbuck), sorter_speed(ctx, sum));
+  sbuck_drop(b);
+}
+
+static void
+sorter_decide(struct sort_context *ctx, struct sort_bucket *b)
+{
+  // Drop empty buckets
+  if (!sbuck_have(b))
+    {
+      SORT_XTRACE(4, "Dropping empty bucket");
+      sbuck_drop(b);
+      return;
+    }
+
+  // How many bits of bucket size we have to reduce before it fits in the RAM?
+  // (this is insanely large if the input size is unknown, but it serves our purpose)
+  u64 insize = sbuck_size(b);
+  u64 mem = ctx->internal_estimate(ctx, b) * 0.8;	// Magical factor accounting for various non-uniformities
+  uint bits = 0;
+  while ((insize >> bits) > mem)
+    bits++;
+
+  // Calculate the possibilities of radix splits
+  uint radix_bits;
+  if (!ctx->radix_split ||
+      (b->flags & SBF_CUSTOM_PRESORT) ||
+      (sorter_debug & SORT_DEBUG_NO_RADIX))
+    radix_bits = 0;
+  else
+    {
+      radix_bits = MIN(bits, b->hash_bits);
+      radix_bits = MIN(radix_bits, sorter_max_radix_bits);
+      if (radix_bits < sorter_min_radix_bits)
+	radix_bits = 0;
+    }
+
+  // The same for multi-way merges
+  uint multiway_bits;
+  if (!ctx->multiway_merge ||
+      (sorter_debug & SORT_DEBUG_NO_MULTIWAY) ||
+      (sorter_debug & SORT_DEBUG_NO_PRESORT))
+    multiway_bits = 0;
+  else
+    {
+      multiway_bits = MIN(bits, sorter_max_multiway_bits);
+      if (multiway_bits < sorter_min_multiway_bits)
+	multiway_bits = 0;
+    }
+
+  SORT_XTRACE(3, "Decisions: size=%s max=%s runs=%d bits=%d hash=%d -> radix=%d multi=%d",
+	stk_fsize(insize), stk_fsize(mem), b->runs, bits, b->hash_bits,
+	radix_bits, multiway_bits);
+
+  // If the input already consists of a single run, just join it
+  if (b->runs)
+    return sorter_join(b);
+
+  // If everything fits in memory, the 2-way strategy will sort it in memory
+  if (!bits)
+    return sorter_twoway(ctx, b);
+
+  // If we can reduce everything in one pass, do so and prefer radix splits
+  if (radix_bits == bits)
+    return sorter_radix(ctx, b, radix_bits);
+  if (multiway_bits == bits)
+    return sorter_multiway(ctx, b);
+
+  // Otherwise, reduce as much as possible and again prefer radix splits
+  if (radix_bits)
+    return sorter_radix(ctx, b, radix_bits);
+  if (multiway_bits)
+    return sorter_multiway(ctx, b);
+
+  // Fall back to 2-way strategy if nothing else applies
+  return sorter_twoway(ctx, b);
+}
+
+void
+sorter_run(struct sort_context *ctx)
+{
+  ctx->pool = mp_new(4096);
+  clist_init(&ctx->bucket_list);
+  sorter_prepare_buf(ctx);
+  asort_start_threads(0);
+
+  // Create bucket containing the source
+  struct sort_bucket *bin = sbuck_new(ctx);
+  bin->flags = SBF_SOURCE | SBF_OPEN_READ;
+  if (ctx->custom_presort)
+    bin->flags |= SBF_CUSTOM_PRESORT;
+  else
+    bin->fb = ctx->in_fb;
+  bin->ident = "in";
+  bin->size = ctx->in_size;
+  bin->hash_bits = ctx->hash_bits;
+  clist_add_tail(&ctx->bucket_list, &bin->n);
+  SORT_XTRACE(2, "Input size: %s, %d hash bits", F_BSIZE(bin), bin->hash_bits);
+  ctx->fb_params = (bin->size < sorter_small_input) ? &sorter_small_fb_params : &sorter_fb_params;
+
+  // Create bucket for the output
+  struct sort_bucket *bout = sbuck_new(ctx);
+  bout->flags = SBF_FINAL;
+  if (bout->fb = ctx->out_fb)
+    bout->flags |= SBF_OPEN_WRITE;
+  bout->ident = "out";
+  bout->runs = 1;
+  clist_add_head(&ctx->bucket_list, &bout->n);
+
+  // Repeatedly sort buckets
+  struct sort_bucket *b;
+  while (bout = clist_head(&ctx->bucket_list), b = clist_next(&ctx->bucket_list, &bout->n))
+    sorter_decide(ctx, b);
+
+  asort_stop_threads();
+  sorter_free_buf(ctx);
+  sbuck_write(bout);		// Force empty bucket to a file
+  SORT_XTRACE(2, "Final size: %s", F_BSIZE(bout));
+  SORT_XTRACE(2, "Final timings: %.3fs external sorting, %.3fs presorting, %.3fs internal sorting",
+	      ctx->total_ext_time/1000., ctx->total_pre_time/1000., ctx->total_int_time/1000.);
+  ctx->out_fb = sbuck_read(bout);
+  mp_delete(ctx->pool);
+}
diff --git a/libucw/ucw/sorter/s-fixint.h b/libucw/ucw/sorter/s-fixint.h
new file mode 100644
index 0000000..1020c26
--- /dev/null
+++ b/libucw/ucw/sorter/s-fixint.h
@@ -0,0 +1,126 @@
+/*
+ *	UCW Library -- Universal Sorter: Fixed-Size Internal Sorting Module
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/stkstring.h>
+
+#define ASORT_PREFIX(x) SORT_PREFIX(array_##x)
+#define ASORT_KEY_TYPE P(key)
+#define ASORT_LT(x,y) (P(compare)(&(x), &(y)) < 0)
+#ifdef SORT_INTERNAL_RADIX
+#  define ASORT_HASH(x) P(hash)(&(x))
+#    ifdef SORT_LONG_HASH
+#      define ASORT_LONG_HASH
+#    endif
+#endif
+#include <ucw/sorter/array.h>
+
+/*
+ *  This is a more efficient implementation of the internal sorter,
+ *  which runs under the following assumptions:
+ *
+ *     - the keys have fixed (and small) size
+ *     - no data are present after the key
+ *     - unification does not require any workspace
+ */
+
+static size_t P(internal_workspace)(void)
+{
+  size_t workspace = 0;
+#ifdef SORT_UNIFY
+  workspace = sizeof(P(key) *);
+#endif
+#ifdef SORT_INTERNAL_RADIX
+  workspace = MAX(workspace, sizeof(P(key)));
+#endif
+  return workspace;
+}
+
+static uint P(internal_num_keys)(struct sort_context *ctx)
+{
+  size_t bufsize = ctx->big_buf_size;
+  size_t workspace = P(internal_workspace)();
+  if (workspace)
+    bufsize -= CPU_PAGE_SIZE;
+  u64 maxkeys = bufsize / (sizeof(P(key)) + workspace);
+  return MIN(maxkeys, ~0U);					// The number of records must fit in uint
+}
+
+static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct sort_bucket *bout, struct sort_bucket *bout_only)
+{
+  sorter_alloc_buf(ctx);
+  struct fastbuf *in = sbuck_read(bin);
+  P(key) *buf = ctx->big_buf;
+  uint maxkeys = P(internal_num_keys)(ctx);
+
+  SORT_XTRACE(5, "s-fixint: Reading (maxkeys=%u, hash_bits=%d)", maxkeys, bin->hash_bits);
+  uint n = 0;
+  while (n < maxkeys && P(read_key)(in, &buf[n]))
+    n++;
+  if (!n)
+    return 0;
+  void *workspace UNUSED = ALIGN_PTR(&buf[n], CPU_PAGE_SIZE);
+
+  SORT_XTRACE(4, "s-fixint: Sorting %u items (%s items, %s workspace)",
+	n,
+	stk_fsize(n * sizeof(P(key))),
+	stk_fsize(n * P(internal_workspace)()));
+  timestamp_t timer;
+  init_timer(&timer);
+  buf = P(array_sort)(buf, n
+#ifdef SORT_INTERNAL_RADIX
+    , workspace, bin->hash_bits
+#endif
+    );
+  if ((void *)buf != ctx->big_buf)
+    workspace = ctx->big_buf;
+  ctx->total_int_time += get_timer(&timer);
+
+  SORT_XTRACE(5, "s-fixint: Writing");
+  if (n < maxkeys)
+    bout = bout_only;
+  struct fastbuf *out = sbuck_write(bout);
+  bout->runs++;
+  uint merged UNUSED = 0;
+  for (uint i=0; i<n; i++)
+    {
+#ifdef SORT_UNIFY
+      if (i < n-1 && !P(compare)(&buf[i], &buf[i+1]))
+	{
+	  P(key) **keys = workspace;
+	  uint n = 2;
+	  keys[0] = &buf[i];
+	  keys[1] = &buf[i+1];
+	  while (!P(compare)(&buf[i], &buf[i+n]))
+	    {
+	      keys[n] = &buf[i+n];
+	      n++;
+	    }
+	  P(write_merged)(out, keys, NULL, n, NULL);
+	  merged += n - 1;
+	  i += n - 1;
+	  continue;
+	}
+#endif
+#ifdef SORT_ASSERT_UNIQUE
+      ASSERT(i == n-1 || P(compare)(&buf[i], &buf[i+1]) < 0);
+#endif
+      P(write_key)(out, &buf[i]);
+    }
+#ifdef SORT_UNIFY
+  SORT_XTRACE(4, "Merging reduced %u records", merged);
+#endif
+
+  return (n == maxkeys);
+}
+
+static u64
+P(internal_estimate)(struct sort_context *ctx, struct sort_bucket *b UNUSED)
+{
+  return P(internal_num_keys)(ctx) * sizeof(P(key)) - 1;	// -1 since if the buffer is full, we don't recognize EOF
+}
diff --git a/libucw/ucw/sorter/s-internal.h b/libucw/ucw/sorter/s-internal.h
new file mode 100644
index 0000000..ff2963a
--- /dev/null
+++ b/libucw/ucw/sorter/s-internal.h
@@ -0,0 +1,252 @@
+/*
+ *	UCW Library -- Universal Sorter: Internal Sorting Module
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/stkstring.h>
+
+#ifdef SORT_INTERNAL_RADIX
+/* Keep copies of the items' hashes to save cache misses */
+#define SORT_COPY_HASH
+#endif
+
+typedef struct {
+  P(key) *key;
+#ifdef SORT_COPY_HASH
+  P(hash_t) hash;
+#endif
+} P(internal_item_t);
+
+#define ASORT_PREFIX(x) SORT_PREFIX(array_##x)
+#define ASORT_KEY_TYPE P(internal_item_t)
+#ifdef SORT_COPY_HASH
+#  ifdef SORT_INT
+#    define ASORT_LT(x,y) ((x).hash < (y).hash)		// In this mode, the hash is the value
+#  else
+#    define ASORT_LT(x,y) ((x).hash < (y).hash || (x).hash == (y).hash && P(compare)((x).key, (y).key) < 0)
+#  endif
+#else
+#  define ASORT_LT(x,y) (P(compare)((x).key, (y).key) < 0)
+#endif
+#ifdef SORT_INTERNAL_RADIX
+#    ifdef SORT_COPY_HASH
+#      define ASORT_HASH(x) (x).hash
+#    else
+#      define ASORT_HASH(x) P(hash)((x).key)
+#    endif
+#    ifdef SORT_LONG_HASH
+#      define ASORT_LONG_HASH
+#    endif
+#endif
+#include <ucw/sorter/array.h>
+
+/*
+ *  The big_buf has the following layout:
+ *
+ *	+-------------------------------------------------------------------------------+
+ *	| array of internal_item's							|
+ *	+-------------------------------------------------------------------------------+
+ *	| padding to make the following part page-aligned				|
+ *	+--------------------------------+----------------------------------------------+
+ *	| shadow copy of item array      | array of pointers to data for write_merged() |
+ *	| used if radix-sorting          +----------------------------------------------+
+ *	|                                | workspace for write_merged()			|
+ *	+--------------------------------+----------------------------------------------+
+ *	|	       +---------+							|
+ *	|              | key     |							|
+ *	|              +---------+							|
+ *	| sequence of  | padding |							|
+ *	| items        +---------+							|
+ *	|              | data    |							|
+ *	|              +---------+							|
+ *	|              | padding |							|
+ *	|              +---------+							|
+ *	+-------------------------------------------------------------------------------+
+ *
+ *  (the data which are in different columns are never accessed simultaneously,
+ *   so we use a single buffer for both)
+ */
+
+static inline void *P(internal_get_data)(P(key) *key)
+{
+  uint ksize = SORT_KEY_SIZE(*key);
+#ifdef SORT_UNIFY
+  ksize = ALIGN_TO(ksize, CPU_STRUCT_ALIGN);
+#endif
+  return (byte *) key + ksize;
+}
+
+static inline size_t P(internal_workspace)(P(key) *key UNUSED)
+{
+  size_t ws = 0;
+#ifdef SORT_UNIFY
+  ws += sizeof(void *);
+#endif
+#ifdef SORT_UNIFY_WORKSPACE
+  ws += SORT_UNIFY_WORKSPACE(*key);
+#endif
+#ifdef SORT_INTERNAL_RADIX
+  ws = MAX(ws, sizeof(P(internal_item_t)));
+#endif
+  return ws;
+}
+
+static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct sort_bucket *bout, struct sort_bucket *bout_only)
+{
+  sorter_alloc_buf(ctx);
+  struct fastbuf *in = sbuck_read(bin);
+
+  P(key) key, *keybuf = ctx->key_buf;
+  if (!keybuf)
+    keybuf = ctx->key_buf = sorter_alloc(ctx, sizeof(key));
+  if (ctx->more_keys)
+    {
+      key = *keybuf;
+      ctx->more_keys = 0;
+    }
+  else if (!P(read_key)(in, &key))
+    return 0;
+
+  size_t bufsize = ctx->big_buf_size;
+#ifdef SORT_VAR_DATA
+  if (sizeof(key) + 2*CPU_PAGE_SIZE + SORT_DATA_SIZE(key) + P(internal_workspace)(&key) > bufsize)
+    {
+      SORT_XTRACE(4, "s-internal: Generating a giant run");
+      struct fastbuf *out = sbuck_write(bout);
+      P(copy_data)(&key, in, out);
+      bout->runs++;
+      return 1;				// We don't know, but 1 is always safe
+    }
+#endif
+
+  SORT_XTRACE(5, "s-internal: Reading");
+  P(internal_item_t) *item_array = ctx->big_buf, *item = item_array, *last_item;
+  byte *end = (byte *) ctx->big_buf + bufsize;
+  size_t remains = bufsize - CPU_PAGE_SIZE;
+  do
+    {
+      uint ksize = SORT_KEY_SIZE(key);
+#ifdef SORT_UNIFY
+      uint ksize_aligned = ALIGN_TO(ksize, CPU_STRUCT_ALIGN);
+#else
+      uint ksize_aligned = ksize;
+#endif
+      uint dsize = SORT_DATA_SIZE(key);
+      uint recsize = ALIGN_TO(ksize_aligned + dsize, CPU_STRUCT_ALIGN);
+      size_t totalsize = recsize + sizeof(P(internal_item_t)) + P(internal_workspace)(&key);
+      if (unlikely(totalsize > remains
+#ifdef CPU_64BIT_POINTERS
+		   || item >= item_array + ~0U		// The number of items must fit in an uint
+#endif
+	 ))
+	{
+	  ctx->more_keys = 1;
+	  *keybuf = key;
+	  break;
+	}
+      remains -= totalsize;
+      end -= recsize;
+      memcpy(end, &key, ksize);
+#ifdef SORT_VAR_DATA
+      breadb(in, end + ksize_aligned, dsize);
+#endif
+      item->key = (P(key)*) end;
+#ifdef SORT_COPY_HASH
+      item->hash = P(hash)(item->key);
+#endif
+      item++;
+    }
+  while (P(read_key)(in, &key));
+  last_item = item;
+
+  uint count = last_item - item_array;
+  void *workspace UNUSED = ALIGN_PTR(last_item, CPU_PAGE_SIZE);
+  SORT_XTRACE(4, "s-internal: Read %u items (%s items, %s workspace, %s data)",
+	count,
+	stk_fsize((byte*)last_item - (byte*)item_array),
+	stk_fsize(end - (byte*)last_item - remains),
+	stk_fsize((byte*)ctx->big_buf + bufsize - end));
+  timestamp_t timer;
+  init_timer(&timer);
+  item_array = P(array_sort)(item_array, count
+#ifdef SORT_INTERNAL_RADIX
+    , workspace, bin->hash_bits
+#endif
+    );
+  if ((void *)item_array != ctx->big_buf)
+    workspace = ctx->big_buf;
+  last_item = item_array + count;
+  ctx->total_int_time += get_timer(&timer);
+
+  SORT_XTRACE(5, "s-internal: Writing");
+  if (!ctx->more_keys)
+    bout = bout_only;
+  struct fastbuf *out = sbuck_write(bout);
+  bout->runs++;
+  uint merged UNUSED = 0;
+  for (item = item_array; item < last_item; item++)
+    {
+#ifdef SORT_UNIFY
+      if (item < last_item - 1 && !P(compare)(item->key, item[1].key))
+	{
+	  // Rewrite the item structures with just pointers to keys and place
+	  // pointers to data in the workspace.
+	  P(key) **key_array = (void *) item;
+	  void **data_array = workspace;
+	  key_array[0] = item[0].key;
+	  data_array[0] = P(internal_get_data)(key_array[0]);
+	  uint cnt;
+	  for (cnt=1; item+cnt < last_item && !P(compare)(key_array[0], item[cnt].key); cnt++)
+	    {
+	      key_array[cnt] = item[cnt].key;
+	      data_array[cnt] = P(internal_get_data)(key_array[cnt]);
+	    }
+	  P(write_merged)(out, key_array, data_array, cnt, data_array+cnt);
+	  item += cnt - 1;
+	  merged += cnt - 1;
+	  continue;
+	}
+#endif
+#ifdef SORT_ASSERT_UNIQUE
+      ASSERT(item == last_item-1 || P(compare)(item->key, item[1].key) < 0);
+#endif
+      P(write_key)(out, item->key);
+#ifdef SORT_VAR_DATA
+      bwrite(out, P(internal_get_data)(item->key), SORT_DATA_SIZE(*item->key));
+#endif
+    }
+#ifdef SORT_UNIFY
+  SORT_XTRACE(4, "Merging reduced %u records", merged);
+#endif
+
+  return ctx->more_keys;
+}
+
+static u64
+P(internal_estimate)(struct sort_context *ctx, struct sort_bucket *b UNUSED)
+{
+  // Most of this is just wild guesses
+#ifdef SORT_VAR_KEY
+  uint avg = ALIGN_TO(sizeof(P(key))/4, CPU_STRUCT_ALIGN);
+#else
+  uint avg = ALIGN_TO(sizeof(P(key)), CPU_STRUCT_ALIGN);
+#endif
+  uint ws = 0;
+#ifdef SORT_UNIFY
+  ws += sizeof(void *);
+#endif
+#ifdef SORT_UNIFY_WORKSPACE
+  ws += avg;
+#endif
+#ifdef SORT_INTERNAL_RADIX
+  ws = MAX(ws, sizeof(P(internal_item_t)));
+#endif
+  // We ignore the data part of records, it probably won't make the estimate much worse
+  return (ctx->big_buf_size / (avg + ws + sizeof(P(internal_item_t))) * avg);
+}
+
+#undef SORT_COPY_HASH
diff --git a/libucw/ucw/sorter/s-multiway.h b/libucw/ucw/sorter/s-multiway.h
new file mode 100644
index 0000000..e20fb38
--- /dev/null
+++ b/libucw/ucw/sorter/s-multiway.h
@@ -0,0 +1,148 @@
+/*
+ *	UCW Library -- Universal Sorter: Multi-Way Merge Module
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ * We use a binary tree to keep track of the current minimum. The tree is
+ * represented by an array (in the same way as binary heaps usually are),
+ * leaves correspond to input streams and each internal vertex remembers
+ * the leaf in its subtree, which has the lowest key.
+ */
+
+typedef struct P(mwt) {
+  int i;		// Minimum of the subtree
+#ifdef SORT_UNIFY
+  int eq;		// Did we encounter equality anywhere in the subtree?
+#endif
+} P(mwt);
+
+static inline void P(update_tree)(P(key) *keys, P(mwt) *tree, uint i)
+{
+  while (i /= 2)
+    {
+      if (tree[2*i].i < 0)
+	tree[i] = tree[2*i+1];
+      else if (tree[2*i+1].i < 0)
+	tree[i] = tree[2*i];
+      else
+	{
+	  int cmp = P(compare)(&keys[tree[2*i].i], &keys[tree[2*i+1].i]);
+	  tree[i] = (cmp <= 0) ? tree[2*i] : tree[2*i+1];
+#ifdef SORT_UNIFY
+	  if (!cmp)
+	    tree[i].eq = 1;
+#endif
+	}
+      /*
+       * It is very tempting to stop as soon as the current node does not
+       * change, but it is wrong, because even if the stream index stored in
+       * the tree is the same, the actual key value can differ.
+       */
+    }
+  /*
+   * This function sometimes triggers optimizer bugs in GCC versions up to 4.2.1,
+   * leading to an assumption that tree[1] does not change during this function.
+   * We add an explicit memory barrier as a work-around. Ugh. See GCC Bug #33262.
+   */
+  asm volatile ("" : : : "memory");
+}
+
+static inline void P(set_tree)(P(key) *keys, P(mwt) *tree, uint i, int val)
+{
+  tree[i].i = val;
+  P(update_tree)(keys, tree, i);
+}
+
+static void P(multiway_merge)(struct sort_context *ctx UNUSED, struct sort_bucket **ins, struct sort_bucket *out)
+{
+  uint num_ins = 0;
+  while (ins[num_ins])
+    num_ins++;
+
+  uint n2 = 1;
+  while (n2 < num_ins)
+    n2 *= 2;
+
+  struct fastbuf *fout = sbuck_write(out);
+  struct fastbuf *fins[num_ins];
+  P(key) keys[num_ins];
+  P(mwt) tree[2*n2];
+  for (uint i=1; i<2*n2; i++)
+    tree[i] = (P(mwt)) { .i = -1 };
+
+  for (uint i=0; i<num_ins; i++)
+    {
+      fins[i] = sbuck_read(ins[i]);
+      if (P(read_key)(fins[i], &keys[i]))
+	P(set_tree)(keys, tree, n2+i, i);
+    }
+
+#ifdef SORT_UNIFY
+
+  uint hits[num_ins];
+  P(key) *mkeys[num_ins], *key;
+  struct fastbuf *mfb[num_ins];
+
+  while (likely(tree[1].i >= 0))
+    {
+      int i = tree[1].i;
+      if (!tree[1].eq)
+	{
+	  /* The key is unique, so let's go through the fast path */
+	  P(copy_data)(&keys[i], fins[i], fout);
+	  if (unlikely(!P(read_key)(fins[i], &keys[i])))
+	    tree[n2+i].i = -1;
+	  P(update_tree)(keys, tree, n2+i);
+	  continue;
+	}
+
+      uint m = 0;
+      key = &keys[i];
+      do
+	{
+	  hits[m] = i;
+	  mkeys[m] = &keys[i];
+	  mfb[m] = fins[i];
+	  m++;
+	  P(set_tree)(keys, tree, n2+i, -1);
+	  i = tree[1].i;
+	  if (unlikely(i < 0))
+	    break;
+	}
+      while (!P(compare)(key, &keys[i]));
+
+      P(copy_merged)(mkeys, mfb, m, fout);
+
+      for (uint j=0; j<m; j++)
+	{
+	  i = hits[j];
+	  if (likely(P(read_key)(fins[i], &keys[i])))
+	    P(set_tree)(keys, tree, n2+i, i);
+	}
+    }
+
+#else
+
+  /* Simplified version which does not support any unification */
+  while (likely(tree[1].i >= 0))
+    {
+      uint i = tree[1].i;
+      P(key) UNUSED key = keys[i];
+      P(copy_data)(&keys[i], fins[i], fout);
+      if (unlikely(!P(read_key)(fins[i], &keys[i])))
+	tree[n2+i].i = -1;
+      P(update_tree)(keys, tree, n2+i);
+#ifdef SORT_ASSERT_UNIQUE
+      ASSERT(tree[1].i < 0 || P(compare)(&key, &keys[tree[1].i]) < 0);
+#endif
+    }
+
+#endif
+
+  out->runs++;
+}
diff --git a/libucw/ucw/sorter/s-radix.h b/libucw/ucw/sorter/s-radix.h
new file mode 100644
index 0000000..cef2580
--- /dev/null
+++ b/libucw/ucw/sorter/s-radix.h
@@ -0,0 +1,30 @@
+/*
+ *	UCW Library -- Universal Sorter: Radix-Split Module
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <string.h>
+
+static void P(radix_split)(struct sort_context *ctx UNUSED, struct sort_bucket *bin, struct sort_bucket **bouts, uint bitpos, uint numbits)
+{
+  uint nbucks = 1 << numbits;
+  uint mask = nbucks - 1;
+  struct fastbuf *in = sbuck_read(bin);
+  P(key) k;
+
+  struct fastbuf *outs[nbucks];
+  bzero(outs, sizeof(outs));
+
+  while (P(read_key)(in, &k))
+    {
+      P(hash_t) h = P(hash)(&k);
+      uint i = (h >> bitpos) & mask;
+      if (unlikely(!outs[i]))
+	outs[i] = sbuck_write(bouts[i]);
+      P(copy_data)(&k, in, outs[i]);
+    }
+}
diff --git a/libucw/ucw/sorter/s-twoway.h b/libucw/ucw/sorter/s-twoway.h
new file mode 100644
index 0000000..ab40278
--- /dev/null
+++ b/libucw/ucw/sorter/s-twoway.h
@@ -0,0 +1,103 @@
+/*
+ *	UCW Library -- Universal Sorter: Two-Way Merge Module
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+static void P(twoway_merge)(struct sort_context *ctx UNUSED, struct sort_bucket **ins, struct sort_bucket **outs)
+{
+  struct fastbuf *fin1, *fin2, *fout1, *fout2, *ftmp;
+  P(key) kbuf1, kbuf2, kbuf3, kbuf4;
+  P(key) *kin1 = &kbuf1, *kprev1 = &kbuf2, *kin2 = &kbuf3, *kprev2 = &kbuf4;
+  P(key) *kout = NULL, *ktmp;
+  int next1, next2, run1, run2;
+  int comp;
+  uint run_count = 0;
+
+  fin1 = sbuck_read(ins[0]);
+  next1 = P(read_key)(fin1, kin1);
+  if (sbuck_have(ins[1]))
+    {
+      fin2 = sbuck_read(ins[1]);
+      next2 = P(read_key)(fin2, kin2);
+    }
+  else
+    {
+      fin2 = NULL;
+      next2 = 0;
+    }
+  fout1 = fout2 = NULL;
+
+  run1 = next1, run2 = next2;
+  while (next1 || next2)
+    {
+      if (!run1)
+	comp = 1;
+      else if (!run2)
+	comp = -1;
+      else
+	comp = P(compare)(kin1, kin2);
+      ktmp = (comp <= 0) ? kin1 : kin2;
+      if (!kout || !(P(compare)(kout, ktmp) LESS 0))
+	{
+	  SWAP(fout1, fout2, ftmp);
+	  if (unlikely(!fout1))
+	    {
+	      if (!fout2)
+		fout1 = sbuck_write(outs[0]);
+	      else if (outs[1])
+		fout1 = sbuck_write(outs[1]);
+	      else
+		fout1 = fout2;
+	    }
+	  run_count++;
+	}
+#ifdef SORT_ASSERT_UNIQUE
+      ASSERT(comp != 0);
+#endif
+      if (comp LESS 0)
+	{
+	  P(copy_data)(kin1, fin1, fout1);
+	  SWAP(kin1, kprev1, ktmp);
+	  next1 = P(read_key)(fin1, kin1);
+	  run1 = next1 && (P(compare)(kprev1, kin1) LESS 0);
+	  kout = kprev1;
+	}
+#ifdef SORT_UNIFY
+      else if (comp == 0)
+	{
+	  P(key) *mkeys[] = { kin1, kin2 };
+	  struct fastbuf *mfb[] = { fin1, fin2 };
+	  P(copy_merged)(mkeys, mfb, 2, fout1);
+	  SWAP(kin1, kprev1, ktmp);
+	  next1 = P(read_key)(fin1, kin1);
+	  run1 = next1 && (P(compare)(kprev1, kin1) LESS 0);
+	  SWAP(kin2, kprev2, ktmp);
+	  next2 = P(read_key)(fin2, kin2);
+	  run2 = next2 && (P(compare)(kprev2, kin2) LESS 0);
+	  kout = kprev2;
+	}
+#endif
+      else
+	{
+	  P(copy_data)(kin2, fin2, fout1);
+	  SWAP(kin2, kprev2, ktmp);
+	  next2 = P(read_key)(fin2, kin2);
+	  run2 = next2 && (P(compare)(kprev2, kin2) LESS 0);
+	  kout = kprev2;
+	}
+      if (!run1 && !run2)
+	{
+	  run1 = next1;
+	  run2 = next2;
+	}
+    }
+
+  if (fout2 && fout2 != fout1)
+    outs[1]->runs += run_count / 2;
+  if (fout1)
+    outs[0]->runs += (run_count+1) / 2;
+}
diff --git a/libucw/ucw/sorter/sbuck.c b/libucw/ucw/sorter/sbuck.c
new file mode 100644
index 0000000..d996ef5
--- /dev/null
+++ b/libucw/ucw/sorter/sbuck.c
@@ -0,0 +1,158 @@
+/*
+ *	UCW Library -- Universal Sorter: Operations on Contexts, Buffers and Buckets
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+#include <ucw/stkstring.h>
+#include <ucw/sorter/common.h>
+
+#include <fcntl.h>
+
+void *
+sorter_alloc(struct sort_context *ctx, uint size)
+{
+  return mp_alloc_zero(ctx->pool, size);
+}
+
+struct sort_bucket *
+sbuck_new(struct sort_context *ctx)
+{
+  struct sort_bucket *b = sorter_alloc(ctx, sizeof(struct sort_bucket));
+  b->ctx = ctx;
+  return b;
+}
+
+void
+sbuck_drop(struct sort_bucket *b)
+{
+  if (b)
+    {
+      ASSERT(!(b->flags & SBF_DESTROYED));
+      if (b->n.prev)
+	clist_remove(&b->n);
+      bclose(b->fb);
+      bzero(b, sizeof(*b));
+      b->flags = SBF_DESTROYED;
+    }
+}
+
+ucw_off_t
+sbuck_size(struct sort_bucket *b)
+{
+  if ((b->flags & SBF_OPEN_WRITE) && !(b->flags & SBF_SWAPPED_OUT))
+    return btell(b->fb);
+  else
+    return b->size;
+}
+
+int
+sbuck_have(struct sort_bucket *b)
+{
+  return b && sbuck_size(b);
+}
+
+int
+sbuck_has_file(struct sort_bucket *b)
+{
+  return (b->fb || (b->flags & SBF_SWAPPED_OUT));
+}
+
+static void
+sbuck_swap_in(struct sort_bucket *b)
+{
+  if (b->flags & SBF_SWAPPED_OUT)
+    {
+      b->fb = bopen_file(b->filename, O_RDWR, b->ctx->fb_params);
+      if (b->flags & SBF_OPEN_WRITE)
+	bseek(b->fb, 0, SEEK_END);
+      if (!(sorter_debug & SORT_DEBUG_KEEP_BUCKETS))
+	bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 1);
+      b->flags &= ~SBF_SWAPPED_OUT;
+      SORT_XTRACE(3, "Swapped in %s", b->filename);
+    }
+}
+
+struct fastbuf *
+sbuck_read(struct sort_bucket *b)
+{
+  sbuck_swap_in(b);
+  if (b->flags & SBF_OPEN_READ)
+    return b->fb;
+  else if (b->flags & SBF_OPEN_WRITE)
+    {
+      b->size = btell(b->fb);
+      b->flags = (b->flags & ~SBF_OPEN_WRITE) | SBF_OPEN_READ;
+      brewind(b->fb);
+      return b->fb;
+    }
+  else
+    ASSERT(0);
+}
+
+struct fastbuf *
+sbuck_write(struct sort_bucket *b)
+{
+  sbuck_swap_in(b);
+  if (b->flags & SBF_OPEN_WRITE)
+    ASSERT(b->fb);
+  else
+    {
+      ASSERT(!(b->flags & (SBF_OPEN_READ | SBF_DESTROYED)));
+      b->fb = bopen_tmp_file(b->ctx->fb_params);
+      if (sorter_debug & SORT_DEBUG_KEEP_BUCKETS)
+	bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 0);
+      b->flags |= SBF_OPEN_WRITE;
+      b->filename = mp_strdup(b->ctx->pool, b->fb->name);
+    }
+  return b->fb;
+}
+
+void
+sbuck_swap_out(struct sort_bucket *b)
+{
+  if ((b->flags & (SBF_OPEN_READ | SBF_OPEN_WRITE)) && b->fb && !(b->flags & SBF_SOURCE))
+    {
+      if (b->flags & SBF_OPEN_WRITE)
+	b->size = btell(b->fb);
+      bconfig(b->fb, BCONFIG_IS_TEMP_FILE, 0);
+      bclose(b->fb);
+      b->fb = NULL;
+      b->flags |= SBF_SWAPPED_OUT;
+      SORT_XTRACE(3, "Swapped out %s", b->filename);
+    }
+}
+
+void
+sorter_prepare_buf(struct sort_context *ctx)
+{
+  u64 bs = sorter_bufsize;
+  bs = ALIGN_TO(bs, (u64)CPU_PAGE_SIZE);
+  bs = MAX(bs, 2*(u64)CPU_PAGE_SIZE);
+  ctx->big_buf_size = bs;
+}
+
+void
+sorter_alloc_buf(struct sort_context *ctx)
+{
+  if (ctx->big_buf)
+    return;
+  ctx->big_buf = big_alloc(ctx->big_buf_size);
+  SORT_XTRACE(3, "Allocated sorting buffer (%s)", stk_fsize(ctx->big_buf_size));
+}
+
+void
+sorter_free_buf(struct sort_context *ctx)
+{
+  if (!ctx->big_buf)
+    return;
+  big_free(ctx->big_buf, ctx->big_buf_size);
+  ctx->big_buf = NULL;
+  SORT_XTRACE(3, "Freed sorting buffer");
+}
diff --git a/libucw/ucw/sorter/sort-test.c b/libucw/ucw/sorter/sort-test.c
new file mode 100644
index 0000000..6aabe6d
--- /dev/null
+++ b/libucw/ucw/sorter/sort-test.c
@@ -0,0 +1,704 @@
+/*
+ *	UCW Library -- Testing the Sorter
+ *
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/conf.h>
+#include <ucw/fastbuf.h>
+#include <ucw/ff-binary.h>
+#include <ucw/hashfunc.h>
+#include <ucw/md5.h>
+#include <ucw/string.h>
+#include <ucw/prime.h>
+#include <ucw/time.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+/*** A hack for overriding radix-sorter configuration ***/
+
+#ifdef FORCE_RADIX_BITS
+#undef CONFIG_UCW_RADIX_SORTER_BITS
+#define CONFIG_UCW_RADIX_SORTER_BITS FORCE_RADIX_BITS
+#endif
+
+/*** Time measurement ***/
+
+static timestamp_t timer;
+static uint test_id;
+
+static void
+start(void)
+{
+  sync();
+  init_timer(&timer);
+}
+
+static void
+stop(void)
+{
+  sync();
+  msg(L_INFO, "Test %d took %.3fs", test_id, get_timer(&timer) / 1000.);
+}
+
+/*** Simple 4-byte integer keys ***/
+
+struct key1 {
+  u32 x;
+};
+
+#define SORT_KEY_REGULAR struct key1
+#define SORT_PREFIX(x) s1_##x
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+#define SORT_UNIQUE
+#define SORT_INT(k) (k).x
+#define SORT_DELETE_INPUT 0
+
+#include <ucw/sorter/sorter.h>
+
+static void
+test_int(int mode, u64 size)
+{
+  uint N = size ? nextprime(MIN(size/4, 0xffff0000)) : 0;
+  uint K = N/4*3;
+  msg(L_INFO, ">>> Integers (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
+
+  struct fastbuf *f = bopen_tmp(65536);
+  for (uint i=0; i<N; i++)
+    bputl(f, (mode==0) ? i : (mode==1) ? N-1-i : ((u64)i * K + 17) % N);
+  brewind(f);
+
+  start();
+  f = s1_sort(f, NULL, N-1);
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  for (uint i=0; i<N; i++)
+    {
+      uint j = bgetl(f);
+      if (i != j)
+	die("Discrepancy: %u instead of %u", j, i);
+    }
+  bclose(f);
+}
+
+/*** Integers with merging, but no data ***/
+
+struct key2 {
+  u32 x;
+  u32 cnt;
+};
+
+static inline void s2_write_merged(struct fastbuf *f, struct key2 **k, void **d UNUSED, uint n, void *buf UNUSED)
+{
+  for (uint i=1; i<n; i++)
+    k[0]->cnt += k[i]->cnt;
+  bwrite(f, k[0], sizeof(struct key2));
+}
+
+#define SORT_KEY_REGULAR struct key2
+#define SORT_PREFIX(x) s2_##x
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+#define SORT_UNIFY
+#define SORT_INT(k) (k).x
+
+#include <ucw/sorter/sorter.h>
+
+static void
+test_counted(int mode, u64 size)
+{
+  u64 items = size / sizeof(struct key2);
+  uint mult = 2;
+  while (items/(2*mult) > 0xffff0000)
+    mult++;
+  uint N = items ? nextprime(items/(2*mult)) : 0;
+  uint K = N/4*3;
+  msg(L_INFO, ">>> Counted integers (%s, N=%u, mult=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N, mult);
+
+  struct fastbuf *f = bopen_tmp(65536);
+  for (uint m=0; m<mult; m++)
+    for (uint i=0; i<N; i++)
+      for (uint j=0; j<2; j++)
+	{
+	  bputl(f, (mode==0) ? (i%N) : (mode==1) ? N-1-(i%N) : ((u64)i * K + 17) % N);
+	  bputl(f, 1);
+	}
+  brewind(f);
+
+  start();
+  f = s2_sort(f, NULL, N-1);
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  for (uint i=0; i<N; i++)
+    {
+      uint j = bgetl(f);
+      if (i != j)
+	die("Discrepancy: %u instead of %u", j, i);
+      uint k = bgetl(f);
+      if (k != 2*mult)
+	die("Discrepancy: %u has count %u instead of %u", j, k, 2*mult);
+    }
+  bclose(f);
+}
+
+/*** Longer records with hashes (similar to Shepherd's index records) ***/
+
+struct key3 {
+  u32 hash[4];
+  u32 i;
+  u32 payload[3];
+};
+
+static inline int s3_compare(struct key3 *x, struct key3 *y)
+{
+  COMPARE(x->hash[0], y->hash[0]);
+  COMPARE(x->hash[1], y->hash[1]);
+  COMPARE(x->hash[2], y->hash[2]);
+  COMPARE(x->hash[3], y->hash[3]);
+  return 0;
+}
+
+static inline uint s3_hash(struct key3 *x)
+{
+  return x->hash[0];
+}
+
+#define SORT_KEY_REGULAR struct key3
+#define SORT_PREFIX(x) s3_##x
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+#define SORT_HASH_BITS 32
+
+#include <ucw/sorter/sorter.h>
+
+static void
+gen_hash_key(int mode, struct key3 *k, uint i)
+{
+  k->i = i;
+  k->payload[0] = 7*i + 13;
+  k->payload[1] = 13*i + 19;
+  k->payload[2] = 19*i + 7;
+  switch (mode)
+    {
+    case 0:
+      k->hash[0] = i;
+      k->hash[1] = k->payload[0];
+      k->hash[2] = k->payload[1];
+      k->hash[3] = k->payload[2];
+      break;
+    case 1:
+      k->hash[0] = ~i;
+      k->hash[1] = k->payload[0];
+      k->hash[2] = k->payload[1];
+      k->hash[3] = k->payload[2];
+      break;
+    default: ;
+      md5_hash_buffer((byte *) &k->hash, (byte *) &k->i, 4);
+      break;
+    }
+}
+
+static void
+test_hashes(int mode, u64 size)
+{
+  uint N = MIN(size / sizeof(struct key3), 0xffffffff);
+  msg(L_INFO, ">>> Hashes (%s, N=%u)", ((char *[]) { "increasing", "decreasing", "random" })[mode], N);
+  struct key3 k, lastk;
+
+  struct fastbuf *f = bopen_tmp(65536);
+  uint hash_sum = 0;
+  for (uint i=0; i<N; i++)
+    {
+      gen_hash_key(mode, &k, i);
+      hash_sum += k.hash[3];
+      bwrite(f, &k, sizeof(k));
+    }
+  brewind(f);
+
+  start();
+  f = s3_sort(f, NULL);
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  for (uint i=0; i<N; i++)
+    {
+      int ok = breadb(f, &k, sizeof(k));
+      ASSERT(ok);
+      if (i && s3_compare(&k, &lastk) <= 0)
+	ASSERT(0);
+      gen_hash_key(mode, &lastk, k.i);
+      if (memcmp(&k, &lastk, sizeof(k)))
+	ASSERT(0);
+      hash_sum -= k.hash[3];
+    }
+  ASSERT(!hash_sum);
+  bclose(f);
+}
+
+/*** Variable-length records (strings) with and without var-length data ***/
+
+#define KEY4_MAX 256
+
+struct key4 {
+  uint len;
+  byte s[KEY4_MAX];
+};
+
+static inline int s4_compare(struct key4 *x, struct key4 *y)
+{
+  uint l = MIN(x->len, y->len);
+  int c = memcmp(x->s, y->s, l);
+  if (c)
+    return c;
+  COMPARE(x->len, y->len);
+  return 0;
+}
+
+static inline int s4_read_key(struct fastbuf *f, struct key4 *x)
+{
+  x->len = bgetl(f);
+  if (x->len == 0xffffffff)
+    return 0;
+  ASSERT(x->len < KEY4_MAX);
+  breadb(f, x->s, x->len);
+  return 1;
+}
+
+static inline void s4_write_key(struct fastbuf *f, struct key4 *x)
+{
+  ASSERT(x->len < KEY4_MAX);
+  bputl(f, x->len);
+  bwrite(f, x->s, x->len);
+}
+
+#define SORT_KEY struct key4
+#define SORT_PREFIX(x) s4_##x
+#define SORT_KEY_SIZE(x) (sizeof(struct key4) - KEY4_MAX + (x).len)
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+
+#include <ucw/sorter/sorter.h>
+
+#define s4b_compare s4_compare
+#define s4b_read_key s4_read_key
+#define s4b_write_key s4_write_key
+
+static inline uint s4_data_size(struct key4 *x)
+{
+  return x->len ? (x->s[0] ^ 0xad) : 0;
+}
+
+#define SORT_KEY struct key4
+#define SORT_PREFIX(x) s4b_##x
+#define SORT_KEY_SIZE(x) (sizeof(struct key4) - KEY4_MAX + (x).len)
+#define SORT_DATA_SIZE(x) s4_data_size(&(x))
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+
+#include <ucw/sorter/sorter.h>
+
+static void
+gen_key4(struct key4 *k)
+{
+  k->len = random_max(KEY4_MAX);
+  for (uint i=0; i<k->len; i++)
+    k->s[i] = random();
+}
+
+static void
+gen_data4(byte *buf, uint len, uint h)
+{
+  while (len--)
+    {
+      *buf++ = h >> 24;
+      h = h*259309 + 17;
+    }
+}
+
+static void
+test_strings(uint mode, u64 size)
+{
+  uint avg_item_size = KEY4_MAX/2 + 4 + (mode ? 128 : 0);
+  uint N = MIN(size / avg_item_size, 0xffffffff);
+  msg(L_INFO, ">>> Strings %s(N=%u)", (mode ? "with data " : ""), N);
+  random_set_seed(1);
+
+  struct key4 k, lastk;
+  byte buf[256], buf2[256];
+  uint sum = 0;
+
+  struct fastbuf *f = bopen_tmp(65536);
+  for (uint i=0; i<N; i++)
+    {
+      gen_key4(&k);
+      s4_write_key(f, &k);
+      uint h = hash_block(k.s, k.len);
+      sum += h;
+      if (mode)
+	{
+	  gen_data4(buf, s4_data_size(&k), h);
+	  bwrite(f, buf, s4_data_size(&k));
+	}
+    }
+  brewind(f);
+
+  start();
+  f = (mode ? s4b_sort : s4_sort)(f, NULL);
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  for (uint i=0; i<N; i++)
+    {
+      int ok = s4_read_key(f, &k);
+      ASSERT(ok);
+      uint h = hash_block(k.s, k.len);
+      if (mode && s4_data_size(&k))
+	{
+	  ok = breadb(f, buf, s4_data_size(&k));
+	  ASSERT(ok);
+	  gen_data4(buf2, s4_data_size(&k), h);
+	  ASSERT(!memcmp(buf, buf2, s4_data_size(&k)));
+	}
+      if (i && s4_compare(&k, &lastk) < 0)
+	ASSERT(0);
+      sum -= h;
+      lastk = k;
+    }
+  ASSERT(!sum);
+  bclose(f);
+}
+
+/*** Graph-like structure with custom presorting ***/
+
+struct key5 {
+  u32 x;
+  u32 cnt;
+};
+
+static uint s5_N, s5_K, s5_L, s5_i, s5_j;
+
+struct s5_pair {
+  uint x, y;
+};
+
+static int s5_gen(struct s5_pair *p)
+{
+  if (s5_j >= s5_N)
+    {
+      if (!s5_N || s5_i >= s5_N-1)
+	return 0;
+      s5_j = 0;
+      s5_i++;
+    }
+  p->x = ((u64)s5_j * s5_K) % s5_N;
+  p->y = ((u64)(s5_i + s5_j) * s5_L) % s5_N;
+  s5_j++;
+  return 1;
+}
+
+#define ASORT_PREFIX(x) s5m_##x
+#define ASORT_KEY_TYPE u32
+#include <ucw/sorter/array-simple.h>
+
+static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, uint n, void *buf)
+{
+  u32 *a = buf;
+  uint m = 0;
+  for (uint i=0; i<n; i++)
+    {
+      memcpy(&a[m], data[i], 4*keys[i]->cnt);
+      m += keys[i]->cnt;
+    }
+  s5m_sort(a, m);
+  keys[0]->cnt = m;
+  bwrite(f, keys[0], sizeof(struct key5));
+  bwrite(f, a, 4*m);
+}
+
+static void s5_copy_merged(struct key5 **keys, struct fastbuf **data, uint n, struct fastbuf *dest)
+{
+  u32 k[n];
+  uint m = 0;
+  for (uint i=0; i<n; i++)
+    {
+      k[i] = bgetl(data[i]);
+      m += keys[i]->cnt;
+    }
+  struct key5 key = { .x = keys[0]->x, .cnt = m };
+  bwrite(dest, &key, sizeof(key));
+  while (key.cnt--)
+    {
+      uint b = 0;
+      for (uint i=1; i<n; i++)
+	if (k[i] < k[b])
+	  b = i;
+      bputl(dest, k[b]);
+      if (--keys[b]->cnt)
+	k[b] = bgetl(data[b]);
+      else
+	k[b] = ~0U;
+    }
+}
+
+static inline int s5p_lt(struct s5_pair x, struct s5_pair y)
+{
+  COMPARE_LT(x.x, y.x);
+  COMPARE_LT(x.y, y.y);
+  return 0;
+}
+
+#define ASORT_PREFIX(x) s5p_##x
+#define ASORT_KEY_TYPE struct s5_pair
+#define ASORT_LT(x,y) s5p_lt(x,y)
+#include <ucw/sorter/array.h>
+
+static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize)
+{
+  uint max = MIN(bufsize/sizeof(struct s5_pair), 0xffffffff);
+  struct s5_pair *a = buf;
+  uint n = 0;
+  while (n<max && s5_gen(&a[n]))
+    n++;
+  if (!n)
+    return 0;
+  s5p_sort(a, n);
+  uint i = 0;
+  while (i < n)
+    {
+      uint j = i;
+      while (i < n && a[i].x == a[j].x)
+	i++;
+      struct key5 k = { .x = a[j].x, .cnt = i-j };
+      bwrite(dest, &k, sizeof(k));
+      while (j < i)
+	bputl(dest, a[j++].y);
+    }
+  return 1;
+}
+
+#define SORT_KEY_REGULAR struct key5
+#define SORT_PREFIX(x) s5_##x
+#define SORT_DATA_SIZE(k) (4*(k).cnt)
+#define SORT_UNIFY
+#define SORT_UNIFY_WORKSPACE(k) SORT_DATA_SIZE(k)
+#define SORT_INPUT_PRESORT
+#define SORT_OUTPUT_THIS_FB
+#define SORT_INT(k) (k).x
+
+#include <ucw/sorter/sorter.h>
+
+#define SORT_KEY_REGULAR struct key5
+#define SORT_PREFIX(x) s5b_##x
+#define SORT_DATA_SIZE(k) (4*(k).cnt)
+#define SORT_UNIFY
+#define SORT_UNIFY_WORKSPACE(k) SORT_DATA_SIZE(k)
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_THIS_FB
+#define SORT_INT(k) (k).x
+#define s5b_write_merged s5_write_merged
+#define s5b_copy_merged s5_copy_merged
+
+#include <ucw/sorter/sorter.h>
+
+static void
+test_graph(uint mode, u64 size)
+{
+  uint N = 3;
+  while ((u64)N*(N+2)*4 < size)
+    N = nextprime(N);
+  if (!size)
+    N = 0;
+  msg(L_INFO, ">>> Graph%s (N=%u)", (mode ? "" : " with custom presorting"), N);
+  s5_N = N;
+  s5_K = N/4*3;
+  s5_L = N/3*2;
+  s5_i = s5_j = 0;
+
+  struct fastbuf *in = NULL;
+  if (mode)
+    {
+      struct s5_pair p;
+      in = bopen_tmp(65536);
+      while (s5_gen(&p))
+	{
+	  struct key5 k = { .x = p.x, .cnt = 1 };
+	  bwrite(in, &k, sizeof(k));
+	  bputl(in, p.y);
+	}
+      brewind(in);
+    }
+
+  start();
+  struct fastbuf *f = bopen_tmp(65536);
+  bputl(f, 0xfeedcafe);
+  struct fastbuf *g = (mode ? s5b_sort(in, f, s5_N-1) : s5_sort(NULL, f, s5_N-1));
+  ASSERT(f == g);
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  uint c = bgetl(f);
+  ASSERT(c == 0xfeedcafe);
+  for (uint i=0; i<N; i++)
+    {
+      struct key5 k;
+      int ok = breadb(f, &k, sizeof(k));
+      ASSERT(ok);
+      ASSERT(k.x == i);
+      ASSERT(k.cnt == N);
+      for (uint j=0; j<N; j++)
+	{
+	  uint y = bgetl(f);
+	  ASSERT(y == j);
+	}
+    }
+  bclose(f);
+}
+
+/*** Simple 8-byte integer keys ***/
+
+struct key6 {
+  u64 x;
+};
+
+#define SORT_KEY_REGULAR struct key6
+#define SORT_PREFIX(x) s6_##x
+#define SORT_INPUT_FB
+#define SORT_OUTPUT_FB
+#define SORT_UNIQUE
+#define SORT_INT64(k) (k).x
+
+#include <ucw/sorter/sorter.h>
+
+static void
+test_int64(int mode, u64 size)
+{
+  u64 N = size ? nextprime(MIN(size/8, 0xffff0000)) : 0;
+  u64 K = N/4*3;
+  msg(L_INFO, ">>> 64-bit integers (%s, N=%llu)", ((char *[]) { "increasing", "decreasing", "random" })[mode], (long long)N);
+
+  struct fastbuf *f = bopen_tmp(65536);
+  for (u64 i=0; i<N; i++)
+    bputq(f, 777777*((mode==0) ? i : (mode==1) ? N-1-i : ((u64)i * K + 17) % N));
+  brewind(f);
+
+  start();
+  f = s6_sort(f, NULL, 777777*(N-1));
+  stop();
+
+  SORT_XTRACE(2, "Verifying");
+  for (u64 i=0; i<N; i++)
+    {
+      u64 j = bgetq(f);
+      if (777777*i != j)
+	die("Discrepancy: %llu instead of %llu", (long long)j, 777777*(long long)i);
+    }
+  bclose(f);
+}
+
+/*** Main ***/
+
+static void
+run_test(uint i, u64 size)
+{
+  test_id = i;
+  switch (i)
+    {
+    case 0:
+      test_int(0, size); break;
+    case 1:
+      test_int(1, size); break;
+    case 2:
+      test_int(2, size); break;
+    case 3:
+      test_counted(0, size); break;
+    case 4:
+      test_counted(1, size); break;
+    case 5:
+      test_counted(2, size); break;
+    case 6:
+      test_hashes(0, size); break;
+    case 7:
+      test_hashes(1, size); break;
+    case 8:
+      test_hashes(2, size); break;
+    case 9:
+      test_strings(0, size); break;
+    case 10:
+      test_strings(1, size); break;
+    case 11:
+      test_graph(0, size); break;
+    case 12:
+      test_graph(1, size); break;
+    case 13:
+      test_int64(0, size); break;
+    case 14:
+      test_int64(1, size); break;
+    case 15:
+      test_int64(2, size); break;
+#define TMAX 16
+    }
+}
+
+int
+main(int argc, char **argv)
+{
+  log_init(NULL);
+  int c;
+  u64 size = 10000000;
+  uint t = ~0;
+
+  while ((c = cf_getopt(argc, argv, CF_SHORT_OPTS "d:s:t:v", CF_NO_LONG_OPTS, NULL)) >= 0)
+    switch (c)
+      {
+      case 'd':
+	sorter_debug = atol(optarg);
+	break;
+      case 's':
+	if (cf_parse_u64(optarg, &size))
+	  goto usage;
+	break;
+      case 't':
+	  {
+	    char *w[32];
+	    int f = str_sepsplit(optarg, ',', w, ARRAY_SIZE(w));
+	    if (f < 0)
+	      goto usage;
+	    t = 0;
+	    for (int i=0; i<f; i++)
+	      {
+		int j = atol(w[i]);
+		if (j >= TMAX)
+		  goto usage;
+		t |= 1 << j;
+	      }
+	  }
+	break;
+      case 'v':
+	sorter_trace++;
+	break;
+      default:
+      usage:
+	fputs("Usage: sort-test [-v] [-d <debug>] [-s <size>] [-t <test>]\n", stderr);
+	exit(1);
+      }
+  if (optind != argc)
+    goto usage;
+
+  for (uint i=0; i<TMAX; i++)
+    if (t & (1 << i))
+      run_test(i, size);
+
+  return 0;
+}
diff --git a/libucw/ucw/sorter/sort-test.t b/libucw/ucw/sorter/sort-test.t
new file mode 100644
index 0000000..3c130f5
--- /dev/null
+++ b/libucw/ucw/sorter/sort-test.t
@@ -0,0 +1,31 @@
+# Tests for sorter
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t1 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t2 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t3 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t4 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t5 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t6 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t7 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t8 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t9 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t10 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t11 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t12 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t13 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t14 2>&1
+
+Run:	../obj/ucw/sorter/sort-test -s1000000 -t15 2>&1
diff --git a/libucw/ucw/sorter/sorter.h b/libucw/ucw/sorter/sorter.h
new file mode 100644
index 0000000..939aeb6
--- /dev/null
+++ b/libucw/ucw/sorter/sorter.h
@@ -0,0 +1,321 @@
+/*
+ *	UCW Library -- Universal Sorter
+ *
+ *	(c) 2001--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *  This is not a normal header file, but a generator of sorting
+ *  routines.  Each time you include it with parameters set in the
+ *  corresponding preprocessor macros, it generates a file sorter
+ *  with the parameters given.
+ *
+ *  The sorter operates on fastbufs containing sequences of items. Each item
+ *  consists of a key, optionally followed by data. The keys are represented
+ *  by fixed-size structures of type SORT_KEY internally, if this format differs
+ *  from the on-disk format, explicit reading and writing routines can be provided.
+ *  The data are always copied verbatim, unless the sorter is in the merging
+ *  mode in which it calls callbacks for merging of items with equal keys.
+ *
+ *  All callbacks must be thread-safe.
+ *
+ *  Basic parameters and callbacks:
+ *
+ *  SORT_PREFIX(x)      add a name prefix (used on all global names defined by the sorter)
+ *
+ *  SORT_KEY		data type capable of holding a single key in memory (the on-disk
+ *			representation can be different). Alternatively, you can use:
+ *  SORT_KEY_REGULAR	data type holding a single key both in memory and on disk;
+ *			in this case, bread() and bwrite() is used to read/write keys
+ *			and it's also assumed that the keys are not very long.
+ *  int PREFIX_compare(SORT_KEY *a, SORT_KEY *b)
+ *			compares two keys, returns result like strcmp(). Mandatory.
+ *  int PREFIX_read_key(struct fastbuf *f, SORT_KEY *k)
+ *			reads a key from a fastbuf, returns nonzero=ok, 0=EOF.
+ *			Mandatory unless SORT_KEY_REGULAR is defined.
+ *  void PREFIX_write_key(struct fastbuf *f, SORT_KEY *k)
+ *			writes a key to a fastbuf. Mandatory unless SORT_KEY_REGULAR.
+ *
+ *  SORT_KEY_SIZE(key)	returns the real size of a key (a SORT_KEY type in memory
+ *			can be truncated to this number of bytes without any harm;
+ *			used to save memory when the keys have variable sizes).
+ *			Default: always store the whole SORT_KEY.
+ *  SORT_DATA_SIZE(key)	gets a key and returns the amount of data following it.
+ *			Default: records consist of keys only.
+ *
+ *  Integer sorting:
+ *
+ *  SORT_INT(key)	we are sorting by an integer value returned by this macro.
+ *			In this mode, PREFIX_compare is supplied automatically and the sorting
+ *			function gets an extra parameter specifying the range of the integers.
+ *			The better the range fits, the faster we sort.
+ *			Sets up SORT_HASH_xxx automatically.
+ *  SORT_INT64(key)	the same for 64-bit integers.
+ *
+ *  Hashing (optional, but it can speed sorting up):
+ *
+ *  SORT_HASH_BITS	signals that a monotone hashing function returning a given number of
+ *			bits is available. A monotone hash is a function f from keys to integers
+ *			such that f(x) < f(y) implies x < y, which is approximately uniformly
+ *			distributed. It should be declared as:
+ *  uint PREFIX_hash(SORT_KEY *a)
+ *
+ *  Unification:
+ *
+ *  SORT_UNIFY		merge items with identical keys. It requires the following functions:
+ *  void PREFIX_write_merged(struct fastbuf *f, SORT_KEY **keys, void **data, uint n, void *buf)
+ *			takes n records in memory with keys which compare equal and writes
+ *			a single record to the given fastbuf. `buf' points to a buffer which
+ *			is guaranteed to hold the sum of workspace requirements (see below)
+ *			over all given records. The function is allowed to modify all its inputs.
+ *  void PREFIX_copy_merged(SORT_KEY **keys, struct fastbuf **data, uint n, struct fastbuf *dest)
+ *			takes n records with keys in memory and data in fastbufs and writes
+ *			a single record. Used only if SORT_DATA_SIZE or SORT_UNIFY_WORKSPACE
+ *			is defined.
+ *  SORT_UNIFY_WORKSPACE(key)
+ *			gets a key and returns the amount of workspace required when merging
+ *			the given record. Defaults to 0.
+ *
+ *  Input (choose one of these):
+ *
+ *  SORT_INPUT_FILE	file of a given name
+ *  SORT_INPUT_FB	seekable fastbuf stream
+ *  SORT_INPUT_PIPE	non-seekable fastbuf stream
+ *  SORT_INPUT_PRESORT	custom presorter. Calls function
+ *  int PREFIX_presort(struct fastbuf *dest, void *buf, size_t bufsize)
+ *			to get successive batches of pre-sorted data.
+ *			The function is passed a page-aligned presorting buffer.
+ *			It returns 1 on success or 0 on EOF.
+ *  SORT_DELETE_INPUT	A C expression, if true, then the input files are deleted
+ *			as soon as possible.
+ *
+ *  Output (chose one of these):
+ *
+ *  SORT_OUTPUT_FILE	file of a given name
+ *  SORT_OUTPUT_FB	temporary fastbuf stream
+ *  SORT_OUTPUT_THIS_FB	a given fastbuf stream which can already contain some data
+ *
+ *  Other switches:
+ *
+ *  SORT_UNIQUE		all items have distinct keys (checked in debug mode)
+ *
+ *  The function generated:
+ *
+ *  <outfb> PREFIX_sort(<in>, <out> [,<range>]), where:
+ *			<in> = input file name/fastbuf or NULL
+ *			<out> = output file name/fastbuf or NULL
+ *			<range> = maximum integer value for the SORT_INT mode
+ *
+ *  After including this file, all parameter macros are automatically
+ *  undef'd.
+ */
+
+#include <ucw/sorter/common.h>
+#include <ucw/fastbuf.h>
+#include <ucw/time.h>
+
+#include <fcntl.h>
+
+#define P(x) SORT_PREFIX(x)
+
+#ifdef SORT_KEY_REGULAR
+typedef SORT_KEY_REGULAR P(key);
+static inline int P(read_key) (struct fastbuf *f, P(key) *k)
+{
+  return breadb(f, k, sizeof(P(key)));
+}
+static inline void P(write_key) (struct fastbuf *f, P(key) *k)
+{
+  bwrite(f, k, sizeof(P(key)));
+}
+#elif defined(SORT_KEY)
+typedef SORT_KEY P(key);
+#else
+#error Missing definition of sorting key.
+#endif
+
+#ifdef SORT_INT64
+typedef u64 P(hash_t);
+#define SORT_INT SORT_INT64
+#define SORT_LONG_HASH
+#else
+typedef uint P(hash_t);
+#endif
+
+#ifdef SORT_INT
+static inline int P(compare) (P(key) *x, P(key) *y)
+{
+  if (SORT_INT(*x) < SORT_INT(*y))
+    return -1;
+  if (SORT_INT(*x) > SORT_INT(*y))
+    return 1;
+  return 0;
+}
+
+#ifndef SORT_HASH_BITS
+static inline P(hash_t) P(hash) (P(key) *x)
+{
+  return SORT_INT((*x));
+}
+#endif
+#endif
+
+#ifdef SORT_UNIFY
+#define LESS <
+#else
+#define LESS <=
+#endif
+#define SWAP(x,y,z) do { z=x; x=y; y=z; } while(0)
+
+#if defined(SORT_UNIQUE) && defined(DEBUG_ASSERTS)
+#define SORT_ASSERT_UNIQUE
+#endif
+
+#ifdef SORT_KEY_SIZE
+#define SORT_VAR_KEY
+#else
+#define SORT_KEY_SIZE(key) sizeof(key)
+#endif
+
+#ifdef SORT_DATA_SIZE
+#define SORT_VAR_DATA
+#else
+#define SORT_DATA_SIZE(key) 0
+#endif
+
+static inline void P(copy_data)(P(key) *key, struct fastbuf *in, struct fastbuf *out)
+{
+  P(write_key)(out, key);
+#ifdef SORT_VAR_DATA
+  bbcopy(in, out, SORT_DATA_SIZE(*key));
+#else
+  (void) in;
+#endif
+}
+
+#if defined(SORT_UNIFY) && !defined(SORT_VAR_DATA) && !defined(SORT_UNIFY_WORKSPACE)
+static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, uint n, struct fastbuf *dest)
+{
+  P(write_merged)(dest, keys, NULL, n, NULL);
+}
+#endif
+
+#if defined(SORT_HASH_BITS) || defined(SORT_INT)
+#define SORT_INTERNAL_RADIX
+#include <ucw/sorter/s-radix.h>
+#endif
+
+#if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE)
+#include <ucw/sorter/s-internal.h>
+#else
+#include <ucw/sorter/s-fixint.h>
+#endif
+
+#include <ucw/sorter/s-twoway.h>
+#include <ucw/sorter/s-multiway.h>
+
+static struct fastbuf *P(sort)(
+#ifdef SORT_INPUT_FILE
+			       byte *in,
+#else
+			       struct fastbuf *in,
+#endif
+#ifdef SORT_OUTPUT_FILE
+			       byte *out
+#else
+			       struct fastbuf *out
+#endif
+#ifdef SORT_INT
+			       , u64 int_range
+#endif
+			       )
+{
+  struct sort_context ctx;
+  bzero(&ctx, sizeof(ctx));
+
+#ifdef SORT_INPUT_FILE
+  ctx.in_fb = bopen_file(in, O_RDONLY, &sorter_fb_params);
+  ctx.in_size = bfilesize(ctx.in_fb);
+#elif defined(SORT_INPUT_FB)
+  ctx.in_fb = in;
+  ctx.in_size = bfilesize(in);
+#elif defined(SORT_INPUT_PIPE)
+  ctx.in_fb = in;
+  ctx.in_size = ~(u64)0;
+#elif defined(SORT_INPUT_PRESORT)
+  ASSERT(!in);
+  ctx.custom_presort = P(presort);
+  ctx.in_size = ~(u64)0;
+#else
+#error No input given.
+#endif
+#ifdef SORT_DELETE_INPUT
+  if (SORT_DELETE_INPUT)
+    bconfig(ctx.in_fb, BCONFIG_IS_TEMP_FILE, 1);
+#endif
+
+#ifdef SORT_OUTPUT_FB
+  ASSERT(!out);
+#elif defined(SORT_OUTPUT_THIS_FB)
+  ctx.out_fb = out;
+#elif defined(SORT_OUTPUT_FILE)
+  /* Just assume fastbuf output and rename the fastbuf later */
+#else
+#error No output given.
+#endif
+
+#ifdef SORT_HASH_BITS
+  ctx.hash_bits = SORT_HASH_BITS;
+  ctx.radix_split = P(radix_split);
+#elif defined(SORT_INT)
+  ctx.hash_bits = 0;
+  while (ctx.hash_bits < 64 && (int_range >> ctx.hash_bits))
+    ctx.hash_bits++;
+  ctx.radix_split = P(radix_split);
+#endif
+
+  ctx.internal_sort = P(internal);
+  ctx.internal_estimate = P(internal_estimate);
+  ctx.twoway_merge = P(twoway_merge);
+  ctx.multiway_merge = P(multiway_merge);
+
+  sorter_run(&ctx);
+
+#ifdef SORT_OUTPUT_FILE
+  bfix_tmp_file(ctx.out_fb, out);
+  ctx.out_fb = NULL;
+#endif
+  return ctx.out_fb;
+}
+
+#undef SORT_ASSERT_UNIQUE
+#undef SORT_DATA_SIZE
+#undef SORT_DELETE_INPUT
+#undef SORT_HASH_BITS
+#undef SORT_INPUT_FB
+#undef SORT_INPUT_FILE
+#undef SORT_INPUT_PIPE
+#undef SORT_INPUT_PRESORT
+#undef SORT_INT
+#undef SORT_INT64
+#undef SORT_INTERNAL_RADIX
+#undef SORT_KEY
+#undef SORT_KEY_REGULAR
+#undef SORT_KEY_SIZE
+#undef SORT_LONG_HASH
+#undef SORT_OUTPUT_FB
+#undef SORT_OUTPUT_FILE
+#undef SORT_OUTPUT_THIS_FB
+#undef SORT_PREFIX
+#undef SORT_UNIFY
+#undef SORT_UNIFY_WORKSPACE
+#undef SORT_UNIQUE
+#undef SORT_VAR_DATA
+#undef SORT_VAR_KEY
+#undef SWAP
+#undef LESS
+#undef P
diff --git a/libucw/ucw/stkstring.c b/libucw/ucw/stkstring.c
new file mode 100644
index 0000000..10a52a0
--- /dev/null
+++ b/libucw/ucw/stkstring.c
@@ -0,0 +1,136 @@
+/*
+ *	UCW Library -- Strings Allocated on the Stack
+ *
+ *	(c) 2005--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2005 Tomas Valla <tom@ucw.cz>
+ *	(c) 2008--2020 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/stkstring.h>
+#include <ucw/string.h>
+
+#include <stdio.h>
+
+uint
+stk_array_len(char **s, uint cnt)
+{
+  uint l = 1;
+  while (cnt--)
+    l += strlen(*s++);
+  return l;
+}
+
+void
+stk_array_join(char *x, char **s, uint cnt, uint sep)
+{
+  while (cnt--)
+    {
+      uint l = strlen(*s);
+      memcpy(x, *s, l);
+      x += l;
+      s++;
+      if (sep && cnt)
+	*x++ = sep;
+    }
+  *x = 0;
+}
+
+uint
+stk_printf_internal(const char *fmt, ...)
+{
+  uint len = 256;
+  char *buf = alloca(len);
+  va_list args, args2;
+  va_start(args, fmt);
+  for (;;)
+    {
+      va_copy(args2, args);
+      int l = vsnprintf(buf, len, fmt, args2);
+      va_end(args2);
+      if (l < 0)
+	len *= 2;
+      else
+	{
+	  va_end(args);
+	  return l+1;
+	}
+      buf = alloca(len);
+    }
+}
+
+uint
+stk_vprintf_internal(const char *fmt, va_list args)
+{
+  uint len = 256;
+  char *buf = alloca(len);
+  va_list args2;
+  for (;;)
+    {
+      va_copy(args2, args);
+      int l = vsnprintf(buf, len, fmt, args2);
+      va_end(args2);
+      if (l < 0)
+	len *= 2;
+      else
+	{
+	  va_end(args);
+	  return l+1;
+	}
+      buf = alloca(len);
+    }
+}
+
+void
+stk_hexdump_internal(char *dst, const byte *src, uint n)
+{
+  mem_to_hex(dst, src, n, ' ');
+}
+
+void
+stk_fsize_internal(char *buf, u64 x)
+{
+  if (x < 1<<10)
+    sprintf(buf, "%dB", (int)x);
+  else if (x < 10<<10)
+    sprintf(buf, "%.1fK", (double)x/(1<<10));
+  else if (x < 1<<20)
+    sprintf(buf, "%dK", (int)(x/(1<<10)));
+  else if (x < 10<<20)
+    sprintf(buf, "%.1fM", (double)x/(1<<20));
+  else if (x < 1<<30)
+    sprintf(buf, "%dM", (int)(x/(1<<20)));
+  else if (x < (u64)10<<30)
+    sprintf(buf, "%.1fG", (double)x/(1<<30));
+  else if (x < (u64)1<<40)
+    sprintf(buf, "%dG", (int)(x/(1<<30)));
+  else if (x < (u64)10<<40)
+    sprintf(buf, "%.1fT", (double)x/((u64)1<<40));
+  else if (x != ~(u64)0)
+    sprintf(buf, "%dT", (int)(x/((u64)1<<40)));
+  else
+    strcpy(buf, "unknown");
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  char *a = stk_strndup("are!",3);
+  a = stk_strcat(a, " the ");
+  a = stk_strmulticat(a, stk_strdup("Jabberwock, "), "my", NULL);
+  char *arr[] = { a, " son" };
+  a = stk_strarraycat(arr, 2);
+  a = stk_printf("Bew%s!", a);
+  puts(a);
+  puts(stk_hexdump(a, 3));
+  char *ary[] = { "The", "jaws", "that", "bite" };
+  puts(stk_strjoin(ary, 4, ' '));
+  puts(stk_fsize(1234567));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/stkstring.h b/libucw/ucw/stkstring.h
new file mode 100644
index 0000000..e5d06f8
--- /dev/null
+++ b/libucw/ucw/stkstring.h
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- Strings Allocated on the Stack
+ *
+ *	(c) 2005--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2005 Tomas Valla <tom@ucw.cz>
+ *	(c) 2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_STKSTRING_H
+#define _UCW_STKSTRING_H
+
+#include <alloca.h>
+#include <string.h>
+#include <stdio.h>
+#include <ucw/string.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define stk_array_join ucw_stk_array_join
+#define stk_array_len ucw_stk_array_len
+#define stk_fsize_internal ucw_stk_fsize_internal
+#define stk_hexdump_internal ucw_stk_hexdump_internal
+#define stk_printf_internal ucw_stk_printf_internal
+#define stk_vprintf_internal ucw_stk_vprintf_internal
+#endif
+
+#define stk_strdup(s) ({ const char *_s=(s); uint _l=strlen(_s)+1; char *_x=alloca(_l); memcpy(_x, _s, _l); _x; })
+#define stk_strndup(s,n) ({ const char *_s=(s); uint _l=strnlen(_s,(n)); char *_x=alloca(_l+1); memcpy(_x, _s, _l); _x[_l]=0; _x; })
+#define stk_strcat(s1,s2) ({ const char *_s1=(s1); const char *_s2=(s2); uint _l1=strlen(_s1); uint _l2=strlen(_s2); char *_x=alloca(_l1+_l2+1); memcpy(_x,_s1,_l1); memcpy(_x+_l1,_s2,_l2+1); _x; })
+#define stk_strmulticat(s...) ({ char *_s[]={s}; char *_x=alloca(stk_array_len(_s, ARRAY_SIZE(_s)-1)); stk_array_join(_x, _s, ARRAY_SIZE(_s)-1, 0); _x; })
+#define stk_strarraycat(s,n) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)); stk_array_join(_x, _s, _n, 0); _x; })
+#define stk_strjoin(s,n,sep) ({ char **_s=(s); int _n=(n); char *_x=alloca(stk_array_len(_s,_n)+_n-1); stk_array_join(_x, _s, _n, (sep)); _x; })
+#define stk_printf(f...) ({ uint _l=stk_printf_internal(f); char *_x=alloca(_l); sprintf(_x, f); _x; })
+#define stk_vprintf(f, args) ({ uint _l=stk_vprintf_internal(f, args); char *_x=alloca(_l); vsprintf(_x, f, args); _x; })
+#define stk_hexdump(s,n) ({ uint _n=(n); char *_x=alloca(3*_n+1); stk_hexdump_internal(_x,(char*)(s),_n); _x; })
+#define stk_str_unesc(s) ({ const char *_s=(s); char *_d=alloca(strlen(_s)+1); str_unesc(_d, _s); _d; })
+#define stk_fsize(n) ({ char *_s=alloca(16); stk_fsize_internal(_s, n); _s; })
+
+uint stk_array_len(char **s, uint cnt);
+void stk_array_join(char *x, char **s, uint cnt, uint sep);
+uint stk_printf_internal(const char *x, ...) FORMAT_CHECK(printf,1,2);
+uint stk_vprintf_internal(const char *x, va_list args);
+void stk_hexdump_internal(char *dst, const byte *src, uint n);
+void stk_fsize_internal(char *dst, u64 size);
+
+#endif
diff --git a/libucw/ucw/stkstring.t b/libucw/ucw/stkstring.t
new file mode 100644
index 0000000..125766c
--- /dev/null
+++ b/libucw/ucw/stkstring.t
@@ -0,0 +1,7 @@
+# Tests for stkstring modules
+
+Run:	../obj/ucw/stkstring-t
+Out:	Beware the Jabberwock, my son!
+	42 65 77
+	The jaws that bite
+	1.2M
diff --git a/libucw/ucw/str-esc.c b/libucw/ucw/str-esc.c
new file mode 100644
index 0000000..248b7ab
--- /dev/null
+++ b/libucw/ucw/str-esc.c
@@ -0,0 +1,97 @@
+/*
+ *	UCW Library -- String Unescaping
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+#include <ucw/chartype.h>
+#include <stdlib.h>
+
+char *
+str_unesc(char *d, const char *s)
+{
+  while (*s)
+    {
+      if (*s == '\\')
+	switch (s[1])
+	  {
+	    case 'a': *d++ = '\a'; s += 2; break;
+	    case 'b': *d++ = '\b'; s += 2; break;
+	    case 'f': *d++ = '\f'; s += 2; break;
+	    case 'n': *d++ = '\n'; s += 2; break;
+	    case 'r': *d++ = '\r'; s += 2; break;
+	    case 't': *d++ = '\t'; s += 2; break;
+	    case 'v': *d++ = '\v'; s += 2; break;
+	    case '\?': *d++ = '\?'; s += 2; break;
+	    case '\'': *d++ = '\''; s += 2; break;
+	    case '\"': *d++ = '\"'; s += 2; break;
+	    case '\\': *d++ = '\\'; s += 2; break;
+	    case 'x':
+	      if (!Cxdigit(s[2]))
+	        {
+		  s++;
+		  DBG("\\x used with no following hex digits");
+		}
+	      else
+	        {
+		  char *p;
+		  uint v = strtoul(s + 2, &p, 16);
+		  if (v <= 255)
+		    *d++ = v;
+		  else
+		    DBG("hex escape sequence out of range");
+                  s = (char *)p;
+		}
+	      break;
+            default:
+	      if (s[1] >= '0' && s[1] <= '7')
+	        {
+		  uint v = s[1] - '0';
+		  s += 2;
+		  for (uint i = 0; i < 2 && *s >= '0' && *s <= '7'; s++, i++)
+		    v = (v << 3) + *s - '0';
+		  if (v <= 255)
+		    *d++ = v;
+		  else
+		    DBG("octal escape sequence out of range");
+	        }
+	      else
+		*d++ = *s++;
+	      break;
+	  }
+      else
+	*d++ = *s++;
+    }
+  *d = 0;
+  return d;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+  if (argc < 2)
+    return 1;
+
+  char tmp[strlen(argv[1]) + 1];
+  int len = str_unesc(tmp, argv[1]) - tmp;
+
+  char hex[2*len + 1];
+  mem_to_hex(hex, tmp, len, ' ');
+  puts(hex);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/str-fix.c b/libucw/ucw/str-fix.c
new file mode 100644
index 0000000..2610fcf
--- /dev/null
+++ b/libucw/ucw/str-fix.c
@@ -0,0 +1,111 @@
+/*
+ *	UCW Library -- Matching Prefixes and Suffixes
+ *
+ *	(c) 2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+
+#include <string.h>
+
+int
+str_has_prefix(const char *str, const char *prefix)
+{
+  size_t pxlen = strlen(prefix);
+  return !strncmp(str, prefix, pxlen);
+}
+
+int
+str_has_suffix(const char *str, const char *suffix)
+{
+  size_t sxlen = strlen(suffix);
+  size_t len = strlen(str);
+
+  if (len < sxlen)
+    return 0;
+  else
+    return !strcmp(str + len - sxlen, suffix);
+}
+
+int
+str_hier_prefix(const char *str, const char *prefix, uint sep)
+{
+  while (*str && *prefix)
+    {
+      size_t sl=0, pl=0;
+      while (str[sl] && (uint) str[sl] != sep)
+	sl++;
+      while (prefix[pl] && (uint) prefix[pl] != sep)
+	pl++;
+      if (sl != pl || memcmp(str, prefix, sl))
+	return 0;
+      str += sl, prefix += pl;
+      if (!*str)
+	return !*prefix;
+      if (!*prefix)
+	return 1;
+      str++, prefix++;
+    }
+  return !*prefix;
+}
+
+int
+str_hier_suffix(const char *str, const char *suffix, uint sep)
+{
+  const char *st = str + strlen(str);
+  const char *sx = suffix + strlen(suffix);
+  while (st > str && sx > suffix)
+    {
+      size_t sl=0, pl=0;
+      while (st-sl > str && (uint) st[-sl-1] != sep)
+	sl++;
+      while (sx-pl > suffix && (uint) sx[-pl-1] != sep)
+	pl++;
+      if (sl != pl || memcmp(st-sl, sx-pl, sl))
+	return 0;
+      st -= sl, sx -= pl;
+      if (st == str)
+	return (sx == suffix);
+      if (sx == suffix)
+	return 1;
+      st--, sx--;
+    }
+  return (sx == suffix);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  if (argc != 4)
+    return 1;
+
+  int ret;
+  switch (argv[1][0])
+    {
+    case 'p':
+      ret = str_has_prefix(argv[2], argv[3]);
+      break;
+    case 's':
+      ret = str_has_suffix(argv[2], argv[3]);
+      break;
+    case 'P':
+      ret = str_hier_prefix(argv[2], argv[3], '.');
+      break;
+    case 'S':
+      ret = str_hier_suffix(argv[2], argv[3], '.');
+      break;
+    default:
+      return 1;
+    }
+  printf("%s\n", (ret ? "YES" : "NO"));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/str-hex.c b/libucw/ucw/str-hex.c
new file mode 100644
index 0000000..0429048
--- /dev/null
+++ b/libucw/ucw/str-hex.c
@@ -0,0 +1,91 @@
+/*
+ *	UCW Library -- Hexdumping and Unhexdumping
+ *
+ *	(c) 2008 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+#include <ucw/chartype.h>
+
+static uint
+hex_make(uint x)
+{
+  return (x < 10) ? (x + '0') : (x - 10 + 'a');
+}
+
+void
+mem_to_hex(char *dest, const byte *src, size_t bytes, uint flags)
+{
+  uint sep = flags & 0xff;
+
+  while (bytes--)
+    {
+      dest[0] = hex_make(*src >> 4);
+      dest[1] = hex_make(*src & 0x0f);
+      if (flags & MEM_TO_HEX_UPCASE)
+	{
+	  dest[0] = Cupcase(dest[0]);
+	  dest[1] = Cupcase(dest[1]);
+	}
+      dest += 2;
+      if (sep && bytes)
+	*dest++ = sep;
+      src++;
+    }
+  *dest = 0;
+}
+
+static uint
+hex_parse(uint c)
+{
+  c = Cupcase(c);
+  c -= '0';
+  return (c < 10) ? c : (c - 7);
+}
+
+const char *
+hex_to_mem(byte *dest, const char *src, size_t max_bytes, uint flags)
+{
+  uint sep = flags & 0xff;
+  while (max_bytes-- && Cxdigit(src[0]) && Cxdigit(src[1]))
+    {
+      *dest++ = (hex_parse(src[0]) << 4) | hex_parse(src[1]);
+      src += 2;
+      if (sep && *src && max_bytes)
+	{
+	  if (*src != (char)sep)
+	    return src;
+	  src++;
+	}
+    }
+  return src;
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  byte x[4] = { 0xfe, 0xed, 0xf0, 0x0d };
+  byte y[4];
+  char a[16];
+
+  mem_to_hex(a, x, 4, MEM_TO_HEX_UPCASE);
+  puts(a);
+  mem_to_hex(a, x, 4, ':');
+  puts(a);
+  const char *z = hex_to_mem(y, a, 4, ':');
+  if (*z)
+    puts("BAD");
+  else
+    printf("%02x%02x%02x%02x\n", y[0], y[1], y[2], y[3]);
+
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/str-imatch.c b/libucw/ucw/str-imatch.c
new file mode 100644
index 0000000..84327fc
--- /dev/null
+++ b/libucw/ucw/str-imatch.c
@@ -0,0 +1,16 @@
+/*
+ *	UCW Library -- Shell-Like Case-Insensitive Pattern Matching (currently only '?' and '*')
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+
+#define Convert(x) Cupcase(x)
+#define MATCH_FUNC_NAME str_match_pattern_nocase
+
+#include <ucw/str-match.h>
diff --git a/libucw/ucw/str-match.c b/libucw/ucw/str-match.c
new file mode 100644
index 0000000..1aa61d6
--- /dev/null
+++ b/libucw/ucw/str-match.c
@@ -0,0 +1,15 @@
+/*
+ *	UCW Library -- Shell-Like Pattern Matching (currently only '?' and '*')
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+
+#define Convert(x) (x)
+#define MATCH_FUNC_NAME str_match_pattern
+
+#include <ucw/str-match.h>
diff --git a/libucw/ucw/str-match.h b/libucw/ucw/str-match.h
new file mode 100644
index 0000000..776cb6f
--- /dev/null
+++ b/libucw/ucw/str-match.h
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- Generic Shell-Like Pattern Matching (currently only '?' and '*')
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/string.h>
+
+int
+MATCH_FUNC_NAME(const char *p, const char *s)
+{
+  while (*p)
+    {
+      if (*p == '?' && *s)
+	p++, s++;
+      else if (*p == '*')
+	{
+	  int z = p[1];
+
+	  if (!z)
+	    return 1;
+	  if (z == '\\' && p[2])
+	    z = p[2];
+	  z = Convert(z);
+	  for(;;)
+	    {
+	      while (*s && Convert(*s) != z)
+		s++;
+	      if (!*s)
+		return 0;
+	      if (MATCH_FUNC_NAME(p+1, s))
+		return 1;
+	      s++;
+	    }
+	}
+      else
+	{
+	  if (*p == '\\' && p[1])
+	    p++;
+	  if (Convert(*p++) != Convert(*s++))
+	    return 0;
+	}
+    }
+  return !*s;
+}
diff --git a/libucw/ucw/str-split.c b/libucw/ucw/str-split.c
new file mode 100644
index 0000000..16aa56b
--- /dev/null
+++ b/libucw/ucw/str-split.c
@@ -0,0 +1,63 @@
+/*
+ *	UCW Library -- Word Splitting
+ *
+ *	(c) 1997 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+#include <ucw/string.h>
+
+#include <string.h>
+
+int
+str_sepsplit(char *str, uint sep, char **rec, uint max)
+{
+  uint cnt = 0;
+  while (1)
+  {
+    rec[cnt++] = str;
+    str = strchr(str, sep);
+    if (!str)
+      return cnt;
+    if (cnt >= max)
+      return -1;
+    *str++ = 0;
+  }
+}
+
+int
+str_wordsplit(char *src, char **dst, uint max)
+{
+  uint cnt = 0;
+
+  for(;;)
+    {
+      while (Cspace(*src))
+	*src++ = 0;
+      if (!*src)
+	break;
+      if (cnt >= max)
+	return -1;
+      if (*src == '"')
+	{
+	  src++;
+	  dst[cnt++] = src;
+	  while (*src && *src != '"')
+	    src++;
+	  if (*src)
+	    *src++ = 0;
+	}
+      else
+	{
+	  dst[cnt++] = src;
+	  while (*src && !Cspace(*src))
+	    src++;
+	}
+    }
+  return cnt;
+}
diff --git a/libucw/ucw/string.c b/libucw/ucw/string.c
new file mode 100644
index 0000000..29cfa42
--- /dev/null
+++ b/libucw/ucw/string.c
@@ -0,0 +1,51 @@
+/*
+ *	UCW Library -- String Routines
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2007--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+
+#ifdef CONFIG_DARWIN
+size_t
+strnlen(const char *str, size_t n)
+{
+  const char *end = str + n;
+  const char *c;
+  for (c = str; *c && c < end; c++);
+  return c - str;
+}
+#endif
+
+char *
+str_format_flags(char *dest, const char *fmt, uint flags)
+{
+  char *start = dest;
+  for (uint i=0; fmt[i]; i++)
+    {
+      if (flags & (1 << i))
+	*dest++ = fmt[i];
+      else
+	*dest++ = '-';
+    }
+  *dest = 0;
+  return start;
+}
+
+size_t
+str_count_char(const char *str, uint chr)
+{
+  const byte *s = str;
+  size_t i = 0;
+  while (*s)
+    if (*s++ == chr)
+      i++;
+  return i;
+}
diff --git a/libucw/ucw/string.h b/libucw/ucw/string.h
new file mode 100644
index 0000000..9c527ba
--- /dev/null
+++ b/libucw/ucw/string.h
@@ -0,0 +1,132 @@
+/*
+ *	UCW Library -- String Routines
+ *
+ *	(c) 2006 Pavel Charvat <pchar@ucw.cz>
+ *	(c) 2007--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_STRING_H
+#define _UCW_STRING_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define hex_to_mem ucw_hex_to_mem
+#define mem_to_hex ucw_mem_to_hex
+#define str_count_char ucw_str_count_char
+#define str_format_flags ucw_str_format_flags
+#define str_has_prefix ucw_str_has_prefix
+#define str_has_suffix ucw_str_has_suffix
+#define str_hier_prefix ucw_str_hier_prefix
+#define str_hier_suffix ucw_str_hier_suffix
+#define str_match_pattern ucw_str_match_pattern
+#define str_match_pattern_nocase ucw_str_match_pattern_nocase
+#define str_sepsplit ucw_str_sepsplit
+#define str_unesc ucw_str_unesc
+#define str_wordsplit ucw_str_wordsplit
+#endif
+
+/* string.c */
+
+#ifdef CONFIG_DARWIN
+size_t strnlen(const char *str, size_t n); // NOAPI
+#endif
+
+/**
+ * Format a set of flag bits. When the i-th bit of @flags is 1,
+ * set the i-th character of @dest to @fmt[i], otherwise to '-'.
+ **/
+char *str_format_flags(char *dest, const char *fmt, uint flags);
+
+/** Counts occurrences of @chr in @str. **/
+size_t str_count_char(const char *str, uint chr);
+
+/* str-esc.c */
+
+/**
+ * Decode a string with backslash escape sequences as in C99 strings.
+ * It is safe to pass @dest equal to @src.
+ **/
+char *str_unesc(char *dest, const char *src);
+
+/* str-split.c */
+
+/**
+ * Split @str to at most @max fields separated by @sep. Occurrences of the
+ * separator are rewritten to string terminators, @rec[i] is set to point
+ * to the i-th field. The total number of fields is returned.
+ *
+ * When there are more than @max fields in @str, the first @max fields
+ * are processed and -1 is returned.
+ **/
+int str_sepsplit(char *str, uint sep, char **rec, uint max);
+
+/**
+ * Split @str to words separated by white-space characters. The spaces
+ * are replaced by string terminators, @rec[i] is set to point to the
+ * i-th field. The total number of fields is returned.
+ *
+ * When there are more than @max fields in @str, the first @max fields
+ * are processed and -1 is returned.
+ *
+ * Fields surrounded by double quotes are also recognized. They can contain
+ * spaces, but no mechanism for escaping embedded quotes is defined.
+ **/
+int str_wordsplit(char *str, char **rec, uint max);
+
+/* str-(i)match.c: Matching of shell patterns */
+
+/**
+ * Test whether the string @str matches the shell-like pattern @patt. Only
+ * "*" and "?" meta-characters are supported.
+ **/
+int str_match_pattern(const char *patt, const char *str);
+
+/** A case-insensitive version of @str_match_pattern(). **/
+int str_match_pattern_nocase(const char *patt, const char *str);
+
+/* str-hex.c */
+
+/**
+ * Create a hexdump of a memory block of @bytes bytes starting at @src.
+ * The @flags contain an optional separator of bytes (0 if bytes should
+ * not be separated), possibly OR-ed with `MEM_TO_HEX_UPCASE` when upper-case
+ * characters should be used.
+ **/
+void mem_to_hex(char *dest, const byte *src, size_t bytes, uint flags);
+
+/**
+ * An inverse function to @mem_to_hex(). Takes a hexdump of at most @max_bytes
+ * bytes and stores the bytes to a buffer starting at @dest. Returns a pointer
+ * at the first character after the dump.
+ **/
+const char *hex_to_mem(byte *dest, const char *src, size_t max_bytes, uint flags);
+
+// Bottom 8 bits of flags are an optional separator of bytes, the rest is:
+#define MEM_TO_HEX_UPCASE 0x100
+
+/* str-fix.c */
+
+int str_has_prefix(const char *str, const char *prefix); /** Tests if @str starts with @prefix. **/
+int str_has_suffix(const char *str, const char *suffix); /** Tests if @str ends with @suffix. **/
+
+/**
+ * Let @str and @prefix be hierarchical names with components separated by
+ * a character @sep. Returns true if @str starts with @prefix, respecting
+ * component boundaries.
+ *
+ * For example, when @sep is '/' and @str is "/usr/local/bin", then:
+ *
+ * - "/usr/local" is a prefix
+ * - "/usr/local/" is a prefix, too
+ * - "/usr/loc" is not,
+ * - "/usr/local/bin" is a prefix,
+ * - "/usr/local/bin/" is not,
+ * - "/" is a prefix,
+ * - "" is a prefix.
+ **/
+int str_hier_prefix(const char *str, const char *prefix, uint sep);
+int str_hier_suffix(const char *str, const char *suffix, uint sep); /** Like @str_hier_prefix(), but for suffixes. **/
+
+#endif
diff --git a/libucw/ucw/string.t b/libucw/ucw/string.t
new file mode 100644
index 0000000..8c15937
--- /dev/null
+++ b/libucw/ucw/string.t
@@ -0,0 +1,99 @@
+# Tests of string routines
+
+Run:	../obj/ucw/str-hex-t
+Out:	FEEDF00D
+	fe:ed:f0:0d
+	feedf00d
+
+Run:	../obj/ucw/str-esc-t '12\r\n\000\\\xff'
+Out:	31 32 0d 0a 00 5c ff
+
+Run:	../obj/ucw/str-esc-t '\100\10a\1a'
+Out:	40 08 61 01 61
+
+Run:	../obj/ucw/str-esc-t '\a\b\f\r\n\t\v\?\"'"\\'"
+Out:	07 08 0c 0d 0a 09 0b 3f 22 27
+
+Name:	prefix1
+Run:	../obj/ucw/str-fix-t p homo.sapiens.neanderthalensis homo.sap
+Out:	YES
+
+Name:	prefix2
+Run:	../obj/ucw/str-fix-t p homo.sapiens.neanderthalensis homo.sapiens.neanderthalensis
+Out:	YES
+
+Name:	prefix3
+Run:	../obj/ucw/str-fix-t p homo.sapiens.neanderthalensis ""
+Out:	YES
+
+Name:	prefix4
+Run:	../obj/ucw/str-fix-t p homo.sapiens.neanderthalensis homo.sapiens.neanderthalensisis
+Out:	NO
+
+Name:	suffix1
+Run:	../obj/ucw/str-fix-t s homo.sapiens.neanderthalensis ensis
+Out:	YES
+
+Name:	suffix2
+Run:	../obj/ucw/str-fix-t s homo.sapiens.neanderthalensis homo.sapiens.neanderthalensis
+Out:	YES
+
+Name:	suffix3
+Run:	../obj/ucw/str-fix-t s homo.sapiens.neanderthalensis ""
+Out:	YES
+
+Name:	suffix4
+Run:	../obj/ucw/str-fix-t s homo.sapiens.neanderthalensis ecce.homo.sapiens.neanderthalensis
+Out:	NO
+
+Name:	hier-prefix1
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sap
+Out:	NO
+
+Name:	hier-prefix2
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sapiens
+Out:	YES
+
+Name:	hier-prefix3
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sapiens.
+Out:	YES
+
+Name:	hier-prefix4
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sapiens.neanderthalensis
+Out:	YES
+
+Name:	hier-prefix5
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sapiens.neanderthalensis.
+Out:	NO
+
+Name:	hier-prefix6
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis ""
+Out:	YES
+
+Name:	hier-suffix1
+Run:	../obj/ucw/str-fix-t S homo.sapiens.neanderthalensis ensis
+Out:	NO
+
+Name:	hier-suffix2
+Run:	../obj/ucw/str-fix-t S homo.sapiens.neanderthalensis sapiens.neanderthalensis
+Out:	YES
+
+Name:	hier-suffix3
+Run:	../obj/ucw/str-fix-t S homo.sapiens.neanderthalensis .sapiens.neanderthalensis
+Out:	YES
+
+Name:	hier-suffix4
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis homo.sapiens.neanderthalensis
+Out:	YES
+
+Name:	hier-suffix5
+Run:	../obj/ucw/str-fix-t P homo.sapiens.neanderthalensis .homo.sapiens.neanderthalensis
+Out:	NO
+
+Name:	hier-suffix6
+Run:	../obj/ucw/str-fix-t S homo.sapiens.neanderthalensis ""
+Out:	YES
+
+Name:	hier-suffix7
+Run:	../obj/ucw/str-fix-t S homo.sapiens.neanderthalensis ecce.homo.sapiens.neanderthalensis
+Out:	NO
diff --git a/libucw/ucw/strtonum-gen.h b/libucw/ucw/strtonum-gen.h
new file mode 100644
index 0000000..621162d
--- /dev/null
+++ b/libucw/ucw/strtonum-gen.h
@@ -0,0 +1,111 @@
+/*
+ *	UCW Library -- Conversions of Strings to Numbers
+ *
+ *	(c) 2010 Daniel Fiala <danfiala@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ * This is not a normal header file, it is a generator of a function for
+ * converting strings to integers of a certain type. This file should be used
+ * by ucw/stronum.c only.
+ */
+
+#define STN_DECLARE(type, suffix) STN_DECLARE_CONVERTOR(type, suffix)
+
+#define S_HELPER2(name, suffix) name##suffix
+#define S_HELPER1(name, suffix) S_HELPER2(name, suffix)
+#define S(name) S_HELPER1(name, STN_SUFFIX)
+
+#define STN_MAX ((STN_TYPE)(-1))
+static const STN_TYPE S(tops)[STN_DBASES_MASK+1] = { [2] = STN_MAX/2, [8] = STN_MAX/8, [10] = STN_MAX/10, [16] = STN_MAX/16 };
+
+static const char *S(parse_string)(const char **pp, const uint flags, const uint sign, const uint base, STN_TYPE *num)
+{
+  const STN_TYPE max = STN_MAX;
+  const STN_TYPE top = S(tops)[base];
+  if (!top)
+    return "Unknown base";
+
+  const STN_TYPE sign_max = ((flags & STN_SIGNED) || sign) ? max/2 + sign : max;
+
+  STN_TYPE val = 0;
+  uint digits = 0;
+  int overflow = 0;
+  for (;; (*pp)++)
+    {
+      const uint c = (byte)**pp;
+
+      if (c == '_')
+        {
+          if (flags & STN_UNDERSCORE)
+            continue;
+          else
+            break;
+        }
+
+      const uint d = get_digit(c);
+      if (d >= base)
+        break;
+
+      digits++;
+
+      if (overflow)
+        continue;
+
+      STN_TYPE v = val;
+      if ( (overflow = (v > top || (v *= base) > sign_max - d)) )
+        continue;
+      val = v + d;
+    }
+
+  if (!overflow)
+    {
+      if (!digits)
+        return "Number contains no digits";
+
+      if (sign)
+        val = -val;
+    }
+  else
+    {
+      if (flags & STN_TRUNC)
+        val = sign_max;
+      else
+        return "Numeric overflow";
+    }
+
+  if ((flags & STN_WHOLE) && **pp)
+    return "Invalid character";
+
+  if (num)
+    *num = val;
+
+  return NULL;
+}
+
+STN_DECLARE(STN_TYPE, STN_SUFFIX)
+{
+  const char *err = NULL;
+
+  uint sign, base;
+  err = str_to_num_init(&str, flags, &sign, &base);
+
+  if (!err)
+    err = S(parse_string)(&str, flags, sign, base, num);
+
+  if (next)
+    *next = str;
+
+  return err;
+}
+
+#undef STN_MAX
+#undef S
+#undef S_HELPER1
+#undef S_HELPER2
+#undef STN_TYPE
+#undef STN_SUFFIX
+#undef STN_DECLARE
diff --git a/libucw/ucw/strtonum-test.c b/libucw/ucw/strtonum-test.c
new file mode 100644
index 0000000..53cd771
--- /dev/null
+++ b/libucw/ucw/strtonum-test.c
@@ -0,0 +1,98 @@
+/*
+ *	UCW Library -- Conversions of Strings to Numbers: Testing
+ *
+ *      (c) 2010 Daniel Fiala <danfiala@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+#include <ucw/strtonum.h>
+
+#include <stdio.h>
+
+static uint str_to_flags(const char *str)
+{
+   uint flags = 0;
+   for(const char *p = str; *p; ++p)
+     {
+       switch(*p)
+         {
+           case 'h':
+             flags = (flags & ~STN_DBASES_MASK) | 16;
+             break;
+           case '8':
+             flags = (flags & ~STN_DBASES_MASK) | 8;
+             break;
+           case '2':
+             flags = (flags & ~STN_DBASES_MASK) | 2;
+             break;
+           case '0':
+             flags = (flags & ~STN_DBASES_MASK) | 10;
+             break;
+
+           case 'X':
+             flags |= STN_HEX;
+             break;
+           case 'o':
+             flags |= STN_OCT;
+             break;
+           case 'O':
+             flags |= STN_OCT0;
+             break;
+           case 'B':
+             flags |= STN_BIN;
+             break;
+           case 'D':
+             flags |= STN_DEC;
+             break;
+
+           case '_':
+             flags |= STN_UNDERSCORE;
+             break;
+           case 't':
+             flags |= STN_TRUNC;
+             break;
+           case '+':
+             flags |= STN_PLUS;
+             break;
+           case '-':
+             flags |= STN_MINUS;
+             break;
+           case 's':
+             flags |= STN_SIGNED;
+             break;
+           case 'W':
+             flags |= STN_WHOLE;
+             break;
+         }
+     }
+
+  return flags;
+}
+
+static void convert(const char *str_flags, const char *str_num)
+{
+  const uint flags = str_to_flags(str_flags);
+
+  const char *next1, *next2;
+  uint ux = 1234567890;
+  uintmax_t um = 1234567890;
+  const char *err1 = str_to_uint(&ux, str_num, &next1, flags);
+  const char *err2 = str_to_uintmax(&um, str_num, &next2, flags);
+
+  if (flags & STN_SIGNED)
+    printf("i%d\nh%x\ne[%s]\nc[%s]\nb%td:0x%x\nI%jd\nH%jx\nE[%s]\nC[%s]\nB%td:0x%x\n", ux, ux, err1, str_num, next1 - str_num, *next1, um, um, err2, str_num, next2 - str_num, *next2);
+  else
+    printf("i%u\nh%x\ne[%s]\nc[%s]\nb%td:0x%x\nI%ju\nH%jx\nE[%s]\nC[%s]\nB%td:0x%x\n", ux, ux, err1, str_num, next1 - str_num, *next1, um, um, err2, str_num, next2 - str_num, *next2);
+}
+
+int main(int argc, char *argv[])
+{
+  if (argc >= 3)
+    convert(argv[1], argv[2]);
+
+  return 0;
+}
diff --git a/libucw/ucw/strtonum-test.t b/libucw/ucw/strtonum-test.t
new file mode 100644
index 0000000..1bac111
--- /dev/null
+++ b/libucw/ucw/strtonum-test.t
@@ -0,0 +1,217 @@
+# Test for the strtonum module
+
+## Testing str_to_uint(.) (It is supoposed that uint is 4 bytes integer)
+
+# 1
+Run:	../obj/ucw/strtonum-test '0o+-_' '0o100_000xc' | grep '^i'
+Out:	i32768
+
+# 2
+Run:	../obj/ucw/strtonum-test '0O+-_' '0100_000xc' | grep '^i'
+Out:	i32768
+
+# 3
+Run:	../obj/ucw/strtonum-test '0O+-_' '00000000778' | grep '^i'
+Out:	i63
+
+# 4
+Run:	../obj/ucw/strtonum-test '0XoB+-_' '4_294_967_295xcyv' | grep '^i'
+Out:	i4294967295
+
+# 5
+Run:	../obj/ucw/strtonum-test '0XoB+-_' '4_294_967_296xc' | grep '^e'
+Out:	e[Numeric overflow]
+
+# 6
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '4_294_967_296xc' | grep '^h'
+Out:	hffffffff
+
+# 7
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '4_294_967_296xc' | grep '^b'
+Out:	b13:0x78
+
+# 8
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '0x__4_' | grep '^i'
+Out:	i4
+
+# 9
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '0x__4_' | grep '^b'
+Out:	b6:0x0
+
+# 10
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '0xXW' | grep '^e'
+Out:	e[Number contains no digits]
+
+# 11
+Run:	../obj/ucw/strtonum-test '0XoBt+-_' '0xXW' | grep '^b'
+Out:	b2:0x58
+
+# 12
+Run:	../obj/ucw/strtonum-test '0oBt+-_' '0xXW' | grep '^i'
+Out:	i0
+
+# 13
+Run:	../obj/ucw/strtonum-test '0oBt+-_' '0xXW' | grep '^b'
+Out:	b1:0x78
+
+# 14
+Run:	../obj/ucw/strtonum-test '0oBt+-_W' '0xXW' | grep '^e'
+Out:	e[Invalid character]
+
+# 15
+Run:	../obj/ucw/strtonum-test '0oBt+-_W' '0xXW' | grep '^b'
+Out:	b1:0x78
+
+# 16
+Run:	../obj/ucw/strtonum-test '0Bs+-_' '2_147_483_647xxx' | grep '^i'
+Out:	i2147483647
+
+# 17
+Run:	../obj/ucw/strtonum-test '0Bs+-_' '2_147_483_647xxx' | grep '^i'
+Out:	i2147483647
+
+# 18
+Run:	../obj/ucw/strtonum-test '0Bs+-_' '2_147_483_648xxx' | grep '^e'
+Out:	e[Numeric overflow]
+
+# 19
+Run:	../obj/ucw/strtonum-test '0Bs+-_' '-2_147_483_648xxx' | grep '^i'
+Out:	i-2147483648
+
+# 20
+Run:	../obj/ucw/strtonum-test '0Bs+-_' '-2_147_483_649xxx' | grep '^e'
+Out:	e[Numeric overflow]
+
+# 21
+Run:	../obj/ucw/strtonum-test '0Bts+-_' '2_147_483_648xxx' | grep '^i'
+Out:	i2147483647
+
+# 22
+Run:	../obj/ucw/strtonum-test '0Bts+-_' '-2_147_483_649xxx' | grep '^i'
+Out:	i-2147483648
+
+# 23
+Run:	../obj/ucw/strtonum-test '0Bts+-_' '-2_147_483_649xxx' | grep '^i'
+Out:	i-2147483648
+
+# 24
+Run:	../obj/ucw/strtonum-test '0X+-' '0xABCDEFxxx' | grep '^h'
+Out:	habcdef
+
+# 25
+Run:	../obj/ucw/strtonum-test '0X+-_' '0x00_AB_CD_EFxxx' | grep '^h'
+Out:	habcdef
+
+# 26
+Run:	../obj/ucw/strtonum-test '0Xs+-_' '-0x00AB_CDEFxxx' | grep '^h'
+Out:	hff543211
+
+# 27
+Run:	../obj/ucw/strtonum-test '0XBs+-_' '-0x00AB_CDEFxxx' | grep '^h'
+Out:	hff543211
+
+# 28
+Run:	../obj/ucw/strtonum-test '0B+-_' '0B1111_0000_1000_0101_1010xxx' | grep '^h'
+Out:	hf085a
+
+# 29
+Run:	../obj/ucw/strtonum-test '0+-_' '0B1111_0000_1000_0101_1010xxx' | grep '^b'
+Out:	b1:0x42
+
+# 30
+Run:	../obj/ucw/strtonum-test '0o+-_' '0o70105xxx' | grep '^i'
+Out:	i28741
+
+# 31
+Run:	../obj/ucw/strtonum-test '0os+-_' '-0o70105xxx' | grep '^i'
+Out:	i-28741
+
+# 32
+Run:	../obj/ucw/strtonum-test '0os+-_' '-0o___________xxx' | grep '^e'
+Out:	e[Number contains no digits]
+
+# 33
+Run:	../obj/ucw/strtonum-test '2+-_' '10578ABCG' | grep '^i'
+Out:	i2
+
+# 34
+Run:	../obj/ucw/strtonum-test '2s+-_' '-10578ABCG' | grep '^i'
+Out:	i-2
+
+# 35
+Run:	../obj/ucw/strtonum-test '8+-_' '10578ABCG' | grep '^i'
+Out:	i559
+
+# 36
+Run:	../obj/ucw/strtonum-test '8s+-_' '-10578ABCG' | grep '^i'
+Out:	i-559
+
+# 37
+Run:	../obj/ucw/strtonum-test '0+-_' '10578ABCG' | grep '^i'
+Out:	i10578
+
+# 38
+Run:	../obj/ucw/strtonum-test '0s+-_' '-10578ABCG' | grep '^i'
+Out:	i-10578
+
+# 39
+Run:	../obj/ucw/strtonum-test 'h+-_' '10578ABCG' | grep '^i'
+Out:	i274172604
+
+# 40
+Run:	../obj/ucw/strtonum-test 'hs+-_' '-10578ABCG' | grep '^i'
+Out:	i-274172604
+
+## Testing str_to_uintmax(.) (It is supoposed that uintmax_t is 8 bytes integer)
+# 41
+Run:	../obj/ucw/strtonum-test 'h+-_' 'FFFF_FFFF_ffff_ffFF' | grep '^H'
+Out:	Hffffffffffffffff
+
+# 42
+Run:	../obj/ucw/strtonum-test 'h+-_' 'FFFF_FFFF_ffff_ffFF' | grep '^I'
+Out:	I18446744073709551615
+
+# 43
+Run:	../obj/ucw/strtonum-test '0t+-_' '1844674407370000009551616' | grep '^I'
+Out:	I18446744073709551615
+
+# 44
+Run:	../obj/ucw/strtonum-test '0+-_' '18446744073709551616' | grep '^E'
+Out:	E[Numeric overflow]
+
+# 45
+Run:	../obj/ucw/strtonum-test '0+-_' '18446744073709551614' | grep '^H'
+Out:	Hfffffffffffffffe
+
+# 46
+Run:	../obj/ucw/strtonum-test '0s+-_' '9223372036854775807L' | grep '^I'
+Out:	I9223372036854775807
+
+# 47
+Run:	../obj/ucw/strtonum-test '0s+-_' '9223372036854775806L' | grep '^I'
+Out:	I9223372036854775806
+
+# 48
+Run:	../obj/ucw/strtonum-test '0st+-_' '92233720368547758000000L' | grep '^I'
+Out:	I9223372036854775807
+
+# 49
+Run:	../obj/ucw/strtonum-test '0s+-_' '9223372036854775808L' | grep '^E'
+Out:	E[Numeric overflow]
+
+# 50
+Run:	../obj/ucw/strtonum-test '0s+-_' '-9223372036854775808L' | grep '^I'
+Out:	I-9223372036854775808
+
+# 51
+Run:	../obj/ucw/strtonum-test '0s+-_' '-9223372036854775807L' | grep '^I'
+Out:	I-9223372036854775807
+
+# 52
+Run:	../obj/ucw/strtonum-test '0st+-_' '-9223372036854775800000L' | grep '^I'
+Out:	I-9223372036854775808
+
+# 53
+Run:	../obj/ucw/strtonum-test '0s+-_' '-9223372036854775809L' | grep '^E'
+Out:	E[Numeric overflow]
+
diff --git a/libucw/ucw/strtonum.c b/libucw/ucw/strtonum.c
new file mode 100644
index 0000000..4e1be9b
--- /dev/null
+++ b/libucw/ucw/strtonum.c
@@ -0,0 +1,120 @@
+/*
+ *	UCW Library -- Conversions of Strings to Numbers
+ *
+ *	(c) 2010 Daniel Fiala <danfiala@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+#include <ucw/chartype.h>
+#include <ucw/strtonum.h>
+
+static uint detect_base(const char **pp, const uint flags)
+{
+  if ((flags & STN_BASES0) && **pp == '0')
+    {
+      switch ( (*pp)[1] )
+        {
+          case 'x':
+          case 'X':
+            if (flags & STN_HEX)
+              {
+                *pp += 2;
+                return 16;
+              }
+            break;
+
+          case 'b':
+          case 'B':
+            if (flags & STN_BIN)
+              {
+                *pp += 2;
+                return 2;
+              }
+            break;
+
+          case 'o':
+          case 'O':
+            if (flags & STN_OCT)
+              {
+                *pp += 2;
+                return 8;
+              }
+            break;
+
+          case '0'...'7':
+            if (flags & STN_OCT0)
+              {
+                (*pp)++;
+                return 8;
+              }
+            break;
+        }
+    }
+
+  return 0;
+}
+
+static const char *str_to_num_init(const char **pp, const uint flags, uint *sign, uint *base)
+{
+  ASSERT(*pp);
+
+  const char *err = NULL;
+  const char *p = *pp;
+
+  // Parse sign
+  *sign = 0;
+  if (flags & (STN_SIGNS))
+    {
+      if (*p == '-' && (flags & STN_MINUS))
+        {
+          *sign = 1;
+          p++;
+        }
+      else if (*p == '+' && (flags & STN_PLUS))
+        p++;
+    }
+
+  *base = detect_base(&p, flags) ? : flags & STN_DBASES_MASK;
+
+  *pp = p;
+  return err;
+}
+
+static inline uint get_digit(const uint c)
+{
+  if (c <= '9')
+    return c - '0';
+  else
+    {
+      const int a = c & 0xDF;
+      uint d = a - 'A';
+      d &= 0xFF;
+      d += 10;
+      return d;
+    }
+}
+
+#define STN_TYPE uint
+#define STN_SUFFIX uint
+#include <ucw/strtonum-gen.h>
+
+#define STN_TYPE u32
+#define STN_SUFFIX u32
+#include <ucw/strtonum-gen.h>
+
+#define STN_TYPE u64
+#define STN_SUFFIX u64
+#include <ucw/strtonum-gen.h>
+
+#define STN_TYPE uintmax_t
+#define STN_SUFFIX uintmax
+#include <ucw/strtonum-gen.h>
+
+// FIXME: For backward compatibility, will be removed soon
+#define STN_TYPE uns
+#define STN_SUFFIX uns
+#include <ucw/strtonum-gen.h>
diff --git a/libucw/ucw/strtonum.h b/libucw/ucw/strtonum.h
new file mode 100644
index 0000000..ae25ff5
--- /dev/null
+++ b/libucw/ucw/strtonum.h
@@ -0,0 +1,69 @@
+/*
+ *	UCW Library -- Conversions of Strings to Numbers: Declarations
+ *
+ *	(c) 2010 Daniel Fiala <danfiala@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _STRTONUM_H
+#define _STRTONUM_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define str_to_u32 ucw_str_to_u32
+#define str_to_u64 ucw_str_to_u64
+#define str_to_uint ucw_str_to_uint
+#define str_to_uintmax ucw_str_to_uintmax
+#define str_to_uns ucw_str_to_uns
+#endif
+
+// Set (flags & 0x1f) in the range 1 to 31 to denote the default base of the number
+enum str_to_num_flags {
+  STN_SIGNED = 0x20,       // The resulting range is signed
+  STN_MINUS = 0x40,        // Allow optional '-' sign
+  STN_PLUS = 0x80,         // Allow optional '+' sign
+  STN_TRUNC = 0x100,       // Allow range overflow -> truncate to the allowed range
+  STN_DEC = 0x200,         // Support decimal numbers (currently no prefix)
+  STN_HEX = 0x400,         // Support hexadecimal numbers (0x...)
+  STN_BIN = 0x800,         // Support binary numbers (0b...)
+  STN_OCT = 0x1000,        // Support octal numbers (0o...)
+  STN_OCT0 = 0x2000,       // Support octal numbers (0[0-7]...)
+  STN_UNDERSCORE = 0x4000, // Number can contain underscore characters to increase readability (eg. 1_000_000)
+  STN_WHOLE = 0x8000,      // Number can be terminated only by \0 character
+};
+
+#define STN_DBASES_MASK    0x1F
+#define STN_SIGNS          (STN_MINUS | STN_PLUS)
+#define STN_BASES          (STN_DEC | STN_HEX | STN_BIN | STN_OCT)
+#define STN_BASES0         (STN_BASES | STN_OCT0)
+#define STN_FLAGS          (STN_MINUS | STN_PLUS | STN_BASES)
+#define STN_UFLAGS         (STN_FLAGS | STN_UNDERSCORE)
+#define STN_SFLAGS         (STN_FLAGS | STN_SIGNED)
+#define STN_USFLAGS        (STN_SFLAGS | STN_UNDERSCORE)
+
+#define STN_DECLARE_CONVERTOR(type, suffix)                                                               \
+const char *str_to_##suffix(type *num, const char *str, const char **next, const uint flags)
+
+#define STN_SIGNED_CONVERTOR(type, suffix, usuffix)                                                       \
+static inline const char *str_to_##suffix(type *num, const char *str, const char **next, const uint flags) \
+{                                                                                                         \
+  return str_to_##usuffix((void *) num, str, next, flags | STN_SIGNED | STN_PLUS | STN_MINUS);            \
+}
+
+STN_DECLARE_CONVERTOR(uint, uint);
+STN_SIGNED_CONVERTOR(int, int, uint)
+
+STN_DECLARE_CONVERTOR(u32, u32);
+STN_SIGNED_CONVERTOR(s32, s32, u32)
+
+STN_DECLARE_CONVERTOR(u64, u64);
+STN_SIGNED_CONVERTOR(s64, s64, u64)
+
+STN_DECLARE_CONVERTOR(uintmax_t, uintmax);
+STN_SIGNED_CONVERTOR(intmax_t, intmax, uintmax)
+
+// FIXME: For backward compatibility, will be removed soon
+STN_DECLARE_CONVERTOR(uns, uns);
+
+#endif
diff --git a/libucw/ucw/table-test-2.c b/libucw/ucw/table-test-2.c
new file mode 100644
index 0000000..4679f59
--- /dev/null
+++ b/libucw/ucw/table-test-2.c
@@ -0,0 +1,159 @@
+/*
+ *	Unit tests of table printer
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/table.h>
+#include <ucw/xtypes-extra.h>
+#include <ucw/opt.h>
+#include <stdio.h>
+
+enum test_table_cols {
+  TEST_COL0_SIZE, TEST_COL1_TS
+};
+
+static struct table_template test_tbl = {
+  TBL_COLUMNS {
+    [TEST_COL0_SIZE] = TBL_COL_SIZE_FMT("size", 15, XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_BYTE)),
+    [TEST_COL1_TS] = TBL_COL_TIMESTAMP("ts", 20),
+    TBL_COL_END
+  },
+  TBL_FMT_HUMAN_READABLE,
+};
+
+static void do_test(void)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+  struct table *tbl = table_init(&test_tbl);
+  table_start(tbl, out);
+
+  u64 test_time = 1403685533;
+  s64 test_size = 4LLU*(1024LLU * 1024LLU * 1024LLU);
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  tbl->column_order[TEST_COL0_SIZE].fmt = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_KILOBYTE);
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  tbl->column_order[TEST_COL0_SIZE].fmt = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_MEGABYTE);
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  tbl->column_order[TEST_COL0_SIZE].fmt = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_GIGABYTE);
+  tbl->column_order[TEST_COL1_TS].fmt = XT_TIMESTAMP_FMT_DATETIME;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  test_size = test_size * 1024LU;
+  tbl->column_order[TEST_COL0_SIZE].fmt = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_TERABYTE);
+  tbl->column_order[TEST_COL1_TS].fmt = XT_TIMESTAMP_FMT_DATETIME;
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
+
+  bclose(out);
+}
+
+static struct table_template test_tbl2 = {
+  TBL_COLUMNS {
+    [TEST_COL0_SIZE] = TBL_COL_SIZE_FMT("size", 15, XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_BYTE)),
+    [TEST_COL1_TS] = TBL_COL_TIMESTAMP("ts", 20),
+    TBL_COL_END
+  },
+  TBL_FMT_HUMAN_READABLE,
+};
+
+static void do_test2(void)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+  struct table *tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  const char *err = table_set_option_value(tbl, "cols", "size[MB,TB,KB],size[MB],size[GB],size[TB],size[auto],ts[datetime],ts[timestamp],ts[],size[MB,KB]");
+  if(err) {
+    opt_failure("err in table_set_option_value: '%s'.", err);
+    abort();
+  }
+  table_start(tbl, out);
+
+  u64 test_time = 1403685533;
+  s64 test_size = 4LU*(1024LU * 1024LU);
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  test_size = test_size * 1024LU;
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  test_size = test_size * 1024LU;
+
+  table_col_size(tbl, TEST_COL0_SIZE, test_size);
+  table_col_timestamp(tbl, TEST_COL1_TS, test_time);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
+
+  bclose(out);
+}
+
+static void do_test3(void)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+
+  struct table *tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  const char *err = table_set_option_value(tbl, "cols", "size[MB,TB,KB],size[MB],size[GB],size[TB],size[auto],ts[datetime],ts[timestamp],size[MB,KB]");
+  bprintf(out, "Error occured: %s\n", err);
+  table_cleanup(tbl);
+
+
+  tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  err = table_set_option_value(tbl, "cols", "size[MB,TB,KB],size[MB],size[GB],size[TB],size[auto],ts[,,datetime,timestamp],ts[],size[MB,KB");
+  bprintf(out, "Error occured: %s\n", err);
+  table_cleanup(tbl);
+
+
+  tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  err = table_set_option_value(tbl, "cols", "size[MB,TB,KB");
+  bprintf(out, "Error occured: %s\n", err);
+  table_cleanup(tbl);
+
+
+  tbl = table_init(&test_tbl2);
+  table_set_col_order_by_name(tbl, "");
+  err = table_set_option_value(tbl, "cols", "size[MB,TB,KB]");
+  bprintf(out, "Error occured: %s\n", err);
+  table_cleanup(tbl);
+
+  bclose(out);
+}
+
+int main(int argc UNUSED, char **argv UNUSED)
+{
+  do_test();
+  do_test2();
+  do_test3();
+
+  return 0;
+}
+
diff --git a/libucw/ucw/table-test-2.t b/libucw/ucw/table-test-2.t
new file mode 100644
index 0000000..0bbbbab
--- /dev/null
+++ b/libucw/ucw/table-test-2.t
@@ -0,0 +1,17 @@
+Run: ../obj/ucw/table-test-2
+Out <<EOF
+           size                   ts
+     4294967296           1403685533
+      4194304KB           1403685533
+         4096MB           1403685533
+            4GB  2014-06-25 08:38:53
+            4TB  2014-06-25 08:38:53
+           size            size            size            size            size                   ts                   ts                   ts            size
+         4096KB             4MB             0GB             0TB             4MB  2014-06-25 08:38:53           1403685533           1403685533          4096KB
+      4194304KB          4096MB             4GB             0TB             4GB  2014-06-25 08:38:53           1403685533           1403685533       4194304KB
+   4294967296KB       4194304MB          4096GB             4TB             4TB  2014-06-25 08:38:53           1403685533           1403685533    4294967296KB
+Error occured: (null)
+Error occured: Invalid column definition, missing ']'.
+Error occured: Invalid column definition, missing ']'.
+Error occured: (null)
+EOF
diff --git a/libucw/ucw/table-test-align.c b/libucw/ucw/table-test-align.c
new file mode 100644
index 0000000..8432449
--- /dev/null
+++ b/libucw/ucw/table-test-align.c
@@ -0,0 +1,109 @@
+/*
+ *	Unit tests of table printer
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/table.h>
+#include <ucw/opt.h>
+#include <stdio.h>
+
+enum test_table_cols {
+  test_col0_str, test_col1_int, test_col2_uint, test_col3_bool, test_col4_double
+};
+
+static struct table_template test_tbl = {
+  TBL_COLUMNS {
+    [test_col0_str] = TBL_COL_STR("col0_str", 30 | CELL_ALIGN_LEFT),
+    [test_col1_int] = TBL_COL_INT("col1_int", 8),
+    [test_col2_uint] = TBL_COL_UINT("col2_uint", 9),
+    [test_col3_bool] = TBL_COL_BOOL_FMT("col3_bool", 9 | CELL_ALIGN_LEFT, XTYPE_FMT_PRETTY),
+    [test_col4_double] = TBL_COL_DOUBLE_FMT("col4_double", 11 | CELL_ALIGN_LEFT, XTYPE_FMT_DEFAULT),
+    TBL_COL_END
+  },
+  TBL_FMT_HUMAN_READABLE,
+  TBL_COL_DELIMITER("\t"),
+};
+
+static char **cli_table_opts;
+
+static struct opt_section table_printer_opts = {
+  OPT_ITEMS {
+    OPT_HELP("Options:"),
+    OPT_STRING_MULTIPLE('T', "table", cli_table_opts, OPT_REQUIRED_VALUE, "\tSets options for the table."),
+    OPT_END
+  }
+};
+
+
+static void process_command_line_opts(char *argv[], struct table *tbl)
+{
+  GARY_INIT(cli_table_opts, 0);
+
+  opt_parse(&table_printer_opts, argv+1);
+  table_set_gary_options(tbl, cli_table_opts);
+
+  GARY_FREE(cli_table_opts);
+}
+
+static void print_table(struct table *tbl, struct fastbuf *out)
+{
+  table_start(tbl, out);
+
+  struct fastbuf *colfb = table_col_fbstart(tbl, test_col0_str);
+  bputs(colfb, "HELLO");
+  bprintf(colfb, ",col_idx:%d", test_col0_str);
+  table_col_fbend(tbl);
+
+  table_col_int(tbl, test_col1_int, -10);
+  table_col_uint(tbl, test_col2_uint, 10);
+  table_col_bool(tbl, test_col3_bool, 0);
+  table_col_double(tbl, test_col4_double, 3.1415926535897);
+  table_end_row(tbl);
+
+
+
+  colfb = table_col_fbstart(tbl, test_col0_str);
+  bputs(colfb, "EHLO");
+  bprintf(colfb, ",col_idx:%d", test_col0_str);
+  table_col_fbend(tbl);
+
+  table_col_int(tbl, test_col1_int, -12345);
+  table_col_uint(tbl, test_col2_uint, 0xFF);
+  table_col_bool(tbl, test_col3_bool, 1);
+  table_col_double(tbl, test_col4_double, 1.61803398875);
+  table_end_row(tbl);
+
+
+
+  colfb = table_col_fbstart(tbl, test_col0_str);
+  bputs(colfb, "AHOJ");
+  bprintf(colfb, ",col_idx:%d", test_col0_str);
+  table_col_fbend(tbl);
+
+  table_col_int(tbl, test_col1_int, -54321);
+  table_col_uint(tbl, test_col2_uint, 0xFF00);
+  table_col_bool(tbl, test_col3_bool, 0);
+  table_col_double(tbl, test_col4_double, 2.718281828459045);
+  table_end_row(tbl);
+
+  table_end(tbl);
+}
+
+
+int main(int argc UNUSED, char **argv)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+
+  struct table *tbl = table_init(&test_tbl);
+  process_command_line_opts(argv, tbl);
+
+  print_table(tbl, out);
+  table_cleanup(tbl);
+  bclose(out);
+
+  return 0;
+}
+
diff --git a/libucw/ucw/table-test-align.t b/libucw/ucw/table-test-align.t
new file mode 100644
index 0000000..8dfe808
--- /dev/null
+++ b/libucw/ucw/table-test-align.t
@@ -0,0 +1,7 @@
+Run: ../obj/ucw/table-test-align
+Out <<EOF
+col0_str                      	col1_int	col2_uint	col3_bool	col4_double
+HELLO,col_idx:0               	     -10	       10	0        	3.14159    
+EHLO,col_idx:0                	  -12345	      255	1        	1.61803    
+AHOJ,col_idx:0                	  -54321	    65280	0        	2.71828    
+EOF
diff --git a/libucw/ucw/table-test.c b/libucw/ucw/table-test.c
new file mode 100644
index 0000000..06bf705
--- /dev/null
+++ b/libucw/ucw/table-test.c
@@ -0,0 +1,201 @@
+/*
+ *	Types used in table printer
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/table.h>
+#include <ucw/xtypes-extra.h>
+#include <ucw/opt.h>
+#include <stdio.h>
+
+enum test_table_cols {
+  TEST_COL0_STR, TEST_COL1_INT, TEST_COL2_UINT, TEST_COL3_BOOL, TEST_COL4_DOUBLE, TEST_COL5_SIZE, TEST_COL6_TIME
+};
+
+static struct table_col_instance test_column_order[] = { TBL_COL(TEST_COL3_BOOL), TBL_COL(TEST_COL4_DOUBLE),
+                       TBL_COL(TEST_COL2_UINT), TBL_COL(TEST_COL1_INT), TBL_COL(TEST_COL0_STR), TBL_COL_ORDER_END };
+
+static struct table_template test_tbl = {
+  TBL_COLUMNS {
+    [TEST_COL0_STR] = TBL_COL_STR("col0_str", 20),
+    [TEST_COL1_INT] = TBL_COL_INT("col1_int", 8),
+    [TEST_COL2_UINT] = TBL_COL_UINT("col2_uint", 9),
+    [TEST_COL3_BOOL] = TBL_COL_BOOL_FMT("col3_bool", 9, XTYPE_FMT_PRETTY),
+    [TEST_COL4_DOUBLE] = TBL_COL_DOUBLE_FMT("col4_double", 11, XTYPE_FMT_PRETTY),
+    [TEST_COL5_SIZE] = TBL_COL_SIZE("col5_size", 11),
+    [TEST_COL6_TIME] = TBL_COL_TIMESTAMP("col6_timestamp", 20),
+    TBL_COL_END
+  },
+  TBL_COL_ORDER(test_column_order),
+  TBL_FMT_HUMAN_READABLE,
+  TBL_COL_DELIMITER("\t"),
+};
+
+enum test_default_order_cols {
+  TEST_DEFAULT_ORDER_COL0_INT, TEST_DEFAULT_ORDER_COL1_INT, TEST_DEFAULT_ORDER_COL2_INT
+};
+
+static struct table_template test_default_order_tbl = {
+  TBL_COLUMNS {
+    [TEST_DEFAULT_ORDER_COL0_INT] = TBL_COL_INT("col0_int", 8),
+    [TEST_DEFAULT_ORDER_COL1_INT] = TBL_COL_INT("col1_int", 9),
+    [TEST_DEFAULT_ORDER_COL2_INT] = TBL_COL_INT("col2_int", 9),
+    TBL_COL_END
+  },
+  TBL_FMT_HUMAN_READABLE,
+  TBL_COL_DELIMITER("\t"),
+};
+
+static void do_default_order_test(struct fastbuf *out)
+{
+  struct table *tbl = table_init(&test_default_order_tbl);
+
+  table_start(tbl, out);
+
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL0_INT, 0);
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL1_INT, 1);
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL2_INT, 2);
+  table_end_row(tbl);
+
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL0_INT, 10);
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL1_INT, 11);
+  table_col_int(tbl, TEST_DEFAULT_ORDER_COL2_INT, 12);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
+}
+
+/**
+ * tests: table_col_int, table_col_uint, table_col_bool, table_col_double, table_col_printf
+ **/
+static void do_print1(struct table *test_tbl)
+{
+  table_col_str(test_tbl, TEST_COL0_STR, "sdsdf");
+  table_col_int(test_tbl, TEST_COL1_INT, -10);
+  table_col_int(test_tbl, TEST_COL1_INT, 10000);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 10);
+  table_col_printf(test_tbl, TEST_COL2_UINT, "XXX-%u", 22222);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, 1);
+  table_col_double(test_tbl, TEST_COL4_DOUBLE, 1.5);
+  table_col_size(test_tbl, TEST_COL5_SIZE, (1024LLU*1024LLU*1024LLU*5LLU));
+  table_col_timestamp(test_tbl, TEST_COL6_TIME, 1404305876);
+  table_end_row(test_tbl);
+
+  table_col_str(test_tbl, TEST_COL0_STR, "test");
+  table_col_int(test_tbl, TEST_COL1_INT, -100);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 100);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, 0);
+  table_col_double(test_tbl, TEST_COL4_DOUBLE, 1.5);
+  table_col_size(test_tbl, TEST_COL5_SIZE, (1024LLU*1024LLU*1024LLU*2LLU));
+  table_col_timestamp(test_tbl, TEST_COL6_TIME, 1404305909);
+  table_end_row(test_tbl);
+}
+
+static char **cli_table_opts;
+
+enum test_type_t {
+  TEST_DEFAULT_COLUMN_ORDER = 1,
+  TEST_INVALID_OPTION = 2,
+  TEST_INVALID_ORDER = 3
+};
+
+static int test_to_perform = -1;
+
+static struct opt_section table_printer_opts = {
+  OPT_ITEMS {
+    OPT_HELP("Options:"),
+    OPT_STRING_MULTIPLE('T', "table", cli_table_opts, OPT_REQUIRED_VALUE, "\tSets options for the table."),
+    OPT_SWITCH('d', 0, test_to_perform, TEST_DEFAULT_COLUMN_ORDER, OPT_SINGLE, "\tRun the test that uses the default column order."),
+    OPT_SWITCH('i', 0, test_to_perform, TEST_INVALID_OPTION, OPT_SINGLE, "\tTest the output for invalid option."),
+    OPT_SWITCH('n', 0, test_to_perform, TEST_INVALID_ORDER, OPT_SINGLE, "\tTest the output for invalid names of columns for the 'cols' option."),
+    OPT_END
+  }
+};
+
+static void process_command_line_opts(char *argv[], struct table *tbl)
+{
+  GARY_INIT(cli_table_opts, 0);
+
+  opt_parse(&table_printer_opts, argv+1);
+  const char *err = table_set_gary_options(tbl, cli_table_opts);
+  if(err) {
+    opt_failure("error while setting cmd line options: %s", err);
+  }
+
+  GARY_FREE(cli_table_opts);
+}
+
+static bool user_defined_option(struct table *tbl UNUSED, const char *key, const char *value, const char **err UNUSED)
+{
+  if(value == NULL && strcmp(key, "novaluekey") == 0) {
+    printf("setting key: %s; value: (null)\n", key);
+    return 1;
+  }
+  if(value != NULL && strcmp(value, "value") == 0 &&
+     key != NULL && strcmp(key, "valuekey") == 0) {
+    printf("setting key: %s; value: %s\n", key, value);
+    return 1;
+  }
+  return 0;
+}
+
+static void test_option_parser(struct table *tbl)
+{
+  struct table_formatter test_option_fmtr = table_fmt_human_readable;
+  test_option_fmtr.process_option = user_defined_option;
+
+  const struct table_formatter *tmp_fmtr = tbl->formatter;
+  tbl->formatter = &test_option_fmtr;
+
+  const char *rv = table_set_option(tbl, "invalid:option");
+  if(rv) printf("Tableprinter option parser returned error: \"%s\".\n", rv);
+
+  rv = table_set_option(tbl, "invalid");
+  if(rv) printf("Tableprinter option parser returned error: \"%s\".\n", rv);
+
+  rv = table_set_option(tbl, "novaluekey");
+  if(rv) printf("Tableprinter option parser returned error: \"%s\".\n", rv);
+
+  rv = table_set_option(tbl, "valuekey:value");
+  if(rv) printf("Tableprinter option parser returned error: \"%s\".\n", rv);
+
+  tbl->formatter = tmp_fmtr;
+}
+
+int main(int argc UNUSED, char **argv)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+
+  struct table *tbl = table_init(&test_tbl);
+
+  process_command_line_opts(argv, tbl);
+
+  const char *rv = NULL;
+  switch(test_to_perform) {
+  case TEST_INVALID_ORDER:
+    rv = table_set_option(tbl, "cols:test_col0_str,test_col1_int,xxx");
+    if(rv) printf("Tableprinter option parser returned: '%s'.\n", rv);
+    return 0;
+  case TEST_DEFAULT_COLUMN_ORDER:
+    do_default_order_test(out);
+    bclose(out);
+    return 0;
+  case TEST_INVALID_OPTION:
+    test_option_parser(tbl);
+    bclose(out);
+    return 0;
+  };
+
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+  table_cleanup(tbl);
+
+  bclose(out);
+
+  return 0;
+}
diff --git a/libucw/ucw/table-test.t b/libucw/ucw/table-test.t
new file mode 100644
index 0000000..63a7d4b
--- /dev/null
+++ b/libucw/ucw/table-test.t
@@ -0,0 +1,107 @@
+Run: ../obj/ucw/table-test -T cols:col3_bool
+Out <<EOF
+col3_bool
+     true
+    false
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str
+Out <<EOF
+col3_bool	            col0_str
+     true	               sdsdf
+    false	                test
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str
+Out <<EOF
+col3_bool	            col0_str
+     true	               sdsdf
+    false	                test
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double
+Out <<EOF
+col3_bool	            col0_str	col4_double
+     true	               sdsdf	       1.50
+    false	                test	       1.50
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine
+Out <<EOF
+col3_bool;col0_str;col4_double
+true;sdsdf;1.50
+false;test;1.50
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T header:1
+Out <<EOF
+col3_bool;col0_str;col4_double
+true;sdsdf;1.50
+false;test;1.50
+EOF
+
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T header:0
+Out <<EOF
+true;sdsdf;1.50
+false;test;1.50
+EOF
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T noheader
+Out <<EOF
+true;sdsdf;1.50
+false;test;1.50
+EOF
+
+Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:AHOJ' -T fmt:machine -T noheader
+Out <<EOF
+trueAHOJsdsdfAHOJ1.50
+falseAHOJtestAHOJ1.50
+EOF
+
+Run: ../obj/ucw/table-test -T 'cols:*' -T fmt:blockline
+Out <<EOF
+col0_str: sdsdf
+col1_int: 10000
+col2_uint: XXX-22222
+col3_bool: 1
+col4_double: 1.5
+col5_size: 5368709120
+col6_timestamp: 1404305876
+
+col0_str: test
+col1_int: -100
+col2_uint: 100
+col3_bool: 0
+col4_double: 1.5
+col5_size: 2147483648
+col6_timestamp: 1404305909
+
+EOF
+
+Run: ../obj/ucw/table-test -n
+Out <<EOF
+Tableprinter option parser returned: 'Unknown table column 'test_col0_str', possible column names are: col0_str, col1_int, col2_uint, col3_bool, col4_double, col5_size, col6_timestamp.'.
+EOF
+
+
+Run: ../obj/ucw/table-test -d
+Out <<EOF
+col0_int	 col1_int	 col2_int
+       0	        1	        2
+      10	       11	       12
+EOF
+
+
+Run: ../obj/ucw/table-test -i
+Out <<EOF
+Tableprinter option parser returned error: "Invalid option: 'invalid:option'.".
+Tableprinter option parser returned error: "Invalid option: 'invalid'.".
+setting key: novaluekey; value: (null)
+setting key: valuekey; value: value
+EOF
diff --git a/libucw/ucw/table.c b/libucw/ucw/table.c
new file mode 100644
index 0000000..1324839
--- /dev/null
+++ b/libucw/ucw/table.c
@@ -0,0 +1,790 @@
+/*
+ *	UCW Library -- Table printer
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/string.h>
+#include <ucw/stkstring.h>
+#include <ucw/gary.h>
+#include <ucw/table.h>
+#include <ucw/strtonum.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+
+/* Forward declarations */
+
+static void table_update_ll(struct table *tbl);
+
+/*** Management of tables ***/
+
+struct table *table_init(const struct table_template *tbl_template)
+{
+  struct mempool *pool = mp_new(4096);
+  struct table *new_inst = mp_alloc_zero(pool, sizeof(struct table));
+
+  new_inst->pool = pool;
+
+  // initialize column definitions
+  uint col_count = 0; // count the number of columns in the struct table
+  for(;;) {
+    if(tbl_template->columns[col_count].name == NULL &&
+       tbl_template->columns[col_count].width == 0 &&
+       tbl_template->columns[col_count].type_def == COL_TYPE_ANY)
+      break;
+    ASSERT(tbl_template->columns[col_count].name != NULL);
+    ASSERT(tbl_template->columns[col_count].width != 0);
+
+    col_count++;
+  }
+  new_inst->column_count = col_count;
+
+  new_inst->columns = tbl_template->columns;
+  new_inst->ll_headers = mp_alloc(new_inst->pool, sizeof(int) * col_count);
+  for(uint i = 0; i < col_count; i++) {
+    new_inst->ll_headers[i] = -1;
+  }
+
+  // initialize column_order
+  if(tbl_template->column_order) {
+    int cols_to_output = 0;
+    for(; ; cols_to_output++) {
+      if(tbl_template->column_order[cols_to_output].idx == ~0U) break;
+    }
+
+    new_inst->column_order = mp_alloc_zero(new_inst->pool, sizeof(struct table_col_instance) * cols_to_output);
+    memcpy(new_inst->column_order, tbl_template->column_order, sizeof(struct table_col_instance) * cols_to_output);
+    for(uint i = 0; i < new_inst->cols_to_output; i++) {
+      new_inst->column_order[i].cell_content = NULL;
+      int col_def_idx = new_inst->column_order[i].idx;
+      new_inst->column_order[i].col_def = new_inst->columns + col_def_idx;
+      new_inst->column_order[i].fmt = tbl_template->columns[col_def_idx].fmt;
+    }
+
+    new_inst->cols_to_output = cols_to_output;
+  }
+
+  new_inst->col_delimiter = tbl_template->col_delimiter;
+  new_inst->print_header = true;
+  new_inst->out = 0;
+  new_inst->row_printing_started = false;
+  new_inst->col_out = -1;
+  new_inst->formatter = tbl_template->formatter;
+  if(!new_inst->formatter) {
+    new_inst->formatter = &table_fmt_human_readable;
+  }
+  new_inst->formatter_data = NULL;
+  return new_inst;
+}
+
+void table_cleanup(struct table *tbl)
+{
+  mp_delete(tbl->pool);
+}
+
+// TODO: test default column order
+static void table_make_default_column_order(struct table *tbl)
+{
+  struct table_col_instance *col_order = alloca(sizeof(struct table_col_instance) * (tbl->column_count + 1));
+  bzero(col_order, sizeof(struct table_col_instance) * tbl->column_count);
+
+  for(int i = 0; i < tbl->column_count; i++) {
+    col_order[i].idx = (uint) i;
+    // currently, XTYPE_FMT_DEFAULT is 0, so bzero actually sets it correctly. This makes it more explicit.
+    col_order[i].fmt = XTYPE_FMT_DEFAULT;
+  }
+  struct table_col_instance tbl_col_order_end = TBL_COL_ORDER_END;
+  col_order[tbl->column_count] = tbl_col_order_end;
+
+  table_set_col_order(tbl, col_order);
+}
+
+void table_start(struct table *tbl, struct fastbuf *out)
+{
+  tbl->row_printing_started = false;
+  tbl->out = out;
+
+  ASSERT_MSG(tbl->out, "Output fastbuf not specified.");
+
+  if(tbl->column_order == NULL) table_make_default_column_order(tbl);
+  // update linked lists
+  table_update_ll(tbl);
+  if(tbl->formatter->table_start != NULL) tbl->formatter->table_start(tbl);
+
+  mp_save(tbl->pool, &tbl->pool_state);
+
+  ASSERT_MSG(tbl->col_delimiter, "Column delimiter not specified.");
+}
+
+void table_end(struct table *tbl)
+{
+  tbl->row_printing_started = false;
+
+  mp_restore(tbl->pool, &tbl->pool_state);
+
+  if(tbl->formatter->table_end) tbl->formatter->table_end(tbl);
+}
+
+/*** Configuration ***/
+
+void table_set_formatter(struct table *tbl, const struct table_formatter *fmt)
+{
+  tbl->formatter = fmt;
+}
+
+int table_get_col_idx(struct table *tbl, const char *col_name)
+{
+  for(int i = 0; i < tbl->column_count; i++) {
+    if(strcmp(tbl->columns[i].name, col_name) == 0) return i;
+  }
+  return -1;
+}
+
+const char * table_get_col_list(struct table *tbl)
+{
+  if(tbl->column_count == 0) return "";
+
+  char *tmp = mp_strdup(tbl->pool, tbl->columns[0].name);
+
+  for(int i = 1; i < tbl->column_count; i++) {
+    tmp = mp_printf_append(tbl->pool, tmp, ", %s", tbl->columns[i].name);
+  }
+
+  return tmp;
+}
+
+static void table_update_ll(struct table *tbl)
+{
+  int cols_to_output = tbl->cols_to_output;
+
+  for(int i = 0; i < tbl->column_count; i++) {
+    tbl->ll_headers[i] = -1;
+  }
+
+  for(int i = 0; i < cols_to_output; i++) {
+    int col_def_idx = tbl->column_order[i].idx;
+    tbl->column_order[i].col_def = tbl->columns + col_def_idx;
+  }
+
+  for(int i = 0; i < cols_to_output; i++) {
+    int col_def_idx = tbl->column_order[i].idx;
+    int first = tbl->ll_headers[col_def_idx];
+    tbl->ll_headers[col_def_idx] = i;
+    tbl->column_order[i].next_column = first;
+  }
+}
+
+void table_set_col_order(struct table *tbl, const struct table_col_instance *col_order)
+{
+  uint cols_to_output = 0;
+  for(; ; cols_to_output++) {
+    if(col_order[cols_to_output].idx == ~0U) break;
+    ASSERT_MSG(col_order[cols_to_output].idx < (uint) tbl->column_count,
+               "Column %d does not exist; column number should be between 0 and %d(including).", col_order[cols_to_output].idx, tbl->column_count - 1);
+  }
+
+  tbl->cols_to_output = cols_to_output;
+  tbl->column_order = mp_alloc(tbl->pool, sizeof(struct table_col_instance) * cols_to_output);
+  memcpy(tbl->column_order, col_order, sizeof(struct table_col_instance) * cols_to_output);
+  for(uint i = 0; i < cols_to_output; i++) {
+    int col_def_idx = tbl->column_order[i].idx; // this is given in arg @col_order
+    tbl->column_order[i].col_def = tbl->columns + col_def_idx;
+    tbl->column_order[i].cell_content = NULL; // cell_content is copied from arg @col_order, so make sure that it is NULL
+    tbl->column_order[i].next_column = -1;
+    // tbl->column_order[i].fmt should be untouched (copied from arg @col_order)
+  }
+}
+
+bool table_col_is_printed(struct table *tbl, uint col_def_idx)
+{
+  if(tbl->ll_headers[col_def_idx] == -1) return false;
+
+  return true;
+}
+
+const char *table_set_col_opt(struct table *tbl, uint col_inst_idx, const char *col_opt)
+{
+  const struct table_column *col_def = tbl->column_order[col_inst_idx].col_def;
+
+  // Make sure that we do not call table_set_col_opt, which would
+  // result in an infinite recursion.
+  if(col_def && col_def->set_col_opt) {
+    ASSERT_MSG(col_def->set_col_opt != table_set_col_opt,"table_set_col_opt should not be used as a struct table_column::set_col_opt hook");
+    return col_def->set_col_opt(tbl, col_inst_idx, col_opt);
+  }
+
+  if(col_def && col_def->type_def) {
+    u32 fmt = 0;
+    const char *tmp_err = xtype_parse_fmt(col_def->type_def, col_opt, &fmt, tbl->pool);
+    if(tmp_err) return mp_printf(tbl->pool, "Invalid column format; xtypes error: '%s'.", tmp_err);
+    tbl->column_order[col_inst_idx].fmt = fmt;
+    return NULL;
+  }
+
+  return mp_printf(tbl->pool, "Invalid column format option: '%s' for column %d.", col_opt, col_inst_idx);
+}
+
+/**
+ * the input is a null-terminated string that contains: "<col-name>'['<param1>','<param2>\0
+ * i.e., the ']' is missing and is replaced by \0.
+ * the function replace the '[' by \0 and then parses the rest of the string.
+ **/
+static char **table_parse_col_arg2(char *col_def)
+{
+  char * left_br = strchr(col_def, '[');
+  if(left_br == NULL) return NULL;
+
+  *left_br = 0;
+  left_br++;
+
+  char *col_opt = left_br;
+
+  char *next = NULL;
+  char **result = NULL;
+  GARY_INIT(result, 0);
+  for(;;) {
+    next = strchr(col_opt, ',');
+    if(!next) break;
+    if(*next == 0) break;
+    *next = 0;
+    next++;
+    if(*col_opt)
+      *GARY_PUSH(result) = col_opt;
+
+    col_opt = next;
+  }
+  if(*col_opt)
+    *GARY_PUSH(result) = col_opt;
+
+  return result;
+}
+
+/**
+ * TODO: This function deliberately leaks memory. When it is called multiple times,
+ * previous column orders still remain allocated in the table's memory pool.
+ **/
+const char * table_set_col_order_by_name(struct table *tbl, const char *col_order_str)
+{
+  if(col_order_str[0] == '*') {
+    table_make_default_column_order(tbl);
+    return NULL;
+  }
+
+  if(!col_order_str[0]) {
+    tbl->column_order = mp_alloc(tbl->pool, 0);
+    tbl->cols_to_output = 0;
+    return NULL;
+  }
+
+  char *tmp_col_order = stk_strdup(col_order_str);
+
+  int col_count = 1;
+  bool inside_brackets = false;
+  for(int i = 0; col_order_str[i] != 0; i++) {
+    if(col_order_str[i] == '[')  inside_brackets = true;
+    if(col_order_str[i] == ']')  inside_brackets = false;
+    if(!inside_brackets && col_order_str[i] == ',') {
+      col_count++;
+    }
+  }
+
+  tbl->cols_to_output = col_count;
+  tbl->column_order = mp_alloc_zero(tbl->pool, sizeof(struct table_col_instance) * col_count);
+
+  int curr_col_inst_idx = 0;
+  char *name_start = tmp_col_order;
+  while(name_start) {
+    char *next = strpbrk(name_start, "[,");
+    if(next && *next == '[') {
+      next = strchr(next, ']');
+      if(!next) return mp_printf(tbl->pool, "Invalid column definition, missing ']'.");
+      *next++ = 0;
+      next = *next == 0 ? NULL : next + 1; // if next points to the last \0 => end the computation
+    } else if(next) {
+      *next++ = 0;
+    }
+
+    char **args = table_parse_col_arg2(name_start); // this sets 0 on the '['
+    int col_def_idx = table_get_col_idx(tbl, name_start);
+
+    if(col_def_idx == -1) {
+      return mp_printf(tbl->pool, "Unknown table column '%s', possible column names are: %s.", name_start, table_get_col_list(tbl));
+    }
+    tbl->column_order[curr_col_inst_idx].col_def = tbl->columns + col_def_idx;
+    tbl->column_order[curr_col_inst_idx].idx = col_def_idx;
+    tbl->column_order[curr_col_inst_idx].fmt = tbl->columns[col_def_idx].fmt;
+    if(args) {
+      for(uint i = 0; i < GARY_SIZE(args); i++) {
+        const char *err = NULL;
+        err = table_set_col_opt(tbl, curr_col_inst_idx, args[i]);
+        if(err) return mp_printf(tbl->pool, "Error occured while setting column option: %s.", err);
+      }
+      GARY_FREE(args);
+   }
+
+    name_start = next;
+    curr_col_inst_idx++;
+  }
+
+  return NULL;
+}
+
+/*** Table cells ***/
+
+/**
+ * The TBL_COL_ITER_START macro are used for iterating over all instances of a particular column in
+ * table _tbl.  _colidx is the column index in _tbl, _instptr is the pointer to the column instance
+ * (struct table_col_instance *), _idxval is the index of current column index. The variables are
+ * enclosed in a block, so they do not introduce variable name collisions.
+ *
+ * The TBL_COL_ITER_END macro must close the block started with TBL_COL_ITER_START.
+ *
+ * These macros are usually used to hide the implementation details of the column instances linked
+ * list. This is usefull for definition of new types.
+ **/
+#define TBL_COL_ITER_START(_tbl, _colidx, _instptr, _idxval) { struct table_col_instance *_instptr = NULL; int _idxval = _tbl->ll_headers[_colidx]; \
+  for(_idxval = _tbl->ll_headers[_colidx], _instptr = _tbl->column_order + _idxval; _idxval != -1; _idxval = _tbl->column_order[_idxval].next_column, _instptr = _tbl->column_order + _idxval)
+
+#define TBL_COL_ITER_END }
+
+static void table_col_raw(struct table *tbl, int col_templ, const char *col_content)
+{
+  TBL_COL_ITER_START(tbl, col_templ, curr_col_ptr, curr_col) {
+    curr_col_ptr->cell_content = col_content;
+  } TBL_COL_ITER_END
+}
+
+void table_col_generic_format(struct table *tbl, int col, void *value, const struct xtype *expected_type)
+{
+  ASSERT_MSG(col < tbl->column_count && col >= 0, "Table column %d does not exist.", col);
+  ASSERT(tbl->columns[col].type_def == COL_TYPE_ANY || expected_type == tbl->columns[col].type_def);
+  tbl->row_printing_started = true;
+  TBL_COL_ITER_START(tbl, col, curr_col, curr_col_inst_idx) {
+    enum xtype_fmt fmt = curr_col->fmt;
+    curr_col->cell_content = expected_type->format(value, fmt, tbl->pool);
+  } TBL_COL_ITER_END
+}
+
+#undef TBL_COL_ITER_START
+#undef TBL_COL_ITER_END
+
+void table_col_printf(struct table *tbl, int col, const char *fmt, ...)
+{
+  ASSERT_MSG(col < tbl->column_count && col >= 0, "Table column %d does not exist.", col);
+  tbl->row_printing_started = true;
+  va_list args;
+  va_start(args, fmt);
+  char *cell_content = mp_vprintf(tbl->pool, fmt, args);
+  table_col_raw(tbl, col, cell_content);
+  va_end(args);
+}
+
+TABLE_COL_BODY(int, int)
+TABLE_COL_BODY(uint, uint)
+TABLE_COL_BODY(double, double)
+TABLE_COL_BODY(intmax, intmax_t)
+TABLE_COL_BODY(uintmax, uintmax_t)
+TABLE_COL_BODY(s64, s64)
+TABLE_COL_BODY(u64, u64)
+TABLE_COL_BODY(bool, bool)
+TABLE_COL_BODY(str, const char *)
+
+void table_reset_row(struct table *tbl)
+{
+  for(uint i = 0; i < tbl->cols_to_output; i++) {
+    tbl->column_order[i].cell_content = NULL;
+  }
+  mp_restore(tbl->pool, &tbl->pool_state);
+  tbl->row_printing_started = false;
+}
+
+void table_end_row(struct table *tbl)
+{
+  ASSERT(tbl->formatter->row_output);
+  if(tbl->row_printing_started == false) return;
+  tbl->formatter->row_output(tbl);
+  table_reset_row(tbl);
+}
+
+/* Construction of a cell using a fastbuf */
+
+struct fastbuf *table_col_fbstart(struct table *tbl, int col)
+{
+  fbpool_init(&tbl->fb_col_out);
+  fbpool_start(&tbl->fb_col_out, tbl->pool, 1);
+  tbl->col_out = col;
+  return &tbl->fb_col_out.fb;
+}
+
+void table_col_fbend(struct table *tbl)
+{
+  char *cell_content = fbpool_end(&tbl->fb_col_out);
+  table_col_raw(tbl, tbl->col_out, cell_content);
+  tbl->col_out = -1;
+}
+
+/*** Option parsing ***/
+
+const char *table_set_option_value(struct table *tbl, const char *key, const char *value)
+{
+  // Options with no value
+  if(value == NULL || (value != NULL && strlen(value) == 0)) {
+    if(strcmp(key, "noheader") == 0) {
+      tbl->print_header = false;
+      return NULL;
+    }
+  }
+
+  // Options with a value
+  if(value) {
+    if(strcmp(key, "header") == 0) {
+      bool tmp;
+      const char *err = xt_bool.parse(value, &tmp, tbl->pool);
+      if(err)
+        return mp_printf(tbl->pool, "Invalid header parameter: '%s' has invalid value: '%s'.", key, value);
+
+      tbl->print_header = tmp;
+
+      return NULL;
+    } else if(strcmp(key, "cols") == 0) {
+      return table_set_col_order_by_name(tbl, value);
+    } else if(strcmp(key, "fmt") == 0) {
+      if(strcmp(value, "human") == 0) table_set_formatter(tbl, &table_fmt_human_readable);
+      else if(strcmp(value, "machine") == 0) table_set_formatter(tbl, &table_fmt_machine_readable);
+      else if(strcmp(value, "blockline") == 0) table_set_formatter(tbl, &table_fmt_blockline);
+      else {
+        return "Invalid argument to output-type option.";
+      }
+      return NULL;
+    } else if(strcmp(key, "cells") == 0) {
+      u32 fmt = 0;
+      const char *err = xtype_parse_fmt(NULL, value, &fmt, tbl->pool);
+      if(err) return mp_printf(tbl->pool, "Invalid cell format: '%s'.", err);
+      for(uint i = 0; i < tbl->cols_to_output; i++) {
+        tbl->column_order[i].fmt = fmt;
+      }
+      return NULL;
+    } else if(strcmp(key, "raw") == 0 || strcmp(key, "pretty") == 0) {
+      u32 fmt = 0;
+      const char *err = xtype_parse_fmt(NULL, key, &fmt, tbl->pool);
+      if(err) return mp_printf(tbl->pool, "Invalid cell format: '%s'.", err);
+      for(uint i = 0; i < tbl->cols_to_output; i++) {
+        tbl->column_order[i].fmt = fmt;
+      }
+      return NULL;
+    } else if(strcmp(key, "col-delim") == 0) {
+      char * d = mp_printf(tbl->pool, "%s", value);
+      tbl->col_delimiter = d;
+      return NULL;
+    }
+  }
+
+  // Formatter options
+  if(tbl->formatter && tbl->formatter->process_option) {
+    const char *err = NULL;
+    if(tbl->formatter->process_option(tbl, key, value, &err)) {
+      return err;
+    }
+  }
+
+  // Unrecognized option
+  return mp_printf(tbl->pool, "Invalid option: '%s%s%s'.", key, (value ? ":" : ""), (value ? : ""));
+}
+
+const char *table_set_option(struct table *tbl, const char *opt)
+{
+  char *key = stk_strdup(opt);
+  char *value = strchr(key, ':');
+  if(value) {
+    *value++ = 0;
+  }
+  return table_set_option_value(tbl, key, value);
+}
+
+const char *table_set_gary_options(struct table *tbl, char **gary_table_opts)
+{
+  for(uint i = 0; i < GARY_SIZE(gary_table_opts); i++) {
+    const char *rv = table_set_option(tbl, gary_table_opts[i]);
+    if(rv != NULL) {
+      return rv;
+    }
+  }
+  return NULL;
+}
+
+/*** Default formatter for human-readable output ***/
+
+static void table_row_human_readable(struct table *tbl)
+{
+  for(uint i = 0; i < tbl->cols_to_output; i++) {
+    const struct table_column *col_def = tbl->column_order[i].col_def;
+    if(i) {
+      bputs(tbl->out, tbl->col_delimiter);
+    }
+    int col_width = col_def->width & CELL_WIDTH_MASK;
+    if(col_def->width & CELL_ALIGN_LEFT) col_width = -1 * col_width;
+    bprintf(tbl->out, "%*s", col_width, tbl->column_order[i].cell_content);
+  }
+  bputc(tbl->out, '\n');
+}
+
+static void table_write_header(struct table *tbl)
+{
+  for(uint i = 0; i < tbl->cols_to_output; i++) {
+    const struct table_column *col_def = tbl->column_order[i].col_def;
+    if(i) {
+      bputs(tbl->out, tbl->col_delimiter);
+    }
+    int col_width = col_def->width & CELL_WIDTH_MASK;
+    if(col_def->width & CELL_ALIGN_LEFT) col_width = -1 * col_width;
+    bprintf(tbl->out, "%*s", col_width, col_def->name);
+  }
+  bputc(tbl->out, '\n');
+}
+
+static void table_start_human_readable(struct table *tbl)
+{
+  if(tbl->col_delimiter == NULL) {
+    tbl->col_delimiter = " ";
+  }
+
+  if(tbl->print_header != false) {
+    table_write_header(tbl);
+  }
+}
+
+const struct table_formatter table_fmt_human_readable = {
+  .row_output = table_row_human_readable,
+  .table_start = table_start_human_readable,
+};
+
+/*** Default formatter for machine-readable output ***/
+
+static void table_row_machine_readable(struct table *tbl)
+{
+  for(uint i = 0; i < tbl->cols_to_output; i++) {
+    if(i) {
+      bputs(tbl->out, tbl->col_delimiter);
+    }
+    bputs(tbl->out, tbl->column_order[i].cell_content);
+  }
+  bputc(tbl->out, '\n');
+}
+
+static void table_start_machine_readable(struct table *tbl)
+{
+  if(tbl->col_delimiter == NULL) {
+    tbl->col_delimiter = "\t";
+  }
+
+  if(tbl->print_header != false && tbl->cols_to_output > 0) {
+    bputs(tbl->out, tbl->column_order[0].col_def->name);
+    for(uint i = 1; i < tbl->cols_to_output; i++) {
+      bputs(tbl->out, tbl->col_delimiter);
+      bputs(tbl->out, tbl->column_order[i].col_def->name);
+    }
+    bputc(tbl->out, '\n');
+  }
+}
+
+const struct table_formatter table_fmt_machine_readable = {
+  .row_output = table_row_machine_readable,
+  .table_start = table_start_machine_readable,
+};
+
+
+/*** Blockline formatter ***/
+
+static void table_row_blockline_output(struct table *tbl)
+{
+  for(uint i = 0; i < tbl->cols_to_output; i++) {
+    const struct table_column *col_def = tbl->column_order[i].col_def;
+    bprintf(tbl->out, "%s: %s\n", col_def->name, tbl->column_order[i].cell_content);
+  }
+  bputc(tbl->out, '\n');
+}
+
+static void table_start_blockline(struct table *tbl)
+{
+  if(tbl->col_delimiter == NULL) {
+    tbl->col_delimiter = "\n";
+  }
+}
+
+const struct table_formatter table_fmt_blockline = {
+  .row_output = table_row_blockline_output,
+  .table_start = table_start_blockline
+};
+
+/*** Tests ***/
+
+#ifdef TEST
+
+#include <stdio.h>
+
+enum test_table_cols {
+  TEST_COL0_STR, TEST_COL1_INT, TEST_COL2_UINT, TEST_COL3_BOOL, TEST_COL4_DOUBLE
+};
+
+static struct table_col_instance test_column_order[] = { TBL_COL(TEST_COL3_BOOL), TBL_COL(TEST_COL4_DOUBLE),
+                      TBL_COL(TEST_COL2_UINT), TBL_COL(TEST_COL1_INT), TBL_COL(TEST_COL0_STR), TBL_COL_ORDER_END };
+
+static struct table_template test_tbl = {
+  TBL_COLUMNS {
+    [TEST_COL0_STR] = TBL_COL_STR("col0_str", 20),
+    [TEST_COL1_INT] = TBL_COL_INT("col1_int", 8),
+    [TEST_COL2_UINT] = TBL_COL_UINT("col2_uint", 9),
+    [TEST_COL3_BOOL] = TBL_COL_BOOL_FMT("col3_bool", 9, XTYPE_FMT_PRETTY),
+    [TEST_COL4_DOUBLE] = TBL_COL_DOUBLE("col4_double", 11),
+    TBL_COL_END
+  },
+  TBL_COL_ORDER(test_column_order),
+  TBL_FMT_HUMAN_READABLE,
+  TBL_COL_DELIMITER("\t"),
+};
+
+/**
+ * tests: table_set_nt, table_set_uint, table_set_bool, table_set_double, table_set_printf
+ **/
+static void do_print1(struct table *test_tbl)
+{
+  table_col_str(test_tbl, TEST_COL0_STR, "sdsdf");
+  table_col_int(test_tbl, TEST_COL1_INT, -10);
+  table_col_int(test_tbl, TEST_COL1_INT, 10000);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 10);
+  table_col_printf(test_tbl, TEST_COL2_UINT, "XXX-%u", 22222);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, true);
+  table_col_double(test_tbl, TEST_COL4_DOUBLE, 1.5);
+  table_col_printf(test_tbl, TEST_COL4_DOUBLE, "AAA");
+  table_end_row(test_tbl);
+
+  table_col_str(test_tbl, TEST_COL0_STR, "test");
+  table_col_int(test_tbl, TEST_COL1_INT, -100);
+  table_col_uint(test_tbl, TEST_COL2_UINT, 100);
+  table_col_bool(test_tbl, TEST_COL3_BOOL, false);
+  table_col_printf(test_tbl, TEST_COL4_DOUBLE, "%.2lf", 1.5);
+  table_end_row(test_tbl);
+}
+
+static void test_simple1(struct fastbuf *out)
+{
+  struct table *tbl = table_init(&test_tbl);
+
+  // print table with header
+  table_set_col_order_by_name(tbl, "col3_bool");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  // print the same table as in the previous case without header
+  table_set_col_order_by_name(tbl, "col0_str,col2_uint,col1_int,col3_bool");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  // this also tests whether there is need to call table_set_col_order_by_name after table_end was called
+  tbl->print_header = false;
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+  tbl->print_header = true;
+
+  table_set_col_order_by_name(tbl, "col3_bool");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  table_set_col_order_by_name(tbl, "col3_bool,col0_str");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  table_set_col_order_by_name(tbl, "col0_str,col3_bool,col2_uint");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  table_set_col_order_by_name(tbl, "col0_str,col3_bool,col2_uint,col0_str,col3_bool,col2_uint,col0_str,col3_bool,col2_uint");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+  table_set_col_order_by_name(tbl, "col0_str,col1_int,col2_uint,col3_bool,col4_double");
+  table_start(tbl, out);
+  do_print1(tbl);
+  table_end(tbl);
+
+
+  // test table_col_order_fmt
+  struct table_col_instance col_order[] = { TBL_COL(TEST_COL0_STR), TBL_COL_FMT(TEST_COL4_DOUBLE, XTYPE_FMT_PRETTY), TBL_COL_FMT(TEST_COL4_DOUBLE, XTYPE_FMT_RAW), TBL_COL_ORDER_END };
+  table_set_col_order(tbl, col_order);
+  table_start(tbl, out);
+
+  table_col_str(tbl, TEST_COL0_STR, "test");
+  table_col_double(tbl, TEST_COL4_DOUBLE, 1.23456789);
+  table_end_row(tbl);
+
+  table_col_str(tbl, TEST_COL0_STR, "test");
+  table_col_double(tbl, TEST_COL4_DOUBLE, 1.23456789);
+  table_end_row(tbl);
+
+  table_end(tbl);
+
+  table_cleanup(tbl);
+}
+
+enum test_any_table_cols {
+  TEST_ANY_COL0_INT, TEST_ANY_COL1_ANY
+};
+
+static struct table_col_instance test_any_column_order[] = { TBL_COL(TEST_ANY_COL0_INT), TBL_COL_FMT(TEST_ANY_COL1_ANY, XTYPE_FMT_PRETTY), TBL_COL_ORDER_END };
+
+static struct table_template test_any_tbl = {
+  TBL_COLUMNS {
+    [TEST_ANY_COL0_INT] = TBL_COL_INT("col0_int", 8),
+    [TEST_ANY_COL1_ANY] = TBL_COL_ANY_FMT("col1_any", 9, XTYPE_FMT_PRETTY),
+    TBL_COL_END
+  },
+  TBL_COL_ORDER(test_any_column_order),
+  TBL_FMT_HUMAN_READABLE,
+  TBL_COL_DELIMITER("\t"),
+};
+
+static void test_any_type(struct fastbuf *out)
+{
+  struct table *tbl = table_init(&test_any_tbl);
+
+  table_start(tbl, out);
+
+  table_col_int(tbl, TEST_ANY_COL0_INT, -10);
+  table_col_int(tbl, TEST_ANY_COL1_ANY, 10000);
+  table_end_row(tbl);
+
+  table_col_int(tbl, TEST_ANY_COL0_INT, -10);
+  table_col_double(tbl, TEST_ANY_COL1_ANY, 1.4);
+  table_end_row(tbl);
+
+  table_col_printf(tbl, TEST_ANY_COL0_INT, "%d", 10);
+  table_col_double(tbl, TEST_ANY_COL1_ANY, 1.4);
+  table_end_row(tbl);
+
+  table_end(tbl);
+  table_cleanup(tbl);
+}
+
+int main(int argc UNUSED, char **argv UNUSED)
+{
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+
+  test_simple1(out);
+
+  test_any_type(out);
+
+  bclose(out);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/table.h b/libucw/ucw/table.h
new file mode 100644
index 0000000..494276b
--- /dev/null
+++ b/libucw/ucw/table.h
@@ -0,0 +1,412 @@
+/*
+ *	UCW Library -- Table printer
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#ifndef _UCW_TABLE_H
+#define _UCW_TABLE_H
+
+#include <inttypes.h>
+
+#include <ucw/fastbuf.h>
+#include <ucw/mempool.h>
+#include <ucw/xtypes.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define table_cleanup ucw_table_cleanup
+#define table_col_bool ucw_table_col_bool
+#define table_col_double ucw_table_col_double
+#define table_col_fbend ucw_table_col_fbend
+#define table_col_fbstart ucw_table_col_fbstart
+#define table_col_generic_format ucw_table_col_generic_format
+#define table_col_int ucw_table_col_int
+#define table_col_intmax ucw_table_col_intmax
+#define table_col_is_printed ucw_table_col_is_printed
+#define table_col_printf ucw_table_col_printf
+#define table_col_s64 ucw_table_col_s64
+#define table_col_str ucw_table_col_str
+#define table_col_str ucw_table_col_str
+#define table_col_u64 ucw_table_col_u64
+#define table_col_uint ucw_table_col_uint
+#define table_col_uintmax ucw_table_col_uintmax
+#define table_end ucw_table_end
+#define table_end_row ucw_table_end_row
+#define table_fmt_blockline ucw_table_fmt_blockline
+#define table_fmt_human_readable ucw_table_fmt_human_readable
+#define table_fmt_machine_readable ucw_table_fmt_machine_readable
+#define table_get_col_idx ucw_table_get_col_idx
+#define table_get_col_list ucw_table_get_col_list
+#define table_init ucw_table_init
+#define table_reset_row ucw_table_reset_row
+#define table_set_col_opt ucw_table_set_col_opt
+#define table_set_col_order ucw_table_set_col_order
+#define table_set_col_order_by_name ucw_table_set_col_order_by_name
+#define table_set_formatter ucw_table_set_formatter
+#define table_set_gary_options ucw_table_set_gary_options
+#define table_set_option ucw_table_set_option
+#define table_set_option_value ucw_table_set_option_value
+#define table_start ucw_table_start
+#endif
+
+/***
+ * Table definitions
+ * -----------------
+ ***/
+
+// FIXME: update documentation according to the changes made in recent commits!
+
+/** The COL_TYPE_ANY macro specifies a column type which can be filled with arbitrary type. **/
+
+#define COL_TYPE_ANY      NULL
+
+/** Justify cell contents to the left. **/
+#define CELL_ALIGN_LEFT     (1U << 31)
+
+// CELL_FLAG_MASK has 1's in bits used for column flags,
+// CELL_WIDTH_MASK has 1's in bits used for column width.
+#define CELL_FLAG_MASK	(CELL_ALIGN_LEFT)
+#define CELL_WIDTH_MASK	(~CELL_FLAG_MASK)
+
+struct table;
+
+/**
+ * Definition of a single table column.
+ * Usually, this is generated using the `TABLE_COL_`'type' macros.
+ * Fields marked with `[*]` are user-accessible.
+ **/
+struct table_column {
+  const char *name;		// [*] Name of the column displayed in table header
+  uint width;			// [*] Width of the column (in characters) OR'ed with column flags
+  uint fmt;                     // [*] default format of the column
+  const struct xtype *type_def; // [*] pointer to xtype of this column
+
+  const char * (*set_col_opt)(struct table *tbl, uint col_inst_idx, const char *col_opt);
+       // [*] process table option for a column instance. @col_inst_idx is the index of the column
+       //     instance to which the @col_opt is set. Return value is the error string.
+};
+
+/**
+ * Definition of a column instance. The table_col_instance belongs to a struct table. col_def is
+ * pointing to a definition of the column in struct table::columns. The user can fill only the @idx
+ * and @fmt. The @col_def, @cell_content, @next_column are private fields.
+ *
+ * Please use only fields marked with `[*]`.
+ **/
+struct table_col_instance {
+  uint idx;                            // [*] idx is a index into struct table::columns
+  const struct table_column *col_def;  // this is pointer to the column definition, located in the array struct table::columns
+  const char *cell_content;            // content of the cell of the current row
+  int next_column;                     // index of next column in linked list of columns of the same type
+  uint fmt;                            // [*] format of this column
+};
+
+/**
+ * Definition of a table. Contains column definitions, and some per-table settings.
+ * Please use only fields marked with `[*]`.
+ **/
+struct table_template {
+  const struct table_column *columns;       // [*] Definition of columns
+  struct table_col_instance *column_order;  // [*] Order of the columns in the print-out of the table
+  const char *col_delimiter;                // [*] Delimiter that is placed between columns
+  // Back-end used for table formatting and its private data
+  const struct table_formatter *formatter;
+};
+
+/**
+ * Handle of a table. Contains column definitions, per-table settings
+ * and internal data. To change the table definition, please use only
+ * fields marked with `[*]`.
+ **/
+struct table {
+  const struct table_column *columns;	// [*] Definition of columns
+  int column_count;			// [*] Number of columns (calculated by table_init())
+  int *ll_headers;                      // headers of linked lists that connects column instances
+  struct mempool *pool;			// Memory pool used for storing table data. Contains global state
+					// and data of the current row.
+  struct mempool_state pool_state;	// State of the pool after the table is initialized, i.e., before
+					// per-row data have been allocated.
+
+  struct table_col_instance *column_order;  // [*] Order of the columns in the print-out of the table
+  uint cols_to_output;			// [*] Number of columns that are printed
+  const char *col_delimiter;		// [*] Delimiter that is placed between columns
+  bool print_header;			// [*] false indicates that table header should not be printed
+
+  struct fastbuf *out;			// [*] Fastbuffer to which the table is printed
+  bool row_printing_started;		// Indicates that a row has been started.
+  struct fbpool fb_col_out;		// Per-cell fastbuf, see table_col_fbstart()
+  int col_out;				// Index of the column that is currently printed using fb_col_out
+
+  // Back-end used for table formatting and its private data
+  const struct table_formatter *formatter;
+  void *formatter_data;
+};
+
+/****
+ * In most cases, table descriptions are constructed using the following macros.
+ * See the examples above for more details.
+ *
+ *  * `TBL_COLUMNS` indicates the start of definition of columns
+ *  * `TBL_COL_`'type'`(name, width)` defines a column of a given type
+ *  * `TBL_COL_`'type'`_FMT(name, width, fmt)` defines a column with a custom format string
+ *  * `TBL_COL_END` ends the column definitions
+ *  * `TBL_COL_ORDER` specifies custom ordering of columns in the output
+ *  * `TBL_COL_DELIMITER` overrides the default delimiter
+ *  * `TBL_FMT_HUMAN_READABLE` requests human-readable formatting (this is the default)
+ *  * `TBL_FMT_MACHINE_READABLE` requests machine-readable TSV output
+ *  * `TBL_FMT_BLOCKLINE` requests block formatting (each cell printed a pair of a key and value on its own line)
+ *
+ ***/
+
+#define TBL_COL_STR(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_str }
+#define TBL_COL_INT(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_int }
+#define TBL_COL_S64(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_s64 }
+#define TBL_COL_UINT(_name, _width)           { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_uint }
+#define TBL_COL_U64(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_u64 }
+#define TBL_COL_INTMAX(_name, _width)         { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_intmax }
+#define TBL_COL_UINTMAX(_name, _width)        { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_uintmax }
+#define TBL_COL_HEXUINT(_name, _width)        { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_uint }
+#define TBL_COL_DOUBLE(_name, _width)         { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_double }
+#define TBL_COL_BOOL(_name, _width)           { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_bool }
+#define TBL_COL_ANY(_name, _width)            { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = COL_TYPE_ANY }
+#define TBL_COL_XTYPE(_name, _width, _xtype)  { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = _xtype }
+
+#define TBL_COL_STR_FMT(_name, _width, _fmt)            { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_str }
+#define TBL_COL_INT_FMT(_name, _width, _fmt)            { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_int }
+#define TBL_COL_S64_FMT(_name, _width, _fmt)            { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_s64 }
+#define TBL_COL_UINT_FMT(_name, _width, _fmt)           { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_uint }
+#define TBL_COL_U64_FMT(_name, _width, _fmt)            { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_u64 }
+#define TBL_COL_INTMAX_FMT(_name, _width, _fmt)         { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_intmax }
+#define TBL_COL_UINTMAX_FMT(_name, _width, _fmt)        { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_uintmax }
+#define TBL_COL_HEXUINT_FMT(_name, _width, _fmt)        { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_uint }
+#define TBL_COL_BOOL_FMT(_name, _width, _fmt)           { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_bool }
+#define TBL_COL_ANY_FMT(_name, _width, _fmt)            { .name = _name, .width = _width, .fmt = _fmt, .type_def = COL_TYPE_ANY }
+#define TBL_COL_DOUBLE_FMT(_name, _width, _fmt)         { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_double }
+
+#define TBL_COL_END { .name = 0, .width = 0, .fmt = 0, .type_def = NULL }
+
+#define TBL_COLUMNS  .columns = (struct table_column [])
+#define TBL_COL_ORDER(order) .column_order = (struct table_col_instance *) order
+#define TBL_COL_DELIMITER(_delimiter) .col_delimiter = _delimiter
+
+/**
+ * These macros are used for definition of column order
+ **/
+#define TBL_COL(_idx) { .idx = _idx, .fmt = XTYPE_FMT_DEFAULT, .next_column = -1 }
+#define TBL_COL_FMT(_idx, _fmt) { .idx = _idx, .fmt = _fmt, .next_column = -1 }
+#define TBL_COL_ORDER_END { .col_def = 0, .idx = ~0U, .fmt = 0, .next_column = -1 }
+
+/**
+ * These macros are aliases to various kinds of table formats.
+ **/
+#define TBL_FMT_HUMAN_READABLE     .formatter = &table_fmt_human_readable
+#define TBL_FMT_BLOCKLINE          .formatter = &table_fmt_blockline
+#define TBL_FMT_MACHINE_READABLE   .formatter = &table_fmt_machine_readable
+#define TBL_FMT(_fmt)              .formatter = _fmt
+
+/**
+ * Creates a new table from a table template. The template should already contain
+ * the definitions of columns.
+ **/
+struct table *table_init(const struct table_template *tbl_template);
+
+/** Destroy a table instance, freeing all memory used by it. **/
+void table_cleanup(struct table *tbl);
+
+/**
+ * Start printing of a table. This is a prerequisite to setting of column values.
+ * After @table_start() is called, it is no longer possible to change parameters
+ * of the table by `table_set_`'something' nor by direct access to the table structure.
+ **/
+void table_start(struct table *tbl, struct fastbuf *out);
+
+/**
+ * This function must be called after all the rows of the current table are printed,
+ * making the table structure ready for the next table. You can call `table_set_`'something'
+ * between @table_end() and @table_start().
+ **/
+void table_end(struct table *tbl);
+
+/***
+ * Filling tables with data
+ * ------------------------
+ *
+ * For each column type, there are functions for filling of cells
+ * of the particular type:
+ *
+ *   * `table_col_`'type'`(table, col_def_idx, value)` sets the cell in column `col_def_idx`
+ *     to the `value`
+ ***/
+
+#define TABLE_COL_PROTO(_name, _type) void table_col_##_name(struct table *tbl, int col, _type val);
+
+TABLE_COL_PROTO(int, int)
+TABLE_COL_PROTO(uint, uint)
+TABLE_COL_PROTO(double, double)
+TABLE_COL_PROTO(intmax, intmax_t)
+TABLE_COL_PROTO(uintmax, uintmax_t)
+TABLE_COL_PROTO(s64, s64)
+TABLE_COL_PROTO(u64, u64)
+TABLE_COL_PROTO(bool, bool)
+TABLE_COL_PROTO(str, const char *)
+
+/** TABLE_COL_BODY macro enables easy definitions of bodies of table_col_<something> functions **/
+#define TABLE_COL_BODY(_name, _type) void table_col_##_name(struct table *tbl, int col, _type val) {\
+    table_col_generic_format(tbl, col, (void*)&val, &xt_##_name);\
+  }
+
+/**
+ * The table_col_generic_format performs all the checks necessary while filling cell with value,
+ * calls the format function from expected_type and stores its result as a cell value. The function
+ * guarantees that each column instance is printed with its format.
+ **/
+void table_col_generic_format(struct table *tbl, int col, void *value, const struct xtype *expected_type);
+
+/**
+ * Set a particular cell of the current row to a string formatted
+ * by sprintf(). This function can set a column of an arbitrary type.
+ **/
+void table_col_printf(struct table *tbl, int col, const char *fmt, ...) FORMAT_CHECK(printf, 3, 4);
+
+/**
+ * Alternatively, a string cell can be constructed as a stream.
+ * This function creates a fastbuf stream connected to the contents
+ * of the particular cell. Before you close the stream by @table_col_fbend(),
+ * no other operations with cells are allowed.
+ **/
+struct fastbuf *table_col_fbstart(struct table *tbl, int col);
+
+/**
+ * Close the stream that is used for printing of the current column.
+ **/
+void table_col_fbend(struct table *tbl);
+
+/**
+ * Called when all cells of the current row have their values filled in.
+ * It sends the completed row to the output stream.
+ **/
+void table_end_row(struct table *tbl);
+
+/**
+ * Resets data in the current row.
+ **/
+void table_reset_row(struct table *tbl);
+
+/***
+ * Configuration functions
+ * -----------------------
+ ***/
+
+/**
+ * Find the index of a column definition with name @col_name. Returns -1 if there is no such column.
+ **/
+int table_get_col_idx(struct table *tbl, const char *col_name);
+
+/**
+ * Sets a string option on a column instance.
+ *
+ * By default, the option is parsed as a formatting mode of the corresponding <<xtypes:,xtype>>
+ * using <<xtypes:fun_xtype_parse_fmt,`xtype_parse_fmt()`>>.
+ *
+ * As special cases might require special handling (e.g., column decoration, post-processing, etc.),
+ * a column can define a `set_col_opt` hook, which takes over option parsing. (Beware, the hook must
+ * not be called directly and it must not call this function.)
+ *
+ * See <<ucw-tableprinter.5:,the list of options>> for more.
+ **/
+const char *table_set_col_opt(struct table *tbl, uint col_inst_idx, const char *col_opt);
+
+/**
+ * Returns a comma-and-space-separated list of column names, allocated from table's internal
+ * memory pool.
+ **/
+const char *table_get_col_list(struct table *tbl);
+
+/**
+ * Sets the order in which the columns are printed. The columns are specified by array of struct
+ * @table_col_instance. This allows specification of format. The user should make an array of struct
+ * @table_col_instance and fill the array using the TBL_COL and TBL_COL_FMT. The array has a special
+ * last element: @TBL_COL_ORDER_END.
+ *
+ * The table copies content of @col_order into an internal representation stored
+ * in `column_order`. Options to column instances can be set using @table_set_col_opt().
+ **/
+void table_set_col_order(struct table *tbl, const struct table_col_instance *col_order);
+
+/**
+ * Sets the order in which the columns are printed. The specification is a string with comma-separated column
+ * names. Returns NULL for success and an error message otherwise. The string is not referenced after
+ * this function returns.
+ *
+ * See <<ucw-tableprinter.5:,the list of options>> for full syntax.
+ **/
+const char *table_set_col_order_by_name(struct table *tbl, const char *col_order);
+
+/**
+ * Returns true if @col_def_idx will be printed, false otherwise.
+ **/
+bool table_col_is_printed(struct table *tbl, uint col_def_idx);
+
+/**
+ * Sets table formatter. See below for the list of formatters.
+ **/
+void table_set_formatter(struct table *tbl, const struct table_formatter *fmt);
+
+/**
+ * Set a table option. All options have a key and a value.
+ * See <<ucw-tableprinter.5:,the list of options>>.
+ **/
+const char *table_set_option_value(struct table *tbl, const char *key, const char *value);
+
+/**
+ * Sets a table option given as 'key'`:`'value' or 'key' (with no value).
+ **/
+const char *table_set_option(struct table *tbl, const char *opt);
+
+/**
+ * Sets several table option in 'key'`:`'value' form, stored in a growing array.
+ * This is frequently used for options given on the command line.
+ **/
+const char *table_set_gary_options(struct table *tbl, char **gary_table_opts);
+
+/***
+ * Formatters
+ * ----------
+ *
+ * Transformation of abstract cell data to the characters in the output stream
+ * is under control of a formatter (which serves as a back-end of the table printer).
+ * There are several built-in formatters, but you can define your own.
+ *
+ * A formatter is described by a structure, which contains pointers to several
+ * call-back functions, which are called by the table printer at specific occasions.
+ *
+ * The formatter can keep its internal state in the `data` field of `struct table`
+ * and allocate temporary data from the table's memory pool. Memory allocated in
+ * the `row_output` call-back is freed before the next row begins. Memory allocated
+ * between the beginning of `table_start` and the end of `table_end` is freed after
+ * `table_end`. Memory allocated by `process_option` when no table is started
+ * is kept until @table_cleanup().
+ ***/
+
+/** Definition of a formatter back-end. **/
+struct table_formatter {
+  void (*row_output)(struct table *tbl);	// [*] Function that outputs one row
+  void (*table_start)(struct table *tbl);	// [*] table_start callback (optional)
+  void (*table_end)(struct table *tbl);		// [*] table_end callback (optional)
+  bool (*process_option)(struct table *tbl, const char *key, const char *value, const char **err);
+	// [*] Process table option and possibly return an error message (optional)
+};
+
+/** Standard formatter for human-readable output. **/
+extern const struct table_formatter table_fmt_human_readable;
+
+/** Standard formatter for machine-readable output (tab-separated values). **/
+extern const struct table_formatter table_fmt_machine_readable;
+
+/**
+ * Standard formatter for block output. Each cell is output on its own line
+ * of the form `column_name: value`. Rows are separated by blank lines.
+ **/
+extern const struct table_formatter table_fmt_blockline;
+
+#endif
diff --git a/libucw/ucw/table.t b/libucw/ucw/table.t
new file mode 100644
index 0000000..a04c5e4
--- /dev/null
+++ b/libucw/ucw/table.t
@@ -0,0 +1,33 @@
+Run: ../obj/ucw/table-t
+Out <<EOF
+col3_bool
+     true
+    false
+            col0_str	col2_uint	col1_int	col3_bool
+               sdsdf	XXX-22222	   10000	     true
+                test	      100	    -100	    false
+               sdsdf	XXX-22222	   10000	     true
+                test	      100	    -100	    false
+col3_bool
+     true
+    false
+col3_bool	            col0_str
+     true	               sdsdf
+    false	                test
+            col0_str	col3_bool	col2_uint
+               sdsdf	     true	XXX-22222
+                test	    false	      100
+            col0_str	col3_bool	col2_uint	            col0_str	col3_bool	col2_uint	            col0_str	col3_bool	col2_uint
+               sdsdf	     true	XXX-22222	               sdsdf	     true	XXX-22222	               sdsdf	     true	XXX-22222
+                test	    false	      100	                test	    false	      100	                test	    false	      100
+            col0_str	col1_int	col2_uint	col3_bool	col4_double
+               sdsdf	   10000	XXX-22222	     true	        AAA
+                test	    -100	      100	    false	       1.50
+            col0_str	col4_double	col4_double
+                test	       1.23	 1.23456789
+                test	       1.23	 1.23456789
+col0_int	 col1_any
+     -10	    10000
+     -10	     1.40
+      10	     1.40
+EOF
diff --git a/libucw/ucw/tbf.c b/libucw/ucw/tbf.c
new file mode 100644
index 0000000..62b0c41
--- /dev/null
+++ b/libucw/ucw/tbf.c
@@ -0,0 +1,59 @@
+/*
+ *	UCW Library -- Rate Limiting based on the Token Bucket Filter
+ *
+ *	(c) 2009 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/tbf.h>
+
+void
+tbf_init(struct token_bucket_filter *f)
+{
+  if (!f->burst)
+    f->burst = MAX(2*f->rate, 1);
+  f->last_hit = 0;
+  f->bucket = f->burst;
+}
+
+int
+tbf_limit(struct token_bucket_filter *f, timestamp_t now)
+{
+  timestamp_t delta_t = now - f->last_hit;
+  f->last_hit = now;
+
+  double b = f->bucket + f->rate * delta_t / 1000;
+  b = MIN(b, f->burst);
+  if (b >= 1)
+    {
+      uint dropped = f->drop_count;
+      f->bucket = b - 1;
+      f->drop_count = 0;
+      return dropped;
+    }
+  else
+    {
+      f->bucket = b;
+      f->drop_count++;
+      return -f->drop_count;
+    }
+}
+
+#ifdef TEST
+
+int main(void)
+{
+  struct token_bucket_filter t = { .rate = 1, .burst = 2 };
+  tbf_init(&t);
+  for (timestamp_t now = 0; now < 3000; now += 77)
+    {
+      int res = tbf_limit(&t, now);
+      msg(L_DEBUG, "t=%u result=%d bucket=%f", (uint) now, res, t.bucket);
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/tbf.h b/libucw/ucw/tbf.h
new file mode 100644
index 0000000..801d5f6
--- /dev/null
+++ b/libucw/ucw/tbf.h
@@ -0,0 +1,39 @@
+/*
+ *	UCW Library -- Rate Limiting based on the Token Bucket Filter
+ *
+ *	(c) 2009 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_TBF_H_
+#define _UCW_TBF_H_
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define tbf_init ucw_tbf_init
+#define tbf_limit ucw_tbf_limit
+#endif
+
+/** A data structure describing a single TBF. **/
+struct token_bucket_filter {
+  double rate;				// Number of tokens received per second
+  uint burst;				// Capacity of the bucket
+  timestamp_t last_hit;			// Internal state...
+  double bucket;
+  uint drop_count;
+};
+
+/** Initialize the bucket. **/
+void tbf_init(struct token_bucket_filter *f);
+
+/**
+ * Ask the filter to process a single event. Returns a negative number
+ * if the event exceeds the rate (and should be dropped) and a non-negative
+ * number if the event passes the filter.
+ * The absolute value of the result is the number of dropped events
+ * since the last passed event.
+ **/
+int tbf_limit(struct token_bucket_filter *f, timestamp_t now);
+
+#endif
diff --git a/libucw/ucw/tempfile.c b/libucw/ucw/tempfile.c
new file mode 100644
index 0000000..cb0914a
--- /dev/null
+++ b/libucw/ucw/tempfile.c
@@ -0,0 +1,106 @@
+/*
+ *	UCW Library -- Temporary Files
+ *
+ *	(c) 2002--2008 Martin Mares <mj@ucw.cz>
+ *	(c) 2008 Michal Vaner <vorner@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/threads.h>
+#include <ucw/io.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/fcntl.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <errno.h>
+
+static char *temp_prefix = "temp";
+static char *temp_dir;
+static int public_dir = 1;
+
+static struct cf_section temp_config = {
+  CF_ITEMS {
+    CF_STRING("Dir", &temp_dir),
+    CF_STRING("Prefix", &temp_prefix),
+    CF_INT("PublicDir", &public_dir),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR temp_global_init(void)
+{
+  cf_declare_section("Tempfiles", &temp_config, 0);
+}
+
+void
+temp_file_name(char *name_buf, int *open_flags)
+{
+  char *dir = temp_dir;
+  if (!dir && !(dir = getenv("TMPDIR")))
+    dir = "/tmp";
+
+  int len;
+  if (public_dir)
+    {
+      struct timeval tv;
+      if (gettimeofday(&tv, NULL))
+	die("gettimeofday() failed: %m");
+      len = snprintf(name_buf, TEMP_FILE_NAME_LEN, "%s/%s%u", dir, temp_prefix, (uint) tv.tv_usec);
+      if (open_flags)
+	*open_flags = O_EXCL;
+    }
+  else
+    {
+      struct ucwlib_context *ctx = ucwlib_thread_context();
+      int cnt = ++ctx->temp_counter;
+      int pid = getpid();
+      if (ucwlib_thread_id(ctx) == pid)
+	len = snprintf(name_buf, TEMP_FILE_NAME_LEN, "%s/%s%d-%d", dir, temp_prefix, pid, cnt);
+      else
+	len = snprintf(name_buf, TEMP_FILE_NAME_LEN, "%s/%s%d-%d-%d", dir, temp_prefix, pid, ucwlib_thread_id(ctx), cnt);
+      if (open_flags)
+	*open_flags = 0;
+    }
+  ASSERT(len < TEMP_FILE_NAME_LEN);
+}
+
+int
+open_tmp(char *name_buf, int open_flags, int mode)
+{
+  int create_flags, fd, retry = 10;
+  do
+    {
+      temp_file_name(name_buf, &create_flags);
+      fd = ucw_open(name_buf, open_flags | create_flags, mode);
+    }
+  while (fd < 0 && errno == EEXIST && retry --);
+  if (fd < 0)
+    die("Unable to create temp file %s: %m", name_buf);
+  return fd;
+}
+
+#ifdef TEST
+
+#include <ucw/getopt.h>
+
+int main(int argc, char **argv)
+{
+  log_init(NULL);
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0)
+    die("Hey, whaddya want?");
+
+  char buf[TEMP_FILE_NAME_LEN];
+  int fd = open_tmp(buf, O_RDWR | O_CREAT | O_TRUNC, 0666);
+  close(fd);
+  unlink(buf);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/threads-conf.c b/libucw/ucw/threads-conf.c
new file mode 100644
index 0000000..15901e9
--- /dev/null
+++ b/libucw/ucw/threads-conf.c
@@ -0,0 +1,27 @@
+/*
+ *	The UCW Library -- Threading Helpers
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/threads.h>
+#include <ucw/conf.h>
+
+uint ucwlib_thread_stack_size = 65556;
+
+static struct cf_section threads_config = {
+  CF_ITEMS {
+    CF_UINT("DefaultStackSize", &ucwlib_thread_stack_size),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR
+ucwlib_threads_conf_init(void)
+{
+  cf_declare_section("Threads", &threads_config, 0);
+}
diff --git a/libucw/ucw/threads.c b/libucw/ucw/threads.c
new file mode 100644
index 0000000..b662571
--- /dev/null
+++ b/libucw/ucw/threads.c
@@ -0,0 +1,136 @@
+/*
+ *	The UCW Library -- Threading Helpers
+ *
+ *	(c) 2006--2010 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/threads.h>
+
+#ifdef CONFIG_UCW_THREADS
+
+#include <pthread.h>
+
+#ifdef CONFIG_LINUX
+#include <sys/types.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#ifdef __NR_gettid
+static pid_t
+ucw_gettid(void)
+{
+  return syscall(__NR_gettid);
+}
+#define CONFIG_USE_GETTID
+#endif
+#endif
+
+/*** Library lock ***/
+
+static pthread_mutex_t ucwlib_master_mutex;
+
+void
+ucwlib_lock(void)
+{
+  pthread_mutex_lock(&ucwlib_master_mutex);
+}
+
+void
+ucwlib_unlock(void)
+{
+  pthread_mutex_unlock(&ucwlib_master_mutex);
+}
+
+/*** Thread identifiers ***/
+
+static int
+ucwlib_tid(void)
+{
+  static int tid_counter;
+  int tid;
+
+#ifdef CONFIG_USE_GETTID
+  tid = ucw_gettid();
+  if (tid > 0)
+    return tid;
+  /* The syscall might be unimplemented */
+#endif
+
+  ucwlib_lock();
+  tid = ++tid_counter;
+  ucwlib_unlock();
+  return tid;
+}
+
+/*** Thread context ***/
+
+static void CONSTRUCTOR_WITH_PRIORITY(10000)
+ucwlib_threads_init_master(void)
+{
+  pthread_mutex_init(&ucwlib_master_mutex, NULL);
+}
+
+#ifdef CONFIG_UCW_TLS
+
+__thread struct ucwlib_context ucwlib_context;
+
+int
+ucwlib_thread_id(struct ucwlib_context *c)
+{
+  if (!c->_thread_id)
+    c->_thread_id = ucwlib_tid();
+  return c->_thread_id;
+}
+
+#else
+
+static pthread_key_t ucwlib_context_key;
+
+static void
+ucwlib_free_thread_context(void *p)
+{
+  xfree(p);
+}
+
+static void CONSTRUCTOR_WITH_PRIORITY(10000)
+ucwlib_threads_init(void)
+{
+  if (pthread_key_create(&ucwlib_context_key, ucwlib_free_thread_context) < 0)
+    die("Cannot create pthread_key: %m");
+}
+
+struct ucwlib_context *
+ucwlib_thread_context(void)
+{
+  struct ucwlib_context *c = pthread_getspecific(ucwlib_context_key);
+  if (!c)
+    {
+      c = xmalloc_zero(sizeof(*c));
+      c->_thread_id = ucwlib_tid();
+      pthread_setspecific(ucwlib_context_key, c);
+    }
+  return c;
+}
+
+#endif /* CONFIG_UCW_TLS */
+
+#else /* !CONFIG_UCW_THREADS */
+
+struct ucwlib_context ucwlib_default_context;
+
+#endif
+
+#ifdef TEST
+
+int main(void)
+{
+  ucwlib_lock();
+  ucwlib_unlock();
+  msg(L_INFO, "tid=%d", ucwlib_thread_id(ucwlib_thread_context()));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/threads.h b/libucw/ucw/threads.h
new file mode 100644
index 0000000..3796abf
--- /dev/null
+++ b/libucw/ucw/threads.h
@@ -0,0 +1,62 @@
+/*
+ *	The UCW Library -- Threading Helpers
+ *
+ *	(c) 2006--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_THREADS_H
+#define _UCW_THREADS_H
+
+#include <ucw/sighandler.h>
+
+/* This structure holds per-thread data */
+
+struct ucwlib_context {
+  int _thread_id;			// Thread ID (either kernel tid or a counter, use ucwlib_thread_id())
+  int temp_counter;			// Counter for fb-temp.c
+  struct asio_queue *io_queue;		// Async I/O queue for fb-direct.c
+  ucw_sighandler_t *signal_handlers;	// Signal handlers for sighandler.c
+  struct main_context *main_context;	// Current context for mainloop.c
+  struct cf_context *cf_context;	// Current context for configuration parser
+  // Resources and transactions:
+  struct respool *current_respool;	// Current resource pool
+  struct mempool *trans_pool;		// Transaction mempool
+  struct trans *current_trans;		// Currently open transaction
+};
+
+#ifdef CONFIG_UCW_THREADS
+
+#ifdef CONFIG_UCW_TLS
+extern __thread struct ucwlib_context ucwlib_context;
+static inline struct ucwlib_context *ucwlib_thread_context(void) { return &ucwlib_context; }
+int ucwlib_thread_id(struct ucwlib_context *c);
+#else
+struct ucwlib_context *ucwlib_thread_context(void);
+static inline int ucwlib_thread_id(struct ucwlib_context *c) { return c->_thread_id; }
+#endif
+
+/* Global lock used for initialization, cleanup and other not so frequently accessed global state */
+
+void ucwlib_lock(void);
+void ucwlib_unlock(void);
+
+extern uint ucwlib_thread_stack_size;
+
+#else
+
+/* We have no threads, let's simulate the context and locking */
+
+extern struct ucwlib_context ucwlib_default_context;
+static inline struct ucwlib_context *ucwlib_thread_context(void) { return &ucwlib_default_context; }
+
+static inline int ucwlib_thread_id(struct ucwlib_context *c UNUSED) { return 0; }
+
+static inline void ucwlib_lock(void) { }
+static inline void ucwlib_unlock(void) { }
+
+#endif
+
+#endif
diff --git a/libucw/ucw/time-conf.c b/libucw/ucw/time-conf.c
new file mode 100644
index 0000000..1126011
--- /dev/null
+++ b/libucw/ucw/time-conf.c
@@ -0,0 +1,71 @@
+/*
+ *	UCW Library -- A Parser of Time Intervals
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/conf.h>
+#include <ucw/time.h>
+#include <ucw/fastbuf.h>
+
+static char *
+timestamp_parser(char *c, void *ptr)
+{
+  timestamp_t *ts = ptr;
+  double d;
+
+  char *err = cf_parse_double(c, &d);
+  if (err)
+    return err;
+  if (d > 1e16)
+    return "Time too large";
+
+  *ts = (timestamp_t)(d*1000 + 0.5);
+  if (!*ts && d)
+    return "Non-zero time rounds down to zero milliseconds";
+
+  return NULL;
+}
+
+static void
+timestamp_dumper(struct fastbuf *fb, void *ptr)
+{
+  timestamp_t *ts = ptr;
+  bprintf(fb, "%jd", (intmax_t) *ts);
+}
+
+struct cf_user_type timestamp_type = {
+  .size = sizeof(timestamp_t),
+  .name = "timestamp",
+  .parser = timestamp_parser,
+  .dumper = timestamp_dumper
+};
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  char line[256];
+
+  while (fgets(line, sizeof(line), stdin))
+    {
+      char *nl = strchr(line, '\n');
+      if (nl)
+	*nl = 0;
+      timestamp_t t = -1;
+      char *err = timestamp_parser(line, &t);
+      if (err)
+	puts(err);
+      else
+	printf("%jd\n", (intmax_t) t);
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/time-stamp.c b/libucw/ucw/time-stamp.c
new file mode 100644
index 0000000..f2c366f
--- /dev/null
+++ b/libucw/ucw/time-stamp.c
@@ -0,0 +1,53 @@
+/*
+ *	UCW Library -- A Simple Millisecond Timer
+ *
+ *	(c) 2007--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/time.h>
+
+#include <sys/time.h>
+#include <time.h>
+
+#ifdef CONFIG_UCW_MONOTONIC_CLOCK
+
+timestamp_t
+get_timestamp(void)
+{
+  struct timespec ts;
+  if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
+    die("clock_gettime failed: %m");
+  return (timestamp_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+}
+
+#else
+
+timestamp_t
+get_timestamp(void)
+{
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  return (timestamp_t)tv.tv_sec * 1000 + tv.tv_usec / 1000
+#ifdef CONFIG_UCW_DEBUG
+	+ 3141592653	// So that we catch all attempts to corelate timestamp_t with wall clock
+#endif
+	;
+}
+
+#endif
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int main(void)
+{
+  printf("%ju\n", (intmax_t) get_timestamp());
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/time-timer.c b/libucw/ucw/time-timer.c
new file mode 100644
index 0000000..38c1e0e
--- /dev/null
+++ b/libucw/ucw/time-timer.c
@@ -0,0 +1,48 @@
+/*
+ *	UCW Library -- A Simple Millisecond Timer
+ *
+ *	(c) 2007--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/time.h>
+
+void
+init_timer(timestamp_t *timer)
+{
+  *timer = get_timestamp();
+}
+
+uint
+get_timer(timestamp_t *timer)
+{
+  timestamp_t t = *timer;
+  *timer = get_timestamp();
+  return MIN(*timer-t, ~0U);
+}
+
+uint
+switch_timer(timestamp_t *oldt, timestamp_t *newt)
+{
+  *newt = get_timestamp();
+  return MIN(*newt-*oldt, ~0U);
+}
+
+#ifdef TEST
+
+#include <stdio.h>
+#include <unistd.h>
+
+int main(void)
+{
+  timestamp_t t;
+  init_timer(&t);
+  usleep(50000);
+  printf("%u\n", get_timer(&t));
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/time.h b/libucw/ucw/time.h
new file mode 100644
index 0000000..8c86740
--- /dev/null
+++ b/libucw/ucw/time.h
@@ -0,0 +1,59 @@
+/*
+ *	UCW Library -- A Simple Millisecond Timer
+ *
+ *	(c) 2007--2012 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_TIMER_H
+#define _UCW_TIMER_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define get_timer ucw_get_timer
+#define get_timestamp ucw_get_timestamp
+#define init_timer ucw_init_timer
+#define switch_timer ucw_switch_timer
+#define timestamp_type ucw_timestamp_type
+#endif
+
+/***
+ * === Timestamps
+ *
+ * All timing functions in LibUCW are based on signed 64-bit timestamps
+ * with millisecond precision (the <<basics:type_timestamp_t,`timestamp_t`>> type), which measure
+ * time from an unspecified moment in the past. Depending on the compile-time
+ * settings, that moment can be the traditional UNIX epoch, or for example
+ * system boot if POSIX monotonic clock is used.
+ ***/
+
+/* time-stamp.c */
+
+timestamp_t get_timestamp(void);		/** Get current time as a millisecond timestamp. **/
+
+/* time-conf.c */
+
+/**
+ * A user type for parsing of time intervals in configuration files.
+ * It is specified as fractional seconds and internally converted to
+ * a <<basics:type_timestamp_t,`timestamp_t`>>. When conversion of
+ * a non-zero value yields zero, an error is raised.
+ **/
+extern struct cf_user_type timestamp_type;
+
+/***
+ * === Timers
+ *
+ * A timer is a very simple construct for measuring execution time.
+ * It can be initialized and then read multiple times. Each read returns
+ * the number of milliseconds elapsed since the previous read or initialization.
+ ***/
+
+/* time-timer.c */
+
+void init_timer(timestamp_t *timer);		/** Initialize a timer. **/
+uint get_timer(timestamp_t *timer);		/** Get the number of milliseconds since last init/get of a timer. **/
+uint switch_timer(timestamp_t *oldt, timestamp_t *newt);	/** Stop ticking of one timer and resume another. **/
+
+#endif
diff --git a/libucw/ucw/time.t b/libucw/ucw/time.t
new file mode 100644
index 0000000..f4c4c33
--- /dev/null
+++ b/libucw/ucw/time.t
@@ -0,0 +1,24 @@
+# Tests for time-conf
+
+Name:	Parser normal
+Run:	../obj/ucw/time-conf-t 'ftp://example.com/other'
+In:	123
+	0.23
+	1e2
+	3k
+	1d
+Out:	123000
+	230
+	100000
+	3000000
+	86400000
+
+Name:	Parser underflow
+Run:	../obj/ucw/time-conf-t 'ftp://example.com/other'
+In:	0.0001
+Out:	Non-zero time rounds down to zero milliseconds
+
+Name:	Parser overflow
+Run:	../obj/ucw/time-conf-t 'ftp://example.com/other'
+In:	1e30
+Out:	Time too large
diff --git a/libucw/ucw/trans.c b/libucw/ucw/trans.c
new file mode 100644
index 0000000..8c39c15
--- /dev/null
+++ b/libucw/ucw/trans.c
@@ -0,0 +1,278 @@
+/*
+ *	The UCW Library -- Transactions
+ *
+ *	(c) 2008--2011 Martin Mares <mj@ucw.cz>
+ *	(c) 2021 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/trans.h>
+#include <ucw/resource.h>
+#include <ucw/mempool.h>
+
+#include <stdio.h>
+
+void
+trans_init(void)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  if (!c->trans_pool)
+    c->trans_pool = mp_new(1024);
+}
+
+void
+trans_cleanup(void)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  if (c->trans_pool)
+    {
+      mp_delete(c->trans_pool);
+      c->trans_pool = NULL;
+    }
+  c->current_trans = NULL;
+}
+
+struct trans *
+trans_open(void)
+{
+  trans_init();
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct mempool *mp = c->trans_pool;
+
+  struct mempool_state *mst = mp_push(mp);
+  struct trans *t = mp_alloc(mp, sizeof(*t));
+  t->trans_pool_state = mst;
+
+  struct respool *rp = rp_new("trans", mp);
+  t->rpool = rp;
+  t->prev_rpool = rp_switch(rp);
+
+  t->thrown_exc = NULL;
+  t->prev_trans = c->current_trans;
+  c->current_trans = t;
+  DBG("Opened transaction %p", t);
+  return t;
+}
+
+struct trans *
+trans_get_current(void)
+{
+  return ucwlib_thread_context() -> current_trans;
+}
+
+struct mempool *
+trans_get_pool(void)
+{
+  return ucwlib_thread_context() -> trans_pool;
+}
+
+static void
+trans_pop(struct trans *t, struct ucwlib_context *c)
+{
+  DBG("... popping trans %p", t);
+  rp_switch(t->prev_rpool);
+  c->current_trans = t->prev_trans;
+}
+
+static void
+trans_drop(struct trans *t, struct ucwlib_context *c)
+{
+  DBG("... dropping trans %p", t);
+  mp_restore(c->trans_pool, t->trans_pool_state);
+}
+
+void
+trans_commit(void)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct trans *t = c->current_trans;
+  DBG("Committing transaction %p", t);
+  ASSERT(t);
+  ASSERT(!t->thrown_exc);
+  rp_commit(t->rpool);
+  trans_pop(t, c);
+  trans_drop(t, c);
+}
+
+void
+trans_rollback(void)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct trans *t = c->current_trans;
+  DBG("Rolling back transaction %p", t);
+  ASSERT(t);
+  ASSERT(!t->thrown_exc);
+  rp_delete(t->rpool);
+  trans_pop(t, c);
+  trans_drop(t, c);
+}
+
+void
+trans_fold(void)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct trans *t = c->current_trans;
+  DBG("Folding transaction %p", t);
+  ASSERT(t);
+  ASSERT(!t->thrown_exc);
+  trans_pop(t, c);
+  ASSERT(c->current_trans);	// Ensure that the parent exists
+  res_subpool(t->rpool);
+  t->rpool = NULL;		// To stop people from using the trans
+}
+
+void
+trans_caught(void)
+{
+  // Exception has been finally caught. Roll back the current transaction,
+  // including all sub-transactions that have been folded to it during
+  // propagation.
+  struct trans *t = trans_get_current();
+  struct exception *x = t->thrown_exc;
+  ASSERT(x);
+  DBG("... exception %p caught", x);
+  t->thrown_exc = NULL;
+  trans_rollback();
+}
+
+void
+trans_dump(void)
+{
+  struct trans *t = trans_get_current();
+  if (!t)
+    {
+      puts("No transaction open.");
+      return;
+    }
+
+  while (t)
+    {
+      printf("Transaction %p:\n", t);
+      struct exception *x = t->thrown_exc;
+      if (x)
+	printf("    Exception %s (%s) in flight\n", x->id, x->msg);
+      rp_dump(t->rpool, 4);
+      t = t->prev_trans;
+    }
+}
+
+void
+trans_throw_exc(struct exception *x)
+{
+  struct ucwlib_context *c = ucwlib_thread_context();
+  struct trans *t = c->current_trans;
+  DBG("Throwing exception %s (%s) in trans %p", x->id, x->msg, t);
+  if (!t)
+    die("%s", x->msg);
+
+  // If we are already handling an exception (i.e., throw from a catch handler),
+  // fold the current transaction into its parent.
+  while (t->thrown_exc)
+    {
+      if (!t->prev_trans)
+	die("%s", x->msg);
+      t->thrown_exc = NULL;
+      trans_fold();
+      t = c->current_trans;
+      DBG("... recursive throw propagated to parent trans %p", t);
+    }
+
+  // And jump overboard.
+  t->thrown_exc = x;
+  longjmp(t->jmp, 1);
+}
+
+void
+trans_throw(const char *id, void *object, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  trans_vthrow(id, object, fmt, args);
+}
+
+void
+trans_vthrow(const char *id, void *object, const char *fmt, va_list args)
+{
+  struct mempool *mp = trans_get_pool();
+  if (!mp)
+    vdie(fmt, args);
+  struct exception *x = mp_alloc(mp, sizeof(*x));
+  x->id = mp_strdup(mp, id);
+  x->object = object;
+  x->msg = mp_vprintf(mp, fmt, args);
+  trans_throw_exc(x);
+}
+
+struct exception *
+trans_current_exc(void)
+{
+  return trans_get_current() -> thrown_exc;
+}
+
+#ifdef TEST
+
+static void trc_free(struct resource *r)
+{
+  printf("Freeing object #%d\n", (int)(intptr_t) r->priv);
+}
+
+static struct res_class trc = {
+  .name = "test",
+  .free = trc_free,
+};
+
+int main(void)
+{
+  TRANS_TRY
+    {
+      res_new(&trc, (void *)(intptr_t) 1);
+      res_malloc(64, NULL);
+      TRANS_TRY
+	{
+	  res_new(&trc, (void *)(intptr_t) 2);
+	  res_malloc(128, NULL);
+	  trans_throw("ucw.test", "inn", "Universe failure: %d+%d=%d", 1, 2, 4);
+	}
+      TRANS_CATCH(x)
+	{
+	  printf("Inner catch: %s\n", x->msg);
+	  trans_dump();
+	  TRANS_TRY
+	    {
+	      res_malloc(256, NULL);
+	      trans_throw("ucw.test.nested", "nest", "Something is wrong recursively");
+	    }
+	  TRANS_CATCH(y)
+	    {
+	      printf("Yet another layer: %s\n", y->msg);
+	      trans_dump();
+	      // trans_throw_exc(y);
+	    }
+	  TRANS_END;
+	  trans_throw("ucw.test2", "out", "Error: %s", x->msg);
+	}
+      TRANS_END;
+    }
+  TRANS_CATCH(x)
+    {
+      printf("Outer catch: %s\n", x->msg);
+      trans_dump();
+    }
+  TRANS_END;
+  trans_throw("ucw.test3", "glob", "Global error. Reboot globe.");
+#if 0
+  trans_open();
+  res_malloc(64, NULL);
+  trans_dump();
+  trans_commit();
+#endif
+  trans_cleanup();
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/trans.h b/libucw/ucw/trans.h
new file mode 100644
index 0000000..3d52172
--- /dev/null
+++ b/libucw/ucw/trans.h
@@ -0,0 +1,99 @@
+/*
+ *	The UCW Library -- Transactions
+ *
+ *	(c) 2008--2011 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_TRANS_H
+#define _UCW_TRANS_H
+
+#include <ucw/mempool.h>
+
+#include <setjmp.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define trans_caught ucw_trans_caught
+#define trans_cleanup ucw_trans_cleanup
+#define trans_commit ucw_trans_commit
+#define trans_current_exc ucw_trans_current_exc
+#define trans_dump ucw_trans_dump
+#define trans_fold ucw_trans_fold
+#define trans_get_current ucw_trans_get_current
+#define trans_get_pool ucw_trans_get_pool
+#define trans_init ucw_trans_init
+#define trans_open ucw_trans_open
+#define trans_rollback ucw_trans_rollback
+#define trans_throw ucw_trans_throw
+#define trans_throw_exc ucw_trans_throw_exc
+#define trans_vthrow ucw_trans_vthrow
+#endif
+
+/** A structure describing a transaction. All fields are for internal use only. **/
+struct trans {
+  struct trans *prev_trans;
+  struct mempool_state *trans_pool_state;
+  struct respool *rpool;
+  struct respool *prev_rpool;
+  struct exception *thrown_exc;
+  jmp_buf jmp;
+};
+
+void trans_init(void);		/** Initializes the transaction system for the current thread. Called automatically as needed. **/
+void trans_cleanup(void);	/** Frees memory occupied by the transaction system pools for the current thread. **/
+
+struct trans *trans_open(void);	/** Creates a new transaction. Used inside `TRANS_TRY`. **/
+struct trans *trans_get_current(void);	/** Get a pointer to the currently running transaction, or NULL if there is none. **/
+void trans_commit(void);	/** Commits the current transaction. **/
+void trans_rollback(void);	/** Rolls back the current transaction. **/
+void trans_fold(void);		/** Folds the current transaction to its parent. **/
+void trans_dump(void);		/** Prints out a debugging dump of the transaction stack to stdout. **/
+
+struct mempool *trans_get_pool(void);
+
+/**
+ * Data associated with an exception. Usually, this structure is created
+ * by calling @trans_throw(), but if you want to pass more data, you can
+ * create your own exception and throw it using @trans_throw_exc().
+ **/
+struct exception {
+  const char *id;		// Hierarchical identifier of the exception
+  const char *msg;		// Error message to present to the user
+  void *object;			// Object on which the exception happened
+  // More data specific for the particular `id' can follow
+};
+
+/** Creates an exception and throws it. The error message can contain `printf`-like formatting. **/
+void trans_throw(const char *id, void *object, const char *fmt, ...) FORMAT_CHECK(printf,3,4) NONRET;
+
+/** A `va_list` variant of @trans_throw(). **/
+void trans_vthrow(const char *id, void *object, const char *fmt, va_list args) NONRET;
+
+/** Throw an already constructed exception (or re-throw an exception you have caught). **/
+void trans_throw_exc(struct exception *x) NONRET;
+
+/** Declare the current exception caught and roll back the current transaction. Called from `TRANS_END`. **/
+void trans_caught(void);
+
+struct exception *trans_current_exc(void);	/** Return the exception in flight, or NULL if there is none. **/
+
+#define TRANS_TRY do {				\
+  struct trans *_t = trans_open();		\
+  if (!setjmp(_t->jmp))				\
+    {
+
+#define TRANS_CATCH(x)				\
+      trans_commit();				\
+    }						\
+  else						\
+    {						\
+      struct exception *x UNUSED = trans_current_exc();
+
+#define TRANS_END				\
+      trans_caught();				\
+    }						\
+  } while(0)
+
+#endif
diff --git a/libucw/ucw/trie-test.c b/libucw/ucw/trie-test.c
new file mode 100644
index 0000000..e53a949
--- /dev/null
+++ b/libucw/ucw/trie-test.c
@@ -0,0 +1,215 @@
+/*
+ *	UCW Library -- Byte-based trie -- Testing utility
+ *
+ *	(c) 2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#undef LOCAL_DEBUG
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+
+#include <alloca.h>
+#include <string.h>
+
+#define TRIE_PREFIX(x) basic_##x
+#define TRIE_NODE_TYPE char
+#define TRIE_WANT_CLEANUP
+#define TRIE_WANT_ADD
+#define TRIE_WANT_DELETE
+#define TRIE_WANT_FIND
+#define TRIE_WANT_AUDIT
+#ifdef LOCAL_DEBUG
+#define TRIE_TRACE
+#endif
+#include <ucw/trie.h>
+
+static void
+basic_test(void)
+{
+  basic_init();
+  basic_add("str1");
+  basic_add("str2");
+  if (!basic_find("str1") || !basic_find("str2") || basic_find("x") || basic_find("str123"))
+    ASSERT(0);
+  basic_audit();
+  basic_delete("str1");
+  if (basic_find("str1") || !basic_find("str2"))
+    ASSERT(0);
+  basic_audit();
+  basic_cleanup();
+}
+
+#define TRIE_PREFIX(x) dynamic_##x
+#define TRIE_NODE_TYPE char
+#define TRIE_REV
+#define TRIE_DYNAMIC
+#define TRIE_WANT_CLEANUP
+#define TRIE_WANT_ADD
+#define TRIE_WANT_FIND
+#define TRIE_WANT_AUDIT
+#ifdef LOCAL_DEBUG
+#define TRIE_TRACE
+#endif
+#include <ucw/trie.h>
+
+static void
+dynamic_test(void)
+{
+  struct dynamic_trie trie1, trie2;
+  dynamic_init(&trie1);
+  dynamic_init(&trie2);
+  dynamic_add(&trie1, "str1");
+  dynamic_add(&trie2, "str2");
+  if (!dynamic_find(&trie1, "str1") || dynamic_find(&trie1, "str2") || !dynamic_find(&trie2, "str2"))
+    ASSERT(0);
+  dynamic_audit(&trie1);
+  dynamic_audit(&trie2);
+  dynamic_cleanup(&trie1);
+  dynamic_cleanup(&trie2);
+}
+
+
+#define TRIE_PREFIX(x) random_##x
+#define TRIE_NODE_TYPE char
+#define TRIE_LEN_TYPE u16
+#undef TRIE_REV
+#define TRIE_WANT_CLEANUP
+#define TRIE_WANT_FIND
+#define TRIE_WANT_ADD
+#define TRIE_WANT_REMOVE
+#define TRIE_WANT_AUDIT
+#ifdef LOCAL_DEBUG
+#define TRIE_TRACE
+#endif
+#include <ucw/trie.h>
+
+#define MAX_STRINGS 200
+
+static uint count;
+static char *str[MAX_STRINGS];
+
+static char *
+gen_string(void)
+{
+  uint l = random_max(11);
+  char *s = xmalloc(l + 1);
+  for (uint i = 0; i < l; i++)
+    s[i] = random_max('z' - 'a') + 'a';
+  s[l] = 0;
+  return s;
+}
+
+static char *
+gen_unique_string(void)
+{
+  char *s;
+again:
+  s = gen_string();
+  for (uint i = 0; i < count; i++)
+    if (!strcmp(s, str[i]))
+      {
+	xfree(s);
+        goto again;
+      }
+  return s;
+}
+
+static void
+insert(void)
+{
+  if (count == MAX_STRINGS)
+    return;
+  char *s = gen_unique_string();
+  str[count++] = s;
+  DBG("add '%s'", s);
+  random_add(s);
+  random_audit();
+}
+
+static void
+delete(void)
+{
+  if (!count)
+    return;
+  uint i = random_max(count);
+  DBG("remove '%s'", str[i]);
+  random_remove(str[i]);
+  random_audit();
+  xfree(str[i]);
+  str[i] = str[--count];
+}
+
+static void
+find(void)
+{
+  if (!count || !random_max(4))
+    {
+      char *s = gen_unique_string();
+      DBG("negative find '%s'", s);
+      if (random_find(s))
+	ASSERT(0);
+      xfree(s);
+    }
+  else
+    {
+      uint i = random_max(count);
+      DBG("positive find '%s'", str[i]);
+      if (random_find(str[i]) != str[i])
+	ASSERT(0);
+    }
+}
+
+static void
+reset(void)
+{
+  DBG("reset");
+  random_cleanup();
+  for (uint i = 0; i < count; i++)
+    xfree(str[i]);
+  count = 0;
+  random_init();
+  random_audit();
+}
+
+static void
+random_test(void)
+{
+  random_init();
+  for (uint i = 0; i < 10000; i++)
+    {
+      int r = random_max(1000);
+      if ((r -= 300) < 0)
+	insert();
+      else if ((r -= 150) < 0)
+	delete();
+      else if ((r -= 300) < 0)
+	find();
+      else if ((r -= 1) < 0)
+	reset();
+    }
+  random_cleanup();
+}
+
+int main(int argc, char **argv)
+{
+  log_init(argv[0]);
+  if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 || optind + 1 != argc)
+    die("Invalid usage, see the source code");
+  random_gen_seed();
+
+  char *test = argv[optind];
+  if (!strcmp(test, "basic"))
+    basic_test();
+  else if (!strcmp(test, "dynamic"))
+    dynamic_test();
+  else if (!strcmp(test, "random"))
+    random_test();
+  else
+    die("Unknown test case");
+
+  return 0;
+}
diff --git a/libucw/ucw/trie-test.t b/libucw/ucw/trie-test.t
new file mode 100644
index 0000000..eadadc2
--- /dev/null
+++ b/libucw/ucw/trie-test.t
@@ -0,0 +1,7 @@
+# Tests for tries
+
+Run:	../obj/ucw/trie-test basic
+
+Run:	../obj/ucw/trie-test dynamic
+
+Run:	../obj/ucw/trie-test random
diff --git a/libucw/ucw/trie.h b/libucw/ucw/trie.h
new file mode 100644
index 0000000..78ef95b
--- /dev/null
+++ b/libucw/ucw/trie.h
@@ -0,0 +1,959 @@
+/*
+ *	UCW Library -- Byte-based trie
+ *
+ *	(c) 2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+/*
+ *	This is not a normal header file, it's a generator of tries.
+ *	Each time you include it with parameters set in the corresponding
+ *	preprocessor macros, it generates a trie with the parameters given.
+ *
+ *	You need to specify:
+ *
+ *	[*] TRIE_PREFIX(x)		macro to add a name prefix (used on all global names
+ *					defined by the trie generator).
+ *
+ *	[*] TRIE_NODE_TYPE		data type where a node dwells (usually a struct).
+ *	    TRIE_NODE_KEY(node)		macro to return the pointer to the key (default=&x)
+ *	    TRIE_NODE_LEN(node)		macro to return the length of the key (default=str_len(TRIE_NODE_KEY(node)))
+ *	    TRIE_LEN_TYPE		integer type large enough to hold length of any inserted string (default=u32).
+ *	    TRIE_REV			work with reversed strings.
+ *	    TRIE_DYNAMIC
+ *
+ *	    TRIE_WANT_CLEANUP		cleanup()
+ *
+ *	    TRIE_WANT_FIND		node *find(char *str)
+ *	    TRIE_WANT_FIND_BUF		node *find_buf(byte *ptr, uint len)
+ *	    TRIE_WANT_ADD		add(*node)
+ *	    TRIE_WANT_REPLACE		node *replace(*node)
+ *	    TRIE_WANT_DELETE		delete(char *str)
+ *	    TRIE_WANT_DELETE_BUF	delete_buf(byte *ptr, uint len)
+ *	    TRIE_WANT_REMOVE		remove(*node)
+ *
+ *	    TRIE_WANT_AUDIT		audit()
+ *	    TRIE_WANT_STATS
+ *
+ *	Be warned that the implementation uses alloca() in several macros,
+ *	so if you use automatic variable-length arrays in the same function,
+ *	all the hell may be unleashed.
+ */
+
+/*** Define once ***/
+
+#ifndef _SHERLOCK_UCW_TRIE_H
+#define _SHERLOCK_UCW_TRIE_H
+
+#include <ucw/eltpool.h>
+#include <ucw/hashfunc.h>
+
+#include <string.h>
+
+#define TRIE_FLAG_DEG		0x01ff	// mask for edge degree (0-256)
+#define TRIE_FLAG_HASH		0x0200	// sons are stored in a hash table
+#define TRIE_FLAG_NODE		0x0400	// edge contains inserted data
+
+#endif
+
+/*** Defaults ***/
+
+#ifndef TRIE_PREFIX
+#error Undefined mandatory macro TRIE_PREFIX
+#endif
+#define P(x) TRIE_PREFIX(x)
+
+#ifndef TRIE_NODE_TYPE
+#error Undefined mandatory macro TRIE_NODE_TYPE
+#endif
+typedef TRIE_NODE_TYPE P(node_t);
+
+#ifndef TRIE_NODE_KEY
+#define TRIE_NODE_KEY(node) ((char *)&(node))
+#endif
+
+#ifndef TRIE_NODE_LEN
+#define TRIE_NODE_LEN(node) (str_len(TRIE_NODE_KEY(node)))
+#endif
+
+#ifndef TRIE_LEN_TYPE
+#define TRIE_LEN_TYPE u32
+#endif
+typedef TRIE_LEN_TYPE P(len_t);
+
+#ifndef TRIE_ELTPOOL_SIZE
+#define TRIE_ELTPOOL_SIZE 1024
+#endif
+
+#ifndef TRIE_HASH_THRESHOLD
+#define TRIE_HASH_THRESHOLD (6 - sizeof(P(len_t)))
+#endif
+
+#ifndef TRIE_BUCKET_RANK
+#define TRIE_BUCKET_RANK (2U + (sizeof(void *) > 4))
+#endif
+#define TRIE_BUCKET_SIZE (1U << TRIE_BUCKET_RANK)
+#define TRIE_BUCKET_MASK (TRIE_BUCKET_SIZE - 1)
+enum { P(bucket_rank) = TRIE_BUCKET_RANK };
+
+#define TRIE_COMPILE_ASSERT(x, y) typedef char TRIE_PREFIX(x##_compile_assert)[!!(y)-1]
+TRIE_COMPILE_ASSERT(len_type, sizeof(P(len_t)) <= sizeof(uint));
+TRIE_COMPILE_ASSERT(hash_threshold, TRIE_HASH_THRESHOLD >= 2);
+TRIE_COMPILE_ASSERT(bucket_size, TRIE_BUCKET_RANK >= 1 && TRIE_BUCKET_MASK < sizeof(void *));
+
+#ifdef TRIE_TRACE
+#define TRIE_DBG(x...) msg(L_DEBUG, "TRIE: " x)
+#else
+#define TRIE_DBG(x...) do{}while(0)
+#endif
+
+/*** Solve dependencies ***/
+
+#if !defined(TRIE_WANT_DO_FIND) && (defined(TRIE_WANT_FIND) || defined(TRIE_WANT_FIND_BUF))
+#define TRIE_WANT_DO_FIND
+#endif
+
+#if !defined(TRIE_WANT_DO_LOOKUP) && (defined(TRIE_WANT_ADD) || defined(TRIE_WANT_REPLACE))
+#define TRIE_WANT_DO_LOOKUP
+#endif
+
+#if !defined(TRIE_WANT_DO_DELETE) && (defined(TRIE_WANT_DELETE) || defined(TRIE_WANT_DELETE_BUF) || defined(TRIE_WANT_REMOVE))
+#define TRIE_WANT_DO_DELETE
+#endif
+
+#if !defined(TRIE_WANT_DO_LOOKUP)
+#error You must request at least one method for inserting nodes
+#endif
+
+/*** Data structures ***/
+
+struct P(trie) {
+  struct P(edge) *root;				// root edge or NULL
+  struct eltpool *epool[TRIE_HASH_THRESHOLD + 1]; // eltpools for edges with array of sons
+  struct eltpool *hpool[9];			// eltpools for edges with hash table
+};
+
+struct P(edge) {
+  u16 flags;					// TRIE_FLAG_x
+  union {
+    byte trans[TRIE_HASH_THRESHOLD];		// transition characters (!TRIE_FLAG_HASH)
+    struct {
+      byte hash_rank;				// logarithmic hash size (TRIE_FLAG_HASH)
+      byte hash_deleted;			// number of deleted items
+    };
+  };
+  P(len_t) len;					// sum of all ancestor edges with their trasition
+						//   characters plus the length of the current edge
+  union {
+    P(node_t) *node;				// inserted data (TRIE_FLAG_NODE)
+    struct P(edge) *leaf;			// reference to a descendant with data (!TRIE_FLAG_NODE)
+  };
+  struct P(edge) *son[0];			// array of sons (!TRIE_FLAG_HASH)
+						//   or hash table (TRIE_FLAG_HASH)
+};
+
+#ifdef TRIE_DYNAMIC
+#define T (*trie)
+#define TA struct P(trie) *trie
+#define TAC TA,
+#define TT trie
+#define TTC trie,
+#else
+static struct P(trie) P(trie);
+#define T P(trie)
+#define TA void
+#define TAC
+#define TT
+#define TTC
+#endif
+
+/*** Memory management ***/
+
+static void
+P(init)(TA)
+{
+  TRIE_DBG("Initializing");
+  bzero(&T, sizeof(T));
+  for (uint i = 0; i < ARRAY_SIZE(T.epool); i++)
+    {
+      uint size = sizeof(struct P(edge)) + i * sizeof(void *);
+      T.epool[i] = ep_new(size, MAX(TRIE_ELTPOOL_SIZE / size, 1));
+    }
+  for (uint i = 0; i < ARRAY_SIZE(T.hpool); i++)
+    {
+      uint size = sizeof(struct P(edge)) + ((sizeof(void *) << TRIE_BUCKET_RANK) << i);
+      T.hpool[i] = ep_new(size, MAX(TRIE_ELTPOOL_SIZE / size, 1));
+    }
+}
+
+#ifdef TRIE_WANT_CLEANUP
+static void
+P(cleanup)(TA)
+{
+  TRIE_DBG("Cleaning up");
+  for (uint i = 0; i < ARRAY_SIZE(T.epool); i++)
+    ep_delete(T.epool[i]);
+  for (uint i = 0; i < ARRAY_SIZE(T.hpool); i++)
+    ep_delete(T.hpool[i]);
+}
+#endif
+
+static struct P(edge) *
+P(edge_alloc)(TAC uint flags)
+{
+  struct P(edge) *edge;
+  if (flags & TRIE_FLAG_HASH)
+    {
+      uint rank = 0, deg = flags & TRIE_FLAG_DEG;
+      while ((TRIE_BUCKET_MASK << rank) < deg * 2) // 25-50% density
+	rank++;
+      ASSERT(rank < ARRAY_SIZE(T.hpool));
+      edge = ep_alloc(T.hpool[rank]);
+      edge->hash_rank = rank;
+      edge->hash_deleted = 0;
+      bzero(edge->son, (sizeof(void *) << TRIE_BUCKET_RANK) << rank);
+    }
+  else
+    edge = ep_alloc(T.epool[flags & TRIE_FLAG_DEG]);
+  edge->flags = flags;
+  TRIE_DBG("Allocated edge %p, flags=0x%x", edge, flags);
+  return edge;
+}
+
+static void
+P(edge_free)(TAC struct P(edge) *edge)
+{
+  TRIE_DBG("Freeing edge %p, flags=0x%x", edge, edge->flags);
+  if (edge->flags & TRIE_FLAG_HASH)
+    ep_free(T.hpool[edge->hash_rank], edge);
+  else
+    ep_free(T.epool[edge->flags & TRIE_FLAG_DEG], edge);
+}
+
+/*** Manipulation with strings ***/
+
+static inline byte *
+P(str_get)(P(node_t) *node)
+{
+  return TRIE_NODE_KEY((*node));
+}
+
+static inline uint
+P(str_len)(P(node_t) *node)
+{
+  return TRIE_NODE_LEN((*node));
+}
+
+static inline uint
+P(str_char)(byte *ptr, uint len UNUSED, uint pos)
+{
+#ifndef TRIE_REV
+  return ptr[pos];
+#else
+  return ptr[len - pos - 1];
+#endif
+}
+
+static inline byte *
+P(str_prefix)(byte *ptr, uint len UNUSED, uint prefix UNUSED)
+{
+#ifndef TRIE_REV
+  return ptr;
+#else
+  return ptr + len - prefix;
+#endif
+}
+
+static inline byte *
+P(str_suffix)(byte *ptr, uint len UNUSED, uint suffix UNUSED)
+{
+#ifndef TRIE_REV
+  return ptr + len - suffix;
+#else
+  return ptr;
+#endif
+}
+
+static inline uint
+P(common_prefix)(byte *ptr1, uint len1, byte *ptr2, uint len2)
+{
+  uint l = MIN(len1, len2), i;
+  for (i = 0; i < l; i++)
+    if (P(str_char)(ptr1, len1, i) != P(str_char)(ptr2, len2, i))
+      break;
+  return i;
+}
+
+/*** Sons ***/
+
+static inline uint
+P(hash_func)(uint c)
+{
+  return hash_u32(c) >> 16;
+}
+
+static inline struct P(edge) **
+P(hash_find)(struct P(edge) *edge, uint c)
+{
+  uint mask = (TRIE_BUCKET_SIZE << edge->hash_rank) - 1;
+  for (uint i = P(hash_func)(c); ; i++)
+    if (((i &= mask) & TRIE_BUCKET_MASK) && (uintptr_t)edge->son[i] != 1)
+      if (!edge->son[i])
+	return NULL;
+      else if (((byte *)&edge->son[i & ~TRIE_BUCKET_MASK])[i & TRIE_BUCKET_MASK] == c)
+        return &edge->son[i];
+}
+
+static inline struct P(edge) **
+P(hash_insert)(struct P(edge) *edge, uint c)
+{
+  uint mask = (TRIE_BUCKET_SIZE << edge->hash_rank) - 1;
+  for (uint i = P(hash_func)(c); ; i++)
+    if (((i &= mask) & TRIE_BUCKET_MASK) && (uintptr_t)edge->son[i] <= 1)
+      {
+	edge->hash_deleted -= (uintptr_t)edge->son[i];
+	edge->son[i] = NULL;
+	((byte *)&edge->son[i & ~TRIE_BUCKET_MASK])[i & TRIE_BUCKET_MASK] = c;
+	return &edge->son[i];
+      }
+}
+
+#ifdef TRIE_WANT_DO_DELETE
+static inline void
+P(hash_delete)(struct P(edge) *edge, uint c)
+{
+  uint mask = (TRIE_BUCKET_SIZE << edge->hash_rank) - 1;
+  for (uint i = P(hash_func)(c); ; i++)
+    if (((i &= mask) & TRIE_BUCKET_MASK) && (uintptr_t)edge->son[i] > 1 &&
+      ((byte *)&edge->son[i & ~TRIE_BUCKET_MASK])[i & TRIE_BUCKET_MASK] == c)
+      {
+	edge->hash_deleted++;
+	edge->son[i] = (void *)1;
+	return;
+      }
+}
+#endif
+
+#define TRIE_HASH_FOR_ALL(xedge, xtrans, xson) do { \
+  struct P(edge) *_edge = (xedge); \
+  for (uint _i = (TRIE_BUCKET_SIZE << _edge->hash_rank); _i--; ) \
+    if ((_i & TRIE_BUCKET_MASK) && (uintptr_t)_edge->son[_i] > 1) { \
+      UNUSED uint xtrans = ((byte *)&_edge->son[_i & ~TRIE_BUCKET_MASK])[_i & TRIE_BUCKET_MASK]; \
+      UNUSED struct P(edge) *xson = _edge->son[_i]; \
+      do {
+#define TRIE_HASH_END_FOR }while(0);}}while(0)
+
+static void
+P(hash_realloc)(TAC struct P(edge) **ref)
+{
+  struct P(edge) *old = *ref, *edge = *ref = P(edge_alloc)(TTC old->flags);
+  TRIE_DBG("Reallocating hash table");
+  edge->node = old->node;
+  edge->len = old->len;
+  TRIE_HASH_FOR_ALL(old, trans, son)
+    *P(hash_insert)(edge, trans) = son;
+  TRIE_HASH_END_FOR;
+  P(edge_free)(TTC old);
+}
+
+/*** Finding/inserting/deleting sons ***/
+
+static struct P(edge) **
+P(son_find)(struct P(edge) *edge, uint c)
+{
+  if (edge->flags & TRIE_FLAG_HASH)
+    return P(hash_find)(edge, c);
+  else
+    for (uint i = edge->flags & TRIE_FLAG_DEG; i--; )
+      if (edge->trans[i] == c)
+	return &edge->son[i];
+  return NULL;
+}
+
+static struct P(edge) **
+P(son_insert)(TAC struct P(edge) **ref, uint c)
+{
+  struct P(edge) *old = *ref, *edge;
+  uint deg = old->flags & TRIE_FLAG_DEG;
+  if (old->flags & TRIE_FLAG_HASH)
+    {
+      old->flags++;
+      if ((deg + 1 + old->hash_deleted) * 4 > (TRIE_BUCKET_MASK << old->hash_rank) * 3) // >75% density
+        {
+	  P(hash_realloc)(TTC ref);
+	  edge = *ref;
+	}
+      else
+	edge = old;
+    }
+  else
+    {
+      if (deg < TRIE_HASH_THRESHOLD)
+        {
+	  TRIE_DBG("Growing array");
+	  edge = P(edge_alloc)(TTC old->flags + 1);
+	  memcpy((byte *)edge + sizeof(edge->flags), (byte *)old + sizeof(edge->flags),
+	    sizeof(*old) - sizeof(edge->flags) + deg * sizeof(*old->son));
+	  edge->trans[deg] = c;
+	  edge->son[deg] = NULL;
+	  P(edge_free)(TTC old);
+	  *ref = edge;
+	  return &edge->son[deg];
+	}
+      else
+        {
+	  TRIE_DBG("Growing array to hash table");
+	  edge = P(edge_alloc)(TTC (old->flags + 1) | TRIE_FLAG_HASH);
+	  edge->node = old->node;
+	  edge->len = old->len;
+	  for (uint i = 0; i < deg; i++)
+	    *P(hash_insert)(edge, old->trans[i]) = old->son[i];
+	  P(edge_free)(TTC old);
+	}
+    }
+  *ref = edge;
+  return P(hash_insert)(edge, c);
+}
+
+#ifdef TRIE_WANT_DO_DELETE
+static void
+P(son_delete)(TAC struct P(edge) **ref, uint c)
+{
+  struct P(edge) *old = *ref, *edge;
+  uint deg = old->flags & TRIE_FLAG_DEG;
+  ASSERT(deg);
+  if (old->flags & TRIE_FLAG_HASH)
+    {
+      P(hash_delete)(old, c);
+      old->flags--;
+      deg--;
+      if (deg <= TRIE_HASH_THRESHOLD / 2)
+        {
+	  TRIE_DBG("Reducing hash table to array");
+	  edge = P(edge_alloc)(TTC old->flags & ~TRIE_FLAG_HASH);
+	  uint k = 0;
+	  TRIE_HASH_FOR_ALL(old, trans, son)
+	    edge->trans[k] = trans;
+	    edge->son[k] = son;
+	    k++;
+	  TRIE_HASH_END_FOR;
+	  ASSERT(k == deg);
+	}
+      else if (deg * 6 >= (TRIE_BUCKET_MASK << old->hash_rank)) // >= 16%
+	return;
+      else
+        {
+	  P(hash_realloc)(TTC ref);
+	  edge = *ref;
+	  return;
+	}
+    }
+  else
+    {
+      TRIE_DBG("Reducing array");
+      edge = P(edge_alloc)(TTC old->flags - 1);
+      uint j = 0;
+      for (uint i = 0; i < deg; i++)
+	if (old->trans[i] != c)
+	  {
+	    edge->trans[j] = old->trans[i];
+	    edge->son[j] = old->son[i];
+	    j++;
+	  }
+      ASSERT(j == deg - 1);
+    }
+  edge->node = old->node;
+  edge->len = old->len;
+  P(edge_free)(TTC old);
+  *ref = edge;
+}
+#endif
+
+#ifdef TRIE_WANT_DO_DELETE
+static struct P(edge) *
+P(son_any)(struct P(edge) *edge)
+{
+  ASSERT(edge->flags & TRIE_FLAG_DEG);
+  if (!(edge->flags & TRIE_FLAG_HASH))
+    return edge->son[0];
+  else
+    for (uint i = 0; ; i++)
+      if ((i & TRIE_BUCKET_MASK) && (uintptr_t)edge->son[i] > 1)
+	return edge->son[i];
+}
+#endif
+
+/*** Find/insert/delete ***/
+
+#ifdef TRIE_WANT_DO_FIND
+static struct P(edge) *
+P(do_find)(TAC byte *ptr, uint len)
+{
+  TRIE_DBG("do_find('%.*s')", len, ptr);
+  struct P(edge) **ref = &T.root, *edge;
+  do
+    {
+      if (!(edge = *ref) || edge->len > len)
+	return NULL;
+      else if (edge->len == len)
+	return ((edge->flags & TRIE_FLAG_NODE) && !memcmp(ptr, P(str_get)(edge->node), len)) ? edge : NULL;
+    }
+  while (ref = P(son_find)(edge, P(str_char)(ptr, len, edge->len)));
+  return NULL;
+}
+#endif
+
+static struct P(edge) *
+P(do_lookup)(TAC byte *ptr, uint len)
+{
+  TRIE_DBG("do_lookup('%.*s')", len, ptr);
+  struct P(edge) **ref, *edge, *leaf, *newleaf;
+  uint prefix, elen, trans, pos;
+  byte *eptr;
+
+  if (!(edge = T.root))
+    {
+      TRIE_DBG("Creating first edge");
+      edge = T.root = P(edge_alloc)(TTC TRIE_FLAG_NODE);
+      edge->node = NULL;
+      edge->len = len;
+      return edge;
+    }
+  else
+    {
+      while (edge->len < len && (ref = P(son_find)(edge, P(str_char)(ptr, len, edge->len))))
+	edge = *ref;
+      if (!(edge->flags & TRIE_FLAG_NODE))
+	edge = edge->leaf;
+      ASSERT(edge->flags & TRIE_FLAG_NODE);
+      eptr = P(str_get)(edge->node);
+      elen = edge->len;
+      prefix = P(common_prefix)(ptr, len, eptr, elen);
+      if (prefix == len && prefix == elen)
+	return edge;
+      TRIE_DBG("The longest common prefix is '%.*s'", prefix, P(str_prefix)(ptr, len, prefix));
+
+      if (prefix < len)
+        {
+          TRIE_DBG("Creating a new leaf");
+          newleaf = P(edge_alloc)(TTC TRIE_FLAG_NODE);
+          newleaf->node = NULL;
+          newleaf->len = len;
+	}
+      else
+	newleaf = NULL;
+
+      ref = &T.root;
+      while (edge = *ref)
+        {
+	  pos = edge->len;
+	  if (prefix < pos)
+	    {
+	      leaf = (edge->flags & TRIE_FLAG_NODE) ? edge : edge->leaf;
+	      TRIE_DBG("Splitting edge '%.*s'", leaf->len, P(str_get)(leaf->node));
+	      trans = P(str_char)(P(str_get)(leaf->node), leaf->len, prefix);
+	      if (len == prefix)
+	        {
+		  edge = P(edge_alloc)(TTC 1 | TRIE_FLAG_NODE);
+		  edge->len = prefix;
+		  edge->node = NULL;
+		  edge->trans[0] = trans;
+		  edge->son[0] = *ref;
+		  return *ref = edge;
+		}
+	      else
+	        {
+		  edge = P(edge_alloc)(TTC 2);
+		  edge->len = prefix;
+		  edge->leaf = leaf;
+		  edge->trans[0] = trans;
+		  edge->son[0] = *ref;
+		  edge->trans[1] = P(str_char)(ptr, len, prefix);
+		  *ref = edge;
+		  return edge->son[1] = newleaf;
+		}
+	    }
+	  if (pos == len)
+	    {
+	      TRIE_DBG("Adding the node to an already existing edge");
+	      edge->flags |= TRIE_FLAG_NODE;
+	      edge->node = NULL;
+	      return edge;
+	    }
+	  if (!(edge->flags & TRIE_FLAG_NODE) && newleaf)
+	    edge->leaf = newleaf;
+	  trans = P(str_char)(ptr, len, pos);
+	  if (pos < prefix)
+	    ref = P(son_find)(edge, trans);
+	  else
+	    ref = P(son_insert)(TTC ref, trans);
+	}
+    }
+  return *ref = newleaf;
+}
+
+#ifdef TRIE_WANT_DO_DELETE
+static P(node_t) *
+P(do_delete)(TAC byte *ptr, uint len)
+{
+  TRIE_DBG("do_delete('%.*s')", len, ptr);
+  struct P(edge) **ref = &T.root, **pref = NULL, *edge, *parent, *leaf, *pold = NULL;
+  while (1)
+    {
+      if (!(edge = *ref) || edge->len > len)
+	return NULL;
+      else if (edge->len == len)
+	if ((edge->flags & TRIE_FLAG_NODE) && !memcmp(ptr, P(str_get)(edge->node), len))
+	  break;
+	else
+	  return NULL;
+      pref = ref;
+      if (!(ref = P(son_find)(edge, P(str_char)(ptr, len, edge->len))))
+	return NULL;
+    }
+
+  P(node_t) *node = edge->node;
+  uint deg = edge->flags & TRIE_FLAG_DEG;
+
+  if (!deg)
+    {
+      if (!pref)
+        {
+	  TRIE_DBG("Deleting last edge");
+	  T.root = NULL;
+	  P(edge_free)(TTC edge);
+	  return node;
+	}
+      else
+        {
+	  TRIE_DBG("Deleting a leaf");
+	  pold = *pref;
+	  P(son_delete)(TTC pref, P(str_char)(ptr, len, pold->len));
+	  parent = *pref;
+	  if ((parent->flags & (TRIE_FLAG_DEG | TRIE_FLAG_NODE)) <= 1)
+	    {
+	      ASSERT((parent->flags & (TRIE_FLAG_DEG | TRIE_FLAG_HASH)) == 1);
+	      TRIE_DBG("... and its parent");
+	      leaf = *pref = parent->son[0];
+	      P(edge_free)(TTC parent);
+	    }
+	  else if (parent->flags & TRIE_FLAG_NODE)
+	    leaf = parent;
+	  else
+	    leaf = P(son_any)(parent);
+	}
+      P(edge_free)(TTC edge);
+    }
+  else if (deg == 1)
+    {
+      TRIE_DBG("Deleting internal edge");
+      ASSERT(!(edge->flags & TRIE_FLAG_HASH));
+      leaf = *ref = edge->son[0];
+      P(edge_free)(TTC edge);
+    }
+  else
+    {
+      TRIE_DBG("Deleting node, but leaving edge");
+      leaf = P(son_any)(edge);
+      if (!(leaf->flags & TRIE_FLAG_NODE))
+        leaf = leaf->leaf;
+      edge->leaf = leaf;
+      edge->flags &= ~TRIE_FLAG_NODE;
+    }
+
+  TRIE_DBG("Updating leaf pointers");
+  if (!(leaf->flags & TRIE_FLAG_NODE))
+    leaf = leaf->leaf;
+  ASSERT(leaf->flags & TRIE_FLAG_NODE);
+  for (ref = &T.root; ref && (*ref)->len < len; ref = P(son_find)(*ref, P(str_char)(ptr, len, (*ref)->len)))
+    if ((*ref)->leaf == edge || (*ref)->leaf == pold)
+      (*ref)->leaf = leaf;
+  return node;
+}
+#endif
+
+#ifdef TRIE_WANT_FIND
+static inline P(node_t) *
+P(find)(TAC char *str)
+{
+  struct P(edge) *edge = P(do_find)(TTC str, str_len(str));
+  return edge ? edge->node : NULL;
+}
+#endif
+
+#ifdef TRIE_WANT_FIND_BUF
+static inline P(node_t) *
+P(find_buf)(TAC byte *ptr, uint len)
+{
+  struct P(edge) *edge = P(do_find)(TTC ptr, len);
+  return edge ? edge->node : NULL;
+}
+#endif
+
+#ifdef TRIE_WANT_ADD
+static inline void
+P(add)(TAC P(node_t) *node)
+{
+  struct P(edge) *edge = P(do_lookup)(TTC P(str_get)(node), P(str_len)(node));
+  ASSERT(!edge->node);
+  edge->node = node;
+}
+#endif
+
+#ifdef TRIE_WANT_REPLACE
+static inline P(node_t) *
+P(replace)(TAC P(node_t) *node)
+{
+  struct P(edge) *edge = P(do_lookup)(TTC P(str_get)(node), P(str_len)(node));
+  P(node_t) *over = edge->node;
+  edge->node = node;
+  return over;
+}
+#endif
+
+#ifdef TRIE_WANT_DELETE
+static inline P(node_t) *
+P(delete)(TAC char *str)
+{
+  return P(do_delete)(TTC str, str_len(str));
+}
+#endif
+
+#ifdef TRIE_WANT_DELETE_BUF
+static inline P(node_t) *
+P(delete_buf)(TAC byte *ptr, uint len)
+{
+  return P(do_delete)(TTC ptr, len);
+}
+#endif
+
+#ifdef TRIE_WANT_REMOVE
+static inline void
+P(remove)(TAC P(node_t) *node)
+{
+  if (unlikely(P(do_delete)(TTC P(str_get)(node), P(str_len)(node)) != node))
+    ASSERT(0);
+}
+#endif
+
+/*** Traversing prefixes and subtrees ***/
+
+#ifndef TRIE_FOR_ALL
+
+// for all matched edges until the first >=xlen (including)
+#define TRIE_FOR_PREFIX_EDGES(px, xtrie, xptr, xlen, xedge)		\
+  do									\
+    {									\
+      byte *_ptr = (xptr);						\
+      uint _len = (xlen);						\
+      struct px##trie *_trie = (xtrie);					\
+      struct px##edge *xedge, **_ref;					\
+      if (!(xedge = _trie->root))					\
+        break;								\
+      while (xedge->len < _len && (_ref = px##son_find(xedge, px##str_char(_ptr, _len, xedge->len))))		\
+        xedge = *_ref;							\
+      if (!(xedge->flags & TRIE_FLAG_NODE))				\
+	xedge = xedge->leaf;						\
+      uint _prefix = px##common_prefix(_ptr, _len, px##str_get(xedge->node), xedge->len);			\
+      for (_ref = &_trie->root; _ref && ((xedge = *_ref)->len <= _prefix || _prefix == _len);			\
+	_ref = (xedge->len < _prefix) ? px##son_find(xedge, px##str_char(_ptr, _len, xedge->len)) : NULL)	\
+        {
+#define TRIE_END_PREFIX_EDGES						\
+	}								\
+    }									\
+  while (0)
+
+// for entire subtree starting in the xstart edge
+#define TRIE_FOR_SUBTREE_EDGES(px, xstart, xedge)			\
+  do									\
+    {									\
+      struct { struct px##edge *edge; uint pos; }			\
+        *_sbuf = alloca(sizeof(*_sbuf) * 16),				\
+        *_sptr = _sbuf, *_send = _sbuf + 16;				\
+      struct px##edge *_next = (xstart), *xedge;			\
+      while (xedge = _next)						\
+	{								\
+	  if (xedge->flags & TRIE_FLAG_DEG)				\
+	    {								\
+	      if (_sptr == _send)					\
+	        {							\
+		  uint stack_size = _sptr - _sbuf;			\
+		  _sptr = alloca(sizeof(*_sptr) * (stack_size * 2));	\
+		  memcpy(_sptr, _sbuf, sizeof(*_sptr) * stack_size);	\
+		  _sbuf = _sptr;					\
+		  _send = _sptr + stack_size * 2;			\
+		}							\
+	      _sptr->edge = xedge;					\
+	      _sptr->pos = (xedge->flags & TRIE_FLAG_HASH) ?		\
+	        (1U << px##bucket_rank) << xedge->hash_rank :		\
+	        (xedge->flags & TRIE_FLAG_DEG);				\
+	      _sptr++;							\
+	    }								\
+	  while (1)							\
+	    {								\
+	      if (_sptr == _sbuf)					\
+	        {							\
+		  _next = NULL;						\
+		  break;						\
+		}							\
+	      _next = (--_sptr)->edge;					\
+	      uint pos = --(_sptr->pos);				\
+	      uint flags = _next->flags;				\
+	      _next = _next->son[pos];					\
+	      if (pos)							\
+	        _sptr++;						\
+	      if (!(flags & TRIE_FLAG_HASH) ||				\
+		((pos & ((1U << px##bucket_rank) - 1)) &&		\
+		 (uintptr_t)_next > 1))					\
+	        break;							\
+	    }
+#define TRIE_END_SUBTREE_EDGES						\
+	}								\
+    }									\
+  while (0)
+
+#define TRIE_FOR_SUBTREE(px, xstart, xnode)				\
+  TRIE_FOR_SUBTREE_EDGES(px, xstart, _edge)				\
+    if (_edge->flags & TRIE_FLAG_NODE)					\
+      {									\
+	px##node_t *xnode = _edge->node;
+#define TRIE_END_SUBTREE						\
+      }									\
+  TRIE_END_SUBTREE_EDGES;
+
+#define TRIE_FOR_ALL_EDGES(px, xtrie, xedge) TRIE_FOR_SUBTREE_EDGES(px, (xtrie)->root, xedge)
+#define TRIE_END_ALL_EDGES TRIE_END_SUBTREE_EDGES
+
+#define TRIE_FOR_ALL(px, xtrie, xnode) TRIE_FOR_SUBTREE(px, (xtrie)->root, xnode)
+#define TRIE_END_ALL TRIE_END_SUBTREE
+
+#endif
+
+/*** Check consistency ***/
+
+#ifdef TRIE_WANT_AUDIT
+
+static void
+P(audit)(TA)
+{
+  uint count = 0;
+  TRIE_FOR_ALL_EDGES(TRIE_PREFIX(), &T, edge)
+    {
+      ASSERT(edge);
+      uint deg = edge->flags & TRIE_FLAG_DEG;
+      ASSERT(edge->node);
+      struct P(edge) * leaf = (edge->flags & TRIE_FLAG_NODE) ? edge : edge->leaf;
+      if (leaf != edge)
+        {
+	  ASSERT(leaf->flags & TRIE_FLAG_NODE);
+	  ASSERT(leaf->len > edge->len);
+	  ASSERT(leaf->node);
+	}
+      TRIE_DBG("Checking edge %p, %s=%p, flags=0x%x, key='%.*s'",
+	  edge, (edge->flags & TRIE_FLAG_NODE) ? "node" : "leaf", edge->node, edge->flags,
+	  edge->len, P(str_prefix)(P(str_get)(leaf->node), leaf->len, edge->len));
+      ASSERT(deg >= 2 || (edge->flags & TRIE_FLAG_NODE));
+      if (edge->flags & TRIE_FLAG_HASH)
+        {
+	  ASSERT(deg > 1 && deg <= 256);
+	  uint count = 0, deleted = 0;
+	  for (uint i = TRIE_BUCKET_SIZE << edge->hash_rank; i--; )
+	    if (i & TRIE_BUCKET_MASK)
+	      if ((uintptr_t)edge->son[i] == 1)
+		deleted++;
+	      else if (edge->son[i])
+	        {
+		  ASSERT(edge->son[i]->len > edge->len);
+		  count++;
+		}
+	  ASSERT(count == deg);
+	  ASSERT(deleted == edge->hash_deleted);
+	}
+      else
+        {
+	  ASSERT(deg <= TRIE_HASH_THRESHOLD);
+	  for (uint i = 0; i < deg; i++)
+	    ASSERT(edge->son[i]->len > edge->len);
+	}
+      count++;
+    }
+  TRIE_END_ALL_EDGES;
+  TRIE_DBG("Found %u edges", count);
+}
+
+#endif
+
+/*** Statistics ***/
+
+#ifdef TRIE_WANT_STATS
+
+struct P(stats) {
+  u64 total_size;
+  u64 small_size;
+  u64 hash_size;
+};
+
+static void
+P(stats)(TAC struct P(stats) *stats)
+{
+  bzero(stats, sizeof(*stats));
+  for (uint i = 0; i < ARRAY_SIZE(T.epool); i++)
+    stats->small_size += ep_total_size(T.epool[i]);
+  for (uint i = 0; i < ARRAY_SIZE(T.hpool); i++)
+    stats->hash_size += ep_total_size(T.hpool[i]);
+  stats->total_size = stats->small_size + stats->hash_size + sizeof(T);
+}
+
+static inline u64
+P(total_size)(TA)
+{
+  struct P(stats) stats;
+  P(stats)(TTC &stats);
+  return stats.total_size;
+}
+
+#endif
+
+/*** Clean up local macros ***/
+
+#undef P
+#undef T
+#undef TA
+#undef TAC
+#undef TT
+#undef TTC
+
+#undef TRIE_PREFIX
+#undef TRIE_NODE_TYPE
+#undef TRIE_NODE_KEY
+#undef TRIE_NODE_LEN
+#undef TRIE_LEN_TYPE
+#undef TRIE_REV
+#undef TRIE_DYNAMIC
+#undef TRIE_ELTPOOL_SIZE
+#undef TRIE_HASH_THRESHOLD
+#undef TRIE_BUCKET_RANK
+#undef TRIE_BUCKET_SIZE
+#undef TRIE_BUCKET_MASK
+#undef TRIE_TRACE
+#undef TRIE_DBG
+#undef TRIE_HASH_FOR_ALL
+#undef TRIE_HASH_END_FOR
+
+#undef TRIE_WANT_CLEANUP
+
+#undef TRIE_WANT_DO_FIND
+#undef TRIE_WANT_DO_LOOKUP
+#undef TRIE_WANT_DO_DELETE
+
+#undef TRIE_WANT_FIND
+#undef TRIE_WANT_FIND_BUF
+#undef TRIE_WANT_ADD
+#undef TRIE_WANT_ADD_OVER
+#undef TRIE_WANT_DELETE
+#undef TRIE_WANT_DELETE_BUF
+#undef TRIE_WANT_REMOVE
+
+#undef TRIE_WANT_AUDIT
diff --git a/libucw/ucw/unaligned.h b/libucw/ucw/unaligned.h
new file mode 100644
index 0000000..d3ed71c
--- /dev/null
+++ b/libucw/ucw/unaligned.h
@@ -0,0 +1,174 @@
+/*
+ *	UCW Library -- Fast Access to Unaligned Data
+ *
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_UNALIGNED_H
+#define _UCW_UNALIGNED_H
+
+/* Big endian format */
+
+#if defined(CPU_ALLOW_UNALIGNED) && defined(CPU_BIG_ENDIAN)
+static inline uint get_u16_be(const void *p) { return *(u16 *)p; }	/** Read 16-bit integer value from an unaligned sequence of 2 bytes (big-endian version). **/
+static inline u32 get_u32_be(const void *p) { return *(u32 *)p; }	/** Read 32-bit integer value from an unaligned sequence of 4 bytes (big-endian version). **/
+static inline u64 get_u64_be(const void *p) { return *(u64 *)p; }	/** Read 64-bit integer value from an unaligned sequence of 8 bytes (big-endian version). **/
+static inline void put_u16_be(void *p, uint x) { *(u16 *)p = x; }	/** Write 16-bit integer value to an unaligned sequence of 2 bytes (big-endian version). **/
+static inline void put_u32_be(void *p, u32 x) { *(u32 *)p = x; }	/** Write 32-bit integer value to an unaligned sequence of 4 bytes (big-endian version). **/
+static inline void put_u64_be(void *p, u64 x) { *(u64 *)p = x; }	/** Write 64-bit integer value to an unaligned sequence of 8 bytes (big-endian version). **/
+#else
+static inline uint get_u16_be(const void *p)
+{
+  const byte *c = (const byte *)p;
+  return (c[0] << 8) | c[1];
+}
+static inline u32 get_u32_be(const void *p)
+{
+  const byte *c = (const byte *)p;
+  return (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3];
+}
+static inline u64 get_u64_be(const void *p)
+{
+  return ((u64) get_u32_be(p) << 32) | get_u32_be((const byte *)p+4);
+}
+static inline void put_u16_be(void *p, uint x)
+{
+  byte *c = (byte *)p;
+  c[0] = x >> 8;
+  c[1] = x;
+}
+static inline void put_u32_be(void *p, u32 x)
+{
+  byte *c = (byte *)p;
+  c[0] = x >> 24;
+  c[1] = x >> 16;
+  c[2] = x >> 8;
+  c[3] = x;
+}
+static inline void put_u64_be(void *p, u64 x)
+{
+  put_u32_be(p, x >> 32);
+  put_u32_be((byte *)p+4, x);
+}
+#endif
+
+static inline u64 get_u40_be(const void *p) /** Read 40-bit integer value from an unaligned sequence of 5 bytes (big-endian version). **/
+{
+  const byte *c = (const byte *)p;
+  return ((u64)c[0] << 32) | get_u32_be(c+1);
+}
+
+static inline void put_u40_be(void *p, u64 x)
+{
+  byte *c = (byte *)p;
+  c[0] = x >> 32;
+  put_u32_be(c+1, x);
+}
+
+/* Little-endian format */
+
+#if defined(CPU_ALLOW_UNALIGNED) && !defined(CPU_BIG_ENDIAN)
+static inline uint get_u16_le(const void *p) { return *(u16 *)p; }	/** Read 16-bit integer value from an unaligned sequence of 2 bytes (little-endian version). **/
+static inline u32 get_u32_le(const void *p) { return *(u32 *)p; }	/** Read 32-bit integer value from an unaligned sequence of 4 bytes (little-endian version). **/
+static inline u64 get_u64_le(const void *p) { return *(u64 *)p; }	/** Read 64-bit integer value from an unaligned sequence of 8 bytes (little-endian version). **/
+static inline void put_u16_le(void *p, uint x) { *(u16 *)p = x; }	/** Write 16-bit integer value to an unaligned sequence of 2 bytes (little-endian version). **/
+static inline void put_u32_le(void *p, u32 x) { *(u32 *)p = x; }	/** Write 32-bit integer value to an unaligned sequence of 4 bytes (little-endian version). **/
+static inline void put_u64_le(void *p, u64 x) { *(u64 *)p = x; }	/** Write 64-bit integer value to an unaligned sequence of 8 bytes (little-endian version). **/
+#else
+static inline uint get_u16_le(const void *p)
+{
+  const byte *c = p;
+  return c[0] | (c[1] << 8);
+}
+static inline u32 get_u32_le(const void *p)
+{
+  const byte *c = p;
+  return c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24);
+}
+static inline u64 get_u64_le(const void *p)
+{
+  return get_u32_le(p) | ((u64) get_u32_le((const byte *)p+4) << 32);
+}
+static inline void put_u16_le(void *p, uint x)
+{
+  byte *c = p;
+  c[0] = x;
+  c[1] = x >> 8;
+}
+static inline void put_u32_le(void *p, u32 x)
+{
+  byte *c = p;
+  c[0] = x;
+  c[1] = x >> 8;
+  c[2] = x >> 16;
+  c[3] = x >> 24;
+}
+static inline void put_u64_le(void *p, u64 x)
+{
+  put_u32_le(p, x);
+  put_u32_le((byte *)p+4, x >> 32);
+}
+#endif
+
+static inline u64 get_u40_le(const void *p) /** Read 40-bit integer value from an unaligned sequence of 5 bytes (little-endian version). **/
+{
+  const byte *c = (const byte *)p;
+  return get_u32_le(c) | ((u64) c[4] << 32);
+}
+
+static inline void put_u40_le(void *p, u64 x)
+{
+  byte *c = (byte *)p;
+  put_u32_le(c, x);
+  c[4] = x >> 32;
+}
+
+/* The native format */
+
+#ifdef CPU_BIG_ENDIAN
+
+static inline uint get_u16(const void *p) { return get_u16_be(p); } /** Read 16-bit integer value from an unaligned sequence of 2 bytes (native byte-order). **/
+static inline u32 get_u32(const void *p) { return get_u32_be(p); }  /** Read 32-bit integer value from an unaligned sequence of 4 bytes (native byte-order). **/
+static inline u64 get_u64(const void *p) { return get_u64_be(p); }  /** Read 64-bit integer value from an unaligned sequence of 8 bytes (native byte-order). **/
+static inline u64 get_u40(const void *p) { return get_u40_be(p); }  /** Read 40-bit integer value from an unaligned sequence of 5 bytes (native byte-order). **/
+static inline void put_u16(void *p, uint x) { return put_u16_be(p, x); } /** Write 16-bit integer value to an unaligned sequence of 2 bytes (native byte-order). **/
+static inline void put_u32(void *p, u32 x) { return put_u32_be(p, x); }  /** Write 32-bit integer value to an unaligned sequence of 4 bytes (native byte-order). **/
+static inline void put_u64(void *p, u64 x) { return put_u64_be(p, x); }  /** Write 64-bit integer value to an unaligned sequence of 8 bytes (native byte-order). **/
+static inline void put_u40(void *p, u64 x) { return put_u40_be(p, x); }  /** Write 40-bit integer value to an unaligned sequence of 5 bytes (native byte-order). **/
+
+#else
+
+static inline uint get_u16(const void *p) { return get_u16_le(p); }
+static inline u32 get_u32(const void *p) { return get_u32_le(p); }
+static inline u64 get_u64(const void *p) { return get_u64_le(p); }
+static inline u64 get_u40(const void *p) { return get_u40_le(p); }
+static inline void put_u16(void *p, uint x) { return put_u16_le(p, x); }
+static inline void put_u32(void *p, u32 x) { return put_u32_le(p, x); }
+static inline void put_u64(void *p, u64 x) { return put_u64_le(p, x); }
+static inline void put_u40(void *p, u64 x) { return put_u40_le(p, x); }
+
+#endif
+
+/* Just for completeness */
+
+static inline uint get_u8(const void *p) { return *(const byte *)p; } /** Read 8-bit integer value. **/
+static inline void put_u8(void *p, uint x) { *(byte *)p = x; } /** Write 8-bit integer value. **/
+
+/* Backward compatibility macros */
+
+#define GET_U8(p) get_u8(p)
+#define GET_U16(p) get_u16(p)
+#define GET_U32(p) get_u32(p)
+#define GET_U64(p) get_u64(p)
+#define GET_U40(p) get_u40(p)
+
+#define PUT_U8(p,x) put_u8(p,x);
+#define PUT_U16(p,x) put_u16(p,x)
+#define PUT_U32(p,x) put_u32(p,x)
+#define PUT_U64(p,x) put_u64(p,x)
+#define PUT_U40(p,x) put_u40(p,x)
+
+#endif
diff --git a/libucw/ucw/unicode.c b/libucw/ucw/unicode.c
new file mode 100644
index 0000000..8615f12
--- /dev/null
+++ b/libucw/ucw/unicode.c
@@ -0,0 +1,143 @@
+/*
+ *	UCW Library -- UTF-8 Functions
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2003 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/unicode.h>
+
+size_t
+utf8_strlen(const byte *str)
+{
+  size_t len = 0;
+  while (*str)
+    {
+      UTF8_SKIP(str);
+      len++;
+    }
+  return len;
+}
+
+size_t
+utf8_strnlen(const byte *str, size_t n)
+{
+  size_t len = 0;
+  const byte *end = str + n;
+  while (str < end)
+    {
+      UTF8_SKIP(str);
+      len++;
+    }
+  return len;
+}
+
+#ifdef TEST
+
+#include <string.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  byte buf[256];
+
+#define FUNCS \
+  F(UTF8_GET) F(UTF8_32_GET) F(UTF16_BE_GET) F(UTF16_LE_GET) \
+  F(UTF8_PUT) F(UTF8_32_PUT) F(UTF16_BE_PUT) F(UTF16_LE_PUT)
+
+  enum {
+#define F(x) FUNC_##x,
+    FUNCS
+#undef F
+  };
+  char *names[] = {
+#define F(x) [FUNC_##x] = #x,
+    FUNCS
+#undef F
+  };
+
+  uint func = ~0U;
+  if (argc > 1)
+    for (uint i = 0; i < ARRAY_SIZE(names); i++)
+      if (!strcasecmp(names[i], argv[1]))
+	func = i;
+  if (!~func)
+    {
+      fprintf(stderr, "Invalid usage!\n");
+      return 1;
+    }
+
+  if (func < FUNC_UTF8_PUT)
+    {
+      byte *p = buf, *q = buf, *last;
+      uint u;
+      bzero(buf, sizeof(buf));
+      while (scanf("%x", &u) == 1)
+	*q++ = u;
+      while (p < q)
+	{
+	  last = p;
+	  if (p != buf)
+	    putchar(' ');
+	  switch (func)
+	    {
+	      case FUNC_UTF8_GET:
+		p = utf8_get(p, &u);
+		break;
+	      case FUNC_UTF8_32_GET:
+		p = utf8_32_get(p, &u);
+		break;
+	      case FUNC_UTF16_BE_GET:
+		p = utf16_be_get(p, &u);
+		break;
+	      case FUNC_UTF16_LE_GET:
+		p = utf16_le_get(p, &u);
+		break;
+	      default:
+		ASSERT(0);
+	    }
+	  printf("%04x", u);
+	  ASSERT(last < p && p <= q);
+	}
+      putchar('\n');
+    }
+  else
+    {
+      uint u, i=0;
+      while (scanf("%x", &u) == 1)
+	{
+	  byte *p = buf, *q = buf;
+	  switch (func)
+	    {
+	      case FUNC_UTF8_PUT:
+		p = utf8_put(p, u);
+		break;
+	      case FUNC_UTF8_32_PUT:
+		p = utf8_32_put(p, u);
+		break;
+	      case FUNC_UTF16_BE_PUT:
+		p = utf16_be_put(p, u);
+		break;
+	      case FUNC_UTF16_LE_PUT:
+		p = utf16_le_put(p, u);
+		break;
+	      default:
+		ASSERT(0);
+	    }
+	  while (q < p)
+	    {
+	      if (i++)
+		putchar(' ');
+	      printf("%02x", *q++);
+	    }
+	}
+      putchar('\n');
+    }
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/unicode.h b/libucw/ucw/unicode.h
new file mode 100644
index 0000000..4ec1c6b
--- /dev/null
+++ b/libucw/ucw/unicode.h
@@ -0,0 +1,382 @@
+/*
+ *	UCW Library -- Unicode Characters
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_UNICODE_H
+#define _UCW_UNICODE_H
+
+#include <ucw/unaligned.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define utf8_strlen ucw_utf8_strlen
+#define utf8_strnlen ucw_utf8_strnlen
+#endif
+
+/* Macros for handling UTF-8 */
+
+#define UNI_REPLACEMENT 0xfffc	/** Unicode value used as a default replacement of invalid characters. **/
+
+/**
+ * Encode a value from the range `[0, 0xFFFF]`
+ * (basic multilingual plane); up to 3 bytes needed (RFC2279).
+ **/
+static inline byte *utf8_put(byte *p, uint u)
+{
+  if (u < 0x80)
+    *p++ = u;
+  else if (u < 0x800)
+    {
+      *p++ = 0xc0 | (u >> 6);
+      *p++ = 0x80 | (u & 0x3f);
+    }
+  else
+    {
+      ASSERT(u < 0x10000);
+      *p++ = 0xe0 | (u >> 12);
+      *p++ = 0x80 | ((u >> 6) & 0x3f);
+      *p++ = 0x80 | (u & 0x3f);
+    }
+  return p;
+}
+
+/**
+ * Encode a value from the range `[0, 0x7FFFFFFF]`;
+ * (superset of Unicode 4.0) up to 6 bytes needed (RFC2279).
+ **/
+static inline byte *utf8_32_put(byte *p, uint u)
+{
+  if (u < 0x80)
+    *p++ = u;
+  else if (u < 0x800)
+    {
+      *p++ = 0xc0 | (u >> 6);
+      goto put1;
+    }
+  else if (u < (1<<16))
+    {
+      *p++ = 0xe0 | (u >> 12);
+      goto put2;
+    }
+  else if (u < (1<<21))
+    {
+      *p++ = 0xf0 | (u >> 18);
+      goto put3;
+    }
+  else if (u < (1<<26))
+    {
+      *p++ = 0xf8 | (u >> 24);
+      goto put4;
+    }
+  else if (u < (1U<<31))
+    {
+      *p++ = 0xfc | (u >> 30);
+      *p++ = 0x80 | ((u >> 24) & 0x3f);
+put4: *p++ = 0x80 | ((u >> 18) & 0x3f);
+put3: *p++ = 0x80 | ((u >> 12) & 0x3f);
+put2: *p++ = 0x80 | ((u >> 6) & 0x3f);
+put1: *p++ = 0x80 | (u & 0x3f);
+    }
+  else
+    ASSERT(0);
+  return p;
+}
+
+#define UTF8_GET_NEXT if (unlikely((*p & 0xc0) != 0x80)) goto bad; u = (u << 6) | (*p++ & 0x3f)
+#define UTF8_CHECK_RANGE(r) if (unlikely(u < r)) goto bad
+
+/**
+ * Decode a value from the range `[0, 0xFFFF]` (basic multilingual plane)
+ * or return @repl if the encoding has been corrupted.
+ **/
+static inline byte *utf8_get_repl(const byte *p, uint *uu, uint repl)
+{
+  uint u = *p++;
+  if (u < 0x80)
+    ;
+  else if (unlikely(u < 0xc0))
+    {
+      /* Incorrect byte sequence */
+    bad:
+      u = repl;
+    }
+  else if (u < 0xe0)
+    {
+      u &= 0x1f;
+      UTF8_GET_NEXT;
+      UTF8_CHECK_RANGE(0x80);
+    }
+  else if (likely(u < 0xf0))
+    {
+      u &= 0x0f;
+      UTF8_GET_NEXT;
+      UTF8_GET_NEXT;
+      UTF8_CHECK_RANGE(0x800);
+    }
+  else
+    goto bad;
+  *uu = u;
+  return (byte *)p;
+}
+
+/**
+ * Decode a value from the range `[0, 0x7FFFFFFF]`
+ * or return @repl if the encoding has been corrupted.
+ **/
+static inline byte *utf8_32_get_repl(const byte *p, uint *uu, uint repl)
+{
+  uint u = *p++;
+  uint limit;
+  if (u < 0x80)
+    ;
+  else if (unlikely(u < 0xc0))
+    goto bad;
+  else if (u < 0xe0)
+    {
+      u &= 0x1f;
+      limit = 0x80;
+      goto get1;
+    }
+  else if (u < 0xf0)
+    {
+      u &= 0x0f;
+      limit = 0x800;
+      goto get2;
+    }
+  else if (u < 0xf8)
+    {
+      u &= 0x07;
+      limit = 1 << 16;
+      goto get3;
+    }
+  else if (u < 0xfc)
+    {
+      u &= 0x03;
+      limit = 1 << 21;
+      goto get4;
+    }
+  else if (u < 0xfe)
+    {
+      u &= 0x01;
+      limit = 1 << 26;
+      UTF8_GET_NEXT;
+get4: UTF8_GET_NEXT;
+get3: UTF8_GET_NEXT;
+get2: UTF8_GET_NEXT;
+get1: UTF8_GET_NEXT;
+      if (unlikely(u < limit))
+	goto bad;
+    }
+  else
+    goto bad;
+  *uu = u;
+  return (byte *)p;
+
+bad:
+  /* Incorrect byte sequence */
+  *uu = repl;
+  return (byte *)p;
+}
+
+/**
+ * Decode a value from the range `[0, 0xFFFF]` (basic multilingual plane)
+ * or return `UNI_REPLACEMENT` if the encoding has been corrupted.
+ **/
+static inline byte *utf8_get(const byte *p, uint *uu)
+{
+  return utf8_get_repl(p, uu, UNI_REPLACEMENT);
+}
+
+/**
+ * Decode a value from the range `[0, 0x7FFFFFFF]`
+ * or return `UNI_REPLACEMENT` if the encoding has been corrupted.
+ **/
+static inline byte *utf8_32_get(const byte *p, uint *uu)
+{
+  return utf8_32_get_repl(p, uu, UNI_REPLACEMENT);
+}
+
+#define UTF8_SKIP(p) do {				\
+    uint c = *p++;					\
+    if (c >= 0xc0)					\
+      while (c & 0x40 && *p >= 0x80 && *p < 0xc0)	\
+        p++, c <<= 1;					\
+  } while (0)
+
+#define UTF8_SKIP_BWD(p) while ((*--(p) & 0xc0) == 0x80)
+
+/**
+ * Return the number of bytes needed to encode a given value from the range `[0, 0x7FFFFFFF]` to UTF-8.
+ **/
+static inline uint utf8_space(uint u)
+{
+  if (u < 0x80)
+    return 1;
+  if (u < 0x800)
+    return 2;
+  if (u < (1<<16))
+    return 3;
+  if (u < (1<<21))
+    return 4;
+  if (u < (1<<26))
+    return 5;
+  return 6;
+}
+
+/**
+ * Compute the length of a single UTF-8 character from its first byte. The encoding must be valid.
+ **/
+static inline uint utf8_encoding_len(uint c)
+{
+  if (c < 0x80)
+    return 1;
+  ASSERT(c >= 0xc0 && c < 0xfe);
+  if (c < 0xe0)
+    return 2;
+  if (c < 0xf0)
+    return 3;
+  if (c < 0xf8)
+    return 4;
+  if (c < 0xfc)
+    return 5;
+  return 6;
+}
+
+/** Maximum number of bytes an UTF-8 character can have. **/
+#define UTF8_MAX_LEN 6
+
+/**
+ * Encode an UTF-16LE character from the range `[0, 0xD7FF]` or `[0xE000,0x11FFFF]`;
+ * up to 4 bytes needed.
+ **/
+static inline void *utf16_le_put(void *p, uint u)
+{
+  if (u < 0xd800 || (u < 0x10000 && u >= 0xe000))
+    {
+      put_u16_le(p, u);
+      return p + 2;
+    }
+  else if ((u -= 0x10000) < 0x100000)
+    {
+      put_u16_le(p, 0xd800 | (u >> 10));
+      put_u16_le(p + 2, 0xdc00 | (u & 0x3ff));
+      return p + 4;
+    }
+  else
+    ASSERT(0);
+}
+
+/**
+ * Encode a UTF-16BE character from the range `[0, 0xD7FF]` or `[0xE000,0x11FFFF]`;
+ * up to 4 bytes needed.
+ **/
+static inline void *utf16_be_put(void *p, uint u)
+{
+  if (u < 0xd800 || (u < 0x10000 && u >= 0xe000))
+    {
+      put_u16_be(p, u);
+      return p + 2;
+    }
+  else if ((u -= 0x10000) < 0x100000)
+    {
+      put_u16_be(p, 0xd800 | (u >> 10));
+      put_u16_be(p + 2, 0xdc00 | (u & 0x3ff));
+      return p + 4;
+    }
+  else
+    ASSERT(0);
+}
+
+/**
+ * Decode a UTF-16LE character from the range `[0, 0xD7FF]` or `[0xE000,11FFFF]`
+ * or return @repl if the encoding has been corrupted.
+ **/
+static inline void *utf16_le_get_repl(const void *p, uint *uu, uint repl)
+{
+  uint u = get_u16_le(p), x, y;
+  x = u - 0xd800;
+  if (x < 0x800)
+    if (x < 0x400 && (y = get_u16_le(p + 2) - 0xdc00) < 0x400)
+      {
+	u = 0x10000 + (x << 10) + y;
+	p += 2;
+      }
+    else
+      u = repl;
+  *uu = u;
+  return (void *)(p + 2);
+}
+
+/**
+ * Decode a UTF-16BE character from the range `[0, 0xD7FF]` or `[0xE000,11FFFF]`
+ * or return @repl if the encoding has been corrupted.
+ **/
+static inline void *utf16_be_get_repl(const void *p, uint *uu, uint repl)
+{
+  uint u = get_u16_be(p), x, y;
+  x = u - 0xd800;
+  if (x < 0x800)
+    if (x < 0x400 && (y = get_u16_be(p + 2) - 0xdc00) < 0x400)
+      {
+	u = 0x10000 + (x << 10) + y;
+	p += 2;
+      }
+    else
+      u = repl;
+  *uu = u;
+  return (void *)(p + 2);
+}
+
+/**
+ * Decode a UTF-16LE  character from the range `[0, 0xD7FF]` or `[0xE000,11FFFF]`
+ * or return `UNI_REPLACEMENT` if the encoding has been corrupted.
+ **/
+static inline void *utf16_le_get(const void *p, uint *uu)
+{
+  return utf16_le_get_repl(p, uu, UNI_REPLACEMENT);
+}
+
+/**
+ * Decode a UTF-16BE  character from the range `[0, 0xD7FF]` or `[0xE000,11FFFF]`
+ * or return `UNI_REPLACEMENT` if the encoding has been corrupted.
+ **/
+static inline void *utf16_be_get(const void *p, uint *uu)
+{
+  return utf16_be_get_repl(p, uu, UNI_REPLACEMENT);
+}
+
+/**
+ * Basic sanity check on Unicode characters. Return `UNI_REPLACEMENT` if the input
+ * character is a surrogate, ASCII or Latin-1 control character different from the tab,
+ * or if it lies outside the basic plane. In all other cases, it acts as an identity.
+ **/
+static inline uint unicode_sanitize_char(uint u)
+{
+  if (u >= 0x10000 ||			// We don't accept anything outside the basic plane
+      u >= 0xd800 && u < 0xf900 ||	// neither we do surrogates and private use characters
+      u >= 0x80 && u < 0xa0 ||		// nor latin-1 control chars
+      u < 0x20 && u != '\t')
+    return UNI_REPLACEMENT;
+  return u;
+}
+
+/* unicode-utf8.c */
+
+/**
+ * Count the number of Unicode characters in a zero-terminated UTF-8 string.
+ * Returned value for corrupted encoding is undefined, but is never greater than strlen().
+ **/
+size_t utf8_strlen(const byte *str);
+
+/**
+ * Same as @utf8_strlen(), but returns at most @n characters.
+ **/
+size_t utf8_strnlen(const byte *str, size_t n);
+
+#endif
diff --git a/libucw/ucw/unicode.t b/libucw/ucw/unicode.t
new file mode 100644
index 0000000..9a2e2ad
--- /dev/null
+++ b/libucw/ucw/unicode.t
@@ -0,0 +1,73 @@
+# Tests for the Unicode module
+
+Name:	utf8_put ASCII
+Run:	../obj/ucw/unicode-t utf8_put
+In:	0041 0048 004f 004a
+Out:	41 48 4f 4a
+
+Name:	utf8_put BMP
+In:	00aa 01aa 02a5 05a5 0a5a 15a5 2a5a 5a5a a5a5
+Out:	c2 aa c6 aa ca a5 d6 a5 e0 a9 9a e1 96 a5 e2 a9 9a e5 a9 9a ea 96 a5
+
+Name:	utf8_get ASCII
+Run:	../obj/ucw/unicode-t utf8_get
+In:	41 48 4f 4a
+Out:	0041 0048 004f 004a
+
+Name:	utf8_get BMP
+In:	c2 aa c6 aa ca a5 d6 a5 e0 a9 9a e1 96 a5 e2 a9 9a e5 a9 9a ea 96 a5
+Out:	00aa 01aa 02a5 05a5 0a5a 15a5 2a5a 5a5a a5a5
+
+Name:	utf8_get garbage
+In:	84 ff f9 f8 c2 aa 41
+Out:	fffc fffc fffc fffc 00aa 0041
+
+Name:	utf8_get denormalized
+In:	c1 bf  e0 9f bf
+Out:	fffc fffc
+
+Name:	utf8_32_put
+Run:	../obj/ucw/unicode-t utf8_32_put
+In:	15a5a 2a5a5 5a5a5 a5a5a 15a5a5 2a5a5a 5a5a5a a5a5a5 15a5a5a 2a5a5a5 5a5a5a5 a5a5a5a 15a5a5a5 2a5a5a5a 5a5a5a5a
+Out:	f0 95 a9 9a f0 aa 96 a5 f1 9a 96 a5 f2 a5 a9 9a f5 9a 96 a5 f8 8a a5 a9 9a f8 96 a5 a9 9a f8 a9 9a 96 a5 f9 96 a5 a9 9a fa a9 9a 96 a5 fc 85 a9 9a 96 a5 fc 8a 96 a5 a9 9a fc 95 a9 9a 96 a5 fc aa 96 a5 a9 9a fd 9a 96 a5 a9 9a
+
+Name:	utf8_32_get
+Run:	../obj/ucw/unicode-t utf8_32_get
+In:	f0 95 a9 9a f0 aa 96 a5 f1 9a 96 a5 f2 a5 a9 9a f5 9a 96 a5 f8 8a a5 a9 9a f8 96 a5 a9 9a f8 a9 9a 96 a5 f9 96 a5 a9 9a fa a9 9a 96 a5 fc 85 a9 9a 96 a5 fc 8a 96 a5 a9 9a fc 95 a9 9a 96 a5 fc aa 96 a5 a9 9a fd 9a 96 a5 a9 9a
+Out:	15a5a 2a5a5 5a5a5 a5a5a 15a5a5 2a5a5a 5a5a5a a5a5a5 15a5a5a 2a5a5a5 5a5a5a5 a5a5a5a 15a5a5a5 2a5a5a5a 5a5a5a5a
+
+Name:	utf8_32_get garbage
+In:	fe 83 81
+Out:	fffc fffc fffc
+
+Name:	utf8_32_get denormalized
+In:	c1 bf  e0 9f bf  f0 8f bf bf  f8 87 bf bf bf  fc 83 bf bf bf
+Out:	fffc fffc fffc fffc fffc
+
+Name:	utf16_be_put
+Run:	../obj/ucw/unicode-t utf16_be_put
+In:	0041 004a 2a5f feff 0000 10ffff ffff 10000
+Out:	00 41 00 4a 2a 5f fe ff 00 00 db ff df ff ff ff d8 00 dc 00
+
+Name:	utf16_le_put
+Run:	../obj/ucw/unicode-t utf16_le_put
+In:	0041 004a 2a5f feff 0000 10ffff ffff 10000
+Out:	41 00 4a 00 5f 2a ff fe 00 00 ff db ff df ff ff 00 d8 00 dc
+
+Name:	utf16_be_get
+Run:	../obj/ucw/unicode-t utf16_be_get
+In:	00 41 00 4a 2a 5f fe ff 00 00 db ff df ff ff ff d8 00 dc 00
+Out:	0041 004a 2a5f feff 0000 10ffff ffff 10000
+
+Name:	utf16_be_get bad surrogates
+In:	dc 1a 2a 5f d8 01 d8 01 2a 5f d8 01
+Out:	fffc 2a5f fffc fffc 2a5f fffc
+
+Name:	utf16_le_get
+Run:	../obj/ucw/unicode-t utf16_le_get
+In:	41 00 4a 00 5f 2a ff fe 00 00 ff db ff df ff ff 00 d8 00 dc
+Out:	0041 004a 2a5f feff 0000 10ffff ffff 10000
+
+Name:	utf16_le_get bad surrogates
+In:	1a dc 5f 2a 01 d8 01 d8 5f 2a 01 d8
+Out:	fffc 2a5f fffc fffc 2a5f fffc
diff --git a/libucw/ucw/url.c b/libucw/ucw/url.c
new file mode 100644
index 0000000..8bdf581
--- /dev/null
+++ b/libucw/ucw/url.c
@@ -0,0 +1,766 @@
+/*
+ *	UCW Library -- URL Functions
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2001--2005 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ *
+ *	XXX: The buffer handling in this module is really horrible, but it works.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/url.h>
+#include <ucw/chartype.h>
+#include <ucw/conf.h>
+#include <ucw/prime.h>
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <alloca.h>
+
+/* Configuration */
+
+static uint url_ignore_spaces;
+static uint url_ignore_underflow;
+static char *url_component_separators = "";
+static uint url_min_repeat_count = 0x7fffffff;
+static uint url_max_repeat_length = 0;
+static uint url_max_occurences = ~0U;
+
+#ifndef TEST
+static struct cf_section url_config = {
+  CF_ITEMS {
+    CF_UINT("IgnoreSpaces", &url_ignore_spaces),
+    CF_UINT("IgnoreUnderflow", &url_ignore_underflow),
+    CF_STRING("ComponentSeparators", &url_component_separators),
+    CF_UINT("MinRepeatCount", &url_min_repeat_count),
+    CF_UINT("MaxRepeatLength", &url_max_repeat_length),
+    CF_UINT("MaxOccurences", &url_max_occurences),
+    CF_END
+  }
+};
+
+static void CONSTRUCTOR url_init_config(void)
+{
+  cf_declare_section("URL", &url_config, 0);
+}
+#endif
+
+/* Escaping and de-escaping */
+
+static uint
+enhex(uint x)
+{
+  return (x<10) ? (x + '0') : (x - 10 + 'A');
+}
+
+int
+url_deescape(const char *s, char *d)
+{
+  char *dstart = d;
+  char *end = d + MAX_URL_SIZE - 10;
+  while (*s)
+    {
+      if (d >= end)
+	return URL_ERR_TOO_LONG;
+      if (*s == '%')
+	{
+	  uint val;
+	  if (!Cxdigit(s[1]) || !Cxdigit(s[2]))
+	    return URL_ERR_INVALID_ESCAPE;
+	  val = Cxvalue(s[1])*16 + Cxvalue(s[2]);
+	  if (val < 0x20)
+	    return URL_ERR_INVALID_ESCAPED_CHAR;
+	  switch (val)
+	    {
+	    case ';':
+	      val = NCC_SEMICOLON; break;
+	    case '/':
+	      val = NCC_SLASH; break;
+	    case '?':
+	      val = NCC_QUEST; break;
+	    case ':':
+	      val = NCC_COLON; break;
+	    case '@':
+	      val = NCC_AT; break;
+	    case '=':
+	      val = NCC_EQUAL; break;
+	    case '&':
+	      val = NCC_AND; break;
+	    case '#':
+	      val = NCC_HASH; break;
+	    case '$':
+	      val = NCC_DOLLAR; break;
+	    case '+':
+	      val = NCC_PLUS; break;
+	    case ',':
+	      val = NCC_COMMA; break;
+	    }
+	  *d++ = val;
+	  s += 3;
+	}
+      else if ((byte) *s > 0x20)
+	*d++ = *s++;
+      else if (Cspace(*s))
+	{
+	  const char *s0 = s;
+	  while (Cspace(*s))
+	    s++;
+	  if (!url_ignore_spaces || !(!*s || d == dstart))
+	    {
+	      while (Cspace(*s0))
+		{
+		  if (d >= end)
+		    return URL_ERR_TOO_LONG;
+		  *d++ = *s0++;
+		}
+	    }
+	}
+      else
+	return URL_ERR_INVALID_CHAR;
+    }
+  *d = 0;
+  return 0;
+}
+
+int
+url_enescape(const char *s, char *d)
+{
+  char *end = d + MAX_URL_SIZE - 10;
+  uint c;
+
+  while (c = *s)
+    {
+      if (d >= end)
+	return URL_ERR_TOO_LONG;
+      if (Calnum(c) ||							/* RFC 2396 (2.1-2.3): Only alphanumerics ... */
+	  c == '!' || c == '*' || c == '\'' || c == '(' || c == ')' ||	/* ... and some exceptions and reserved chars */
+	  c == '$' || c == '-' || c == '_' || c == '.' || c == '+' ||
+	  c == ',' || c == '=' || c == '&' || c == '#' || c == ';' ||
+	  c == '/' || c == '?' || c == ':' || c == '@' || c == '~'
+	)
+	*d++ = *s++;
+      else
+	{
+	  uint val = (byte)(((byte)*s < NCC_MAX) ? NCC_CHARS[(byte)*s] : *s);
+	  *d++ = '%';
+	  *d++ = enhex(val >> 4);
+	  *d++ = enhex(val & 0x0f);
+	  s++;
+	}
+    }
+  *d = 0;
+  return 0;
+}
+
+int
+url_enescape_friendly(const char *src, char *dest)
+{
+  char *end = dest + MAX_URL_SIZE - 10;
+  const byte *srcb = src;
+  while (*srcb)
+    {
+      if (dest >= end)
+	return URL_ERR_TOO_LONG;
+      if ((byte)*srcb < NCC_MAX)
+	*dest++ = NCC_CHARS[*srcb++];
+      else if (*srcb >= 0x20 && *srcb < 0x7f)
+	*dest++ = *srcb++;
+      else
+	{
+	  *dest++ = '%';
+	  *dest++ = enhex((byte)*srcb >> 4);
+	  *dest++ = enhex(*srcb++ & 0x0f);
+	}
+    }
+  *dest = 0;
+  return 0;
+}
+
+/* Split an URL (several parts may be copied to the destination buffer) */
+
+char *url_proto_names[URL_PROTO_MAX] = URL_PNAMES;
+static int url_proto_path_flags[URL_PROTO_MAX] = URL_PATH_FLAGS;
+
+uint
+url_identify_protocol(const char *p)
+{
+  uint i;
+
+  for(i=1; i<URL_PROTO_MAX; i++)
+    if (!strcasecmp(p, url_proto_names[i]))
+      return i;
+  return URL_PROTO_UNKNOWN;
+}
+
+int
+url_split(char *s, struct url *u, char *d)
+{
+  bzero(u, sizeof(struct url));
+  u->port = ~0;
+  u->bufend = d + MAX_URL_SIZE - 10;
+
+  if (s[0] != '/')			/* Seek for "protocol:" */
+    {
+      char *p = s;
+      while (*p && Calnum(*p))
+	p++;
+      if (p != s && *p == ':')
+	{
+	  u->protocol = d;
+	  while (s < p)
+	    *d++ = *s++;
+	  *d++ = 0;
+	  u->protoid = url_identify_protocol(u->protocol);
+	  s++;
+	  if (url_proto_path_flags[u->protoid] && (s[0] != '/' || s[1] != '/'))
+	    {
+	      /* The protocol requires complete host spec, but it's missing -> treat as a relative path instead */
+	      int len = d - u->protocol;
+	      d -= len;
+	      s -= len;
+	      u->protocol = NULL;
+	      u->protoid = 0;
+	    }
+	}
+    }
+
+  if (s[0] == '/')			/* Host spec or absolute path */
+    {
+      if (s[1] == '/')			/* Host spec */
+	{
+	  char *q, *e;
+	  char *at = NULL;
+	  char *ep;
+
+	  s += 2;
+	  q = d;
+	  while (*s && *s != '/' && *s != '?')	/* Copy user:passwd@host:port */
+	    {
+	      if (*s != '@')
+		*d++ = *s;
+	      else if (!at)
+		{
+		  *d++ = 0;
+		  at = d;
+		}
+	      else			/* This shouldn't happen with sane URL's, but we need to be sure */
+		*d++ = NCC_AT;
+	      s++;
+	    }
+	  *d++ = 0;
+	  if (at)			/* user:passwd present */
+	    {
+	      u->user = q;
+	      if (e = strchr(q, ':'))
+		{
+		  *e++ = 0;
+		  u->pass = e;
+		}
+	    }
+	  else
+	    at = q;
+	  e = strchr(at, ':');
+	  if (e)			/* host:port present */
+	    {
+	      uint p;
+	      *e++ = 0;
+	      p = strtoul(e, &ep, 10);
+	      if (ep && *ep || p > 65535)
+		return URL_ERR_INVALID_PORT;
+	      else if (p)		/* Port 0 (e.g. in :/) is treated as default port */
+		u->port = p;
+	    }
+	  u->host = at;
+	}
+    }
+
+  u->rest = s;
+  u->buf = d;
+  return 0;
+}
+
+/* Normalization according to given base URL */
+
+static uint std_ports[] = URL_DEFPORTS;	/* Default port numbers */
+
+static int
+relpath_merge(struct url *u, struct url *b)
+{
+  char *a = u->rest;
+  char *o = b->rest;
+  char *d = u->buf;
+  char *e = u->bufend;
+  char *p;
+
+  if (a[0] == '/')			/* Absolute path => OK */
+    return 0;
+  if (o[0] != '/' && o[0] != '?')
+    return URL_PATH_UNDERFLOW;
+
+  if (!a[0])				/* Empty URL -> inherit everything */
+    {
+      u->rest = b->rest;
+      return 0;
+    }
+
+  u->rest = d;				/* We know we'll need to copy the path somewhere else */
+
+  if (a[0] == '#')			/* Another fragment */
+    {
+      for(p=o; *p && *p != '#'; p++)
+	;
+      goto copy;
+    }
+  if (a[0] == '?')			/* New query */
+    {
+      for(p=o; *p && *p != '#' && *p != '?'; p++)
+	;
+      goto copy;
+    }
+
+  p = NULL;				/* Copy original path and find the last slash */
+  while (*o && *o != '?' && *o != '#')
+    {
+      if (d >= e)
+	return URL_ERR_TOO_LONG;
+      if ((*d++ = *o++) == '/')
+	p = d;
+    }
+  if (!p)
+    return URL_ERR_REL_NOTHING;
+  d = p;
+
+  while (*a)
+    {
+      if (a[0] == '.')
+	{
+	  if (a[1] == '/' || !a[1])	/* Skip "./" and ".$" */
+	    {
+	      a++;
+	      if (a[0])
+		a++;
+	      continue;
+	    }
+	  else if (a[1] == '.' && (a[2] == '/' || !a[2])) /* "../" */
+	    {
+	      a += 2;
+	      if (a[0])
+		a++;
+	      if (d <= u->buf + 1)
+		{
+		  /*
+		   * RFC 1808 says we should leave ".." as a path segment, but
+		   * we intentionally break the rule and refuse the URL.
+		   */
+		  if (!url_ignore_underflow)
+		    return URL_PATH_UNDERFLOW;
+		}
+	      else
+		{
+		  d--;			/* Discard trailing slash */
+		  while (d[-1] != '/')
+		    d--;
+		}
+	      continue;
+	    }
+	}
+      while (a[0] && a[0] != '/')
+	{
+	  if (d >= e)
+	    return URL_ERR_TOO_LONG;
+	  *d++ = *a++;
+	}
+      if (a[0])
+	*d++ = *a++;
+    }
+
+okay:
+  *d++ = 0;
+  u->buf = d;
+  return 0;
+
+copy:					/* Combine part of old URL with the new one */
+  while (o < p)
+    if (d < e)
+      *d++ = *o++;
+    else
+      return URL_ERR_TOO_LONG;
+  while (*a)
+    if (d < e)
+      *d++ = *a++;
+    else
+      return URL_ERR_TOO_LONG;
+  goto okay;
+}
+
+int
+url_normalize(struct url *u, struct url *b)
+{
+  int err;
+
+  /* Basic checks */
+  if (url_proto_path_flags[u->protoid] && (!u->host || !*u->host) ||
+      !u->host && u->user ||
+      !u->user && u->pass ||
+      !u->rest)
+    return URL_SYNTAX_ERROR;
+
+  if (!u->protocol)
+    {
+      /* Now we know it's a relative URL. Do we have any base? */
+      if (!b || !url_proto_path_flags[b->protoid])
+	return URL_ERR_REL_NOTHING;
+      u->protocol = b->protocol;
+      u->protoid = b->protoid;
+
+      /* Reference to the same host */
+      if (!u->host)
+	{
+	  u->host = b->host;
+	  u->user = b->user;
+	  u->pass = b->pass;
+	  u->port = b->port;
+	  if (err = relpath_merge(u, b))
+	    return err;
+	}
+    }
+
+  /* Change path "?" to "/?" because it's the true meaning */
+  if (u->rest[0] == '?')
+    {
+      int l = strlen(u->rest);
+      if (u->bufend - u->buf < l+1)
+	return URL_ERR_TOO_LONG;
+      u->buf[0] = '/';
+      memcpy(u->buf+1, u->rest, l+1);
+      u->rest = u->buf;
+      u->buf += l+2;
+    }
+
+  /* Fill in missing info */
+  if (u->port == ~0U)
+    u->port = std_ports[u->protoid];
+
+  return 0;
+}
+
+/* Name canonicalization */
+
+static void
+lowercase(char *b)
+{
+  if (b)
+    while (*b)
+      {
+	if (*b >= 'A' && *b <= 'Z')
+	  *b = *b + 0x20;
+	b++;
+      }
+}
+
+static void
+kill_end_dot(char *b)
+{
+  char *k;
+
+  if (b)
+    {
+      k = b + strlen(b) - 1;
+      while (k > b && *k == '.')
+	*k-- = 0;
+    }
+}
+
+int
+url_canonicalize(struct url *u)
+{
+  char *c;
+
+  lowercase(u->protocol);
+  lowercase(u->host);
+  kill_end_dot(u->host);
+  if ((!u->rest || !*u->rest) && url_proto_path_flags[u->protoid])
+    u->rest = "/";
+  if (u->rest && (c = strchr(u->rest, '#')))	/* Kill fragment reference */
+    *c = 0;
+  return 0;
+}
+
+/* Pack a broken-down URL */
+
+static char *
+append(char *d, const char *s, char *e)
+{
+  if (d)
+    while (*s)
+      {
+	if (d >= e)
+	  return NULL;
+	*d++ = *s++;
+      }
+  return d;
+}
+
+int
+url_pack(struct url *u, char *d)
+{
+  char *e = d + MAX_URL_SIZE - 10;
+
+  if (u->protocol)
+    {
+      d = append(d, u->protocol, e);
+      d = append(d, ":", e);
+      u->protoid = url_identify_protocol(u->protocol);
+    }
+  if (u->host)
+    {
+      d = append(d, "//", e);
+      if (u->user)
+	{
+	  d = append(d, u->user, e);
+	  if (u->pass)
+	    {
+	      d = append(d, ":", e);
+	      d = append(d, u->pass, e);
+	    }
+	  d = append(d, "@", e);
+	}
+      d = append(d, u->host, e);
+      if (u->port != std_ports[u->protoid] && u->port != ~0U)
+	{
+	  char z[10];
+	  sprintf(z, "%d", u->port);
+	  d = append(d, ":", e);
+	  d = append(d, z, e);
+	}
+    }
+  if (u->rest)
+    d = append(d, u->rest, e);
+  if (!d)
+    return URL_ERR_TOO_LONG;
+  *d = 0;
+  return 0;
+}
+
+/* Error messages */
+
+static char *errmsg[] = {
+  "Something is wrong",
+  "Too long",
+  "Invalid character",
+  "Invalid escape",
+  "Invalid escaped character",
+  "Invalid port number",
+  "Relative URL not allowed",
+  "Unknown protocol",
+  "Syntax error",
+  "Path underflow"
+};
+
+char *
+url_error(uint err)
+{
+  if (err >= sizeof(errmsg) / sizeof(char *))
+    err = 0;
+  return errmsg[err];
+}
+
+/* Standard cookbook recipes */
+
+int
+url_canon_split_rel(const char *u, char *buf1, char *buf2, struct url *url, struct url *base)
+{
+  int err;
+
+  if (err = url_deescape(u, buf1))
+    return err;
+  if (err = url_split(buf1, url, buf2))
+    return err;
+  if (err = url_normalize(url, base))
+    return err;
+  return url_canonicalize(url);
+}
+
+int
+url_auto_canonicalize_rel(const char *src, char *dst, struct url *base)
+{
+  char buf1[MAX_URL_SIZE], buf2[MAX_URL_SIZE], buf3[MAX_URL_SIZE];
+  int err;
+  struct url ur;
+
+  (void)((err = url_canon_split_rel(src, buf1, buf2, &ur, base)) ||
+   (err = url_pack(&ur, buf3)) ||
+   (err = url_enescape(buf3, dst)));
+  return err;
+}
+
+/* Testing */
+
+#ifdef TEST
+
+int main(int argc, char **argv)
+{
+  char buf1[MAX_URL_SIZE], buf2[MAX_URL_SIZE], buf3[MAX_URL_SIZE], buf4[MAX_URL_SIZE];
+  int err;
+  struct url url, url0;
+  char *base = "http://mj@www.hell.org/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?";
+
+  if (argc != 2 && argc != 3)
+    return 1;
+  if (argc == 3)
+    base = argv[2];
+  if (err = url_deescape(argv[1], buf1))
+    {
+      printf("deesc: error %d\n", err);
+      return 1;
+    }
+  printf("deesc: %s\n", buf1);
+  if (err = url_split(buf1, &url, buf2))
+    {
+      printf("split: error %d\n", err);
+      return 1;
+    }
+  printf("split: @%s@%s@%s@%s@%d@%s\n", url.protocol, url.user, url.pass, url.host, url.port, url.rest);
+  if (err = url_split(base, &url0, buf3))
+    {
+      printf("split base: error %d\n", err);
+      return 1;
+    }
+  if (err = url_normalize(&url0, NULL))
+    {
+      printf("normalize base: error %d\n", err);
+      return 1;
+    }
+  printf("base: @%s@%s@%s@%s@%d@%s\n", url0.protocol, url0.user, url0.pass, url0.host, url0.port, url0.rest);
+  if (err = url_normalize(&url, &url0))
+    {
+      printf("normalize: error %d\n", err);
+      return 1;
+    }
+  printf("normalize: @%s@%s@%s@%s@%d@%s\n", url.protocol, url.user, url.pass, url.host, url.port, url.rest);
+  if (err = url_canonicalize(&url))
+    {
+      printf("canonicalize: error %d\n", err);
+      return 1;
+    }
+  printf("canonicalize: @%s@%s@%s@%s@%d@%s\n", url.protocol, url.user, url.pass, url.host, url.port, url.rest);
+  if (err = url_pack(&url, buf4))
+    {
+      printf("pack: error %d\n", err);
+      return 1;
+    }
+  printf("pack: %s\n", buf4);
+  if (err = url_enescape(buf4, buf2))
+    {
+      printf("enesc: error %d\n", err);
+      return 1;
+    }
+  printf("enesc: %s\n", buf2);
+  return 0;
+}
+
+#endif
+
+struct component {
+	const char *start;
+	int length;
+	uint count;
+	u32 hash;
+};
+
+static inline u32
+hashf(const char *start, int length)
+{
+	u32 hf = length;
+	while (length-- > 0)
+		hf = (hf << 8 | hf >> 24) ^ *start++;
+	return hf;
+}
+
+static inline uint
+repeat_count(struct component *comp, uint count, uint len)
+{
+	struct component *orig_comp = comp;
+	uint found = 0;
+	while (1)
+	{
+		uint i;
+		comp += len;
+		count -= len;
+		found++;
+		if (count < len)
+			return found;
+		for (i=0; i<len; i++)
+			if (comp[i].hash != orig_comp[i].hash
+			|| comp[i].length != orig_comp[i].length
+			|| memcmp(comp[i].start, orig_comp[i].start, comp[i].length))
+				return found;
+	}
+}
+
+int
+url_has_repeated_component(const char *url)
+{
+	struct component *comp;
+	uint comps, comp_len, rep_prefix, hash_size, *hash, *next;
+	const char *c;
+	uint i, j, k;
+
+	for (comps=0, c=url; c; comps++)
+	{
+		c = strpbrk(c, url_component_separators);
+		if (c)
+			c++;
+	}
+	if (comps < url_min_repeat_count && comps <= url_max_occurences)
+		return 0;
+	comp = alloca(comps * sizeof(*comp));
+	for (i=0, c=url; c; i++)
+	{
+		comp[i].start = c;
+		c = strpbrk(c, url_component_separators);
+		if (c)
+		{
+			comp[i].length = c - comp[i].start;
+			c++;
+		}
+		else
+			comp[i].length = strlen(comp[i].start);
+	}
+	ASSERT(i == comps);
+	for (i=0; i<comps; i++)
+		comp[i].hash = hashf(comp[i].start, comp[i].length);
+	if (comps > url_max_occurences)
+	{
+		hash_size = next_table_prime(comps);
+		hash = alloca(hash_size * sizeof(*hash));
+		next = alloca(comps * sizeof(*next));
+		memset(hash, 255, hash_size * sizeof(*hash));
+		for (i=0; i<comps; i++)
+		{
+			j = comp[i].hash % hash_size;
+			for (k = hash[j]; ~k && (comp[i].hash != comp[k].hash || comp[i].length != comp[k].length ||
+			    memcmp(comp[k].start, comp[i].start, comp[i].length)); k = next[k]);
+			if (!~k)
+			{
+				next[i] = hash[j];
+				hash[j] = i;
+				comp[i].count = 1;
+			}
+			else
+			{
+				if (comp[k].count++ >= url_max_occurences)
+					return 1;
+			}
+		}
+	}
+	for (comp_len = 1; comp_len <= url_max_repeat_length && comp_len <= comps; comp_len++)
+		for (rep_prefix = 0; rep_prefix <= comps - comp_len; rep_prefix++)
+			if (repeat_count(comp + rep_prefix, comps - rep_prefix, comp_len) >= url_min_repeat_count)
+				return comp_len;
+	return 0;
+}
diff --git a/libucw/ucw/url.h b/libucw/ucw/url.h
new file mode 100644
index 0000000..5af7dbc
--- /dev/null
+++ b/libucw/ucw/url.h
@@ -0,0 +1,113 @@
+/*
+ *	UCW Library -- URL Functions
+ *
+ *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2001 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_URL_H
+#define _UCW_URL_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define url_auto_canonicalize_rel ucw_url_auto_canonicalize_rel
+#define url_canon_split_rel ucw_url_canon_split_rel
+#define url_canonicalize ucw_url_canonicalize
+#define url_deescape ucw_url_deescape
+#define url_enescape ucw_url_enescape
+#define url_enescape_friendly ucw_url_enescape_friendly
+#define url_error ucw_url_error
+#define url_has_repeated_component ucw_url_has_repeated_component
+#define url_identify_protocol ucw_url_identify_protocol
+#define url_normalize ucw_url_normalize
+#define url_pack ucw_url_pack
+#define url_proto_names ucw_url_proto_names
+#define url_split ucw_url_split
+#endif
+
+#define MAX_URL_SIZE 1024
+
+/* Non-control meanings of control characters */
+
+enum {
+  NCC_SEMICOLON = 1,
+  NCC_SLASH = 2,
+  NCC_QUEST = 3,
+  NCC_COLON = 4,
+  NCC_AT = 5,
+  NCC_EQUAL = 6,
+  NCC_AND = 7,
+  NCC_HASH = 8,
+  // Avoid 9 (\t) and 10 (\n)
+  NCC_DOLLAR = 11,
+  NCC_PLUS = 12,
+  // Avoid 13 (\r)
+  NCC_COMMA = 14,
+  NCC_MAX = 15
+};
+
+#define NCC_CHARS " ;/?:@=&#\t\n$+\r,"
+
+/* Remove/Introduce '%' escapes */
+
+int url_deescape(const char *s, char *d);
+int url_enescape(const char *s, char *d);
+int url_enescape_friendly(const char *src, char *dest);
+
+/* URL splitting and normalization */
+
+struct url {
+  char *protocol;
+  uint protoid;
+  char *user;
+  char *pass;
+  char *host;
+  uint port;				/* ~0 if unspec */
+  char *rest;
+  char *buf, *bufend;
+};
+
+int url_split(char *s, struct url *u, char *d);
+int url_normalize(struct url *u, struct url *b);
+int url_canonicalize(struct url *u);
+int url_pack(struct url *u, char *d);
+int url_canon_split_rel(const char *url, char *buf1, char *buf2, struct url *u, struct url *base);
+int url_auto_canonicalize_rel(const char *src, char *dst, struct url *base);
+uint url_identify_protocol(const char *p);
+int url_has_repeated_component(const char *url);
+
+static inline int url_canon_split(const char *url, char *buf1, char *buf2, struct url *u)
+{ return url_canon_split_rel(url, buf1, buf2, u, NULL); }
+
+static inline int url_auto_canonicalize(const char *src, char *dst)
+{ return url_auto_canonicalize_rel(src, dst, NULL); }
+
+/* Error codes */
+
+char *url_error(uint);
+
+#define URL_ERR_TOO_LONG 1
+#define URL_ERR_INVALID_CHAR 2
+#define URL_ERR_INVALID_ESCAPE 3
+#define URL_ERR_INVALID_ESCAPED_CHAR 4
+#define URL_ERR_INVALID_PORT 5
+#define URL_ERR_REL_NOTHING 6
+#define URL_ERR_UNKNOWN_PROTOCOL 7
+#define URL_SYNTAX_ERROR 8
+#define URL_PATH_UNDERFLOW 9
+
+#define URL_PROTO_UNKNOWN 0
+#define URL_PROTO_HTTP 1
+#define URL_PROTO_FTP 2
+#define URL_PROTO_FILE 3
+#define URL_PROTO_MAX 4
+
+#define URL_PNAMES { "unknown", "http", "ftp", "file" }
+#define URL_DEFPORTS { ~0, 80, 21, 0 }
+#define URL_PATH_FLAGS { 0, 1, 1, 1 }
+
+extern char *url_proto_names[];
+
+#endif
diff --git a/libucw/ucw/url.t b/libucw/ucw/url.t
new file mode 100644
index 0000000..37e6def
--- /dev/null
+++ b/libucw/ucw/url.t
@@ -0,0 +1,91 @@
+# Tests for url.c
+
+Name:	Absolute
+Run:	../obj/ucw/url-t 'ftp://example.com/other'
+Out:	deesc: ftp://example.com/other
+	split: @ftp@(null)@(null)@example.com@-1@/other
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @ftp@(null)@(null)@example.com@21@/other
+	canonicalize: @ftp@(null)@(null)@example.com@21@/other
+	pack: ftp://example.com/other
+	enesc: ftp://example.com/other
+
+Name:	Simple
+Run:	../obj/ucw/url-t 'object'
+Out:	deesc: object
+	split: @(null)@(null)@(null)@(null)@-1@object
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/object
+	canonicalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/object
+	pack: http://mj@www.hell.org/123/sub_dir;param/object
+	enesc: http://mj@www.hell.org/123/sub_dir;param/object
+
+Name:	Toplevel
+Run:	../obj/ucw/url-t '/object'
+Out:	deesc: /object
+	split: @(null)@(null)@(null)@(null)@-1@/object
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/object
+	canonicalize: @http@mj@(null)@www.hell.org@80@/object
+	pack: http://mj@www.hell.org/object
+	enesc: http://mj@www.hell.org/object
+
+Name:	Domain
+Run:	../obj/ucw/url-t '//www.example.com'
+Out:	deesc: //www.example.com
+	split: @(null)@(null)@(null)@www.example.com@-1@
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@(null)@(null)@www.example.com@80@
+	canonicalize: @http@(null)@(null)@www.example.com@80@/
+	pack: http://www.example.com/
+	enesc: http://www.example.com/
+
+Name:	Levels
+Run:	../obj/ucw/url-t '../a/b;paramb/c/.././x?a#frag'
+Out:	deesc: ../a/b;paramb/c/.././x?a#frag
+	split: @(null)@(null)@(null)@(null)@-1@../a/b;paramb/c/.././x?a#frag
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/123/a/b;paramb/x?a#frag
+	canonicalize: @http@mj@(null)@www.hell.org@80@/123/a/b;paramb/x?a
+	pack: http://mj@www.hell.org/123/a/b;paramb/x?a
+	enesc: http://mj@www.hell.org/123/a/b;paramb/x?a
+
+Name:	Query
+Run:	../obj/ucw/url-t '?query'
+Out:	deesc: ?query
+	split: @(null)@(null)@(null)@(null)@-1@?query
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query
+	canonicalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query
+	pack: http://mj@www.hell.org/123/sub_dir;param/index.html;param?query
+	enesc: http://mj@www.hell.org/123/sub_dir;param/index.html;param?query
+
+Name:	Fragments
+Run:	../obj/ucw/url-t '#../?a' 'http://example.com/?query#@?/x'
+Out:	deesc: #../?a
+	split: @(null)@(null)@(null)@(null)@-1@#../?a
+	base: @http@(null)@(null)@example.com@80@/?query#@?/x
+	normalize: @http@(null)@(null)@example.com@80@/?query#../?a
+	canonicalize: @http@(null)@(null)@example.com@80@/?query
+	pack: http://example.com/?query
+	enesc: http://example.com/?query
+
+Name:	Deescape
+Run:	../obj/ucw/url-t '/%20%25'
+Out:	deesc: / %
+	split: @(null)@(null)@(null)@(null)@-1@/ %
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/ %
+	canonicalize: @http@mj@(null)@www.hell.org@80@/ %
+	pack: http://mj@www.hell.org/ %
+	enesc: http://mj@www.hell.org/%20%25
+
+Name:	Dots
+Run:	../obj/ucw/url-t '..a/./x.?a/x'
+Out:	deesc: ..a/./x.?a/x
+	split: @(null)@(null)@(null)@(null)@-1@..a/./x.?a/x
+	base: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?
+	normalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/..a/x.?a/x
+	canonicalize: @http@mj@(null)@www.hell.org@80@/123/sub_dir;param/..a/x.?a/x
+	pack: http://mj@www.hell.org/123/sub_dir;param/..a/x.?a/x
+	enesc: http://mj@www.hell.org/123/sub_dir;param/..a/x.?a/x
diff --git a/libucw/ucw/utils/Makefile b/libucw/ucw/utils/Makefile
new file mode 100644
index 0000000..ba4f978
--- /dev/null
+++ b/libucw/ucw/utils/Makefile
@@ -0,0 +1,27 @@
+# Makefile for the UCW utilities (c) 2008 Michal Vaner <vorner@ucw.cz>
+
+DIRS+=ucw/utils
+
+UCW_SBIN_UTILS=$(addprefix $(o)/ucw/utils/ucw-,daemon-control rotate-log)
+UCW_BIN_UTILS=$(addprefix $(o)/ucw/utils/ucw-,basecode urltool)
+
+ifdef CONFIG_UCW_OBSOLETE_DAEMON_HELPER
+UCW_SBIN_UTILS+=$(o)/ucw/utils/ucw-daemon-helper
+endif
+
+PROGS+=$(UCW_BIN_UTILS) $(UCW_SBIN_UTILS)
+
+$(o)/ucw/utils/ucw-basecode: $(o)/ucw/utils/ucw-basecode.o $(LIBUCW)
+$(o)/ucw/utils/ucw-daemon-helper: $(o)/ucw/utils/ucw-daemon-helper.o $(LIBUCW)
+$(o)/ucw/utils/ucw-daemon-control: $(o)/ucw/utils/ucw-daemon-control.o $(LIBUCW)
+$(o)/ucw/utils/ucw-urltool: $(o)/ucw/utils/ucw-urltool.o $(LIBUCW)
+
+TESTS+=$(o)/ucw/utils/basecode.test
+$(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode
+
+INSTALL_TARGETS+=install-ucw-utils
+install-ucw-utils:
+	install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_BIN_DIR) $(INSTALL_SBIN_DIR))
+	install -m 755 $(UCW_SBIN_UTILS) $(DESTDIR)$(INSTALL_SBIN_DIR)
+	install -m 755 $(UCW_BIN_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)
+.PHONY: install-ucw-utils
diff --git a/libucw/ucw/utils/basecode.t b/libucw/ucw/utils/basecode.t
new file mode 100644
index 0000000..76d1d0e
--- /dev/null
+++ b/libucw/ucw/utils/basecode.t
@@ -0,0 +1,16 @@
+# Tests for base64 and base224 modules
+
+Name:	Base64 encode
+Run:	../obj/ucw/utils/ucw-basecode -e
+In:	Here are some test data
+Out:	SGVyZSBhcmUgc29tZSB0ZXN0IGRhdGEK
+
+Name:	Base64 decode
+Run:	../obj/ucw/utils/ucw-basecode -d
+In:	SGVyZSBhcmUgc29tZSB0ZXN0IGRhdGEK
+Out:	Here are some test data
+
+Name:	Base224 encode & decode
+Run:	../obj/ucw/utils/ucw-basecode -E | ../obj/ucw/utils/ucw-basecode -D
+In:	Some more test data for 224 encoding
+Out:	Some more test data for 224 encoding
diff --git a/libucw/ucw/utils/ucw-basecode.c b/libucw/ucw/utils/ucw-basecode.c
new file mode 100644
index 0000000..cafbe1d
--- /dev/null
+++ b/libucw/ucw/utils/ucw-basecode.c
@@ -0,0 +1,122 @@
+/*
+ *	UCW Library -- Line utility for encoding and decoding base64 & base224
+ *
+ *	(c) 2008, Michal Vaner <vorner@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <ucw/lib.h>
+#include <ucw/base64.h>
+#include <ucw/base224.h>
+#include <ucw/fastbuf.h>
+#include <ucw/getopt.h>
+
+static struct option opts[] = {
+  { "encode64", 0, 0, 'e' },
+  { "decode64", 0, 0, 'd' },
+  { "encode224", 0, 0, 'E' },
+  { "decode224", 0, 0, 'D' },
+  { "prefix", 1, 0, 'p' },
+  { "blocks", 1, 0, 'b' },
+  { 0, 0, 0, 0 }
+};
+
+static const struct {
+  uint (*function)(byte *, const byte *, uint);
+  uint in_block, out_block, num_blocks;
+  uint add_prefix;
+} actions[] = {
+  {
+    base64_encode,
+    BASE64_IN_CHUNK, BASE64_OUT_CHUNK, 20,
+    1
+  },
+  {
+    base64_decode,
+    BASE64_OUT_CHUNK, BASE64_IN_CHUNK, 20,
+    0
+  },
+  {
+    base224_encode,
+    BASE224_IN_CHUNK, BASE64_OUT_CHUNK, 6,
+    1
+  },
+  {
+    base224_decode,
+    BASE224_OUT_CHUNK, BASE224_IN_CHUNK, 6,
+    0
+  }
+};
+
+int main(int argc, char **argv)
+{
+  // Choose mode
+  int mode = -1;
+  char *prefix = NULL;
+  uint blocks = 0;
+  int opt;
+  while ((opt = getopt_long(argc, argv, "edEDp:b:", opts, NULL)) >= 0)
+    switch (opt)
+    {
+      case 'e': mode = 0; break;
+      case 'd': mode = 1; break;
+      case 'E': mode = 2; break;
+      case 'D': mode = 3; break;
+      case 'p': prefix = optarg; break;
+      case 'b':
+        {
+          char *end;
+          blocks = strtol(optarg, &end, 0);
+          if ((blocks > 0) && !*end)
+            break;
+        }
+      default: goto usage;
+    }
+
+  if (mode == -1)
+  {
+    usage:
+    fprintf(stderr, "ucw-basecode mode [--prefix=prefix] [--blocks=number_of_blocks]\nMode is one of:\n\t--encode64 (-e)\n\t--decode64 (-d)\n\t--encode224 (-E)\n\t--decode224 (-D)\n");
+    return 1;
+  }
+  if (!blocks)
+    blocks = actions[mode].num_blocks;
+
+  // Prepare buffers
+  struct fastbuf *in = bfdopen_shared(0, 4096);
+  struct fastbuf *out = bfdopen_shared(1, 4096);
+  int has_offset = !actions[mode].add_prefix && prefix;
+  uint offset = has_offset ? strlen(prefix) : 0;
+  uint read_size = actions[mode].in_block * blocks + offset + has_offset;
+  uint write_size = actions[mode].out_block * blocks;
+  byte in_buff[read_size], out_buff[write_size];
+  uint isize;
+
+  // Recode it
+  while (isize = bread(in, in_buff, read_size))
+  {
+    if (prefix)
+    {
+      if (actions[mode].add_prefix)
+        bputs(out, prefix);
+      else
+        if ((isize < offset) || (in_buff[isize-1] != '\n')
+            || (strncmp(prefix, in_buff, offset)))
+          die("Invalid line syntax");
+    }
+    uint osize = actions[mode].function(out_buff, in_buff + offset, isize - offset - has_offset);
+    bwrite(out, out_buff, osize);
+    if (actions[mode].add_prefix && prefix)
+      bputc(out, '\n');
+  }
+
+  bclose(in);
+  bclose(out);
+  return 0;
+}
diff --git a/libucw/ucw/utils/ucw-daemon-control.c b/libucw/ucw/utils/ucw-daemon-control.c
new file mode 100644
index 0000000..b7be71c
--- /dev/null
+++ b/libucw/ucw/utils/ucw-daemon-control.c
@@ -0,0 +1,123 @@
+/*
+ *	A Simple Utility for Controlling Daemons
+ *
+ *	(c) 2012 Martin Mares <mj@ucw.cz>
+ *
+ *	For more information, see ucw/doc/daemon.txt.
+ *
+ *	Return codes:
+ *	100	already done
+ *	101	not running
+ *	102	error
+ */
+
+#include <ucw/lib.h>
+#include <ucw/daemon.h>
+#include <ucw/signames.h>
+#include <ucw/string.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <getopt.h>
+
+static int action;
+
+static struct option options[] = {
+  { "pid-file",		required_argument,	NULL,		'p' },
+  { "guard-file",	required_argument,	NULL,		'g' },
+  { "signal",		required_argument,	NULL,		's' },
+  { "start",		no_argument,		&action,	DAEMON_CONTROL_START },
+  { "stop",		no_argument,		&action,	DAEMON_CONTROL_STOP },
+  { "check",		no_argument,		&action,	DAEMON_CONTROL_CHECK },
+  { "reload",		no_argument,		&action,	DAEMON_CONTROL_SIGNAL },
+  { NULL,		no_argument,		NULL,		0 }
+};
+
+static void NONRET
+usage(void)
+{
+  fputs("\n\
+Usage: ucw-daemon-control --start <options> -- <daemon> <args>\n\
+   or: ucw-daemon-control --stop <options>\n\
+   or: ucw-daemon-control --reload <options>\n\
+   or: ucw-daemon-control --check <options>\n\
+\n\
+Options:\n\
+--pid-file <name>	Name of PID file for this daemon (mandatory)\n\
+--guard-file <name>	Name of guard file (default: derived from --pid-file)\n\
+--signal <sig>		Send a signal of a given name or number\n\
+			Default: SIGTERM for --stop, SIGHUP for --reload\n\
+\n\
+Exit codes:\n\
+0			Successfully completed\n\
+1			Invalid arguments\n\
+100			The action was null (e.g., --stop on a stopped daemon)\n\
+101			The daemon was not running (on --reload or --check)\n\
+102			The action has failed (error message was printed to stderr)\n\
+103			The daemon was in an undefined state (e.g., stale PID file)\n\
+", stderr);
+  exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+  int c, sig;
+  struct daemon_control_params dc = { };
+
+  while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0)
+    switch (c)
+      {
+      case 0:
+	break;
+      case 'p':
+	dc.pid_file = optarg;
+	break;
+      case 'g':
+	dc.guard_file = optarg;
+	break;
+      case 's':
+	sig = sig_name_to_number(optarg);
+	if (sig < 0)
+	  {
+	    fprintf(stderr, "%s: Unknown signal %s\n", argv[0], optarg);
+	    return 1;
+	  }
+	dc.signal = sig;
+	break;
+      default:
+	usage();
+      }
+  if (!dc.pid_file || !action)
+    usage();
+  dc.action = action;
+
+  if (action == DAEMON_CONTROL_START)
+    {
+      if (optind >= argc)
+	usage();
+      dc.argv = argv + optind;
+    }
+  else if (optind < argc)
+    usage();
+
+  if (!dc.guard_file)
+    {
+      if (!str_has_suffix(dc.pid_file, ".pid"))
+	{
+	  fprintf(stderr, "%s: For automatic choice of --guard-file, the --pid-file must end with `.pid'\n", argv[0]);
+	  return 1;
+	}
+      int len = strlen(dc.pid_file);
+      char *buf = xmalloc(len + 2);
+      sprintf(buf, "%.*s.lock", len-4, dc.pid_file);
+      dc.guard_file = buf;
+    }
+
+  int err = daemon_control(&dc);
+  if (err == DAEMON_STATUS_ERROR)
+    fprintf(stderr, "%s: %s\n", argv[0], dc.error_msg);
+  return err;
+}
diff --git a/libucw/ucw/utils/ucw-daemon-helper.c b/libucw/ucw/utils/ucw-daemon-helper.c
new file mode 100644
index 0000000..61051ee
--- /dev/null
+++ b/libucw/ucw/utils/ucw-daemon-helper.c
@@ -0,0 +1,188 @@
+/*
+ *	A Simple Wrapper for Starting and Stopping of Daemons
+ *
+ *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *
+ *	It would seem that we are reinventing the wheel and the
+ *	start-stop-daemon command present in most Linux distributions
+ *	is just what we need, but the usual "does the process already
+ *	exist?" strategies fail in presence of multiple running daemons.
+ *
+ *	Return codes:
+ *	101	already running
+ *	102	not running
+ *
+ *	NOTE: This utility is obsolete and has been replaced by ucw-daemon-control.
+ *	You need to enable CONFIG_UCW_OBSOLETE_DAEMON_HELPER to compile it.
+ */
+
+#include <ucw/lib.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <errno.h>
+#include <alloca.h>
+
+enum action {
+  ACTION_NONE,
+  ACTION_START,
+  ACTION_STOP,
+  ACTION_FORCE_STOP,
+  ACTION_CHECK,
+  ACTION_RELOAD
+};
+
+static int action;
+
+static struct option options[] = {
+  { "pid-file",		required_argument,	NULL, 'p' },
+  { "status-file",	required_argument,	NULL, 's' },
+  { "start",		no_argument,		&action, ACTION_START },
+  { "stop",		no_argument,		&action, ACTION_STOP },
+  { "force-stop",	no_argument,		&action, ACTION_FORCE_STOP },
+  { "check",		no_argument,		&action, ACTION_CHECK },
+  { "reload",		no_argument,		&action, ACTION_RELOAD },
+  { NULL,		no_argument,		NULL, 0 }
+};
+
+static void NONRET
+usage(void)
+{
+  fputs("\n\
+Usage: ucw-daemon-helper --start <options> -- <daemon> <args>\n\
+   or: ucw-daemon-helper --stop <options>\n\
+   or: ucw-daemon-helper --force-stop <options>\n\
+   or: ucw-daemon-helper --reload <options>\n\
+   or: ucw-daemon-helper --check <options>\n\
+\n\
+Options:\n\
+--pid-file <name>	Name of PID file for this daemon (mandatory)\n\
+--status-file <name>	Status file used by the daemon (deleted just before starting)\n\
+", stderr);
+  exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+  int c, fd;
+  char *pidfile = NULL;
+  char *statfile = NULL;
+  struct flock fl;
+  char buf[64];
+
+  while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0)
+    switch (c)
+      {
+      case 0:
+	break;
+      case 'p':
+	pidfile = optarg;
+	break;
+      case 's':
+	statfile = optarg;
+	break;
+      default:
+	usage();
+      }
+  if (!pidfile)
+    usage();
+
+  bzero(&fl, sizeof(fl));
+  fl.l_type = F_WRLCK;
+  fl.l_whence = SEEK_SET;
+
+  switch (action)
+    {
+    case ACTION_START:
+      if (optind >= argc)
+	usage();
+      fd = open(pidfile, O_RDWR | O_CREAT, 0666);
+      if (fd < 0)
+	die("Unable to create %s: %m", pidfile);
+      if ((c = fcntl(fd, F_SETLK, &fl)) < 0)
+	{
+	  if (errno == EAGAIN || errno == EACCES)
+	    return 101;
+	  else
+	    die("fcntl lock on %s failed: %m", pidfile);
+	}
+      c = sprintf(buf, "%d\n", getpid());
+      if (write(fd, buf, c) != c)
+	die("write on %s failed: %m", pidfile);
+      if (ftruncate(fd, c) < 0)
+	die("truncate on %s failed: %m", pidfile);
+      if (statfile && unlink(statfile) < 0 && errno != ENOENT)
+	die("unlink(%s) failed: %m", statfile);
+      setsid();
+      /* Disconnect from stdin and stdout, leave stderr to the daemon. */
+      close(0);
+      open("/dev/null", O_RDWR, 0);
+      dup2(0, 1);
+      argv += optind;
+      argc -= optind;
+      char **a = alloca(sizeof(char *) * (argc+1));
+      memcpy(a, argv, sizeof(char *) * argc);
+      a[argc] = NULL;
+      execv(a[0], a);
+      die("Cannot execute %s: %m", a[0]);
+    case ACTION_STOP:
+    case ACTION_FORCE_STOP:
+    case ACTION_CHECK:
+    case ACTION_RELOAD:
+      if (optind < argc)
+	usage();
+      fd = open(pidfile, O_RDWR);
+      if (fd < 0)
+	{
+	  if (errno == ENOENT)
+	    return 102;
+	  else
+	    die("Unable to open %s: %m", pidfile);
+	}
+      if ((c = fcntl(fd, F_SETLK, &fl)) >= 0)
+	{
+	nopid:
+	  unlink(pidfile);
+	  return 102;
+	}
+      if (errno != EAGAIN && errno != EACCES)
+	die("fcntl lock on %s failed: %m", pidfile);
+      if ((c = read(fd, buf, sizeof(buf))) < 0)
+	die("read on %s failed: %m", pidfile);
+      if (!c)
+	goto nopid;
+      if (c >= (int) sizeof(buf) || sscanf(buf, "%d", &c) != 1)
+	die("PID file syntax error");
+      int sig = 0;
+      if (action == ACTION_CHECK || action == ACTION_RELOAD)
+	{
+	  if (action == ACTION_RELOAD)
+	    sig = SIGHUP;
+	  if (kill(c, sig) < 0 && errno == ESRCH)
+	    goto nopid;
+	  return 0;
+	}
+      sig = (action == ACTION_STOP) ? SIGTERM : SIGQUIT;
+      if (kill(c, sig) < 0)
+	{
+	  if (errno == ESRCH)
+	    goto nopid;
+	  die("Cannot kill process %d: %m", c);
+	}
+      if ((c = fcntl(fd, F_SETLKW, &fl)) < 0)
+	die("Cannot lock %s: %m", pidfile);
+      if (statfile)
+	unlink(statfile);
+      if (unlink(pidfile) < 0)
+	die("Cannot unlink %s: %m", pidfile);
+      return 0;
+    default:
+      usage();
+    }
+}
diff --git a/libucw/ucw/utils/ucw-rotate-log.pl b/libucw/ucw/utils/ucw-rotate-log.pl
new file mode 100644
index 0000000..4d4be66
--- /dev/null
+++ b/libucw/ucw/utils/ucw-rotate-log.pl
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+
+#	LibUCW Utilities -- Rotate logs
+#	(c) 2001--2002 Martin Mares <mj@ucw.cz>
+
+use File::stat;
+
+@ARGV >= 3 or die "Usage: ucw-rotate-log <days-to-compress> <date-to-delete> <logs...>";
+
+$now = time;
+$cps = shift @ARGV;
+$del = shift @ARGV;
+
+$compress_thr = $now - 86400 * $cps;
+$delete_thr = $now - 86400 * $del;
+foreach $f (@ARGV) {
+	-f $f or next;
+	$st = stat $f or next;
+	if ($del > 0 && $st->mtime < $delete_thr) {
+		print "Deleting $f\n";
+		unlink $f || die "Delete FAILED: $!";
+	} elsif ($cps > 0 && $st->mtime < $compress_thr && $f !~ /\.(gz|bz2)$/) {
+		print "Compressing $f\n";
+		`gzip -f $f`;
+		$? && die "Compression FAILED: $!";
+	}
+}
diff --git a/libucw/ucw/utils/ucw-urltool.c b/libucw/ucw/utils/ucw-urltool.c
new file mode 100644
index 0000000..057b403
--- /dev/null
+++ b/libucw/ucw/utils/ucw-urltool.c
@@ -0,0 +1,145 @@
+/*
+ *	LibUCW Utilities -- URL Handling Tool
+ *
+ *	(c) 2004 Martin Mares <mj@ucw.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/getopt.h>
+#include <ucw/url.h>
+#include <ucw/fastbuf.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static byte *base_url;
+static struct url base;
+static uint opt_split = 0, opt_normalize = 0, opt_forgive = 0;
+static struct fastbuf *fout;
+static uint err_count;
+
+static void
+process_url(byte *url)
+{
+  byte buf1[MAX_URL_SIZE], buf2[MAX_URL_SIZE], buf3[MAX_URL_SIZE], buf4[MAX_URL_SIZE];
+  int e;
+  struct url ur;
+
+  if ((e = url_deescape(url, buf1)) || (e = url_split(buf1, &ur, buf2)))
+    goto error;
+  if ((base_url || opt_normalize) && (e = url_normalize(&ur, &base)))
+    goto error;
+  if (opt_normalize && (e = url_canonicalize(&ur)))
+    goto error;
+  if (opt_split)
+    {
+      if (ur.protocol)
+	bprintf(fout, "protocol=%s\n", ur.protocol);
+      if (ur.user)
+	bprintf(fout, "user=%s\n", ur.user);
+      if (ur.pass)
+	bprintf(fout, "pass=%s\n", ur.pass);
+      if (ur.host)
+	bprintf(fout, "host=%s\n", ur.host);
+      if (ur.port != ~0U)
+	bprintf(fout, "port=%d\n", ur.port);
+      if (ur.rest)
+	bprintf(fout, "rest=%s\n", ur.rest);
+      bputc(fout, '\n');
+    }
+  else
+    {
+      if ((e = url_pack(&ur, buf3)) || (e = url_enescape(buf3, buf4)))
+	goto error;
+      bprintf(fout, "%s\n", buf4);
+    }
+  return;
+
+ error:
+  msg(L_ERROR, "%s: %s", url, url_error(e));
+  err_count++;
+}
+
+static char *shortopts = CF_SHORT_OPTS "b:fns";
+static struct option longopts[] =
+{
+  CF_LONG_OPTS
+  { "base",		1, 0, 'b' },
+  { "forgive",		0, 0, 'f' },
+  { "normalize",	0, 0, 'n' },
+  { "split",		0, 0, 's' },
+  { NULL,		0, 0, 0 }
+};
+
+static char *help = "\
+Usage: ucw-urltool [<options>] <operations> [<URL's>]\n\
+\n\
+Options:\n"
+CF_USAGE "\
+-b, --base <URL>\tInput URL's are relative to this base\n\
+-f, --forgive\t\tReturn exit status 0 even if there were errors\n\
+\n\
+Operations:\n\
+-s, --split\t\tSplit a given URL to components\n\
+-n, --normalize\t\tNormalize given URL\n\
+";
+
+static void NONRET
+usage(byte *msg)
+{
+  if (msg)
+    {
+      fputs(msg, stderr);
+      fputc('\n', stderr);
+    }
+  fputs(help, stderr);
+  exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+  int opt, err;
+  byte *base_url = NULL;
+  byte basebuf1[MAX_URL_SIZE], basebuf2[MAX_URL_SIZE];
+
+  log_init(argv[0]);
+  while ((opt = cf_getopt(argc, argv, shortopts, longopts, NULL)) >= 0)
+    switch (opt)
+      {
+      case 'b':
+	base_url = optarg;
+	err = url_canon_split(base_url, basebuf1, basebuf2, &base);
+	if (err)
+	  die("Invalid base URL: %s", url_error(err));
+	break;
+      case 's':
+	opt_split = 1;
+	break;
+      case 'n':
+	opt_normalize = 1;
+	break;
+      case 'f':
+	opt_forgive = 1;
+	break;
+      default:
+	usage("Invalid option");
+      }
+
+  fout = bfdopen_shared(1, 4096);
+  if (optind >= argc)
+    {
+      struct fastbuf *fin = bfdopen_shared(0, 4096);
+      byte url[MAX_URL_SIZE];
+      while (bgets(fin, url, sizeof(url)))
+	process_url(url);
+      bclose(fin);
+    }
+  else
+    while (optind < argc)
+      process_url(argv[optind++]);
+  bclose(fout);
+
+  return (err_count && !opt_forgive);
+}
diff --git a/libucw/ucw/varint.c b/libucw/ucw/varint.c
new file mode 100644
index 0000000..cf576e4
--- /dev/null
+++ b/libucw/ucw/varint.c
@@ -0,0 +1,113 @@
+/*
+ *	UCW Library -- Coding of u64 into variable length bytecode.
+ *
+ *	(c) 2013 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/varint.h>
+
+#define PUTB(j,i)  p[j] = (byte)((u >> (8*(i))));
+#define PUTB4(b)   PUTB(0,b-1) PUTB(1,b-2) PUTB(2,b-3) PUTB(3,b-4)
+uint varint_put_big(byte *p, u64 u)
+{
+	ASSERT(u >= VARINT_SHIFT_L4);
+
+	if (u < VARINT_SHIFT_L5) {
+		u -= VARINT_SHIFT_L4;
+		PUTB4(5)
+		p[0] |= 0xf0;
+		PUTB(4,0);
+		return 5;
+	}
+	if (u < VARINT_SHIFT_L6) {
+		u -= VARINT_SHIFT_L5;
+		PUTB4(6)
+		PUTB(4,1) PUTB(5,0)
+		p[0] |= 0xf8;
+		return 6;
+	}
+	if (u < VARINT_SHIFT_L7) {
+		u -= VARINT_SHIFT_L6;
+		PUTB4(7)
+		p[0] |= 0xfc;
+		PUTB(4,2) PUTB(5,1) PUTB(6,0)
+		return 7;
+	}
+	if (u < VARINT_SHIFT_L8) {
+		u -= VARINT_SHIFT_L7;
+		p[0] = 0xfe;
+		PUTB(1,6) PUTB(2,5) PUTB(3,4) PUTB(4,3)
+		PUTB(5,2) PUTB(6,1) PUTB(7,0)
+		return 8;
+	}
+	u -= VARINT_SHIFT_L8;
+	p[0] = 0xff;
+	PUTB(1,7) PUTB(2,6) PUTB(3,5) PUTB(4,4)
+	PUTB(5,3) PUTB(6,2) PUTB(7,1) PUTB(8,0)
+	return 9;
+}
+
+const byte *varint_get_big(const byte *p, u64 *r)
+{
+	ASSERT((*p & 0xf0) == 0xf0);
+
+	byte h = ~*p;
+	if (h & 0x08) {
+		*r = (u64)(p[0] & 7)<<32 | (u64)p[1]<<24 | (u64)p[2]<<16 | (u64)p[3]<<8 | (u64)p[4];
+		*r += VARINT_SHIFT_L4;
+		return p+5;
+	}
+	if (h & 0x04) {
+		*r = (u64)(p[0] & 3)<<40 | (u64)p[1]<<32 | (u64)p[2]<<24 | (u64)p[3]<<16 | (u64)p[4]<<8 | (u64)p[5];
+		*r += VARINT_SHIFT_L5;
+		return p+6;
+	}
+	if (h & 0x02) {
+		*r = (u64)(p[0] & 1)<<48 | (u64)p[1]<<40 | (u64)p[2]<<32 | (u64)p[3]<<24 | (u64)p[4]<<16 | (u64)p[5]<<8 | (u64)p[6];
+		*r += VARINT_SHIFT_L6;
+		return p+7;
+	}
+	if (h & 0x01) {
+		*r = (u64)p[1]<<48 | (u64)p[2]<<40 | (u64)p[3]<<32 | (u64)p[4]<<24 | (u64)p[5]<<16 | (u64)p[6]<<8 | (u64)p[7];
+		*r += VARINT_SHIFT_L7;
+		return p+8;
+	}
+	*r = ((u64)p[1] << 56) | ((u64)p[2] << 48) | ((u64)p[3] << 40) | ((u64)p[4] << 32) | ((u64)p[5] << 24) | ((u64)p[6] << 16) | ((u64)p[7] << 8) | (u64)p[8];
+	*r += VARINT_SHIFT_L8;
+	return p+9;
+}
+
+
+#ifdef TEST
+
+#include <string.h>
+#include <stdio.h>
+#include <inttypes.h>
+
+int main(int argc, char **argv UNUSED)
+{
+	byte buf[16] = { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
+	u64 u;
+
+	if (scanf("%"SCNx64, &u) != 1) {
+		fprintf(stderr, "Invalid usage!\n");
+		return 1;
+	}
+	varint_put(buf, u);
+	int l = varint_len(buf[0]);
+	varint_get(buf, &u);
+	printf("%u %d %jx", varint_space(u), l, (uintmax_t) u);
+	if (argc > 1) {
+		for (int i=0; i<l; i++)
+			printf(" %x", buf[i]);
+	}
+	printf("\n");
+
+	return 0;
+}
+
+#endif
diff --git a/libucw/ucw/varint.h b/libucw/ucw/varint.h
new file mode 100644
index 0000000..493af81
--- /dev/null
+++ b/libucw/ucw/varint.h
@@ -0,0 +1,218 @@
+/*
+ *	UCW Library -- Coding of u64 into variable length bytecode.
+ *
+ *	(c) 2013 Tomas Valla <tom@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_VARINT_H
+#define _UCW_VARINT_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define varint_get_big ucw_varint_get_big
+#define varint_put_big ucw_varint_put_big
+#endif
+
+/***
+ * The encoding works in the following way:
+ *
+ *  First byte			Stored values
+ *
+ *  0xxxxxxx			7 bits
+ *  10xxxxxx  +1 byte		14 bits, value shifted by 2^7
+ *  110xxxxx  +2 bytes		21 bits, value shifted by 2^7+2^14
+ *  1110xxxx  +3 bytes		28 bits, value shifted by 2^7+2^14+2^21
+ *    ....
+ *  11111110  +7 bytes		56 bits, value shifted by 2^7+2^14+2^21+2^28+2^35+2^42
+ *  11111111  +8 bytes		full 64 bits, value shifted by 2^7+2^14+2^21+2^28+2^35+2^42+2^56
+ *
+ * The values are stored in bigendian to allow lexicographic sorting.
+ * The encoding and algorithms are aimed to be optimised for storing shorter numbers.
+ *
+ * There is an invalid combination: if the first two bytes are 0xff 0xff.
+ ***/
+
+
+#define VARINT_SHIFT_L1			      0x80
+#define VARINT_SHIFT_L2			    0x4080
+#define VARINT_SHIFT_L3			  0x204080
+#define VARINT_SHIFT_L4			0x10204080
+#define VARINT_SHIFT_L5		      0x0810204080
+#define VARINT_SHIFT_L6		    0x040810204080
+#define VARINT_SHIFT_L7		  0x02040810204080
+#define VARINT_SHIFT_L8		0x0102040810204080
+
+/*
+ * The following code is already unrolled, to maximize the speed.
+ * Yes, it is ugly.
+ */
+
+#define PUTB(j,i)  p[j] = (byte)((u >> (8*(i))));
+#define PUTB4(b)   PUTB(0,b-1) PUTB(1,b-2) PUTB(2,b-3) PUTB(3,b-4)
+
+/* for internal use only, need the length > 4 */
+uint varint_put_big(byte *p, u64 u);
+const byte *varint_get_big(const byte *p, u64 *r);
+
+/**
+ * Encode u64 value u into byte sequence p.
+ * Returns the number of bytes used (at least 1 and at most 9).
+ **/
+static inline uint varint_put(byte *p, u64 u)
+{
+	if (u < VARINT_SHIFT_L1) {
+		p[0] = (byte)u;
+		return 1;
+	}
+	if (u < VARINT_SHIFT_L2) {
+		u -= VARINT_SHIFT_L1;
+		PUTB(0,1)
+		p[0] |= 0x80;
+		PUTB(1,0)
+		return 2;
+	}
+	if (u < VARINT_SHIFT_L3) {
+		u -= VARINT_SHIFT_L2;
+		PUTB(0,2)
+		p[0] |= 0xc0;
+		PUTB(1,1) PUTB(2,0)
+		return 3;
+	}
+	if (u < VARINT_SHIFT_L4) {
+		u -= VARINT_SHIFT_L3;
+		PUTB4(4)
+		p[0] |= 0xe0;
+		return 4;
+	}
+	return varint_put_big(p, u);
+}
+#undef GETB
+#undef GETB4
+
+/**
+ * Decode u64 value from a byte sequence p into res.
+ * The invalid combination is not detected.
+ * Returns pointer to the next position after the sequence.
+ **/
+static inline const byte *varint_get(const byte *p, u64 *res)
+{
+	byte h = ~*p;
+
+	if (h & 0x80) {
+		*res = p[0];
+		return p+1;
+	}
+	if (h & 0x40) {
+		*res = (p[0] & 0x3f)<<8 | p[1];
+		*res += VARINT_SHIFT_L1;
+		return p+2;
+	}
+	if (h & 0x20) {
+		*res = (p[0] & 0x1f)<<16 | p[1]<<8 | p[2];
+		*res += VARINT_SHIFT_L2;
+		return p+3;
+	}
+	if (h & 0x10) {
+		*res = (p[0] & 0xf)<<24 | p[1]<<16 | p[2]<<8 | p[3];
+		*res += VARINT_SHIFT_L3;
+		return p+4;
+	}
+	return varint_get_big(p, res);
+}
+
+/**
+ * Decode at most u32 value from a byte sequence p into u32 res.
+ * The invalid combination is not detected.
+ * Returns pointer to the next position after the sequence.
+ * If the stored number cannot fit into u32, fill res by 0xffffffff and returns p.
+ **/
+static inline const byte *varint_get32(const byte *p, u32 *res)
+{
+	byte h = ~*p;
+
+	if (h & 0x80) {
+		*res = p[0];
+		return p+1;
+	}
+	if (h & 0x40) {
+		*res = (p[0] & 0x3f)<<8 | p[1];
+		*res += VARINT_SHIFT_L1;
+		return p+2;
+	}
+	if (h & 0x20) {
+		*res = (p[0] & 0x1f)<<16 | p[1]<<8 | p[2];
+		*res += VARINT_SHIFT_L2;
+		return p+3;
+	}
+	if (h & 0x10) {
+		*res = (p[0] & 0xf)<<24 | p[1]<<16 | p[2]<<8 | p[3];
+		*res += VARINT_SHIFT_L3;
+		return p+4;
+	}
+	u64 r = (u64)(p[0] & 7)<<32 | (u64)p[1]<<24 | (u64)p[2]<<16 | (u64)p[3]<<8 | (u64)p[4];
+	r += VARINT_SHIFT_L4;
+	if (r > 0xffffffff) {
+		*res = 0xffffffff;
+		return p;
+	}
+	*res = r;
+	return p+5;
+}
+
+/** Does the byte sequence p code the invalid sequence? **/
+static inline int varint_invalid(const byte *p)
+{
+	return p[0] == 0xff && p[1] == 0xff;
+}
+
+/**
+ * Store the invalid sequence.
+ * Returns always 2 (2 bytes were used, to be consistent with varint_put).
+ **/
+static inline uint varint_put_invalid(byte *p)
+{
+	p[0] = p[1] = 0xff;
+	return 2;
+}
+
+/** Compute the length of encoding in bytes from the first byte hdr of the encoding. **/
+static inline uint varint_len(const byte hdr)
+{
+	byte b = ~hdr;
+
+	uint l = 0;
+	if (!b)
+		l = -1;
+	else {
+		if (b & 0xf0) { l += 4; b &= 0xf0; }
+		if (b & 0xcc) { l += 2; b &= 0xcc; }
+		if (b & 0xaa) l++;
+	}
+	return 8 - l;
+}
+
+/** Compute the number of bytes needed to store the value u. **/
+static inline uint varint_space(u64 u)
+{
+	if (u < VARINT_SHIFT_L1)
+		return 1;
+	if (u < VARINT_SHIFT_L2)
+		return 2;
+	if (u < VARINT_SHIFT_L3)
+		return 3;
+	if (u < VARINT_SHIFT_L4)
+		return 4;
+	if (u < VARINT_SHIFT_L5)
+		return 5;
+	if (u < VARINT_SHIFT_L6)
+		return 6;
+	if (u < VARINT_SHIFT_L7)
+		return 7;
+	if (u < VARINT_SHIFT_L8)
+		return 8;
+	return 9;
+}
+
+#endif
diff --git a/libucw/ucw/varint.t b/libucw/ucw/varint.t
new file mode 100644
index 0000000..05cc9c1
--- /dev/null
+++ b/libucw/ucw/varint.t
@@ -0,0 +1,70 @@
+# Tests for the Varint module
+# In format: <hexnumber>
+# Out format: <space> <len> <hexnumber>
+# when run as varint-t full:
+# Out format: <space> <len> <hexnumber> <hexbyte0> <hexbyte1> ...
+
+Name:	varint (1)
+Run:	../obj/ucw/varint-t full
+In:	41
+Out:	1 1 41 41
+
+Name:	varint (2)
+Run:	../obj/ucw/varint-t full
+In:	80
+Out:	2 2 80 80 0
+
+Name:	varint (3)
+Run:	../obj/ucw/varint-t full
+In:	ab
+Out:	2 2 ab 80 2b
+
+Name:	varint (4)
+Run:	../obj/ucw/varint-t full
+In:	0
+Out:	1 1 0 0
+
+Name:   varint (5)
+Run:	../obj/ucw/varint-t full
+In:	2222
+Out:	2 2 2222 a1 a2
+
+Name:   varint (6)
+Run:	../obj/ucw/varint-t
+In:	abcd
+Out:	3 3 abcd
+
+Name:   varint (7)
+Run:	../obj/ucw/varint-t
+In:	abcde
+Out:	3 3 abcde
+
+Name:   varint (8)
+Run:	../obj/ucw/varint-t
+In:	1020407f
+Out:	4 4 1020407f
+
+Name:   varint (9)
+Run:	../obj/ucw/varint-t full
+In:	deadbeef
+Out:	5 5 deadbeef f0 ce 8d 7e 6f
+
+Name:   varint (10)
+Run:	../obj/ucw/varint-t
+In:	4081020400f
+Out:	6 6 4081020400f
+
+Name:   varint (11)
+Run:	../obj/ucw/varint-t
+In:	20408010204070
+Out:	8 8 20408010204070
+
+Name:   varint (12)
+Run:	../obj/ucw/varint-t
+In:	feeddeadbabebeef
+Out:	9 9 feeddeadbabebeef
+
+Name:   varint (13)
+Run:	../obj/ucw/varint-t
+In:	102040810204080
+Out:	9 9 102040810204080
diff --git a/libucw/ucw/wildmatch.c b/libucw/ucw/wildmatch.c
new file mode 100644
index 0000000..7a9aefb
--- /dev/null
+++ b/libucw/ucw/wildmatch.c
@@ -0,0 +1,237 @@
+/*
+ *	UCW Library -- Fast Pattern Matcher for Short Wildcard Patterns (only `?' and `*' supported)
+ *
+ *	Traditional NFA -> DFA method with on-the-fly DFA construction.
+ *
+ *	(c) 1999 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/wildmatch.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#define MAX_STATES 32		/* Must be <= 32, state 0 is reserved, state 1 is initial */
+#define MAX_CACHED 256		/* Maximum number of cached DFA states */
+#define HASH_SIZE 512		/* Number of entries in DFA hash table (at least MAX_CACHED+MAX_STATES) */
+#define HASH_SKIP 137
+
+struct nfa_state {
+  char ch;			/* 0 for non-matching state */
+  byte final;			/* Accepting state */
+  u32 match_states;		/* States to go to when input character == ch */
+  u32 default_states;		/* States to go to whatever the input is */
+};
+
+struct dfa_state {
+  uintptr_t edge[256];		/* Outgoing DFA edges. Bit 0 is set for incomplete edges which
+				 * contain just state set and clear for complete ones which point
+				 * to other states. NULL means `no match'.
+				 */
+  u32 nfa_set;			/* A set of NFA states this DFA state represents */
+  int final;			/* This is an accepting state */
+  struct dfa_state *next;	/* Next in the chain of free states */
+};
+
+struct wildpatt {
+  struct nfa_state nfa[MAX_STATES];
+  struct dfa_state *hash[HASH_SIZE];
+  struct dfa_state *dfa_start;
+  uint nfa_states;
+  uint dfa_cache_counter;
+  struct mempool *pool;
+  struct dfa_state *free_states;
+};
+
+static inline uint
+wp_hash(u32 set)
+{
+  set ^= set >> 16;
+  set ^= set >> 8;
+  return set % HASH_SIZE;
+}
+
+static struct dfa_state *
+wp_new_state(struct wildpatt *w, u32 set)
+{
+  uint h = wp_hash(set);
+  struct dfa_state *d;
+  uint bit;
+  u32 def_set;
+
+  while (d = w->hash[h])
+    {
+      if (d->nfa_set == set)
+	return d;
+      h = (h + HASH_SKIP) % HASH_SIZE;
+    }
+  if (d = w->free_states)
+    w->free_states = d->next;
+  else
+    d = mp_alloc(w->pool, sizeof(*d));
+  w->hash[h] = d;
+  bzero(d, sizeof(*d));
+  d->nfa_set = set;
+  def_set = 0;
+  for(bit=1; bit <= w->nfa_states; bit++)
+    if (set & (1 << bit))
+      {
+	struct nfa_state *n = &w->nfa[bit];
+	if (n->ch)
+	  d->edge[(unsigned char)n->ch] |= n->match_states | 1;
+	d->final |= n->final;
+	def_set |= n->default_states;
+      }
+  if (def_set)
+    {
+      uint i;
+      def_set |= 1;
+      for(i=0; i<256; i++)
+	d->edge[i] |= def_set;
+    }
+  w->dfa_cache_counter++;
+  return d;
+}
+
+struct wildpatt *
+wp_compile(const char *p, struct mempool *pool)
+{
+  struct wildpatt *w;
+  uint i;
+
+  if (strlen(p) >= MAX_STATES)		/* Too long */
+    return NULL;
+  w = mp_alloc_zero(pool, sizeof(*w));
+  w->pool = pool;
+  for(i=1; *p; p++)
+    {
+      struct nfa_state *n = w->nfa + i;
+      if (*p == '?')
+	n->default_states |= 1 << (++i);/* Default edge to a new state */
+      else if (*p == '*')
+	n->default_states |= 1 << i;	/* Default edge to the same state */
+      else
+	{
+	  n->ch = *p;			/* Edge to new state labelled with 'c' */
+	  n->match_states = 1 << (++i);
+	}
+    }
+  w->nfa[i].final = 1;
+  w->nfa_states = i;
+  w->dfa_start = wp_new_state(w, 1 << 1);
+  return w;
+}
+
+static void
+wp_prune_cache(struct wildpatt *w)
+{
+  /*
+   *	I was unable to trigger cache overflow on my large set of
+   *	test cases, so I decided to handle it in an extremely dumb
+   *	way.   --mj
+   */
+  int i;
+  for(i=0; i<HASH_SIZE; i++)
+    if (w->hash[i] && w->hash[i]->nfa_set != (1 << 1))
+      {
+	struct dfa_state *d = w->hash[i];
+	w->hash[i] = NULL;
+	d->next = w->free_states;
+	w->free_states = d;
+      }
+  w->dfa_cache_counter = 1;	/* Only the initial state remains */
+}
+
+int
+wp_match(struct wildpatt *w, const char *s)
+{
+  struct dfa_state *d;
+
+  if (w->dfa_cache_counter >= MAX_CACHED)
+    wp_prune_cache(w);
+  d = w->dfa_start;
+  while (*s)
+    {
+      uintptr_t next = d->edge[(unsigned char)*s];
+      if (next & 1)
+	{
+	  /* Need to lookup/create the destination state */
+	  struct dfa_state *new = wp_new_state(w, next & ~1);
+	  d->edge[(unsigned char)*s] = (uintptr_t) new;
+	  d = new;
+	}
+      else if (!next)
+	return 0;
+      else
+	d = (struct dfa_state *) next;
+      s++;
+    }
+  return d->final;
+}
+
+int
+wp_min_size(const char *p)
+{
+  int s = 0;
+
+  while (*p)
+    if (*p++ != '*')
+      s++;
+  return s;
+}
+
+#ifdef TEST
+
+void
+wp_dump(struct wildpatt *w)
+{
+  int i;
+
+  puts("NFA:");
+  for(i=1; i<=w->nfa_states; i++)
+    {
+      struct nfa_state *n = w->nfa + i;
+      printf("%2d: %d %02x %08x %08x\n", i, n->final, n->ch, n->match_states, n->default_states);
+    }
+  puts("DFA:");
+  for(i=0; i<HASH_SIZE; i++)
+    if (w->hash[i])
+      printf("%3d: %08x\n", i, w->hash[i]->nfa_set);
+  printf("%d DFA states cached.\n", w->dfa_cache_counter);
+}
+
+int main(int argc, char **argv)
+{
+  struct wildpatt *w;
+  char buf[1024];
+
+  if (argc != 2) return 1;
+  w = wp_compile(argv[1], mp_new(65536));
+  if (!w)
+    {
+      puts("Compile error");
+      return 1;
+    }
+  wp_dump(w);
+  while (fgets(buf, sizeof(buf)-1, stdin))
+    {
+      char *c = strchr(buf, '\n');
+      if (!c) break;
+      *c = 0;
+#if 0
+      printf("%d\n", wp_match(w, buf));
+#else
+      if (wp_match(w, buf))
+	puts(buf);
+#endif
+    }
+  wp_dump(w);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/wildmatch.h b/libucw/ucw/wildmatch.h
new file mode 100644
index 0000000..67bd923
--- /dev/null
+++ b/libucw/ucw/wildmatch.h
@@ -0,0 +1,21 @@
+/*
+ *	UCW Library -- Fast Wildcard Pattern Matcher (only `?' and `*' supported)
+ *
+ *	(c) 1999 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define wp_compile ucw_wp_compile
+#define wp_match ucw_wp_match
+#define wp_min_size ucw_wp_min_size
+#endif
+
+struct wildpatt;
+struct mempool;
+
+struct wildpatt *wp_compile(const char *, struct mempool *);
+int wp_match(struct wildpatt *, const char *);
+int wp_min_size(const char *);
diff --git a/libucw/ucw/workqueue.c b/libucw/ucw/workqueue.c
new file mode 100644
index 0000000..b01f258
--- /dev/null
+++ b/libucw/ucw/workqueue.c
@@ -0,0 +1,281 @@
+/*
+ *	UCW Library -- Thread Pools and Work Queues
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/threads.h>
+#include <ucw/workqueue.h>
+#include <ucw/heap.h>
+
+static void *
+worker_thread_init(void *arg)
+{
+  struct worker_thread *t = arg;
+  struct worker_pool *pool = t->pool;
+
+  if (pool->init_thread)
+    pool->init_thread(t);
+  sem_post(pool->init_cleanup_sem);
+
+  for (;;)
+    {
+      struct work *w = raw_queue_get(&pool->requests);
+      w->go(t, w);
+      raw_queue_put(&w->reply_to->finished, w);
+    }
+
+  return NULL;
+}
+
+static void
+worker_thread_signal_finish(struct worker_thread *t, struct work *w UNUSED)
+{
+  if (t->pool->cleanup_thread)
+    t->pool->cleanup_thread(t);
+  sem_post(t->pool->init_cleanup_sem);
+  pthread_exit(NULL);
+}
+
+void
+worker_pool_init(struct worker_pool *p)
+{
+  clist_init(&p->worker_threads);
+  raw_queue_init(&p->requests);
+  p->init_cleanup_sem = sem_alloc();
+
+  pthread_attr_t attr;
+  if (pthread_attr_init(&attr) < 0 ||
+      pthread_attr_setstacksize(&attr, p->stack_size ? : ucwlib_thread_stack_size) < 0)
+    ASSERT(0);
+
+  for (uint i=0; i < p->num_threads; i++)
+    {
+      struct worker_thread *t = (p->new_thread ? p->new_thread() : xmalloc(sizeof(*t)));
+      t->pool = p;
+      t->id = i;
+      int err = pthread_create(&t->thread, &attr, worker_thread_init, t);
+      if (err)
+	die("Unable to create thread: %m");
+      clist_add_tail(&p->worker_threads, &t->n);
+      sem_wait(p->init_cleanup_sem);
+    }
+
+  pthread_attr_destroy(&attr);
+}
+
+void
+worker_pool_cleanup(struct worker_pool *p)
+{
+  for (uint i=0; i < p->num_threads; i++)
+    {
+      struct work w = {
+	.go = worker_thread_signal_finish
+      };
+      raw_queue_put(&p->requests, &w);
+      sem_wait(p->init_cleanup_sem);
+    }
+
+  struct worker_thread *tmp;
+  CLIST_FOR_EACH_DELSAFE(struct worker_thread *, t, p->worker_threads, tmp)
+    {
+      int err = pthread_join(t->thread, NULL);
+      ASSERT(!err);
+      if (p->free_thread)
+	p->free_thread(t);
+      else
+	xfree(t);
+    }
+  raw_queue_cleanup(&p->requests);
+  sem_free(p->init_cleanup_sem);
+}
+
+void
+raw_queue_init(struct raw_queue *q)
+{
+  pthread_mutex_init(&q->queue_mutex, NULL);
+  clist_init(&q->pri0_queue);
+  q->queue_sem = sem_alloc();
+  q->pri_heap = NULL;
+  q->heap_cnt = q->heap_max = 0;
+}
+
+void
+raw_queue_cleanup(struct raw_queue *q)
+{
+  ASSERT(clist_empty(&q->pri0_queue));
+  ASSERT(!q->heap_cnt);
+  xfree(q->pri_heap);
+  sem_free(q->queue_sem);
+  pthread_mutex_destroy(&q->queue_mutex);
+}
+
+#define PRI_LESS(x,y) ((x)->priority > (y)->priority)
+
+void
+raw_queue_put(struct raw_queue *q, struct work *w)
+{
+  pthread_mutex_lock(&q->queue_mutex);
+  if (!w->priority)
+    clist_add_tail(&q->pri0_queue, &w->n);
+  else
+    {
+      if (unlikely(q->heap_cnt >= q->heap_max))
+	{
+	  struct work **old_heap = q->pri_heap;
+	  q->heap_max = (q->heap_max ? 2*q->heap_max : 16);
+	  q->pri_heap = xrealloc(old_heap, (q->heap_max + 1) * sizeof(struct work *));
+	}
+      struct work **heap = q->pri_heap;
+      HEAP_INSERT(struct work *, heap, q->heap_cnt, PRI_LESS, HEAP_SWAP, w);
+    }
+  pthread_mutex_unlock(&q->queue_mutex);
+  sem_post(q->queue_sem);
+}
+
+static inline struct work *
+raw_queue_do_get(struct raw_queue *q)
+{
+  pthread_mutex_lock(&q->queue_mutex);
+  struct work *w;
+  if (!q->heap_cnt)
+    {
+      w = clist_head(&q->pri0_queue);
+      ASSERT(w);
+      clist_remove(&w->n);
+    }
+  else
+    {
+      struct work **heap = q->pri_heap;
+      w = heap[1];
+      HEAP_DELETE_MIN(struct work *, heap, q->heap_cnt, PRI_LESS, HEAP_SWAP);
+    }
+  pthread_mutex_unlock(&q->queue_mutex);
+  return w;
+}
+
+struct work *
+raw_queue_get(struct raw_queue *q)
+{
+  sem_wait(q->queue_sem);
+  return raw_queue_do_get(q);
+}
+
+struct work *
+raw_queue_try_get(struct raw_queue *q)
+{
+  if (!sem_trywait(q->queue_sem))
+    return raw_queue_do_get(q);
+  else
+    return NULL;
+}
+
+void
+work_queue_init(struct worker_pool *p, struct work_queue *q)
+{
+  q->pool = p;
+  q->nr_running = 0;
+  raw_queue_init(&q->finished);
+}
+
+void
+work_queue_cleanup(struct work_queue *q)
+{
+  ASSERT(!q->nr_running);
+  raw_queue_cleanup(&q->finished);
+}
+
+void
+work_submit(struct work_queue *q, struct work *w)
+{
+  ASSERT(w->go);
+  w->reply_to = q;
+  raw_queue_put(&q->pool->requests, w);
+  q->nr_running++;
+}
+
+static struct work *
+work_do_wait(struct work_queue *q, int try)
+{
+  if (!q->nr_running)
+    return NULL;
+  struct work *w = (try ? raw_queue_try_get : raw_queue_get)(&q->finished);
+  if (!w)
+    return NULL;
+  q->nr_running--;
+  return w;
+}
+
+struct work *
+work_wait(struct work_queue *q)
+{
+  return work_do_wait(q, 0);
+}
+
+struct work *
+work_try_wait(struct work_queue *q)
+{
+  return work_do_wait(q, 1);
+}
+
+#ifdef TEST
+
+#include <unistd.h>
+
+static void wt_init(struct worker_thread *t)
+{
+  msg(L_INFO, "INIT %d", t->id);
+}
+
+static void wt_cleanup(struct worker_thread *t)
+{
+  msg(L_INFO, "CLEANUP %d", t->id);
+}
+
+struct w {
+  struct work w;
+  uint id;
+};
+
+static void go(struct worker_thread *t, struct work *w)
+{
+  msg(L_INFO, "GO %d: request %d (pri %d)", t->id, ((struct w *)w)->id, w->priority);
+  usleep(1);
+}
+
+int main(void)
+{
+  struct worker_pool pool = {
+    .num_threads = 10,
+    .stack_size = 65536,
+    .init_thread = wt_init,
+    .cleanup_thread = wt_cleanup
+  };
+  worker_pool_init(&pool);
+
+  struct work_queue q;
+  work_queue_init(&pool, &q);
+  for (uint i=0; i<500; i++)
+    {
+      struct w *w = xmalloc_zero(sizeof(*w));
+      w->w.go = go;
+      w->w.priority = (i < 250 ? i : 0);
+      w->id = i;
+      work_submit(&q, &w->w);
+      msg(L_INFO, "Submitted request %d (pri %d)", w->id, w->w.priority);
+    }
+
+  struct w *w;
+  while (w = (struct w *) work_wait(&q))
+    msg(L_INFO, "Finished request %d", w->id);
+
+  work_queue_cleanup(&q);
+  worker_pool_cleanup(&pool);
+  return 0;
+}
+
+#endif
diff --git a/libucw/ucw/workqueue.h b/libucw/ucw/workqueue.h
new file mode 100644
index 0000000..5073b34
--- /dev/null
+++ b/libucw/ucw/workqueue.h
@@ -0,0 +1,108 @@
+/*
+ *	UCW Library -- Thread Pools and Work Queues
+ *
+ *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_WORKQUEUE_H
+#define _UCW_WORKQUEUE_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define raw_queue_cleanup ucw_raw_queue_cleanup
+#define raw_queue_get ucw_raw_queue_get
+#define raw_queue_init ucw_raw_queue_init
+#define raw_queue_put ucw_raw_queue_put
+#define raw_queue_try_get ucw_raw_queue_try_get
+#define work_queue_cleanup ucw_work_queue_cleanup
+#define work_queue_init ucw_work_queue_init
+#define work_submit ucw_work_submit
+#define work_try_wait ucw_work_try_wait
+#define work_wait ucw_work_wait
+#define worker_pool_cleanup ucw_worker_pool_cleanup
+#define worker_pool_init ucw_worker_pool_init
+#endif
+
+/*
+ *  A thread pool is a set of threads receiving work requests from a common queue,
+ *  each work request contains a pointer to a function inside the thread.
+ *
+ *  A work queue is an interface for submitting work requests. It's bound to a single
+ *  thread pool, it remembers running requests and gathers replies. A single work queue
+ *  should not be used by multiple threads simultaneously.
+ *
+ *  Requests can have priorities. Requests with the highest priority are served first.
+ *  Requests of priority 0 are guaranteed to be served on first-come-first-served
+ *  basis, requests of higher priorities are unordered.
+ *
+ *  When a thread pool is initialized, new_thread() is called for every thread first,
+ *  allocating struct worker_thread (and user-defined thread context following it) for
+ *  each thread. Then the threads are fired and each of them executes the init_thread()
+ *  callback. These callbacks are serialized and worker_pool_init() function waits
+ *  until all of them finish.
+ */
+
+#include <ucw/semaphore.h>
+#include <ucw/clists.h>
+
+#include <pthread.h>
+
+struct worker_thread {				// One of threads serving requests
+  cnode n;
+  pthread_t thread;
+  struct worker_pool *pool;
+  int id;					// Inside the pool
+  /* user-defined data can follow */
+};
+
+struct raw_queue {				// Generic queue with locking
+  pthread_mutex_t queue_mutex;
+  clist pri0_queue;				// Ordinary queue for requests with priority=0
+  struct work **pri_heap;			// A heap for request with priority>0
+  uint heap_cnt, heap_max;
+  sem_t *queue_sem;				// Number of requests queued
+};
+
+struct worker_pool {
+  struct raw_queue requests;
+  uint num_threads;
+  uint stack_size;				// 0 for default
+  struct worker_thread *(*new_thread)(void);	// default: xmalloc the struct
+  void (*free_thread)(struct worker_thread *t);	// default: xfree
+  void (*init_thread)(struct worker_thread *t);	// default: empty
+  void (*cleanup_thread)(struct worker_thread *t); // default: empty
+  clist worker_threads;
+  sem_t *init_cleanup_sem;
+};
+
+struct work_queue {
+  struct worker_pool *pool;
+  uint nr_running;				// Number of requests in service
+  struct raw_queue finished;			// Finished requests queue up here
+};
+
+struct work {					// A single request
+  cnode n;
+  uint priority;
+  struct work_queue *reply_to;			// Where to queue the request when it's finished
+  void (*go)(struct worker_thread *t, struct work *w);		// Called inside the worker thread
+};
+
+void worker_pool_init(struct worker_pool *p);
+void worker_pool_cleanup(struct worker_pool *p);
+
+void raw_queue_init(struct raw_queue *q);
+void raw_queue_cleanup(struct raw_queue *q);
+void raw_queue_put(struct raw_queue *q, struct work *w);
+struct work *raw_queue_get(struct raw_queue *q);
+struct work *raw_queue_try_get(struct raw_queue *q);
+
+void work_queue_init(struct worker_pool *p, struct work_queue *q);
+void work_queue_cleanup(struct work_queue *q);
+void work_submit(struct work_queue *q, struct work *w);
+struct work *work_wait(struct work_queue *q);
+struct work *work_try_wait(struct work_queue *q);
+
+#endif	/* !_UCW_WORKQUEUE_H */
diff --git a/libucw/ucw/xtypes-basic.c b/libucw/ucw/xtypes-basic.c
new file mode 100644
index 0000000..2665185
--- /dev/null
+++ b/libucw/ucw/xtypes-basic.c
@@ -0,0 +1,150 @@
+/*
+ *	UCW Library -- Basic Extended Types
+ *
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/strtonum.h>
+#include <ucw/xtypes.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdlib.h>
+
+#define XTYPE_NUM_FORMAT(_type, _fmt, _typename) static const char *xt_##_typename##_format(void *src, u32 fmt UNUSED, struct mempool *pool) \
+{\
+  return mp_printf(pool, _fmt, *(_type *)src);\
+}
+
+#define XTYPE_NUM_PARSE(_typename) static const char *xt_##_typename##_parse(const char *str, void *dest, struct mempool *pool UNUSED)\
+{\
+  return str_to_##_typename(dest, str, NULL, 10 | STN_WHOLE | STN_MINUS | STN_PLUS | STN_HEX | STN_BIN | STN_OCT);\
+}
+
+#define XTYPE_NUM_STRUCT(_type, _typename) const struct xtype xt_##_typename = {\
+  .size = sizeof(_type),\
+  .name = #_typename,\
+  .parse = xt_##_typename##_parse,\
+  .format = xt_##_typename##_format,\
+};
+
+#define XTYPE_NUM_DEF(_type, _fmt, _typename) XTYPE_NUM_FORMAT(_type, _fmt, _typename) \
+  XTYPE_NUM_PARSE(_typename)\
+  XTYPE_NUM_STRUCT(_type, _typename)
+
+XTYPE_NUM_DEF(int, "%d", int)
+XTYPE_NUM_DEF(s64, "%" PRId64, s64)
+XTYPE_NUM_DEF(intmax_t, "%jd", intmax)
+XTYPE_NUM_DEF(uint, "%u", uint)
+XTYPE_NUM_DEF(u64, "%" PRIu64, u64)
+XTYPE_NUM_DEF(uintmax_t, "%ju", uintmax)
+
+/* double */
+
+static const char *xt_double_format(void *src, u32 fmt, struct mempool *pool)
+{
+  double val = *((double *)src);
+
+  if (fmt & XT_DOUBLE_FMT_PREC_FLAG)
+    {
+      uint prec = fmt & ~XT_DOUBLE_FMT_PREC_FLAG;
+      return mp_printf(pool, "%.*lf", prec, val);
+    }
+
+  switch(fmt)
+    {
+    case XTYPE_FMT_RAW:
+      return mp_printf(pool, "%.15lg", val);
+    case XTYPE_FMT_PRETTY:
+      return mp_printf(pool, "%.2lf", val);
+    case XTYPE_FMT_DEFAULT:
+    default:
+      return mp_printf(pool, "%.6lg", val);
+    }
+}
+
+static const char *xt_double_parse(const char *str, void *dest, struct mempool *pool UNUSED)
+{
+  char *endptr = NULL;
+  errno = 0;
+  double result = strtod(str, &endptr);
+  if (*endptr != 0 || endptr == str ||
+      errno == ERANGE)
+    return "Could not parse floating point number.";
+
+  *((double *) dest) = result;
+  return NULL;
+}
+
+static const char * xt_double_fmt_parse(const char *str, u32 *dest, struct mempool *pool)
+{
+  uint precision = 0;
+  const char *tmp_err = str_to_uint(&precision, str, NULL, 10);
+  if (tmp_err)
+    return mp_printf(pool, "Could not parse floating point number precision: %s", tmp_err);
+
+  *dest = XT_DOUBLE_FMT_PREC(precision);
+  return NULL;
+}
+
+const struct xtype xt_double = {
+  .size = sizeof(double),
+  .name = "double",
+  .parse = xt_double_parse,
+  .format = xt_double_format,
+  .parse_fmt = xt_double_fmt_parse
+};
+
+/* bool */
+
+static const char *xt_bool_format(void *src, u32 fmt UNUSED, struct mempool *pool UNUSED)
+{
+  bool val = *((bool *)src);
+  switch (fmt)
+    {
+    case XTYPE_FMT_PRETTY:
+      return val ? "true" : "false";
+    case XTYPE_FMT_DEFAULT:
+    case XTYPE_FMT_RAW:
+    default:
+      return val ? "1" : "0";
+    }
+}
+
+static const char *xt_bool_parse(const char *str, void *dest, struct mempool *pool UNUSED)
+{
+  if (!strcmp(str, "0") || !strcmp(str, "false") || !strcmp(str, "no"))
+    {
+      *((bool *)dest) = false;
+      return NULL;
+    }
+  else if (!strcmp(str, "1") || !strcmp(str, "true") || !strcmp(str, "yes"))
+    {
+      *((bool *)dest) = true;
+      return NULL;
+    }
+
+  return "Could not parse a boolean value.";
+}
+
+XTYPE_NUM_STRUCT(bool, bool)
+
+/* str */
+
+static const char *xt_str_format(void *src, u32 fmt UNUSED, struct mempool *pool)
+{
+  return mp_strdup(pool, *((const char **) src));
+}
+
+static const char *xt_str_parse(const char *str, void *dest, struct mempool *pool)
+{
+  *((const char **) dest) = mp_strdup(pool, str);
+  return NULL;
+}
+
+XTYPE_NUM_STRUCT(char *, str)
diff --git a/libucw/ucw/xtypes-extra.c b/libucw/ucw/xtypes-extra.c
new file mode 100644
index 0000000..c0c31a8
--- /dev/null
+++ b/libucw/ucw/xtypes-extra.c
@@ -0,0 +1,213 @@
+/*
+ *	UCW Library -- Table printer types
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/strtonum.h>
+#include <ucw/table.h>
+#include <time.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <errno.h>
+
+#include <ucw/xtypes-extra.h>
+
+/** xt_size **/
+
+static const struct unit_definition xt_size_units[] = {
+  [XT_SIZE_UNIT_BYTE] = { "", 1LLU, 1 },
+  [XT_SIZE_UNIT_KILOBYTE] = { "KB", 1024LLU, 1 },
+  [XT_SIZE_UNIT_MEGABYTE] = { "MB", 1024LLU * 1024LLU, 1 },
+  [XT_SIZE_UNIT_GIGABYTE] = { "GB", 1024LLU * 1024LLU * 1024LLU, 1 },
+  [XT_SIZE_UNIT_TERABYTE] = { "TB", 1024LLU * 1024LLU * 1024LLU * 1024LLU, 1 },
+  { 0, 0, 0 }
+};
+
+static enum size_units xt_size_auto_units(u64 sz)
+{
+  if(sz >= xt_size_units[XT_SIZE_UNIT_TERABYTE].num) {
+    return XT_SIZE_UNIT_TERABYTE;
+  } else if(sz >= xt_size_units[XT_SIZE_UNIT_GIGABYTE].num) {
+    return XT_SIZE_UNIT_GIGABYTE;
+  } else if(sz >= xt_size_units[XT_SIZE_UNIT_MEGABYTE].num) {
+    return XT_SIZE_UNIT_MEGABYTE;
+  } else if(sz >= xt_size_units[XT_SIZE_UNIT_KILOBYTE].num) {
+    return XT_SIZE_UNIT_KILOBYTE;
+  }
+
+  return XT_SIZE_UNIT_BYTE;
+}
+
+static const char *xt_size_format(void *src, u32 fmt, struct mempool *pool)
+{
+  u64 curr_val = *(u64*) src;
+  uint out_units;
+
+  if(fmt & XT_SIZE_FMT_FIXED_UNIT) {
+    out_units = fmt & ~XT_SIZE_FMT_FIXED_UNIT;
+  } else {
+    switch(fmt) {
+    case XTYPE_FMT_RAW:
+      return mp_printf(pool, "%"PRIu64, curr_val);
+    case XTYPE_FMT_PRETTY:
+      out_units = XT_SIZE_UNIT_AUTO;
+      break;
+    case XTYPE_FMT_DEFAULT:
+    default:
+      out_units = XT_SIZE_UNIT_BYTE;
+      break;
+    }
+  }
+
+  if(out_units == XT_SIZE_UNIT_AUTO) {
+    out_units = xt_size_auto_units(curr_val);
+  }
+  ASSERT(out_units < ARRAY_SIZE(xt_size_units));
+
+  curr_val = curr_val / xt_size_units[out_units].num;
+  return mp_printf(pool, "%"PRIu64"%s", curr_val, xt_size_units[out_units].unit);
+}
+
+static const char *xt_size_fmt_parse(const char *opt_str, u32 *dest, struct mempool *pool)
+{
+  if(strlen(opt_str) == 0 || strcmp(opt_str, "B") == 0 || strcmp(opt_str, "Bytes") == 0) {
+    *dest = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_BYTE);
+    return NULL;
+  }
+
+  if(strcmp(opt_str, "auto") == 0) {
+    *dest = XT_SIZE_FMT_UNIT(XT_SIZE_UNIT_AUTO);
+    return NULL;
+  }
+
+  int unit_idx = xtype_unit_parser(opt_str, xt_size_units);
+  if(unit_idx == -1) {
+    return mp_printf(pool, "Unknown option '%s'", opt_str);
+  }
+
+  *dest = XT_SIZE_FMT_UNIT(unit_idx);
+  return NULL;
+}
+
+static const char *xt_size_parse(const char *str, void *dest, struct mempool *pool)
+{
+  errno = 0;
+  const char *units_start = NULL;
+  u64 parsed;
+  const char *err = str_to_u64(&parsed, str, &units_start, 10 | STN_FLAGS);
+  if(err != NULL) {
+    return mp_printf(pool, "Invalid value of size: '%s'; number parser error: %s.", str, err);
+  }
+
+  if(*units_start == 0) {
+    *(u64*) dest = (u64) parsed;
+    return NULL;
+  }
+
+  int unit_idx = xtype_unit_parser(units_start, xt_size_units);
+  if(unit_idx == -1) {
+    return mp_printf(pool, "Invalid units: '%s'.", str);
+  }
+
+  // Overflow detection
+  u64 num = xt_size_units[unit_idx].num;
+  if(parsed && UINT64_MAX / parsed < num) {
+    return mp_printf(pool, "Size too large: '%s'.", str);
+  }
+
+  *(u64*) dest = parsed * xt_size_units[unit_idx].num;
+  return NULL;
+}
+
+TABLE_COL_BODY(size, u64)
+
+const struct xtype xt_size = {
+  .size = sizeof(u64),
+  .name = "size",
+  .parse = xt_size_parse,
+  .format = xt_size_format,
+  .parse_fmt = xt_size_fmt_parse
+};
+
+/** xt_timestamp **/
+
+#define FORMAT_TIME_SIZE 20	// Minimum buffer size
+
+static const char *xt_timestamp_format(void *src, u32 fmt, struct mempool *pool)
+{
+  char formatted_time_buf[FORMAT_TIME_SIZE] = { 0 };
+
+  u64 tmp_time_u64 = *(u64*)src;
+  time_t tmp_time = (time_t) tmp_time_u64;
+  struct tm t = *gmtime(&tmp_time);
+  switch (fmt) {
+  case XTYPE_FMT_DEFAULT:
+  case XTYPE_FMT_RAW:
+    sprintf(formatted_time_buf, "%"PRIu64, tmp_time_u64);
+    break;
+  case XTYPE_FMT_PRETTY:
+    strftime(formatted_time_buf, FORMAT_TIME_SIZE, "%F %T", &t);
+    break;
+  default:
+    ASSERT(0);
+    break;
+  }
+
+  return mp_strdup(pool, formatted_time_buf);
+}
+
+static const char *xt_timestamp_fmt_parse(const char *opt_str, u32 *dest, struct mempool *pool)
+{
+  if(strcasecmp(opt_str, "timestamp") == 0 || strcasecmp(opt_str, "epoch") == 0) {
+    *dest = XT_TIMESTAMP_FMT_EPOCH;
+    return NULL;
+  } else if(strcasecmp(opt_str, "datetime") == 0) {
+    *dest = XT_TIMESTAMP_FMT_DATETIME;
+    return NULL;
+  }
+
+  return mp_printf(pool, "Invalid column format option: '%s'.", opt_str);
+}
+
+static const char *xt_timestamp_parse(const char *str, void *dest, struct mempool *pool)
+{
+  errno = 0;
+  const char *parse_end = NULL;
+  u64 parsed;
+  const char *err = str_to_u64(&parsed, str, &parse_end, 10 | STN_FLAGS);
+  if(str == parse_end) {
+    return mp_printf(pool, "Invalid value of timestamp: '%s'; number parser error: %s.", str, err);
+  }
+
+  if(*parse_end == 0) {
+    *(u64*) dest = (u64) parsed;
+    return NULL;
+  }
+
+  struct tm parsed_time;
+  parse_end = strptime(str, "%F %T", &parsed_time);
+  if(parse_end == NULL) {
+    return mp_printf(pool, "Invalid value of timestamp: '%s'.", str);
+  }
+  if(*parse_end != 0) {
+    return mp_printf(pool, "Invalid value of timestamp: '%s'.", str);
+  }
+
+  time_t tmp_time = mktime(&parsed_time);
+  *(u64*)dest = (u64) tmp_time;
+
+  return NULL;
+}
+
+TABLE_COL_BODY(timestamp, u64)
+
+const struct xtype xt_timestamp = {
+  .size = sizeof(u64),
+  .name = "timestamp",
+  .parse = xt_timestamp_parse,
+  .format = xt_timestamp_format,
+  .parse_fmt = xt_timestamp_fmt_parse
+};
diff --git a/libucw/ucw/xtypes-extra.h b/libucw/ucw/xtypes-extra.h
new file mode 100644
index 0000000..e82a7c1
--- /dev/null
+++ b/libucw/ucw/xtypes-extra.h
@@ -0,0 +1,78 @@
+/*
+ *	UCW Library -- Extended types - extra types
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ */
+
+#ifndef _UCW_XTYPES_EXTRA_H
+#define _UCW_XTYPES_EXTRA_H
+
+#include <ucw/xtypes.h>
+#include <ucw/table.h>
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define table_col_size ucw_table_col_size
+#define table_col_timestamp ucw_table_col_timestamp
+#define xt_size ucw_xt_size
+#define xt_timestamp ucw_xt_timestamp
+#endif
+
+/***
+ * Size
+ * ~~~~
+ *
+ * `xt_size` is a size, possibly with a unit. Internally, it is represented
+ * as a `u64`.
+ ***/
+
+extern const struct xtype xt_size;
+
+/** Units **/
+enum size_units {
+  XT_SIZE_UNIT_BYTE,
+  XT_SIZE_UNIT_KILOBYTE,
+  XT_SIZE_UNIT_MEGABYTE,
+  XT_SIZE_UNIT_GIGABYTE,
+  XT_SIZE_UNIT_TERABYTE,
+  XT_SIZE_UNIT_AUTO
+};
+
+/**
+ * Custom formatting mode: use a specified unit (`XT_SIZE_UNIT_`'xxx').
+ * Textual representation of the mode is the name of the unit (case-insensitive).
+ **/
+#define XT_SIZE_FMT_UNIT(_unit) (_unit | XT_SIZE_FMT_FIXED_UNIT)
+#define XT_SIZE_FMT_FIXED_UNIT XTYPE_FMT_CUSTOM
+
+#define TBL_COL_SIZE(_name, _width)       { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_size }
+#define TBL_COL_SIZE_FMT(_name, _width, _fmt)      { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_size }
+
+TABLE_COL_PROTO(size, u64)
+
+/***
+ * Time
+ * ~~~~
+ *
+ * `xt_timestamp` is a timestamp, internally represented as `time_t`.
+ ***/
+
+/**
+ * Custom formatting mode: seconds since Unix epoch. Currently,
+ * this is the same as the raw format. Textual representation: `timestamp` or `epoch`.
+ **/
+#define XT_TIMESTAMP_FMT_EPOCH     XTYPE_FMT_RAW
+
+/**
+ * Custom formatting mode: date and time. Currently, this is the same
+ * as the human-readable format. Textual representation: `datetime`.
+ **/
+#define XT_TIMESTAMP_FMT_DATETIME  XTYPE_FMT_PRETTY
+
+extern const struct xtype xt_timestamp;
+
+#define TBL_COL_TIMESTAMP(_name, _width)  { .name = _name, .width = _width, .fmt = XTYPE_FMT_DEFAULT, .type_def = &xt_timestamp }
+#define TBL_COL_TIMESTAMP_FMT(_name, _width, _fmt) { .name = _name, .width = _width, .fmt = _fmt, .type_def = &xt_timestamp }
+
+TABLE_COL_PROTO(timestamp, u64)
+
+#endif
diff --git a/libucw/ucw/xtypes-test.c b/libucw/ucw/xtypes-test.c
new file mode 100644
index 0000000..b8cbe32
--- /dev/null
+++ b/libucw/ucw/xtypes-test.c
@@ -0,0 +1,217 @@
+/*
+ *	UCW Library -- Test of Extended Types
+ *
+ *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/xtypes.h>
+#include <ucw/xtypes-extra.h>
+
+#include <errno.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <time.h>
+
+static void test_size_parse_correct(struct fastbuf *out)
+{
+  static const char *size_strs[] = {
+    "4",
+    "4KB",
+    "4MB",
+    "4GB",
+    "4TB",
+    NULL
+  };
+
+  static u64 size_parsed[] = {
+    4LLU,
+    4 * 1024LLU,
+    4 * 1024LLU * 1024LLU,
+    4 * 1024LLU * 1024LLU * 1024LLU,
+    4 * 1024LLU * 1024LLU * 1024LLU * 1024LLU
+  };
+
+  struct mempool *pool = mp_new(4096);
+
+  uint i = 0;
+  while(size_strs[i] != NULL) {
+    u64 result;
+    const char *parse_err = xt_size.parse(size_strs[i], &result, pool);
+
+    if(parse_err != NULL) {
+      die("Unexpected error in xt_size.parse");
+    }
+    if(size_parsed[i] != result) {
+      die("xt_size.parse parsed an incorrect value.");
+    }
+
+    const char *result_str = xt_size.format(&result, XT_SIZE_FMT_UNIT(i), pool);
+    bprintf(out, "%s %s\n", size_strs[i], result_str);
+
+    i++;
+  }
+
+  mp_delete(pool);
+}
+
+static void test_size_parse_errors(struct fastbuf *out)
+{
+  static const char *size_strs[] = {
+    "1X",
+    "KB",
+    "X1KB",
+    "1XKB",
+    "1KBX",
+    "\0",
+    NULL
+  };
+
+  uint i = 0;
+  struct mempool *pool = mp_new(4096);
+
+  while(size_strs[i] != NULL) {
+    u64 result;
+    const char *parse_err = xt_size.parse(size_strs[i], &result, pool);
+    if(parse_err == NULL) {
+      bprintf(out, "xt_size.parse incorrectly did not result in error while parsing: '%s'.\n", size_strs[i]);
+    } else {
+      bprintf(out, "xt_size.parse error: '%s'.\n", parse_err);
+    }
+
+    i++;
+  }
+
+  mp_delete(pool);
+}
+
+static void test_bool_parse_correct(struct fastbuf *out)
+{
+  static const char *bool_strs[] = {
+    "0",
+    "1",
+    "false",
+    "true",
+    NULL
+  };
+
+  static bool bool_parsed[] = {
+    false,
+    true,
+    false,
+    true
+  };
+
+  struct mempool *pool = mp_new(4096);
+  uint i = 0;
+
+  while(bool_strs[i] != NULL) {
+    bool result;
+    const char *err_str = xt_bool.parse(bool_strs[i], &result, pool);
+    if(err_str != NULL) {
+      die("Unexpected error in xt_bool.parse %s", err_str);
+    }
+    if(bool_parsed[i] != result) {
+      die("xt_bool.parse parsed an incorrect value.");
+    }
+    bprintf(out, "%s %s\n", bool_strs[i], result ? "true" : "false");
+    i++;
+  }
+
+  mp_delete(pool);
+}
+
+static void test_timestamp_parse_correct(struct fastbuf *out)
+{
+  static const char *timestamp_strs[] = {
+    "1403685533",
+    "2014-06-25 08:38:53",
+    NULL
+  };
+
+  static u64 timestamp_parsed[] = {
+    1403685533,
+    0,
+  };
+
+  // fill the value of timestamp_parsed as the timestamp in the
+  // current time zone.
+  {
+    struct tm parsed_time;
+    strptime(timestamp_strs[1], "%F %T", &parsed_time);
+    timestamp_parsed[1] = mktime(&parsed_time);
+  }
+
+  struct mempool *pool = mp_new(4096);
+  uint i = 0;
+
+  while(timestamp_strs[i]) {
+    u64 result;
+    const char *err_str = xt_timestamp.parse(timestamp_strs[i], &result, pool);
+    if(err_str != NULL) {
+      die("Unexpected error in xt_timestamp.parse: %s", err_str);
+    }
+    if(timestamp_parsed[i] != result) {
+      die("Expected: %" PRIu64 " but got %" PRIu64, timestamp_parsed[i], result);
+    }
+
+    bprintf(out, "%" PRIu64 " %" PRIu64 "\n", timestamp_parsed[i], result);
+
+    i++;
+  }
+
+  mp_delete(pool);
+}
+
+static void test_timestamp_parse_errors(struct fastbuf *out)
+{
+  static const char *timestamp_strs[] = {
+    "1403685533X",
+    "2014X-06-25 08:38:53",
+    "2X014-06-25 08:38:53",
+    "2014-06-25 08:38:53X",
+    "X2014-06-25 08:38:53",
+    "X1403685533",
+    "14X03685533",
+    "1403685533X",
+    NULL
+  };
+
+  struct mempool *pool = mp_new(4096);
+  uint i = 0;
+
+  while(timestamp_strs[i]) {
+    u64 result;
+    const char *err_str = xt_timestamp.parse(timestamp_strs[i], &result, pool);
+
+    if(err_str == NULL) {
+      bprintf(out, "xt_timestamp.parse incorrectly did not result in error while parsing: '%s'.\n", timestamp_strs[i]);
+    } else {
+      bprintf(out, "xt_timestamp.parse error: '%s'.\n", err_str);
+    }
+
+    i++;
+  }
+
+  mp_delete(pool);
+}
+
+int main(void)
+{
+  setenv("TZ", "Europe/Prague", 1);
+  struct fastbuf *out;
+  out = bfdopen_shared(1, 4096);
+
+  test_size_parse_correct(out);
+  test_size_parse_errors(out);
+  test_bool_parse_correct(out);
+  test_timestamp_parse_correct(out);
+  test_timestamp_parse_errors(out);
+  bclose(out);
+
+  return 0;
+}
diff --git a/libucw/ucw/xtypes-test.t b/libucw/ucw/xtypes-test.t
new file mode 100644
index 0000000..86a00bf
--- /dev/null
+++ b/libucw/ucw/xtypes-test.t
@@ -0,0 +1,28 @@
+Run: ../obj/ucw/xtypes-test
+Out <<EOF
+4 4
+4KB 4KB
+4MB 4MB
+4GB 4GB
+4TB 4TB
+xt_size.parse error: 'Invalid units: '1X'.'.
+xt_size.parse error: 'Invalid value of size: 'KB'; number parser error: Number contains no digits.'.
+xt_size.parse error: 'Invalid value of size: 'X1KB'; number parser error: Number contains no digits.'.
+xt_size.parse error: 'Invalid units: '1XKB'.'.
+xt_size.parse error: 'Invalid units: '1KBX'.'.
+xt_size.parse error: 'Invalid value of size: ''; number parser error: Number contains no digits.'.
+0 false
+1 true
+false false
+true true
+1403685533 1403685533
+1403678333 1403678333
+xt_timestamp.parse error: 'Invalid value of timestamp: '1403685533X'.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: '2014X-06-25 08:38:53'.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: '2X014-06-25 08:38:53'.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: '2014-06-25 08:38:53X'.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: 'X2014-06-25 08:38:53'; number parser error: Number contains no digits.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: 'X1403685533'; number parser error: Number contains no digits.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: '14X03685533'.'.
+xt_timestamp.parse error: 'Invalid value of timestamp: '1403685533X'.'.
+EOF
diff --git a/libucw/ucw/xtypes.c b/libucw/ucw/xtypes.c
new file mode 100644
index 0000000..08172b4
--- /dev/null
+++ b/libucw/ucw/xtypes.c
@@ -0,0 +1,55 @@
+/*
+ *	UCW Library -- Extended Types -- Generic Operations
+ *
+ *	(c) 2014 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#include <ucw/lib.h>
+#include <ucw/xtypes.h>
+
+#include <string.h>
+
+static const char * const fmt_names[] = {
+  [XTYPE_FMT_DEFAULT] = "default",
+  [XTYPE_FMT_RAW] = "raw",
+  [XTYPE_FMT_PRETTY] = "pretty",
+};
+
+const char *xtype_parse_fmt(const struct xtype *xt, const char *str, u32 *dest, struct mempool *pool)
+{
+  for (uint i=0; i < ARRAY_SIZE(fmt_names); i++)
+    if (!strcmp(str, fmt_names[i]))
+      {
+	*dest = i;
+	return NULL;
+      }
+
+  if (xt && xt->parse_fmt)
+    return (xt->parse_fmt)(str, dest, pool);
+  else
+    return "Unknown mode";
+}
+
+const char *xtype_format_fmt(struct xtype *xt, u32 fmt, struct mempool *pool)
+{
+  if (fmt & XTYPE_FMT_CUSTOM)
+    {
+      if (xt->format_fmt)
+	return (xt->format_fmt)(fmt, pool);
+    }
+  else if (fmt < ARRAY_SIZE(fmt_names))
+    return fmt_names[fmt];
+
+  return "";
+}
+
+int xtype_unit_parser(const char *str, const struct unit_definition *units)
+{
+  for (int i=0; units[i].unit; i++)
+    if (!strcmp(str, units[i].unit))
+      return i;
+  return -1;
+}
diff --git a/libucw/ucw/xtypes.h b/libucw/ucw/xtypes.h
new file mode 100644
index 0000000..f1fc406
--- /dev/null
+++ b/libucw/ucw/xtypes.h
@@ -0,0 +1,167 @@
+/*
+ *	UCW Library -- Extended Types
+ *
+ *	(c) 2014--2015 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_XTYPES_H
+#define _UCW_XTYPES_H
+
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define xt_bool ucw_xt_bool
+#define xt_double ucw_xt_double
+#define xt_int ucw_xt_int
+#define xt_intmax ucw_xt_intmax
+#define xt_s64 ucw_xt_s64
+#define xt_str ucw_xt_str
+#define xt_u64 ucw_xt_u64
+#define xt_uint ucw_xt_uint
+#define xt_uintmax ucw_xt_uintmax
+#define xtype_format_fmt ucw_xtype_format_fmt
+#define xtype_parse_fmt ucw_xtype_parse_fmt
+#define xtype_unit_parser ucw_xtype_unit_parser
+#endif
+
+struct mempool;
+
+/***
+ * Definitions of types
+ * ~~~~~~~~~~~~~~~~~~~~
+ ***/
+
+/**
+ * A parsing callback. Takes a string, interprets it as a value of the particular
+ * xtype and stores it where @dest points. Returns NULL on success and an error message
+ * otherwise. It may allocate memory from the @pool and the parsed value can contain
+ * pointers to this memory.
+ **/
+typedef const char * (*xtype_parser)(const char *str, void *dest, struct mempool *pool);
+
+/**
+ * A formatting callback. Takes a value of the particular xtype and a formatting
+ * mode @fmt (see below for how the modes work) and returns a string representation
+ * of the value. The string can be allocated from the @pool, but it does not have to.
+ *
+ * When @fmt is set to `XTYPE_FMT_DEFAULT`, the resulting string should be
+ * parseable via the parsing callback and yield a semantically equivalent value.
+ **/
+typedef const char * (*xtype_formatter)(void *src, u32 fmt, struct mempool *pool);
+
+/**
+ * Formatting of values is controlled by a mode parameter, which is generally
+ * a 32-bit integer. If the most significant bit is clear, it is one of generic
+ * well-known modes (`XTYPE_FMT_`'something'), which can be passed to all formatters
+ * and if it is not understood, it acts like `XTYPE_FMT_DEFAULT`. When the most
+ * significant bit is set, the meaning of the mode is specific to the particular
+ * xtype.
+ **/
+enum xtype_fmt {
+  XTYPE_FMT_DEFAULT = 0,	// Default format: readable, but not hostile to machine parsing
+  XTYPE_FMT_RAW = 1,		// Raw data with no frills
+  XTYPE_FMT_PRETTY = 2,		// Try to please humans (e.g., like "ls -h")
+  XTYPE_FMT_CUSTOM = 0x80000000,
+};
+
+/**
+ * A callback for parsing non-generic formatting modes. See `xtype_parser` for more
+ * details. It is usually called via `xtype_parse_fmt`, which handles the generic modes.
+ **/
+typedef const char * (*xtype_fmt_parser)(const char *str, u32 *dest, struct mempool *pool);
+
+/**
+ * A callback for constructing a string representation of non-generic formatting modes,
+ * analogous to `xtype_formatter`. It is usually called via `xtype_format_fmt`,
+ * which handles the generic modes. Returns an empty string for unknown modes.
+ **/
+typedef const char * (*xtype_fmt_formatter)(u32 fmt, struct mempool *pool);
+
+/**
+ * This structure describes an xtype. Among other things, it points to callback
+ * functions handling this xtype.
+ **/
+struct xtype {
+  size_t size;				// How many bytes does a single value occupy
+  const char *name;			// Name used in debug messages
+  xtype_parser parse;			// Parsing callback
+  xtype_formatter format;		// Formatting callback
+  xtype_fmt_parser parse_fmt;		// Format mode parsing callback (optional)
+  xtype_fmt_formatter format_fmt;	// Format mode formatting callback (optional)
+};
+
+/**
+ * Construct a formatting mode from its string representation. It is a wrapper
+ * around the `xtype_fmt_parser` hook, which handles generic modes first.
+ *
+ * The generic modes are called `default`, `raw`, and `pretty`.
+ **/
+const char *xtype_parse_fmt(const struct xtype *xt, const char *str, u32 *dest, struct mempool *pool);
+
+/**
+ * Construct a string representation of a formatting mode. It is a wrapper
+ * around the `xtype_fmt_formatter` hook, which handles generic modes first.
+ * Returns an empty string for unknown modes.
+ **/
+const char *xtype_format_fmt(struct xtype *xt, u32 fmt, struct mempool *pool);
+
+/***
+ * Basic pre-defined types
+ * ~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * We provide xtypes for many basic data types:
+ *
+ * * `xt_bool`
+ * * `xt_double` -- in addition to the generic formatting modes, you can use
+ *   `XT_DOUBLE_FMT_PREC(`'n'`)` to generate a mode for fixed formatting with
+ *   'n' decimal places.
+ * * `xt_int`
+ * * `xt_intmax`
+ * * `xt_s64`
+ * * `xt_str` -- string, represented by a `const char *`
+ * * `xt_u64`
+ * * `xt_uint`
+ * * `xt_uintmax`
+ ***/
+
+extern const struct xtype xt_bool;
+extern const struct xtype xt_double;
+extern const struct xtype xt_int;
+extern const struct xtype xt_intmax;
+extern const struct xtype xt_s64;
+extern const struct xtype xt_str;
+extern const struct xtype xt_u64;
+extern const struct xtype xt_uint;
+extern const struct xtype xt_uintmax;
+
+// Fixed-precision formats for xt_double
+#define XT_DOUBLE_FMT_PREC(_prec) (_prec | XT_DOUBLE_FMT_PREC_FLAG)
+#define XT_DOUBLE_FMT_PREC_FLAG XTYPE_FMT_CUSTOM
+
+/***
+ * Tables of units
+ * ~~~~~~~~~~~~~~~
+ *
+ * Various xtypes accept values accompanied by a unit of measure.
+ * Units by handled by the xtypes themselves, but we provide a couple
+ * of generic functions for their convenience.
+ ***/
+
+/**
+ * Each unit is defined by a conversion ratio, which is a fraction with 64-bit numerator
+ * and denominator. Therefore, a value of 'x' units is interpreted as 'x' * 'num' / 'denom'.
+ **/
+struct unit_definition {
+  const char *unit;		// Symbol (name of the unit, as appended to values)
+  u64 num;			// Numerator
+  u64 denom;			// Denominator
+};
+
+/**
+ * Given an array @units of unit definitions (terminated by an all-zero entry),
+ * parse a name of a unit and return its index in the array, or -1 if it is not found.
+ **/
+int xtype_unit_parser(const char *str, const struct unit_definition *units);
+
+#endif