added unicode trait and case functions.

fixed some code for os2
2012-12-06 13:02:46 +00:00 · 2012-12-06 13:02:46 +00:00 · 4ccc843e6b
commit 4ccc843e6b
parent d0dd9a3347
34 changed files with 29503 additions and 691 deletions
--- a/qse/cmd/Makefile.am
+++ b/qse/cmd/Makefile.am
@ -1,2 +1,2 @@
-SUBDIRS = awk sed 
+SUBDIRS = awk sed net
 DIST_SUBDIRS = $(SUBDIRS) 
--- a/qse/cmd/Makefile.in
+++ b/qse/cmd/Makefile.in
@ -261,7 +261,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = awk sed 
+SUBDIRS = awk sed net
 DIST_SUBDIRS = $(SUBDIRS) 
 all: all-recursive
--- a/qse/cmd/net/Makefile.am
+++ b/qse/cmd/net/Makefile.am
@ -0,0 +1,18 @@
 AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 bin_PROGRAMS = qsehttpd
 qsehttpd_SOURCES = httpd.c
 qsehttpd_LDFLAGS = -L../../lib/net -L../../lib/cmn -L$(libdir)
 qsehttpd_LDADD = -lqsenet -lqsecmn
 if WIN32 
 if WCHAR
 qsehttpd_LDADD += $(UNICOWS_LIBS)
 endif
 endif
--- a/qse/cmd/net/Makefile.in
+++ b/qse/cmd/net/Makefile.in
@ -0,0 +1,586 @@
 # Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
@SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = qsehttpd$(EXEEXT)
@WCHAR_TRUE@@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
 subdir = cmd/net
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_numval.m4 $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 	$(top_srcdir)/m4/lx_find_mpi.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/qse/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_qsehttpd_OBJECTS = httpd.$(OBJEXT)
 qsehttpd_OBJECTS = $(am_qsehttpd_OBJECTS)
 am__DEPENDENCIES_1 =
@WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 qsehttpd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 qsehttpd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsehttpd_LDFLAGS) \
 	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(qsehttpd_SOURCES)
 DIST_SOURCES = $(qsehttpd_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
 ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_MODE = @BUILD_MODE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHAR_MODE = @CHAR_MODE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_CXX = @HAVE_CXX@
 INCLTDL = @INCLTDL@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
 LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
 LIBADD_DLOPEN = @LIBADD_DLOPEN@
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
 LIBLTDL = @LIBLTDL@
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTDLDEPS = @LTDLDEPS@
 LTDLINCL = @LTDLINCL@
 LTDLOPEN = @LTDLOPEN@
 LTLIBOBJS = @LTLIBOBJS@
 LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MPICC = @MPICC@
 MPI_CFLAGS = @MPI_CFLAGS@
 MPI_CLDFLAGS = @MPI_CLDFLAGS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
 PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
 PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 QSE_PROJECT_AUTHOR = @QSE_PROJECT_AUTHOR@
 QSE_PROJECT_URL = @QSE_PROJECT_URL@
 QSE_SIZEOF_CHAR = @QSE_SIZEOF_CHAR@
 QSE_SIZEOF_DOUBLE = @QSE_SIZEOF_DOUBLE@
 QSE_SIZEOF_FLOAT = @QSE_SIZEOF_FLOAT@
 QSE_SIZEOF_INT = @QSE_SIZEOF_INT@
 QSE_SIZEOF_LONG = @QSE_SIZEOF_LONG@
 QSE_SIZEOF_LONG_DOUBLE = @QSE_SIZEOF_LONG_DOUBLE@
 QSE_SIZEOF_LONG_LONG = @QSE_SIZEOF_LONG_LONG@
 QSE_SIZEOF_SHORT = @QSE_SIZEOF_SHORT@
 QSE_SIZEOF_VOID_P = @QSE_SIZEOF_VOID_P@
 QSE_SIZEOF_WCHAR_T = @QSE_SIZEOF_WCHAR_T@
 RANLIB = @RANLIB@
 RM = @RM@
 RMDIR = @RMDIR@
 SED = @SED@
 SENDFILE_LIBS = @SENDFILE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 SSL_LIBS = @SSL_LIBS@
 STRIP = @STRIP@
 TRUE = @TRUE@
 UCI_LIBS = @UCI_LIBS@
 UNICOWS_LIBS = @UNICOWS_LIBS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 ltdl_LIBOBJS = @ltdl_LIBOBJS@
 ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sys_symbol_underscore = @sys_symbol_underscore@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 qsehttpd_SOURCES = httpd.c
 qsehttpd_LDFLAGS = -L../../lib/net -L../../lib/cmn -L$(libdir)
 qsehttpd_LDADD = -lqsenet -lqsecmn $(am__append_1)
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cmd/net/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign cmd/net/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
 	  then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
 	    else { print "f", $$3 "/" $$4, $$1; } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
 	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	    } \
 	; done
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' `; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 clean-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 qsehttpd$(EXEEXT): $(qsehttpd_OBJECTS) $(qsehttpd_DEPENDENCIES) $(EXTRA_qsehttpd_DEPENDENCIES) 
 	@rm -f qsehttpd$(EXEEXT)
 	$(qsehttpd_LINK) $(qsehttpd_OBJECTS) $(qsehttpd_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 distclean-compile:
 	-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpd.Po@am__quote@
 .c.o:
@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 .c.lo:
@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 mostlyclean-libtool:
 	-rm -f *.lo
 clean-libtool:
 	-rm -rf .libs _libs
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 dvi: dvi-am
 dvi-am:
 html: html-am
 html-am:
 info: info-am
 info-am:
 install-data-am:
 install-dvi: install-dvi-am
 install-dvi-am:
 install-exec-am: install-binPROGRAMS
 install-html: install-html-am
 install-html-am:
 install-info: install-info-am
 install-info-am:
 install-man:
 install-pdf: install-pdf-am
 install-pdf-am:
 install-ps: install-ps-am
 install-ps-am:
 installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 pdf: pdf-am
 pdf-am:
 ps: ps-am
 ps-am:
 uninstall-am: uninstall-binPROGRAMS
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/qse/cmd/net/httpd.c
+++ b/qse/cmd/net/httpd.c
@ -0,0 +1,296 @@
 #include <qse/net/httpd.h>
 #include <qse/cmn/stdio.h>
 #include <qse/cmn/main.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/mem.h>
 #include <qse/cmn/mbwc.h>
 #include <qse/cmn/time.h>
 #include <signal.h>
 #include <locale.h>
 #if defined(_WIN32)
 #	include <windows.h>
 #	include <tchar.h>
 #	include <process.h>
 #elif defined(__OS2__)
 #	define INCL_DOSPROCESS
 #	define INCL_DOSEXCEPTIONS
 #	define INCL_ERRORS
 #	include <os2.h>
 #elif defined(__DOS__)
 #	include <dos.h>
 #else
 #	include <unistd.h>
 #	include <errno.h>
 #endif
 #if defined(HAVE_SSL)
 #	include <openssl/ssl.h>
 #	include <openssl/err.h>
 #	include <openssl/engine.h>
 #endif
 /* --------------------------------------------------------------------- */
 static qse_httpd_t* g_httpd = QSE_NULL;
 static void sigint (int sig)
 {
 	if (g_httpd) qse_httpd_stop (g_httpd);
 }
 /* --------------------------------------------------------------------- */
 typedef struct server_xtn_t server_xtn_t;
 struct server_xtn_t
 {
 	int tproxy;
 	qse_httpd_server_cbstd_t* orgcbstd;
 };
 static int makersrc (
 	qse_httpd_t* httpd, qse_httpd_client_t* client,
 	qse_htre_t* req, qse_httpd_rsrc_t* rsrc)
 {
 	server_xtn_t* server_xtn;
 	server_xtn = qse_httpd_getserverxtnstd (httpd, client->server);
 	if (server_xtn->tproxy)
 	{
 		if (qse_nwadequal(&client->orgdst_addr, &client->local_addr)) /* both equal and error */
 		{
 			/* TODO: implement a better check that the
 			 *       destination is not one of the local addresses */
 			rsrc->type = QSE_HTTPD_RSRC_ERR;
 			rsrc->u.err.code = 500;
 		}
 		else
 		{
 			rsrc->type = QSE_HTTPD_RSRC_PROXY;
 			rsrc->u.proxy.dst = client->orgdst_addr;
 			rsrc->u.proxy.src = client->remote_addr;
 			if (rsrc->u.proxy.src.type == QSE_NWAD_IN4)
 				rsrc->u.proxy.src.u.in4.port = 0; /* reset the port to 0. */
 			else if (rsrc->u.proxy.src.type == QSE_NWAD_IN6)
 				rsrc->u.proxy.src.u.in6.port = 0; /* reset the port to 0. */
 		}
 		return 0;
 	}
 	else
 	{
 	#if 0
 		if (server_xtn->orgcbstd->makersrc (httpd, client, req, rsrc) <= -1) return -1;
 		if (rsrc->type == QSE_HTTPD_RSRC_DIR)
 		{
 			/* no directory listing - */
 			if (server_xtn->orgcbstd->freersrc)
 				server_xtn->orgcbstd->freersrc (httpd, client, req, rsrc);
 			rsrc->type = QSE_HTTPD_RSRC_ERROR;
 			rsrc->u.error.code = 403;
 		}
 		return 0;
 	#endif
 		return server_xtn->orgcbstd->makersrc (httpd, client, req, rsrc);
 	}
 }
 static void freersrc (
 	qse_httpd_t* httpd, qse_httpd_client_t* client, 
 	qse_htre_t* req, qse_httpd_rsrc_t* rsrc)
 {
 	server_xtn_t* server_xtn;
 	server_xtn = qse_httpd_getserverxtnstd (httpd, client->server);
 	if (server_xtn->tproxy)
 	{
 		/* nothing to do */
 	}
 	else
 	{
 		if (server_xtn->orgcbstd->freersrc) 
 			server_xtn->orgcbstd->freersrc (httpd, client, req, rsrc);
 	}
 }
 /* --------------------------------------------------------------------- */
 static qse_httpd_server_t* attach_server (
 	qse_httpd_t* httpd, qse_char_t* uri, qse_httpd_server_cbstd_t* cbstd)
 {
 	qse_httpd_server_t* server;
 	server_xtn_t* server_xtn;
 	int tproxy = 0;
 	static qse_httpd_server_idxstd_t idxstd[] =
 	{
 		{ QSE_MT("index.cgi")  },
 		{ QSE_MT("index.html") },
 		{ QSE_NULL             }
 	};
 	if (qse_strzcasecmp (uri, QSE_T("http-tproxy://"), 14) == 0)
 	{
 		tproxy = 1;
 		qse_strcpy (&uri[4], &uri[11]); 
 	}
 	server = qse_httpd_attachserverstd (
 		httpd, uri, QSE_NULL, QSE_SIZEOF(server_xtn_t));
 	if (server == QSE_NULL) return QSE_NULL;
 	/* qse_httpd_getserverxtnstd() returns the pointer to 
 	 * the extension space requested above, of the size
 	 * QSE_SIZEOF(server_xtn_t) */
 	server_xtn = qse_httpd_getserverxtnstd (httpd, server);
 	server_xtn->tproxy = tproxy;
 	/* qse_httpd_getserverxtn() returns the pointer to the
 	 * extension space created by qse_httpd_attachserverstd()
 	 * internally.
 	 */
 	/* remember the callback set in qse_httpd_attachserverstd() */
 	qse_httpd_getserveroptstd (
 		httpd, server, 
 		QSE_HTTPD_SERVER_CBSTD, (void**)&server_xtn->orgcbstd);
 	/* override it with a new callback for chaining */
 	qse_httpd_setserveroptstd (
 		httpd, server,
 		QSE_HTTPD_SERVER_CBSTD, cbstd);
 	/* totally override idxstd without remembering the old idxstd */
 	qse_httpd_setserveroptstd (
 		httpd, server,
 		QSE_HTTPD_SERVER_IDXSTD, idxstd);
 	qse_httpd_setserveroptstd (
 		httpd, server, QSE_HTTPD_SERVER_DIRCSS, 
 		QSE_MT("<style type='text/css'>body { background-color:#d0e4fe; font-size: 0.9em; } div.header { font-weight: bold; margin-bottom: 5px; } div.footer { border-top: 1px solid #99AABB; text-align: right; } table { font-size: 0.9em; } td { white-space: nowrap; } td.size { text-align: right; }</style>"));
 	qse_httpd_setserveroptstd (
 		httpd, server, QSE_HTTPD_SERVER_ERRCSS, 
 		QSE_MT("<style type='text/css'>body { background-color:#d0e4fe; font-size: 0.9em; } div.header { font-weight: bold; margin-bottom: 5px; } div.footer { border-top: 1px solid #99AABB; text-align: right; }</style>"));
 	return server;
 }
 /* --------------------------------------------------------------------- */
 static int httpd_main (int argc, qse_char_t* argv[])
 {
 	qse_httpd_t* httpd = QSE_NULL;
 	qse_ntime_t tmout;
 	int ret = -1, i;
 	static qse_httpd_server_cbstd_t cbstd = { makersrc, freersrc };
 	if (argc <= 1)
 	{
 		qse_fprintf (QSE_STDERR, QSE_T("Usage: %s <listener_uri> ...\n"), argv[0]);
 		goto oops;
 	}
 	httpd = qse_httpd_openstd (QSE_SIZEOF(server_xtn_t));
 	if (httpd == QSE_NULL)
 	{
 		qse_fprintf (QSE_STDERR, QSE_T("Cannot open httpd\n"));
 		goto oops;
 	}
 	for (i = 1; i < argc; i++)
 	{
 		if (attach_server (httpd, argv[i], &cbstd) == QSE_NULL)
 		{
 			qse_fprintf (QSE_STDERR,
 				QSE_T("Failed to add httpd listener - %s\n"), argv[i]);
 			goto oops;
 		}
 	}
 	g_httpd = httpd;
 	signal (SIGINT, sigint);
 #if defined(SIGPIPE)
 	signal (SIGPIPE, SIG_IGN);
 #endif
 	qse_httpd_setname (httpd, QSE_MT("httpd02/qse 1.0"));
 	qse_httpd_setoption (httpd, QSE_HTTPD_CGIERRTONUL);
 	tmout.sec = 10;
 	tmout.nsec = 0;
 	ret = qse_httpd_loopstd (httpd, &tmout);
 	signal (SIGINT, SIG_DFL);
 #if defined(SIGPIPE)
 	signal (SIGPIPE, SIG_DFL);
 #endif
 	g_httpd = QSE_NULL;
 	if (ret <= -1) qse_fprintf (QSE_STDERR, QSE_T("Httpd error\n"));
 oops:
 	if (httpd) qse_httpd_close (httpd);
 	return ret;
 }
 int qse_main (int argc, qse_achar_t* argv[])
 {
 	int ret;
 #if defined(_WIN32)
 	char locale[100];
 	UINT codepage;
 	WSADATA wsadata;
 	codepage = GetConsoleOutputCP();
 	if (codepage == CP_UTF8)
 	{
 		/*SetConsoleOUtputCP (CP_UTF8);*/
 		qse_setdflcmgrbyid (QSE_CMGR_UTF8);
 	}
 	else
 	{
 		sprintf (locale, ".%u", (unsigned int)codepage);
 		setlocale (LC_ALL, locale);
 		qse_setdflcmgrbyid (QSE_CMGR_SLMB);
 	}
 	if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0)
 	{
 		qse_fprintf (QSE_STDERR, QSE_T("Failed to start up winsock\n"));
 		return -1;
 	}
 #else
 	setlocale (LC_ALL, "");
 	qse_setdflcmgrbyid (QSE_CMGR_SLMB);
 #endif
 #if defined(HAVE_SSL)    
 	SSL_load_error_strings ();
 	SSL_library_init ();
 #endif
 	ret = qse_runmain (argc, argv, httpd_main);
 #if defined(HAVE_SSL)
 	/*ERR_remove_state ();*/
 	ENGINE_cleanup ();
 	ERR_free_strings ();
 	EVP_cleanup ();
 	CRYPTO_cleanup_all_ex_data ();
 #endif
 #if defined(_WIN32)
 	WSACleanup ();	
 #endif
 	return ret;
 }
--- a/qse/configure
+++ b/qse/configure
@ -643,6 +643,8 @@ ENABLE_CXX_TRUE
 BUILD_MODE
 INCLUDE_MORE_CMGRS_FALSE
 INCLUDE_MORE_CMGRS_TRUE
 ENABLE_BUNDLED_UNICODE_FALSE
 ENABLE_BUNDLED_UNICODE_TRUE
 WCHAR_FALSE
 WCHAR_TRUE
 CHAR_MODE
@ -820,6 +822,7 @@ with_ltdl_include
 with_ltdl_lib
 enable_ltdl_install
 enable_wchar
 enable_bundled_unicode
 enable_more_cmgrs
 enable_syscall
 enable_debug
@ -1470,6 +1473,8 @@ Optional Features:
  --enable-ltdl-install   install libltdl
  --enable-wchar          use wchar_t a default charater type when enabled
                          (default. yes)
  --enable-bundled-unicode
                          use thn bundled unicode routines (default. no)
  --enable-more-cmgrs     include more built-in cmgrs like cp949 and cp950
                          when enabled (default. yes)
  --enable-syscall        use the syscall() function to call system calls
@ -20136,7 +20141,7 @@ $as_echo "#define QSE_CHAR_IS_MCHAR /**/" >>confdefs.h
 	CHAR_MODE="QSE_CHAR_IS_MCHAR"
 fi
- if test "${enable_wchar_is}" = "yes" ; then
+ if test "${enable_wchar_is}" = "yes"; then
  WCHAR_TRUE=
  WCHAR_FALSE='#'
 else
@ -20145,6 +20150,29 @@ else
 fi
 # Check whether --enable-bundled-unicode was given.
 if test "${enable_bundled_unicode+set}" = set; then :
  enableval=$enable_bundled_unicode; enable_bundled_unicode_is=$enableval
 else
  enable_bundled_unicode_is=yes
 fi
 if test "${ac_cv_header_wctype_h}" = "no" -o "${ac_cv_func_wctrans}" = "no" -o "${ac_cv_func_wctype}" = "no"
 then
 $as_echo "#define QSE_ENABLE_BUNDLED_UNICODE /**/" >>confdefs.h
 	enable_bundled_unicode_is=yes
 fi
 if test "${enable_bundled_unicode_is}" = "yes"; then
  ENABLE_BUNDLED_UNICODE_TRUE=
  ENABLE_BUNDLED_UNICODE_FALSE='#'
 else
  ENABLE_BUNDLED_UNICODE_TRUE='#'
  ENABLE_BUNDLED_UNICODE_FALSE=
 fi
 # Check whether --enable-more-cmgrs was given.
 if test "${enable_more_cmgrs+set}" = set; then :
  enableval=$enable_more_cmgrs; enable_more_cmgrs_is=$enableval
@ -20695,7 +20723,7 @@ QSE_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}"
 QSE_PROJECT_URL="${PACKAGE_URL}"
-ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/net/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/sed/Makefile lib/net/Makefile cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile mod/Makefile mod/awk/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/sed/Makefile samples/net/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/page/Makefile doc/image/Makefile doc/Doxyfile tools/Makefile"
+ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/net/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/sed/Makefile lib/net/Makefile cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile cmd/net/Makefile mod/Makefile mod/awk/Makefile samples/Makefile samples/cmn/Makefile samples/awk/Makefile samples/sed/Makefile samples/net/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/page/Makefile doc/image/Makefile doc/Doxyfile tools/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@ -20868,6 +20896,10 @@ if test -z "${WCHAR_TRUE}" && test -z "${WCHAR_FALSE}"; then
  as_fn_error $? "conditional \"WCHAR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_BUNDLED_UNICODE_TRUE}" && test -z "${ENABLE_BUNDLED_UNICODE_FALSE}"; then
  as_fn_error $? "conditional \"ENABLE_BUNDLED_UNICODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INCLUDE_MORE_CMGRS_TRUE}" && test -z "${INCLUDE_MORE_CMGRS_FALSE}"; then
  as_fn_error $? "conditional \"INCLUDE_MORE_CMGRS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -21875,6 +21907,7 @@ do
    "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;
    "cmd/awk/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/Makefile" ;;
    "cmd/sed/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/sed/Makefile" ;;
    "cmd/net/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/net/Makefile" ;;
    "mod/Makefile") CONFIG_FILES="$CONFIG_FILES mod/Makefile" ;;
    "mod/awk/Makefile") CONFIG_FILES="$CONFIG_FILES mod/awk/Makefile" ;;
    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
--- a/qse/configure.ac
+++ b/qse/configure.ac
@ -398,7 +398,16 @@ else
 	AC_DEFINE([QSE_CHAR_IS_MCHAR],[],[char is mchar])
 	AC_SUBST(CHAR_MODE, "QSE_CHAR_IS_MCHAR")
 fi
-AM_CONDITIONAL(WCHAR, test "${enable_wchar_is}" = "yes" )
+AM_CONDITIONAL(WCHAR, test "${enable_wchar_is}" = "yes")
 AC_ARG_ENABLE([bundled-unicode], [AS_HELP_STRING([--enable-bundled-unicode],[use thn bundled unicode routines (default. no)])],
 	enable_bundled_unicode_is=$enableval,enable_bundled_unicode_is=yes)
 if test "${ac_cv_header_wctype_h}" = "no" -o "${ac_cv_func_wctrans}" = "no" -o "${ac_cv_func_wctype}" = "no"
 then
 	AC_DEFINE([QSE_ENABLE_BUNDLED_UNICODE],[],[use the bundled unicode routines])
 	enable_bundled_unicode_is=yes
 fi
 AM_CONDITIONAL(ENABLE_BUNDLED_UNICODE, test "${enable_bundled_unicode_is}" = "yes")
 AC_ARG_ENABLE([more-cmgrs], [AS_HELP_STRING([--enable-more-cmgrs],[include more built-in cmgrs like cp949 and cp950 when enabled (default. yes)])],
 	enable_more_cmgrs_is=$enableval,enable_more_cmgrs_is=yes)
@ -489,6 +498,7 @@ AC_CONFIG_FILES([
 	cmd/Makefile 
 	cmd/awk/Makefile 
 	cmd/sed/Makefile 
 	cmd/net/Makefile 
 	mod/Makefile
 	mod/awk/Makefile
 	samples/Makefile 
--- a/qse/include/qse/cmn/Makefile.am
+++ b/qse/include/qse/cmn/Makefile.am
@ -42,6 +42,7 @@ pkginclude_HEADERS = \
 	time.h \
 	tio.h \
 	tre.h \
 	uni.h \
 	uri.h \
 	utf8.h \
 	xma.h 
--- a/qse/include/qse/cmn/Makefile.in
+++ b/qse/include/qse/cmn/Makefile.in
@ -56,8 +56,8 @@ am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dir.h dll.h \
 	env.h fio.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h \
 	lda.h main.h map.h mbwc.h mem.h mux.h nwad.h nwif.h nwio.h \
 	oht.h opt.h path.h pio.h pma.h rbt.h rex.h sio.h sll.h slmb.h \
-	stdio.h str.h task.h time.h tio.h tre.h uri.h utf8.h xma.h \
+	stdio.h str.h task.h time.h tio.h tre.h uni.h uri.h utf8.h \
-	Mmgr.hpp StdMmgr.hpp Mmged.hpp
+	xma.h Mmgr.hpp StdMmgr.hpp Mmged.hpp
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -266,8 +266,8 @@ pkginclude_HEADERS = alg.h chr.h cp949.h cp950.h dir.h dll.h env.h \
 	fio.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h \
 	main.h map.h mbwc.h mem.h mux.h nwad.h nwif.h nwio.h oht.h \
 	opt.h path.h pio.h pma.h rbt.h rex.h sio.h sll.h slmb.h \
-	stdio.h str.h task.h time.h tio.h tre.h uri.h utf8.h xma.h \
+	stdio.h str.h task.h time.h tio.h tre.h uni.h uri.h utf8.h \
-	$(am__append_1)
+	xma.h $(am__append_1)
 all: all-am
 .SUFFIXES:
--- a/qse/include/qse/cmn/uni.h
+++ b/qse/include/qse/cmn/uni.h
@ -0,0 +1,56 @@
 /*
 * $Id$
 *
    Copyright 2006-2012 Chung, Hyung-Hwan.
    This file is part of QSE.
    QSE 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 3 of 
    the License, or (at your option) any later version.
    QSE 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 QSE. If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _QSE_CMN_UNI_H_
 #define _QSE_CMN_UNI_H_
 /** @file
 * This file provides functions, types, macros for unicode handling.
 */
 #include <qse/types.h>
 #include <qse/macros.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 QSE_EXPORT int qse_isunitype (qse_wcint_t c, int type);
 QSE_EXPORT int qse_isuniupper (qse_wcint_t c);
 QSE_EXPORT int qse_isunilower (qse_wcint_t c);
 QSE_EXPORT int qse_isunialpha (qse_wcint_t c);
 QSE_EXPORT int qse_isunidigit (qse_wcint_t c);
 QSE_EXPORT int qse_isunixdigit (qse_wcint_t c);
 QSE_EXPORT int qse_isunialnum (qse_wcint_t c);
 QSE_EXPORT int qse_isunispace (qse_wcint_t c);
 QSE_EXPORT int qse_isuniprint (qse_wcint_t c);
 QSE_EXPORT int qse_isunigraph (qse_wcint_t c);
 QSE_EXPORT int qse_isunicntrl (qse_wcint_t c);
 QSE_EXPORT int qse_isunipunct (qse_wcint_t c);
 QSE_EXPORT qse_wcint_t qse_touniupper (qse_wcint_t c);
 QSE_EXPORT qse_wcint_t qse_tounilower (qse_wcint_t c);
 #ifdef __cplusplus
 }
 #endif
 #endif
--- a/qse/include/qse/conf-dos.h
+++ b/qse/include/qse/conf-dos.h
@ -36,56 +36,64 @@
 #	define QSE_SIZEOF_INT         4
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   8
-#
+
 #	define QSE_SIZEOF_VOID_P      4
 #	define QSE_SIZEOF_FLOAT       4
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      1
 #	define QSE_SIZEOF___INT16     2
 #	define QSE_SIZEOF___INT32     4
 #	define QSE_SIZEOF___INT64     8
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       4
-#
+
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          8
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #elif defined(__WATCOMC__) && !defined(__386__)
 #	define QSE_SIZEOF_CHAR        1
 #	define QSE_SIZEOF_SHORT       2
 #	define QSE_SIZEOF_INT         2
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   8
-#
+
 #	define QSE_SIZEOF_VOID_P      4
 #	define QSE_SIZEOF_FLOAT       4
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      1
 #	define QSE_SIZEOF___INT16     2
 #	define QSE_SIZEOF___INT32     4
 #	define QSE_SIZEOF___INT64     8
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       4
-#
+
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          8
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #
 #	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #else
 #	error Define the size of various data types.
 #endif
--- a/qse/include/qse/conf-msw.h
+++ b/qse/include/qse/conf-msw.h
@ -50,7 +50,7 @@ _M_X64 x64 platform
 #	define QSE_SIZEOF_INT         4
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   8
-#
+
 #	if defined(_WIN64)
 #		define QSE_SIZEOF_VOID_P      8
 #	else
@ -60,27 +60,33 @@ _M_X64 x64 platform
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      1
 #	define QSE_SIZEOF___INT16     2
 #	define QSE_SIZEOF___INT32     4
 #	define QSE_SIZEOF___INT64     8
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       8
-#
+
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          16
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #elif defined(__GNUC__) || defined(__DMC__) || defined(__POCC__)
 #	define QSE_SIZEOF_CHAR        1
 #	define QSE_SIZEOF_SHORT       2
 #	define QSE_SIZEOF_INT         4
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   8
-#
+
 #	if defined(_WIN64)
 #		define QSE_SIZEOF_VOID_P      8
 #	else
@ -90,20 +96,26 @@ _M_X64 x64 platform
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 16
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      0
 #	define QSE_SIZEOF___INT16     0
 #	define QSE_SIZEOF___INT32     0
 #	define QSE_SIZEOF___INT64     0
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       8
-#
+
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          16
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #elif defined(_MSC_VER)
 #	define QSE_SIZEOF_CHAR        1
 #	define QSE_SIZEOF_SHORT       2
@ -114,7 +126,7 @@ _M_X64 x64 platform
 #	else
 #		define QSE_SIZEOF_LONG_LONG   0
 #	endif
-#
+
 #	if defined(_WIN64)
 #		define QSE_SIZEOF_VOID_P      8
 #	else
@ -124,24 +136,25 @@ _M_X64 x64 platform
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      1
 #	define QSE_SIZEOF___INT16     2
 #	define QSE_SIZEOF___INT32     4
 #	define QSE_SIZEOF___INT64     8
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       8
-#
+
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          8
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #
 #	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #else
 #	error Define the size of various data types.
 #endif
--- a/qse/include/qse/conf-os2.h
+++ b/qse/include/qse/conf-os2.h
@ -36,35 +36,66 @@
 #	define QSE_SIZEOF_INT         4
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   8
 #
 #	define QSE_SIZEOF_VOID_P      4
 #	define QSE_SIZEOF_FLOAT       4
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
-#
+
 #	define QSE_SIZEOF___INT8      1
 #	define QSE_SIZEOF___INT16     2
 #	define QSE_SIZEOF___INT32     4
 #	define QSE_SIZEOF___INT64     8
 #	define QSE_SIZEOF___INT128    0
-#
+
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       8
-#
+
 /* I don't know the exact mbstate size. 
 * but this should be large enough */
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 /* TODO: check the exact value */
 #	define QSE_MBLEN_MAX          8
-#
+
-#	define QSE_CHAR_IS_WCHAR
+	/* these two have only to be large enough */
 #
 #	/* these two have only to be large enough */
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR      1
 #	undef QSE_ENABLE_BUNDLED_UNICODE
 #elif defined(__BORLANDC__)
 #	define QSE_SIZEOF_CHAR        1
 #	define QSE_SIZEOF_SHORT       2
 #	define QSE_SIZEOF_INT         4
 #	define QSE_SIZEOF_LONG        4
 #	define QSE_SIZEOF_LONG_LONG   0
 #	define QSE_SIZEOF_VOID_P      4
 #	define QSE_SIZEOF_FLOAT       4
 #	define QSE_SIZEOF_DOUBLE      8
 #	define QSE_SIZEOF_LONG_DOUBLE 8
 #	define QSE_SIZEOF_WCHAR_T     2
 #	define QSE_SIZEOF___INT8      0
 #	define QSE_SIZEOF___INT16     0
 #	define QSE_SIZEOF___INT32     0
 #	define QSE_SIZEOF___INT64     0
 #	define QSE_SIZEOF___INT128    0
 #	define QSE_SIZEOF_OFF64_T     0
 #	define QSE_SIZEOF_OFF_T       4
 #	define QSE_SIZEOF_MBSTATE_T   QSE_SIZEOF_LONG
 #	define QSE_MBLEN_MAX          8
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN 32
 #	define QSE_SIZEOF_STRUCT_SOCKADDR_IN6 64
 #	define QSE_CHAR_IS_WCHAR          1
 #	define QSE_ENABLE_BUNDLED_UNICODE 1
 #else
 #	error Define the size of various data types.
 #endif
-#include "conf-inf.h"
+#include <qse/conf-inf.h>
--- a/qse/include/qse/config.h.in
+++ b/qse/include/qse/config.h.in
@ -616,6 +616,9 @@
 /* char is wchar */
 #undef QSE_CHAR_IS_WCHAR
 /* use the bundled unicode routines */
 #undef QSE_ENABLE_BUNDLED_UNICODE
 /* enable qse_sed_setexectracer() */
 #undef QSE_ENABLE_SEDTRACER
--- a/qse/include/qse/pack1.h
+++ b/qse/include/qse/pack1.h
@ -22,7 +22,7 @@
 #	pragma pack(1)
 #elif defined(__HP_aCC) || defined(__HP_cc)
 #	pragma PACK 1
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
+#elif defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0500))
 #	pragma pack(push,1)
 #elif defined(__DECC)
 #	pragma pack(push,1)
--- a/qse/include/qse/pack2.h
+++ b/qse/include/qse/pack2.h
@ -22,7 +22,7 @@
 #	pragma pack(2)
 #elif defined(__HP_aCC) || defined(__HP_cc)
 #	pragma PACK 2
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
+#elif defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0500))
 #	pragma pack(push,2)
 #elif defined(__DECC)
 #	pragma pack(push,2)
--- a/qse/include/qse/unpack.h
+++ b/qse/include/qse/unpack.h
@ -22,7 +22,7 @@
 #	pragma pack()
 #elif defined(__HP_aCC) || defined(__HP_cc)
 #	pragma PACK
-#elif defined(_MSC_VER) || defined(__BORLANDC__)
+#elif defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0500))
 #	pragma pack(pop)
 #elif defined(__DECC)
 #	pragma pack(pop)
--- a/qse/lib/cmn/Makefile.am
+++ b/qse/lib/cmn/Makefile.am
@ -108,13 +108,15 @@ libqsecmn_la_SOURCES = \
 	utf8.c \
 	xma.c
 if ENABLE_BUNDLED_UNICODE
 libqsecmn_la_SOURCES += uni.c 
 endif
 if INCLUDE_MORE_CMGRS
-libqsecmn_la_SOURCES += \
+libqsecmn_la_SOURCES += cp949.c cp950.c
 	cp949.c \
 	cp950.c
 endif
 libqsecmn_la_LDFLAGS = -L$(libdir) -version-info 1:0:0 -no-undefined
 libqsecmn_la_LIBADD = $(SOCKET_LIBS)
--- a/qse/lib/cmn/Makefile.in
+++ b/qse/lib/cmn/Makefile.in
@ -35,11 +35,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@INCLUDE_MORE_CMGRS_TRUE@am__append_1 = \
+@ENABLE_BUNDLED_UNICODE_TRUE@am__append_1 = uni.c 
-@INCLUDE_MORE_CMGRS_TRUE@	cp949.c \
+@INCLUDE_MORE_CMGRS_TRUE@am__append_2 = cp949.c cp950.c
-@INCLUDE_MORE_CMGRS_TRUE@	cp950.c
+@ENABLE_CXX_TRUE@am__append_3 = libqsecmnxx.la
@ENABLE_CXX_TRUE@am__append_2 = libqsecmnxx.la
 subdir = lib/cmn
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@ -100,8 +98,9 @@ am__libqsecmn_la_SOURCES_DIST = alg-base64.c alg-rand.c alg-search.c \
 	str-spn.c str-str.c str-subst.c str-tok.c str-trm.c str-word.c \
 	task.c time.c tio.c tre.c tre-ast.c tre-compile.c \
 	tre-match-backtrack.c tre-match-parallel.c tre-parse.c \
-	tre-stack.c uri.c utf8.c xma.c cp949.c cp950.c
+	tre-stack.c uri.c utf8.c xma.c uni.c cp949.c cp950.c
-@INCLUDE_MORE_CMGRS_TRUE@am__objects_1 = cp949.lo cp950.lo
+@ENABLE_BUNDLED_UNICODE_TRUE@am__objects_1 = uni.lo
@INCLUDE_MORE_CMGRS_TRUE@am__objects_2 = cp949.lo cp950.lo
 am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
 	alg-sort.lo assert.lo chr.lo dir.lo dll.lo env.lo gdl.lo \
 	htb.lo fio.lo fma.lo fmt.lo fs.lo fs-err.lo fs-move.lo glob.lo \
@ -117,7 +116,7 @@ am_libqsecmn_la_OBJECTS = alg-base64.lo alg-rand.lo alg-search.lo \
 	str-trm.lo str-word.lo task.lo time.lo tio.lo tre.lo \
 	tre-ast.lo tre-compile.lo tre-match-backtrack.lo \
 	tre-match-parallel.lo tre-parse.lo tre-stack.lo uri.lo utf8.lo \
-	xma.lo $(am__objects_1)
+	xma.lo $(am__objects_1) $(am__objects_2)
 libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
 libqsecmn_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@ -336,7 +335,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
-lib_LTLIBRARIES = libqsecmn.la $(am__append_2)
+lib_LTLIBRARIES = libqsecmn.la $(am__append_3)
 noinst_HEADERS = \
 	cp949.h \
 	cp950.h \
@ -363,7 +362,7 @@ libqsecmn_la_SOURCES = alg-base64.c alg-rand.c alg-search.c alg-sort.c \
 	str-spn.c str-str.c str-subst.c str-tok.c str-trm.c str-word.c \
 	task.c time.c tio.c tre.c tre-ast.c tre-compile.c \
 	tre-match-backtrack.c tre-match-parallel.c tre-parse.c \
-	tre-stack.c uri.c utf8.c xma.c $(am__append_1)
+	tre-stack.c uri.c utf8.c xma.c $(am__append_1) $(am__append_2)
 libqsecmn_la_LDFLAGS = -L$(libdir) -version-info 1:0:0 -no-undefined
 libqsecmn_la_LIBADD = $(SOCKET_LIBS)
@ENABLE_CXX_TRUE@libqsecmnxx_la_SOURCES = \
@ -533,6 +532,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tre-parse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tre-stack.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tre.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uri.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xma.Plo@am__quote@
--- a/qse/lib/cmn/assert.c
+++ b/qse/lib/cmn/assert.c
@ -21,12 +21,12 @@
 #include <qse/types.h>
 #include <qse/macros.h>
-#ifndef NDEBUG
+#if !defined(NDEBUG)
 #include <qse/cmn/sio.h>
 #include "mem.h"
-#ifdef HAVE_EXECINFO_H
+#if defined(HAVE_EXECINFO_H)
 #	include <execinfo.h>
 #	include <stdlib.h>
 #	include <qse/cmn/str.h>
@ -91,7 +91,7 @@ void qse_assert_failed (
 	const qse_char_t* expr, const qse_char_t* desc, 
 	const qse_char_t* file, qse_size_t line)
 {
-#ifdef HAVE_BACKTRACE
+#if defined(HAVE_BACKTRACE)
 	void *btarray[128];
 	qse_size_t btsize, i;
 	char **btsyms;
@ -138,7 +138,7 @@ void qse_assert_failed (
 		qse_sio_putmbs (sio, QSE_MT("\n"));
 	}
-#ifdef HAVE_BACKTRACE
+#if defined(HAVE_BACKTRACE)
 	btsize = backtrace (btarray, QSE_COUNTOF(btarray));
 	btsyms = backtrace_symbols (btarray, btsize);
 	if (btsyms != QSE_NULL)
--- a/qse/lib/cmn/chr.c
+++ b/qse/lib/cmn/chr.c
@ -22,13 +22,18 @@
 #include <qse/cmn/str.h>
 #include <ctype.h>
-#include <wctype.h>
+
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 #	include <qse/cmn/uni.h>
 #else
 #	include <wctype.h>
 #endif
 static QSE_INLINE int is_malpha (qse_mcint_t c) { return isalpha(c); }
 static QSE_INLINE int is_malnum (qse_mcint_t c) { return isalnum(c); }
 static QSE_INLINE int is_mblank (qse_mcint_t c) 
 { 
-#ifdef HAVE_ISBLANK
+#if defined(HAVE_ISBLANK)
 	return isblank(c); 
 #else
 	return c == QSE_MT(' ') || c == QSE_MT('\t');
@ -45,25 +50,105 @@ static QSE_INLINE int is_mupper (qse_mcint_t c) { return isupper(c); }
 static QSE_INLINE int is_mxdigit (qse_mcint_t c) { return isxdigit(c); }
-static QSE_INLINE int is_walpha (qse_wcint_t c) { return iswalpha(c); }
+static QSE_INLINE int is_walpha (qse_wcint_t c) 
-static QSE_INLINE int is_walnum (qse_wcint_t c) { return iswalnum(c); }
+{ 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunialpha (c);
 #else
 	return iswalpha(c); 
 #endif
 }
 static QSE_INLINE int is_walnum (qse_wcint_t c) 
 {
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunialnum (c);
 #else
 	return iswalnum(c); 
 #endif
 }
 static QSE_INLINE int is_wblank (qse_wcint_t c) 
 { 
-#ifdef HAVE_ISWBLANK
+#if defined(HAVE_ISWBLANK)
 	return iswblank(c); 
 #else
 	return c == QSE_WT(' ') || c == QSE_WT('\t');
 #endif
 }
-static QSE_INLINE int is_wcntrl (qse_wcint_t c) { return iswcntrl(c); }
+static QSE_INLINE int is_wcntrl (qse_wcint_t c) 
-static QSE_INLINE int is_wdigit (qse_wcint_t c) { return iswdigit(c); }
+{ 
-static QSE_INLINE int is_wgraph (qse_wcint_t c) { return iswgraph(c); }
+#if defined(QSE_ENABLE_BUNDLED_UNICODE)
-static QSE_INLINE int is_wlower (qse_wcint_t c) { return iswlower(c); }
+	return qse_isunicntrl (c);
-static QSE_INLINE int is_wprint (qse_wcint_t c) { return iswprint(c); }
+#else
-static QSE_INLINE int is_wpunct (qse_wcint_t c) { return iswpunct(c); }
+	return iswcntrl(c); 
-static QSE_INLINE int is_wspace (qse_wcint_t c) { return iswspace(c); }
+#endif
-static QSE_INLINE int is_wupper (qse_wcint_t c) { return iswupper(c); }
+}
-static QSE_INLINE int is_wxdigit (qse_wcint_t c) { return iswxdigit(c); }
+static QSE_INLINE int is_wdigit (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunidigit (c);
 #else
 	return iswdigit(c); 
 #endif
 }
 static QSE_INLINE int is_wgraph (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunigraph (c);
 #else
 	return iswgraph(c); 
 #endif
 }
 static QSE_INLINE int is_wlower (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunilower (c);
 #else
 	return iswlower(c); 
 #endif
 }
 static QSE_INLINE int is_wprint (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isuniprint (c);
 #else
 	return iswprint(c); 
 #endif
 }
 static QSE_INLINE int is_wpunct (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunipunct (c);
 #else
 	return iswpunct(c); 
 #endif
 }
 static QSE_INLINE int is_wspace (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunispace (c);
 #else
 	return iswspace(c); 
 #endif
 }
 static QSE_INLINE int is_wupper (qse_wcint_t c) 
 { 
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isuniupper (c);
 #else
 	return iswupper(c); 
 #endif
 }
 static QSE_INLINE int is_wxdigit (qse_wcint_t c) 
 {
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	return qse_isunixdigit (c);
 #else
 	return iswxdigit(c); 
 #endif
 }
 int qse_ismctype (qse_mcint_t c, qse_mctype_t type)
 { 
@ -172,6 +257,21 @@ int qse_iswctype (qse_wcint_t c, qse_wctype_t type)
 		is_wupper,
 		is_wxdigit
 #endif
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 		qse_isunialnum,
 		qse_isunialpha,
 		is_wblank,
 		qse_isunicntrl,
 		qse_isunidigit,
 		qse_isunigraph,
 		qse_isunilower,
 		qse_isuniprint,
 		qse_isunipunct,
 		qse_isunispace,
 		qse_isuniupper,
 		qse_isunixdigit
 #else
 		iswalnum,
 		iswalpha,
 		is_wblank,
@ -184,6 +284,7 @@ int qse_iswctype (qse_wcint_t c, qse_wctype_t type)
 		iswspace,
 		iswupper,
 		iswxdigit
 #endif
 	};
 	QSE_ASSERTX (type >= QSE_WCTYPE_ALNUM && type <= QSE_WCTYPE_XDIGIT,
@ -219,8 +320,13 @@ qse_wcint_t qse_towctype (qse_wcint_t c, qse_wctype_t type)
 */
 	QSE_ASSERTX (type == QSE_WCTYPE_UPPER || type == QSE_WCTYPE_LOWER,
 		"The type should be one of QSE_WCTYPE_UPPER and QSE_WCTYPE_LOWER");
 #if defined(QSE_ENABLE_BUNDLED_UNICODE)
 	if (type == QSE_WCTYPE_UPPER) return qse_touniupper(c);
 	if (type == QSE_WCTYPE_LOWER) return qse_tounilower(c);
 #else
 	if (type == QSE_WCTYPE_UPPER) return towupper(c);
 	if (type == QSE_WCTYPE_LOWER) return towlower(c);
 #endif
 	return c;
 /*
 #endif
--- a/qse/lib/cmn/dir.c
+++ b/qse/lib/cmn/dir.c
@ -51,7 +51,11 @@ struct qse_dir_t
 	int done;
 #elif defined(__OS2__)
 	HDIR h;
 	#if defined(FIL_STANDARDL) 
 	FILEFINDBUF3L ffb;	
 	#else
 	FILEFINDBUF3 ffb;	
 	#endif
 	ULONG count;
 	int opened;
 #elif defined(__DOS__)
@ -326,7 +330,12 @@ static int reset_to_path (qse_dir_t* dir, const qse_char_t* path)
 		&dir->ffb,
 		QSE_SIZEOF(dir->ffb),
 		&dir->count,
-		FIL_STANDARDL);
+#if defined(FIL_STANDARDL) 
 		FIL_STANDARDL
 #else
 		FIL_STANDARD
 #endif
 	);
 	if (rc != NO_ERROR) return -1;
--- a/qse/lib/cmn/fio.c
+++ b/qse/lib/cmn/fio.c
@ -455,7 +455,11 @@ int qse_fio_init (
 		APIRET ret;
 		ULONG action_taken = 0;
 		ULONG open_action, open_mode, open_attr;
 	#if defined(FIL_STANDARDL)
 		LONGLONG zero;
 	#else
 		ULONG zero;	
 	#endif
 	#if defined(QSE_CHAR_IS_MCHAR)
 		const qse_mchar_t* path_mb = path;
@ -493,8 +497,12 @@ int qse_fio_init (
 		}
 	#endif
 	#if defined(FIL_STANDARDL)
 		zero.ulLo = 0;
 		zero.ulHi = 0;
 	#else
 		zero = 0;
 	#endif
 		if (flags & QSE_FIO_APPEND) 
 			fio->status |= STATUS_APPEND;
@ -549,7 +557,11 @@ int qse_fio_init (
 		open_attr = (mode & QSE_FIO_WUSR)? FILE_NORMAL: FILE_READONLY;
 	#if defined(FIL_STANDARDL)
 		ret = DosOpenL (
 	#else
 		ret = DosOpen (
 	#endif
 			path_mb,       /* file name */
 			&handle,       /* file handle */
 			&action_taken, /* store action taken */
@ -1015,6 +1027,8 @@ qse_fio_off_t qse_fio_seek (
 		FILE_END
 	};
 	#if defined(FIL_STANDARDL)
 	LONGLONG pos, newpos;
 	APIRET ret;
@ -1030,7 +1044,22 @@ qse_fio_off_t qse_fio_seek (
 		return (qse_fio_off_t)-1;
 	}
-	return ((qse_fio_off_t)pos.ulHi << 32) | pos.ulLo;
+	return ((qse_fio_off_t)newpos.ulHi << 32) | newpos.ulLo;
 	#else
 	ULONG newpos;
 	APIRET ret;
 	ret = DosSetFilePtr (fio->handle, offset, seek_map[origin], &newpos);
 	if (ret != NO_ERROR) 
 	{
 		fio->errnum = syserr_to_errnum (ret);
 		return (qse_fio_off_t)-1;
 	}
 	return newpos;
 	#endif
 #elif defined(__DOS__)
 	static int seek_map[] =
 	{
@ -1093,7 +1122,10 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size)
 	return 0;
 #elif defined(__OS2__)
 	APIRET ret;
 	#if defined(FIL_STANDARDL)
 	LONGLONG sz;
 	/* the file must have the write access for it to succeed */
@ -1101,11 +1133,14 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size)
 	sz.ulHi = (ULONG)(size>>32);
 	ret = DosSetFileSizeL (fio->handle, sz);
 	#else
 	ret = DosSetFileSize (fio->handle, size);
 	#endif
 	if (ret != NO_ERROR)
 	{
 		fio->errnum = syserr_to_errnum (ret);
 		return -1;
 	}
 	return 0;
@ -1235,10 +1270,15 @@ qse_ssize_t qse_fio_write (qse_fio_t* fio, const void* data, qse_size_t size)
   	if (fio->status & STATUS_APPEND)
 	{
 		/* i do this on a best-effort basis */
 	#if defined(FIL_STANDARDL)
 		LONGLONG pos, newpos;
 		pos.ulLo = (ULONG)0;
 		pos.ulHi = (ULONG)0;
    		DosSetFilePtrL (fio->handle, pos, FILE_END, &newpos);
 	#else
 		ULONG newpos;
    		DosSetFilePtr (fio->handle, 0, FILE_END, &newpos);
 	#endif
    	}
 	if (size > (QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(ULONG))) 
@ -1452,10 +1492,18 @@ int qse_fio_chmod (qse_fio_t* fio, int mode)
 	APIRET n;
 	int flags = FILE_NORMAL;
 	#if defined(FIL_STANDARDL)
 	FILESTATUS3L stat;
 	#else
 	FILESTATUS3 stat;
 	#endif
 	ULONG size = QSE_SIZEOF(stat);
 	#if defined(FIL_STANDARDL)
 	n = DosQueryFileInfo (fio->handle, FIL_STANDARDL, &stat, size);
 	#else
 	n = DosQueryFileInfo (fio->handle, FIL_STANDARD, &stat, size);
 	#endif
 	if (n != NO_ERROR)
 	{
 		fio->errnum = syserr_to_errnum (n);
@ -1465,7 +1513,11 @@ int qse_fio_chmod (qse_fio_t* fio, int mode)
 	if (!(mode & QSE_FIO_WUSR)) flags = FILE_READONLY;
 	stat.attrFile = flags;
 	#if defined(FIL_STANDARDL)
 	n = DosSetFileInfo (fio->handle, FIL_STANDARDL, &stat, size);
 	#else
 	n = DosSetFileInfo (fio->handle, FIL_STANDARD, &stat, size);
 	#endif
 	if (n != NO_ERROR)
 	{
 		fio->errnum = syserr_to_errnum (n);
--- a/qse/lib/cmn/mux.c
+++ b/qse/lib/cmn/mux.c
@ -89,6 +89,16 @@ struct qse_mux_t
 		qse_size_t capa;
     } ee;
 	struct
 	{
 		qse_mux_evt_t** ptr;
 		int ubound;
 	} me;
 #elif defined(__OS2__)
 	int fdarr;
 	int rsize;
 	int wsize;
 	struct
 	{
 		qse_mux_evt_t** ptr;
@ -131,27 +141,27 @@ static qse_mux_errnum_t syserr_to_errnum (DWORD e)
 	}
 }
 #elif defined(__OS2__)
-static qse_mux_errnum_t syserr_to_errnum (APIRET e)
+static qse_mux_errnum_t syserr_to_errnum (int e)
 {
 	switch (e)
 	{
-		case ERROR_NOT_ENOUGH_MEMORY:
+		case SOCENOMEM:
 			return QSE_MUX_ENOMEM;
-		case ERROR_INVALID_PARAMETER:
+		case SOCEINVAL:
 		case ERROR_INVALID_HANDLE:
 		case ERROR_INVALID_NAME:
 			return QSE_MUX_EINVAL;
-		case ERROR_ACCESS_DENIED:
+		case SOCEACCES:
 			return QSE_MUX_EACCES;
-		case ERROR_FILE_NOT_FOUND:
+		case SOCENOENT:
 		case ERROR_PATH_NOT_FOUND:
 			return QSE_MUX_ENOENT;
-		case ERROR_ALREADY_EXISTS:
+		case SOCEEXIST:
 			return QSE_MUX_EEXIST;
 		case SOCEINTR:
 			return QSE_MUX_EINTR;
 		default:
 			return QSE_MUX_ESYSERR;
@ -272,6 +282,11 @@ int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse
 		if (flag >= 0) fcntl (mux->fd, F_SETFD, flag | FD_CLOEXEC);
 	}
 	#endif
 #elif defined(__OS2__)
 	mux->errnum = QSE_MUX_ENOIMPL;
 	return -1;
 #else
 	/* TODO: */
 	mux->errnum = QSE_MUX_ENOIMPL;
@ -458,6 +473,9 @@ int qse_mux_insert (qse_mux_t* mux, const qse_mux_evt_t* evt)
 	*mux->me.ptr[evt->hnd] = *evt;
 	mux->ee.len++;
 	return 0;
 #elif defined(__OS2__)
 	mux->errnum = QSE_MUX_ENOIMPL;
 	return -1;
 #else
 	/* TODO: */
 	mux->errnum = QSE_MUX_ENOIMPL;
@ -526,6 +544,12 @@ done:
 	mux->ee.len--;
 	return 0;
 #elif defined(__OS2__)
 	/* TODO */
 	mux->errnum = QSE_MUX_ENOIMPL;
 	return -1;
 #else
 	/* TODO */
 	mux->errnum = QSE_MUX_ENOIMPL;
@ -550,6 +574,8 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout)
 	{
 	#if defined(_WIN32)
 		mux->errnum = syserr_to_errnum(WSAGetLastError());
 	#elif defined(__OS2__)
 		mux->errnum = syserr_to_errnum(sock_errno());
 	#else
 		mux->errnum = syserr_to_errnum(errno);
 	#endif
@ -614,6 +640,27 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout)
 	return nfds;
 #elif defined(__OS2__)
 	/*
 	long tv;
 	int n;
 	tv = QSE_SEC_TO_MSEC(nwio->tmout.r.sec) + QSE_NSEC_TO_MSEC (nwio->tmout.r.nsec);
 	n = os2_select (handle_array, read_count, write_count, 0, &tv);
 	if (n < = 1)
 	{
 		mux->errnum = syserr_to_errnum(sock_errno());
 		return -1;
 	}
 	return n;
 	*/
 	mux->errnum = QSE_MUX_ENOIMPL;
 	return -1;
 #else
 	/* TODO */
 	mux->errnum = QSE_MUX_ENOIMPL;
--- a/qse/lib/cmn/nwio.c
+++ b/qse/lib/cmn/nwio.c
@ -307,13 +307,15 @@ static int preset_tmout (qse_nwio_t* nwio)
 #if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO)
 	#if defined(_WIN32)
 	DWORD tv;
 	#elif defined(__OS2__)
 	long	tv;
 	#else
 	struct timeval tv;
 	#endif
 	if (TMOUT_ENABLED(nwio->tmout.r))
 	{
-	#if defined(_WIN32)
+	#if defined(_WIN32) || defined(__OS2__)
 		tv = QSE_SEC_TO_MSEC(nwio->tmout.r.sec) + QSE_NSEC_TO_MSEC (nwio->tmout.r.nsec);
 	#else
 		tv.tv_sec = nwio->tmout.r.sec;
@ -322,6 +324,13 @@ static int preset_tmout (qse_nwio_t* nwio)
 		if (setsockopt (nwio->handle, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, QSE_SIZEOF(tv)) <= -1)
 		{
 	#if defined(_WIN32)
 			nwio->errnum = syserr_to_errnum (WSAGetLastError());
 	#elif defined(__OS2__)
 			nwio->errnum = syserr_to_errnum (sock_errno());
 	#else
 			nwio->errnum = syserr_to_errnum (errno);
 	#endif
 			return -1; /* tried to set but failed */
 		}
@ -330,7 +339,7 @@ static int preset_tmout (qse_nwio_t* nwio)
 	if (TMOUT_ENABLED(nwio->tmout.w))
 	{
-	#if defined(_WIN32)
+	#if defined(_WIN32) || defined(__OS2__)
 		tv = QSE_SEC_TO_MSEC(nwio->tmout.w.sec) + QSE_NSEC_TO_MSEC (nwio->tmout.w.nsec);
 	#else
 		tv.tv_sec = nwio->tmout.w.sec;
@ -338,6 +347,13 @@ static int preset_tmout (qse_nwio_t* nwio)
 	#endif
 		if (setsockopt (nwio->handle, SOL_SOCKET, SO_SNDTIMEO, (void*)&tv, QSE_SIZEOF(tv)) <= -1)
 		{
 	#if defined(_WIN32)
 			nwio->errnum = syserr_to_errnum (WSAGetLastError());
 	#elif defined(__OS2__)
 			nwio->errnum = syserr_to_errnum (sock_errno());
 	#else
 			nwio->errnum = syserr_to_errnum (errno);
 	#endif
 			return -1; /* tried to set but failed */
 		}
--- a/qse/lib/cmn/uni.c
+++ b/qse/lib/cmn/uni.c
--- a/qse/lib/net/httpd-std.c
+++ b/qse/lib/net/httpd-std.c
@ -41,7 +41,16 @@
 #	define EPOCH_DIFF_SECS  ((qse_long_t)EPOCH_DIFF_DAYS*24*60*60)
 #elif defined(__OS2__)
-	/* TODO */
+#	define INCL_DOSERRORS
 #	define INCL_DOSFILEMGR
 #	include <os2.h>
 #	include <types.h>
 #	include <sys/socket.h>
 #	include <netinet/in.h>
 #	include <tcpustd.h>
 #	include <sys/ioctl.h>
 #	include <nerrno.h>
 #	pragma library("tcpip32.lib")
 #elif defined(__DOS__)
 	/* TODO */
@ -236,7 +245,7 @@ static qse_httpd_errnum_t syserr_to_errnum (int e)
 #define MAX_SEND_SIZE 4096
-static qse_ssize_t send_file (
+static qse_ssize_t __send_file (
 	int out_fd, qse_ubi_t in_fd, qse_foff_t* offset, qse_size_t count)
 {
 #if defined(HAVE_SENDFILE) && defined(HAVE_SENDFILE64)
@ -325,7 +334,7 @@ on failure xfer != n.
 /* ------------------------------------------------------------------- */
 #if defined(HAVE_SSL)
-static qse_ssize_t send_file_ssl (
+static qse_ssize_t __send_file_ssl (
 	SSL* out, qse_ubi_t in_fd, qse_foff_t* offset, qse_size_t count)
 {
 	qse_mchar_t buf[MAX_SEND_SIZE];
@ -950,28 +959,43 @@ static int mux_poll (qse_httpd_t* httpd, void* vmux, const qse_ntime_t* tmout)
 static int mux_readable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t* tmout)
 {
 #if defined(__OS2__)
 	long tv;
 	tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1;
 	return os2_select (&handle.i, 1, 0, 0, tv);
 #else
 	fd_set r;
 	struct timeval tv, * tvp;
 	if (tmout)
 	{
 		tv.tv_sec = tmout->sec;
 		tv.tv_usec = tmout->nsec;
 		tvp = &tv;
 	}
 	else tvp = QSE_NULL;
 	FD_ZERO (&r);
 	FD_SET (handle.i, &r);
 	if (tmout)
 	{
 		tv.tv_sec = tmout->sec;
 		tv.tv_usec = tmout->nsec;
 		tvp = &tv;
 	}
 	else tvp = QSE_NULL;
 	return select (handle.i + 1, &r, QSE_NULL, QSE_NULL, tvp);
 #endif
 }
 static int mux_writable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t* tmout)
 {
 #if defined(__OS2__)
 	long tv;
 	tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1;
 	return os2_select (&handle.i, 0, 1, 0, tv);
 #else
 	fd_set w;
 	struct timeval tv, * tvp;
 	FD_ZERO (&w);
 	FD_SET (handle.i, &w);
 	if (tmout)
 	{
 		tv.tv_sec = tmout->sec;
@ -980,10 +1004,8 @@ static int mux_writable (qse_httpd_t* httpd, qse_ubi_t handle, const qse_ntime_t
 	}
 	else tvp = QSE_NULL;
 	FD_ZERO (&w);
 	FD_SET (handle.i, &w);
 	return select (handle.i + 1, QSE_NULL, &w, QSE_NULL, tvp);
 #endif
 }
 /* ------------------------------------------------------------------- */
@ -1034,17 +1056,19 @@ static int stat_file (
 #elif defined(__OS2__)
 	APIRET rc;
 	HDIR h;
 	FILEFINDBUF3L ffb;
 	ULONG count;
 	qse_btime_t bt;
 	qse_ntime_t nt;
 #if 0
 	HDIR h;
 	ULONG count;
 	/* fail if the path name contains a wilecard letter */
 	if (qse_mbspbrk (path, QSE_MT("?*")) != QSE_NULL) return -1;
 	rc = DosFindFirst (
-		mptr,
+		path,
 		&h,
 		FILE_DIRECTORY | FILE_READONLY,
 		&ffb,
@ -1053,7 +1077,10 @@ static int stat_file (
 		FIL_STANDARDL);
 	if (rc != NO_ERROR) return -1;
-	DosFindClose (&h);
+	DosFindClose (h);
 #endif
 	rc = DosQueryPathInfo (path, FIL_STANDARDL, &ffb, QSE_SIZEOF(ffb));
 	if (rc != NO_ERROR) return -1;
 	QSE_MEMSET (&bt, 0, QSE_SIZEOF(bt));
 	bt.mday = ffb.fdateLastWrite.day;
@ -1067,9 +1094,22 @@ static int stat_file (
 	QSE_MEMSET (hst, 0, QSE_SIZEOF(*hst));
 	if (ffb.attrFile & FILE_DIRECTORY) hst->isdir = 1;
-	hst->size = ffb.cbFile;
+	hst->size = ((qse_foff_t)ffb.cbFile.ulHi << 32) | ffb.cbFile.ulLo;
 	hst->mtime = nt;
 	if (path[0] != QSE_MT('\0') && path[1] == QSE_MT(':'))
 	{
 		if (path[0] >= QSE_MT('a') && path[0] <= QSE_MT('z')) 
 			hst->dev = path[0] - QSE_MT('a');
 		else if (path[0] >= QSE_MT('A') && path[0] <= QSE_MT('Z')) 
 			hst->dev = path[0] - QSE_MT('A');
 	}
 	else
 	{
 		ULONG num, map;
 		if (DosQueryCurrentDisk (&num, &map) == NO_ERROR) hst->dev = num - 1;
 	}
 	return 0;
 #elif defined(__DOS__)
@ -1372,14 +1412,14 @@ static qse_ssize_t client_sendfile (
 	if (client->status & CLIENT_SECURE)
 	{
 #if defined(HAVE_SSL)
-		return send_file_ssl (client->handle2.ptr, handle, offset, count);
+		return __send_file_ssl (client->handle2.ptr, handle, offset, count);
 #else
 		return -1;
 #endif
 	}
 	else
 	{
-		return send_file (client->handle.i, handle, offset, count);
+		return __send_file (client->handle.i, handle, offset, count);
 	}
 }
--- a/qse/lib/net/httpd-task.c
+++ b/qse/lib/net/httpd-task.c
@ -223,19 +223,23 @@ static qse_httpd_task_t* entask_status (
 	const qse_mchar_t* extrapst = QSE_MT("");
 	const qse_mchar_t* extraval = QSE_MT("");
-	qse_mchar_t text[1024] = QSE_MT(""); /* TODO: make this buffer dynamic or scalable */
+	qse_mchar_t text[1024]; /* TODO: make this buffer dynamic or scalable */
 	msg = qse_httpstatustombs (code);
 	if (code == 301 || code == 307) 
 	{
-		status_reloc_t* reloc = (status_reloc_t*)extra;
+		status_reloc_t* reloc;
 		reloc = (status_reloc_t*)extra;
 		extrapre = QSE_MT("Location: ");
 		extrapst = reloc->redir? QSE_MT("/\r\n"): QSE_MT("\r\n");
 		extraval = reloc->dst;
 		text[0] = QSE_MT('\0');
 	}
 	else if (code == 304)
 	{
-		/* nothing to do */
+		text[0] = QSE_MT('\0');
 	}
 	else
 	{
--- a/qse/samples/net/httpd02.c
+++ b/qse/samples/net/httpd02.c
@ -277,7 +277,7 @@ int qse_main (int argc, qse_achar_t* argv[])
 	SSL_library_init ();
 #endif
-     ret = qse_runmain (argc, argv, httpd_main);
+	ret = qse_runmain (argc, argv, httpd_main);
 #if defined(HAVE_SSL)
 	/*ERR_remove_state ();*/
--- a/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/debug/dos32/lib/cmn/qsecmn.tgt
@ -42,7 +42,7 @@ WVList
 0
 10
 WPickList
-89
+91
 11
 MItem
 3
@ -95,8 +95,8 @@ WVList
 0
 23
 MItem
-33
+35
-../../../../../lib/cmn/alg-rand.c
+../../../../../lib/cmn/alg-base64.c
 24
 WString
 4
@ -113,8 +113,8 @@ WVList
 0
 27
 MItem
-35
+33
-../../../../../lib/cmn/alg-search.c
+../../../../../lib/cmn/alg-rand.c
 28
 WString
 4
@ -131,8 +131,8 @@ WVList
 0
 31
 MItem
-33
+35
-../../../../../lib/cmn/alg-sort.c
+../../../../../lib/cmn/alg-search.c
 32
 WString
 4
@ -149,8 +149,8 @@ WVList
 0
 35
 MItem
-31
+33
-../../../../../lib/cmn/assert.c
+../../../../../lib/cmn/alg-sort.c
 36
 WString
 4
@ -167,8 +167,8 @@ WVList
 0
 39
 MItem
-28
+31
-../../../../../lib/cmn/chr.c
+../../../../../lib/cmn/assert.c
 40
 WString
 4
@ -185,8 +185,8 @@ WVList
 0
 43
 MItem
-30
+28
-../../../../../lib/cmn/cp949.c
+../../../../../lib/cmn/chr.c
 44
 WString
 4
@ -204,7 +204,7 @@ WVList
 47
 MItem
 30
-../../../../../lib/cmn/cp950.c
+../../../../../lib/cmn/cp949.c
 48
 WString
 4
@ -221,8 +221,8 @@ WVList
 0
 51
 MItem
-28
+30
-../../../../../lib/cmn/dir.c
+../../../../../lib/cmn/cp950.c
 52
 WString
 4
@ -240,7 +240,7 @@ WVList
 55
 MItem
 28
-../../../../../lib/cmn/dll.c
+../../../../../lib/cmn/dir.c
 56
 WString
 4
@ -258,7 +258,7 @@ WVList
 59
 MItem
 28
-../../../../../lib/cmn/env.c
+../../../../../lib/cmn/dll.c
 60
 WString
 4
@ -276,7 +276,7 @@ WVList
 63
 MItem
 28
-../../../../../lib/cmn/fio.c
+../../../../../lib/cmn/env.c
 64
 WString
 4
@ -294,7 +294,7 @@ WVList
 67
 MItem
 28
-../../../../../lib/cmn/fma.c
+../../../../../lib/cmn/fio.c
 68
 WString
 4
@ -312,7 +312,7 @@ WVList
 71
 MItem
 28
-../../../../../lib/cmn/fmt.c
+../../../../../lib/cmn/fma.c
 72
 WString
 4
@ -329,8 +329,8 @@ WVList
 0
 75
 MItem
-31
+28
-../../../../../lib/cmn/fs-err.c
+../../../../../lib/cmn/fmt.c
 76
 WString
 4
@ -347,8 +347,8 @@ WVList
 0
 79
 MItem
-32
+31
-../../../../../lib/cmn/fs-move.c
+../../../../../lib/cmn/fs-err.c
 80
 WString
 4
@ -365,8 +365,8 @@ WVList
 0
 83
 MItem
-27
+32
-../../../../../lib/cmn/fs.c
+../../../../../lib/cmn/fs-move.c
 84
 WString
 4
@ -383,8 +383,8 @@ WVList
 0
 87
 MItem
-28
+27
-../../../../../lib/cmn/gdl.c
+../../../../../lib/cmn/fs.c
 88
 WString
 4
@ -401,8 +401,8 @@ WVList
 0
 91
 MItem
-29
+28
-../../../../../lib/cmn/glob.c
+../../../../../lib/cmn/gdl.c
 92
 WString
 4
@ -419,8 +419,8 @@ WVList
 0
 95
 MItem
-28
+29
-../../../../../lib/cmn/htb.c
+../../../../../lib/cmn/glob.c
 96
 WString
 4
@ -437,8 +437,8 @@ WVList
 0
 99
 MItem
-29
+28
-../../../../../lib/cmn/hton.c
+../../../../../lib/cmn/htb.c
 100
 WString
 4
@ -456,7 +456,7 @@ WVList
 103
 MItem
 29
-../../../../../lib/cmn/ipad.c
+../../../../../lib/cmn/hton.c
 104
 WString
 4
@ -473,8 +473,8 @@ WVList
 0
 107
 MItem
-28
+29
-../../../../../lib/cmn/lda.c
+../../../../../lib/cmn/ipad.c
 108
 WString
 4
@ -491,8 +491,8 @@ WVList
 0
 111
 MItem
-29
+28
-../../../../../lib/cmn/main.c
+../../../../../lib/cmn/lda.c
 112
 WString
 4
@ -509,8 +509,8 @@ WVList
 0
 115
 MItem
-33
+29
-../../../../../lib/cmn/mbwc-str.c
+../../../../../lib/cmn/main.c
 116
 WString
 4
@ -527,8 +527,8 @@ WVList
 0
 119
 MItem
-29
+33
-../../../../../lib/cmn/mbwc.c
+../../../../../lib/cmn/mbwc-str.c
 120
 WString
 4
@ -545,8 +545,8 @@ WVList
 0
 123
 MItem
-28
+29
-../../../../../lib/cmn/mem.c
+../../../../../lib/cmn/mbwc.c
 124
 WString
 4
@ -564,7 +564,7 @@ WVList
 127
 MItem
 28
-../../../../../lib/cmn/mux.c
+../../../../../lib/cmn/mem.c
 128
 WString
 4
@ -581,8 +581,8 @@ WVList
 0
 131
 MItem
-34
+28
-../../../../../lib/cmn/nwad-skad.c
+../../../../../lib/cmn/mux.c
 132
 WString
 4
@ -599,8 +599,8 @@ WVList
 0
 135
 MItem
-29
+34
-../../../../../lib/cmn/nwad.c
+../../../../../lib/cmn/nwad-skad.c
 136
 WString
 4
@ -617,8 +617,8 @@ WVList
 0
 139
 MItem
-33
+29
-../../../../../lib/cmn/nwif-cfg.c
+../../../../../lib/cmn/nwad.c
 140
 WString
 4
@ -635,8 +635,8 @@ WVList
 0
 143
 MItem
-29
+33
-../../../../../lib/cmn/nwif.c
+../../../../../lib/cmn/nwif-cfg.c
 144
 WString
 4
@ -654,7 +654,7 @@ WVList
 147
 MItem
 29
-../../../../../lib/cmn/nwio.c
+../../../../../lib/cmn/nwif.c
 148
 WString
 4
@ -671,8 +671,8 @@ WVList
 0
 151
 MItem
-28
+29
-../../../../../lib/cmn/oht.c
+../../../../../lib/cmn/nwio.c
 152
 WString
 4
@ -690,7 +690,7 @@ WVList
 155
 MItem
 28
-../../../../../lib/cmn/opt.c
+../../../../../lib/cmn/oht.c
 156
 WString
 4
@ -707,8 +707,8 @@ WVList
 0
 159
 MItem
-38
+28
-../../../../../lib/cmn/path-basename.c
+../../../../../lib/cmn/opt.c
 160
 WString
 4
@ -725,8 +725,8 @@ WVList
 0
 163
 MItem
-35
+38
-../../../../../lib/cmn/path-canon.c
+../../../../../lib/cmn/path-basename.c
 164
 WString
 4
@ -743,8 +743,8 @@ WVList
 0
 167
 MItem
-28
+35
-../../../../../lib/cmn/pio.c
+../../../../../lib/cmn/path-canon.c
 168
 WString
 4
@ -762,7 +762,7 @@ WVList
 171
 MItem
 28
-../../../../../lib/cmn/pma.c
+../../../../../lib/cmn/pio.c
 172
 WString
 4
@ -780,7 +780,7 @@ WVList
 175
 MItem
 28
-../../../../../lib/cmn/rbt.c
+../../../../../lib/cmn/pma.c
 176
 WString
 4
@ -798,7 +798,7 @@ WVList
 179
 MItem
 28
-../../../../../lib/cmn/rex.c
+../../../../../lib/cmn/rbt.c
 180
 WString
 4
@ -816,7 +816,7 @@ WVList
 183
 MItem
 28
-../../../../../lib/cmn/sio.c
+../../../../../lib/cmn/rex.c
 184
 WString
 4
@ -834,7 +834,7 @@ WVList
 187
 MItem
 28
-../../../../../lib/cmn/sll.c
+../../../../../lib/cmn/sio.c
 188
 WString
 4
@ -851,8 +851,8 @@ WVList
 0
 191
 MItem
-29
+28
-../../../../../lib/cmn/slmb.c
+../../../../../lib/cmn/sll.c
 192
 WString
 4
@ -869,8 +869,8 @@ WVList
 0
 195
 MItem
-30
+29
-../../../../../lib/cmn/stdio.c
+../../../../../lib/cmn/slmb.c
 196
 WString
 4
@ -887,8 +887,8 @@ WVList
 0
 199
 MItem
-32
+30
-../../../../../lib/cmn/str-beg.c
+../../../../../lib/cmn/stdio.c
 200
 WString
 4
@ -906,7 +906,7 @@ WVList
 203
 MItem
 32
-../../../../../lib/cmn/str-cat.c
+../../../../../lib/cmn/str-beg.c
 204
 WString
 4
@ -924,7 +924,7 @@ WVList
 207
 MItem
 32
-../../../../../lib/cmn/str-chr.c
+../../../../../lib/cmn/str-cat.c
 208
 WString
 4
@ -942,7 +942,7 @@ WVList
 211
 MItem
 32
-../../../../../lib/cmn/str-cmp.c
+../../../../../lib/cmn/str-chr.c
 212
 WString
 4
@ -960,7 +960,7 @@ WVList
 215
 MItem
 32
-../../../../../lib/cmn/str-cnv.c
+../../../../../lib/cmn/str-cmp.c
 216
 WString
 4
@ -978,7 +978,7 @@ WVList
 219
 MItem
 32
-../../../../../lib/cmn/str-cpy.c
+../../../../../lib/cmn/str-cnv.c
 220
 WString
 4
@ -996,7 +996,7 @@ WVList
 223
 MItem
 32
-../../../../../lib/cmn/str-del.c
+../../../../../lib/cmn/str-cpy.c
 224
 WString
 4
@ -1014,7 +1014,7 @@ WVList
 227
 MItem
 32
-../../../../../lib/cmn/str-dup.c
+../../../../../lib/cmn/str-del.c
 228
 WString
 4
@ -1031,8 +1031,8 @@ WVList
 0
 231
 MItem
-33
+32
-../../../../../lib/cmn/str-dynm.c
+../../../../../lib/cmn/str-dup.c
 232
 WString
 4
@ -1050,7 +1050,7 @@ WVList
 235
 MItem
 33
-../../../../../lib/cmn/str-dynw.c
+../../../../../lib/cmn/str-dynm.c
 236
 WString
 4
@ -1067,8 +1067,8 @@ WVList
 0
 239
 MItem
-32
+33
-../../../../../lib/cmn/str-end.c
+../../../../../lib/cmn/str-dynw.c
 240
 WString
 4
@ -1085,8 +1085,8 @@ WVList
 0
 243
 MItem
-33
+32
-../../../../../lib/cmn/str-excl.c
+../../../../../lib/cmn/str-end.c
 244
 WString
 4
@ -1104,7 +1104,7 @@ WVList
 247
 MItem
 33
-../../../../../lib/cmn/str-fcpy.c
+../../../../../lib/cmn/str-excl.c
 248
 WString
 4
@ -1121,8 +1121,8 @@ WVList
 0
 251
 MItem
-34
+33
-../../../../../lib/cmn/str-fnmat.c
+../../../../../lib/cmn/str-fcpy.c
 252
 WString
 4
@ -1139,8 +1139,8 @@ WVList
 0
 255
 MItem
-33
+34
-../../../../../lib/cmn/str-incl.c
+../../../../../lib/cmn/str-fnmat.c
 256
 WString
 4
@ -1157,8 +1157,8 @@ WVList
 0
 259
 MItem
-32
+33
-../../../../../lib/cmn/str-len.c
+../../../../../lib/cmn/str-incl.c
 260
 WString
 4
@ -1176,7 +1176,7 @@ WVList
 263
 MItem
 32
-../../../../../lib/cmn/str-pac.c
+../../../../../lib/cmn/str-len.c
 264
 WString
 4
@ -1193,8 +1193,8 @@ WVList
 0
 267
 MItem
-33
+32
-../../../../../lib/cmn/str-pbrk.c
+../../../../../lib/cmn/str-pac.c
 268
 WString
 4
@ -1211,8 +1211,8 @@ WVList
 0
 271
 MItem
-32
+33
-../../../../../lib/cmn/str-put.c
+../../../../../lib/cmn/str-pbrk.c
 272
 WString
 4
@ -1230,7 +1230,7 @@ WVList
 275
 MItem
 32
-../../../../../lib/cmn/str-rev.c
+../../../../../lib/cmn/str-put.c
 276
 WString
 4
@ -1248,7 +1248,7 @@ WVList
 279
 MItem
 32
-../../../../../lib/cmn/str-rot.c
+../../../../../lib/cmn/str-rev.c
 280
 WString
 4
@ -1266,7 +1266,7 @@ WVList
 283
 MItem
 32
-../../../../../lib/cmn/str-set.c
+../../../../../lib/cmn/str-rot.c
 284
 WString
 4
@ -1284,7 +1284,7 @@ WVList
 287
 MItem
 32
-../../../../../lib/cmn/str-spl.c
+../../../../../lib/cmn/str-set.c
 288
 WString
 4
@ -1302,7 +1302,7 @@ WVList
 291
 MItem
 32
-../../../../../lib/cmn/str-spn.c
+../../../../../lib/cmn/str-spl.c
 292
 WString
 4
@ -1320,7 +1320,7 @@ WVList
 295
 MItem
 32
-../../../../../lib/cmn/str-str.c
+../../../../../lib/cmn/str-spn.c
 296
 WString
 4
@ -1337,8 +1337,8 @@ WVList
 0
 299
 MItem
-34
+32
-../../../../../lib/cmn/str-subst.c
+../../../../../lib/cmn/str-str.c
 300
 WString
 4
@ -1355,8 +1355,8 @@ WVList
 0
 303
 MItem
-32
+34
-../../../../../lib/cmn/str-tok.c
+../../../../../lib/cmn/str-subst.c
 304
 WString
 4
@ -1374,7 +1374,7 @@ WVList
 307
 MItem
 32
-../../../../../lib/cmn/str-trm.c
+../../../../../lib/cmn/str-tok.c
 308
 WString
 4
@ -1391,8 +1391,8 @@ WVList
 0
 311
 MItem
-33
+32
-../../../../../lib/cmn/str-word.c
+../../../../../lib/cmn/str-trm.c
 312
 WString
 4
@ -1409,8 +1409,8 @@ WVList
 0
 315
 MItem
-29
+33
-../../../../../lib/cmn/task.c
+../../../../../lib/cmn/str-word.c
 316
 WString
 4
@ -1428,7 +1428,7 @@ WVList
 319
 MItem
 29
-../../../../../lib/cmn/time.c
+../../../../../lib/cmn/task.c
 320
 WString
 4
@ -1445,8 +1445,8 @@ WVList
 0
 323
 MItem
-28
+29
-../../../../../lib/cmn/tio.c
+../../../../../lib/cmn/time.c
 324
 WString
 4
@ -1463,8 +1463,8 @@ WVList
 0
 327
 MItem
-32
+28
-../../../../../lib/cmn/tre-ast.c
+../../../../../lib/cmn/tio.c
 328
 WString
 4
@ -1481,8 +1481,8 @@ WVList
 0
 331
 MItem
-36
+32
-../../../../../lib/cmn/tre-compile.c
+../../../../../lib/cmn/tre-ast.c
 332
 WString
 4
@ -1499,8 +1499,8 @@ WVList
 0
 335
 MItem
-44
+36
-../../../../../lib/cmn/tre-match-backtrack.c
+../../../../../lib/cmn/tre-compile.c
 336
 WString
 4
@ -1517,8 +1517,8 @@ WVList
 0
 339
 MItem
-43
+44
-../../../../../lib/cmn/tre-match-parallel.c
+../../../../../lib/cmn/tre-match-backtrack.c
 340
 WString
 4
@ -1535,8 +1535,8 @@ WVList
 0
 343
 MItem
-34
+43
-../../../../../lib/cmn/tre-parse.c
+../../../../../lib/cmn/tre-match-parallel.c
 344
 WString
 4
@ -1554,7 +1554,7 @@ WVList
 347
 MItem
 34
-../../../../../lib/cmn/tre-stack.c
+../../../../../lib/cmn/tre-parse.c
 348
 WString
 4
@ -1571,8 +1571,8 @@ WVList
 0
 351
 MItem
-28
+34
-../../../../../lib/cmn/tre.c
+../../../../../lib/cmn/tre-stack.c
 352
 WString
 4
@ -1589,8 +1589,8 @@ WVList
 0
 355
 MItem
-29
+28
-../../../../../lib/cmn/utf8.c
+../../../../../lib/cmn/tre.c
 356
 WString
 4
@ -1608,7 +1608,7 @@ WVList
 359
 MItem
 28
-../../../../../lib/cmn/xma.c
+../../../../../lib/cmn/uri.c
 360
 WString
 4
@ -1625,44 +1625,44 @@ WVList
 0
 363
 MItem
-3
+29
-*.h
+../../../../../lib/cmn/utf8.c
 364
 WString
-3
+4
-NIL
+COBJ
 365
 WVList
 0
 366
 WVList
 0
-1
+11
 1
 1
 0
 367
 MItem
 28
-../../../../../lib/cmn/mem.h
+../../../../../lib/cmn/xma.c
 368
 WString
-3
+4
-NIL
+COBJ
 369
 WVList
 0
 370
 WVList
 0
-363
+11
 1
 1
 0
 371
 MItem
-32
+3
-../../../../../lib/cmn/syscall.h
+*.h
 372
 WString
 3
@ -1673,7 +1673,43 @@ WVList
 374
 WVList
 0
-363
+-1
 1
 1
 0
 375
 MItem
 28
 ../../../../../lib/cmn/mem.h
 376
 WString
 3
 NIL
 377
 WVList
 0
 378
 WVList
 0
 371
 1
 1
 0
 379
 MItem
 32
 ../../../../../lib/cmn/syscall.h
 380
 WString
 3
 NIL
 381
 WVList
 0
 382
 WVList
 0
 371
 1
 1
 0
--- a/qse/watcom/debug/os2/cmd/net/qsehttpd.tgt
+++ b/qse/watcom/debug/os2/cmd/net/qsehttpd.tgt
@ -0,0 +1,145 @@
 40
 targetIdent
 0
 MProject
 1
 MComponent
 0
 2
 WString
 4
 OEXE
 3
 WString
 5
 oc2eo
 1
 0
 1
 4
 MCommand
 0
 5
 MCommand
 0
 6
 MItem
 12
 qsehttpd.exe
 7
 WString
 4
 OEXE
 8
 WVList
 2
 9
 MVState
 10
 WString
 7
 OS2LINK
 11
 WString
 28
 ?????Library directories(;):
 1
 12
 WString
 27
 ../../lib/cmn ../../lib/net
 0
 13
 MVState
 14
 WString
 7
 OS2LINK
 15
 WString
 18
 ?????Libraries(,):
 1
 16
 WString
 13
 qsecmn qsenet
 0
 17
 WVList
 0
 -1
 1
 1
 0
 18
 WPickList
 2
 19
 MItem
 3
 *.c
 20
 WString
 4
 COBJ
 21
 WVList
 2
 22
 MVState
 23
 WString
 3
 WCC
 24
 WString
 25
 o?2??Include directories:
 1
 25
 WString
 54
 "$(%watcom)/h;$(%watcom)/h/os2;../../../../../include"
 0
 26
 MVState
 27
 WString
 3
 WCC
 28
 WString
 23
 ?????Macro definitions:
 1
 29
 WString
 15
 QSE_BUILD_DEBUG
 0
 30
 WVList
 0
 -1
 1
 1
 0
 31
 MItem
 30
 ../../../../../cmd/net/httpd.c
 32
 WString
 4
 COBJ
 33
 WVList
 0
 34
 WVList
 0
 19
 1
 1
 0
--- a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
@ -42,7 +42,7 @@ WVList
 0
 10
 WPickList
-89
+91
 11
 MItem
 3
@ -107,8 +107,8 @@ WVList
 0
 26
 MItem
-33
+35
-../../../../../lib/cmn/alg-rand.c
+../../../../../lib/cmn/alg-base64.c
 27
 WString
 4
@ -125,8 +125,8 @@ WVList
 0
 30
 MItem
-35
+33
-../../../../../lib/cmn/alg-search.c
+../../../../../lib/cmn/alg-rand.c
 31
 WString
 4
@ -143,8 +143,8 @@ WVList
 0
 34
 MItem
-33
+35
-../../../../../lib/cmn/alg-sort.c
+../../../../../lib/cmn/alg-search.c
 35
 WString
 4
@ -161,8 +161,8 @@ WVList
 0
 38
 MItem
-31
+33
-../../../../../lib/cmn/assert.c
+../../../../../lib/cmn/alg-sort.c
 39
 WString
 4
@ -179,8 +179,8 @@ WVList
 0
 42
 MItem
-28
+31
-../../../../../lib/cmn/chr.c
+../../../../../lib/cmn/assert.c
 43
 WString
 4
@ -197,8 +197,8 @@ WVList
 0
 46
 MItem
-30
+28
-../../../../../lib/cmn/cp949.c
+../../../../../lib/cmn/chr.c
 47
 WString
 4
@ -216,7 +216,7 @@ WVList
 50
 MItem
 30
-../../../../../lib/cmn/cp950.c
+../../../../../lib/cmn/cp949.c
 51
 WString
 4
@ -233,8 +233,8 @@ WVList
 0
 54
 MItem
-28
+30
-../../../../../lib/cmn/dir.c
+../../../../../lib/cmn/cp950.c
 55
 WString
 4
@ -252,7 +252,7 @@ WVList
 58
 MItem
 28
-../../../../../lib/cmn/dll.c
+../../../../../lib/cmn/dir.c
 59
 WString
 4
@ -270,7 +270,7 @@ WVList
 62
 MItem
 28
-../../../../../lib/cmn/env.c
+../../../../../lib/cmn/dll.c
 63
 WString
 4
@ -288,7 +288,7 @@ WVList
 66
 MItem
 28
-../../../../../lib/cmn/fio.c
+../../../../../lib/cmn/env.c
 67
 WString
 4
@ -306,7 +306,7 @@ WVList
 70
 MItem
 28
-../../../../../lib/cmn/fma.c
+../../../../../lib/cmn/fio.c
 71
 WString
 4
@ -324,7 +324,7 @@ WVList
 74
 MItem
 28
-../../../../../lib/cmn/fmt.c
+../../../../../lib/cmn/fma.c
 75
 WString
 4
@ -341,8 +341,8 @@ WVList
 0
 78
 MItem
-31
+28
-../../../../../lib/cmn/fs-err.c
+../../../../../lib/cmn/fmt.c
 79
 WString
 4
@ -359,8 +359,8 @@ WVList
 0
 82
 MItem
-32
+31
-../../../../../lib/cmn/fs-move.c
+../../../../../lib/cmn/fs-err.c
 83
 WString
 4
@ -377,8 +377,8 @@ WVList
 0
 86
 MItem
-27
+32
-../../../../../lib/cmn/fs.c
+../../../../../lib/cmn/fs-move.c
 87
 WString
 4
@ -395,8 +395,8 @@ WVList
 0
 90
 MItem
-28
+27
-../../../../../lib/cmn/gdl.c
+../../../../../lib/cmn/fs.c
 91
 WString
 4
@ -413,8 +413,8 @@ WVList
 0
 94
 MItem
-29
+28
-../../../../../lib/cmn/glob.c
+../../../../../lib/cmn/gdl.c
 95
 WString
 4
@ -431,8 +431,8 @@ WVList
 0
 98
 MItem
-28
+29
-../../../../../lib/cmn/htb.c
+../../../../../lib/cmn/glob.c
 99
 WString
 4
@ -449,8 +449,8 @@ WVList
 0
 102
 MItem
-29
+28
-../../../../../lib/cmn/hton.c
+../../../../../lib/cmn/htb.c
 103
 WString
 4
@ -468,7 +468,7 @@ WVList
 106
 MItem
 29
-../../../../../lib/cmn/ipad.c
+../../../../../lib/cmn/hton.c
 107
 WString
 4
@ -485,8 +485,8 @@ WVList
 0
 110
 MItem
-28
+29
-../../../../../lib/cmn/lda.c
+../../../../../lib/cmn/ipad.c
 111
 WString
 4
@ -503,8 +503,8 @@ WVList
 0
 114
 MItem
-29
+28
-../../../../../lib/cmn/main.c
+../../../../../lib/cmn/lda.c
 115
 WString
 4
@ -521,8 +521,8 @@ WVList
 0
 118
 MItem
-33
+29
-../../../../../lib/cmn/mbwc-str.c
+../../../../../lib/cmn/main.c
 119
 WString
 4
@ -539,8 +539,8 @@ WVList
 0
 122
 MItem
-29
+33
-../../../../../lib/cmn/mbwc.c
+../../../../../lib/cmn/mbwc-str.c
 123
 WString
 4
@ -557,8 +557,8 @@ WVList
 0
 126
 MItem
-28
+29
-../../../../../lib/cmn/mem.c
+../../../../../lib/cmn/mbwc.c
 127
 WString
 4
@ -576,7 +576,7 @@ WVList
 130
 MItem
 28
-../../../../../lib/cmn/mux.c
+../../../../../lib/cmn/mem.c
 131
 WString
 4
@ -593,8 +593,8 @@ WVList
 0
 134
 MItem
-34
+28
-../../../../../lib/cmn/nwad-skad.c
+../../../../../lib/cmn/mux.c
 135
 WString
 4
@ -611,8 +611,8 @@ WVList
 0
 138
 MItem
-29
+34
-../../../../../lib/cmn/nwad.c
+../../../../../lib/cmn/nwad-skad.c
 139
 WString
 4
@ -629,8 +629,8 @@ WVList
 0
 142
 MItem
-33
+29
-../../../../../lib/cmn/nwif-cfg.c
+../../../../../lib/cmn/nwad.c
 143
 WString
 4
@ -647,8 +647,8 @@ WVList
 0
 146
 MItem
-29
+33
-../../../../../lib/cmn/nwif.c
+../../../../../lib/cmn/nwif-cfg.c
 147
 WString
 4
@ -666,7 +666,7 @@ WVList
 150
 MItem
 29
-../../../../../lib/cmn/nwio.c
+../../../../../lib/cmn/nwif.c
 151
 WString
 4
@ -683,8 +683,8 @@ WVList
 0
 154
 MItem
-28
+29
-../../../../../lib/cmn/oht.c
+../../../../../lib/cmn/nwio.c
 155
 WString
 4
@ -702,7 +702,7 @@ WVList
 158
 MItem
 28
-../../../../../lib/cmn/opt.c
+../../../../../lib/cmn/oht.c
 159
 WString
 4
@ -719,8 +719,8 @@ WVList
 0
 162
 MItem
-38
+28
-../../../../../lib/cmn/path-basename.c
+../../../../../lib/cmn/opt.c
 163
 WString
 4
@ -737,8 +737,8 @@ WVList
 0
 166
 MItem
-35
+38
-../../../../../lib/cmn/path-canon.c
+../../../../../lib/cmn/path-basename.c
 167
 WString
 4
@ -755,8 +755,8 @@ WVList
 0
 170
 MItem
-28
+35
-../../../../../lib/cmn/pio.c
+../../../../../lib/cmn/path-canon.c
 171
 WString
 4
@ -774,7 +774,7 @@ WVList
 174
 MItem
 28
-../../../../../lib/cmn/pma.c
+../../../../../lib/cmn/pio.c
 175
 WString
 4
@ -792,7 +792,7 @@ WVList
 178
 MItem
 28
-../../../../../lib/cmn/rbt.c
+../../../../../lib/cmn/pma.c
 179
 WString
 4
@ -810,7 +810,7 @@ WVList
 182
 MItem
 28
-../../../../../lib/cmn/rex.c
+../../../../../lib/cmn/rbt.c
 183
 WString
 4
@ -828,7 +828,7 @@ WVList
 186
 MItem
 28
-../../../../../lib/cmn/sio.c
+../../../../../lib/cmn/rex.c
 187
 WString
 4
@ -846,7 +846,7 @@ WVList
 190
 MItem
 28
-../../../../../lib/cmn/sll.c
+../../../../../lib/cmn/sio.c
 191
 WString
 4
@ -863,8 +863,8 @@ WVList
 0
 194
 MItem
-29
+28
-../../../../../lib/cmn/slmb.c
+../../../../../lib/cmn/sll.c
 195
 WString
 4
@ -881,8 +881,8 @@ WVList
 0
 198
 MItem
-30
+29
-../../../../../lib/cmn/stdio.c
+../../../../../lib/cmn/slmb.c
 199
 WString
 4
@ -899,8 +899,8 @@ WVList
 0
 202
 MItem
-32
+30
-../../../../../lib/cmn/str-beg.c
+../../../../../lib/cmn/stdio.c
 203
 WString
 4
@ -918,7 +918,7 @@ WVList
 206
 MItem
 32
-../../../../../lib/cmn/str-cat.c
+../../../../../lib/cmn/str-beg.c
 207
 WString
 4
@ -936,7 +936,7 @@ WVList
 210
 MItem
 32
-../../../../../lib/cmn/str-chr.c
+../../../../../lib/cmn/str-cat.c
 211
 WString
 4
@ -954,7 +954,7 @@ WVList
 214
 MItem
 32
-../../../../../lib/cmn/str-cmp.c
+../../../../../lib/cmn/str-chr.c
 215
 WString
 4
@ -972,7 +972,7 @@ WVList
 218
 MItem
 32
-../../../../../lib/cmn/str-cnv.c
+../../../../../lib/cmn/str-cmp.c
 219
 WString
 4
@ -990,7 +990,7 @@ WVList
 222
 MItem
 32
-../../../../../lib/cmn/str-cpy.c
+../../../../../lib/cmn/str-cnv.c
 223
 WString
 4
@ -1008,7 +1008,7 @@ WVList
 226
 MItem
 32
-../../../../../lib/cmn/str-del.c
+../../../../../lib/cmn/str-cpy.c
 227
 WString
 4
@ -1026,7 +1026,7 @@ WVList
 230
 MItem
 32
-../../../../../lib/cmn/str-dup.c
+../../../../../lib/cmn/str-del.c
 231
 WString
 4
@ -1043,8 +1043,8 @@ WVList
 0
 234
 MItem
-33
+32
-../../../../../lib/cmn/str-dynm.c
+../../../../../lib/cmn/str-dup.c
 235
 WString
 4
@ -1062,7 +1062,7 @@ WVList
 238
 MItem
 33
-../../../../../lib/cmn/str-dynw.c
+../../../../../lib/cmn/str-dynm.c
 239
 WString
 4
@ -1079,8 +1079,8 @@ WVList
 0
 242
 MItem
-32
+33
-../../../../../lib/cmn/str-end.c
+../../../../../lib/cmn/str-dynw.c
 243
 WString
 4
@ -1097,8 +1097,8 @@ WVList
 0
 246
 MItem
-33
+32
-../../../../../lib/cmn/str-excl.c
+../../../../../lib/cmn/str-end.c
 247
 WString
 4
@ -1116,7 +1116,7 @@ WVList
 250
 MItem
 33
-../../../../../lib/cmn/str-fcpy.c
+../../../../../lib/cmn/str-excl.c
 251
 WString
 4
@ -1133,8 +1133,8 @@ WVList
 0
 254
 MItem
-34
+33
-../../../../../lib/cmn/str-fnmat.c
+../../../../../lib/cmn/str-fcpy.c
 255
 WString
 4
@ -1151,8 +1151,8 @@ WVList
 0
 258
 MItem
-33
+34
-../../../../../lib/cmn/str-incl.c
+../../../../../lib/cmn/str-fnmat.c
 259
 WString
 4
@ -1169,8 +1169,8 @@ WVList
 0
 262
 MItem
-32
+33
-../../../../../lib/cmn/str-len.c
+../../../../../lib/cmn/str-incl.c
 263
 WString
 4
@ -1188,7 +1188,7 @@ WVList
 266
 MItem
 32
-../../../../../lib/cmn/str-pac.c
+../../../../../lib/cmn/str-len.c
 267
 WString
 4
@ -1205,8 +1205,8 @@ WVList
 0
 270
 MItem
-33
+32
-../../../../../lib/cmn/str-pbrk.c
+../../../../../lib/cmn/str-pac.c
 271
 WString
 4
@ -1223,8 +1223,8 @@ WVList
 0
 274
 MItem
-32
+33
-../../../../../lib/cmn/str-put.c
+../../../../../lib/cmn/str-pbrk.c
 275
 WString
 4
@ -1242,7 +1242,7 @@ WVList
 278
 MItem
 32
-../../../../../lib/cmn/str-rev.c
+../../../../../lib/cmn/str-put.c
 279
 WString
 4
@ -1260,7 +1260,7 @@ WVList
 282
 MItem
 32
-../../../../../lib/cmn/str-rot.c
+../../../../../lib/cmn/str-rev.c
 283
 WString
 4
@ -1278,7 +1278,7 @@ WVList
 286
 MItem
 32
-../../../../../lib/cmn/str-set.c
+../../../../../lib/cmn/str-rot.c
 287
 WString
 4
@ -1296,7 +1296,7 @@ WVList
 290
 MItem
 32
-../../../../../lib/cmn/str-spl.c
+../../../../../lib/cmn/str-set.c
 291
 WString
 4
@ -1314,7 +1314,7 @@ WVList
 294
 MItem
 32
-../../../../../lib/cmn/str-spn.c
+../../../../../lib/cmn/str-spl.c
 295
 WString
 4
@ -1332,7 +1332,7 @@ WVList
 298
 MItem
 32
-../../../../../lib/cmn/str-str.c
+../../../../../lib/cmn/str-spn.c
 299
 WString
 4
@ -1349,8 +1349,8 @@ WVList
 0
 302
 MItem
-34
+32
-../../../../../lib/cmn/str-subst.c
+../../../../../lib/cmn/str-str.c
 303
 WString
 4
@ -1367,8 +1367,8 @@ WVList
 0
 306
 MItem
-32
+34
-../../../../../lib/cmn/str-tok.c
+../../../../../lib/cmn/str-subst.c
 307
 WString
 4
@ -1386,7 +1386,7 @@ WVList
 310
 MItem
 32
-../../../../../lib/cmn/str-trm.c
+../../../../../lib/cmn/str-tok.c
 311
 WString
 4
@ -1403,8 +1403,8 @@ WVList
 0
 314
 MItem
-33
+32
-../../../../../lib/cmn/str-word.c
+../../../../../lib/cmn/str-trm.c
 315
 WString
 4
@ -1421,8 +1421,8 @@ WVList
 0
 318
 MItem
-29
+33
-../../../../../lib/cmn/task.c
+../../../../../lib/cmn/str-word.c
 319
 WString
 4
@ -1440,7 +1440,7 @@ WVList
 322
 MItem
 29
-../../../../../lib/cmn/time.c
+../../../../../lib/cmn/task.c
 323
 WString
 4
@ -1457,8 +1457,8 @@ WVList
 0
 326
 MItem
-28
+29
-../../../../../lib/cmn/tio.c
+../../../../../lib/cmn/time.c
 327
 WString
 4
@ -1475,8 +1475,8 @@ WVList
 0
 330
 MItem
-32
+28
-../../../../../lib/cmn/tre-ast.c
+../../../../../lib/cmn/tio.c
 331
 WString
 4
@ -1493,8 +1493,8 @@ WVList
 0
 334
 MItem
-36
+32
-../../../../../lib/cmn/tre-compile.c
+../../../../../lib/cmn/tre-ast.c
 335
 WString
 4
@ -1511,8 +1511,8 @@ WVList
 0
 338
 MItem
-44
+36
-../../../../../lib/cmn/tre-match-backtrack.c
+../../../../../lib/cmn/tre-compile.c
 339
 WString
 4
@ -1529,8 +1529,8 @@ WVList
 0
 342
 MItem
-43
+44
-../../../../../lib/cmn/tre-match-parallel.c
+../../../../../lib/cmn/tre-match-backtrack.c
 343
 WString
 4
@ -1547,8 +1547,8 @@ WVList
 0
 346
 MItem
-34
+43
-../../../../../lib/cmn/tre-parse.c
+../../../../../lib/cmn/tre-match-parallel.c
 347
 WString
 4
@ -1566,7 +1566,7 @@ WVList
 350
 MItem
 34
-../../../../../lib/cmn/tre-stack.c
+../../../../../lib/cmn/tre-parse.c
 351
 WString
 4
@ -1583,8 +1583,8 @@ WVList
 0
 354
 MItem
-28
+34
-../../../../../lib/cmn/tre.c
+../../../../../lib/cmn/tre-stack.c
 355
 WString
 4
@ -1601,8 +1601,8 @@ WVList
 0
 358
 MItem
-29
+28
-../../../../../lib/cmn/utf8.c
+../../../../../lib/cmn/tre.c
 359
 WString
 4
@ -1620,7 +1620,7 @@ WVList
 362
 MItem
 28
-../../../../../lib/cmn/xma.c
+../../../../../lib/cmn/uri.c
 363
 WString
 4
@ -1637,44 +1637,44 @@ WVList
 0
 366
 MItem
-3
+29
-*.h
+../../../../../lib/cmn/utf8.c
 367
 WString
-3
+4
-NIL
+COBJ
 368
 WVList
 0
 369
 WVList
 0
-1
+11
 1
 1
 0
 370
 MItem
 28
-../../../../../lib/cmn/mem.h
+../../../../../lib/cmn/xma.c
 371
 WString
-3
+4
-NIL
+COBJ
 372
 WVList
 0
 373
 WVList
 0
-366
+11
 1
 1
 0
 374
 MItem
-32
+3
-../../../../../lib/cmn/syscall.h
+*.h
 375
 WString
 3
@ -1685,7 +1685,43 @@ WVList
 377
 WVList
 0
-366
+-1
 1
 1
 0
 378
 MItem
 28
 ../../../../../lib/cmn/mem.h
 379
 WString
 3
 NIL
 380
 WVList
 0
 381
 WVList
 0
 374
 1
 1
 0
 382
 MItem
 32
 ../../../../../lib/cmn/syscall.h
 383
 WString
 3
 NIL
 384
 WVList
 0
 385
 WVList
 0
 374
 1
 1
 0
--- a/qse/watcom/qse.wpj
+++ b/qse/watcom/qse.wpj
@ -4,10 +4,10 @@ projectIdent
 VpeMain
 1
 WRect
-117
+530
-273
+80
-9311
+9310
-9664
+9640
 2
 MProject
 3
@ -16,7 +16,7 @@ MCommand
 4
 MCommand
 0
-19
+21
 5
 WFileName
 30
@ -94,310 +94,350 @@ WFileName
 29
 debug/os2/mod/awk/awk-str.tgt
 24
-WVList
+WFileName
-19
+28
 debug/os2/lib/net/qsenet.tgt
 25
-VComponent
+WFileName
 30
 debug/os2/cmd/net/qsehttpd.tgt
 26
 WVList
 21
 27
 VComponent
 28
 WRect
 1060
-2506
+2480
 5690
-4222
+4200
 1
 0
-27
+29
 WFileName
 30
 release/os2/lib/cmn/qsecmn.tgt
 0
-5
+1
-28
+30
 VComponent
-29
+31
 WRect
 80
-1228
+1213
 5690
-4222
+4200
 1
 0
-30
+32
 WFileName
 30
 release/os2/lib/sed/qsesed.tgt
 0
 0
-31
+33
 VComponent
-32
+34
 WRect
-2091
+2090
-1384
+1360
 5690
-4222
+4200
 1
 0
-33
+35
 WFileName
 30
 release/os2/cmd/sed/qsesed.tgt
 0
 1
-34
+36
 VComponent
-35
+37
 WRect
-2816
+2810
-331
+320
 5690
-4222
+4200
 1
 0
-36
+38
 WFileName
 28
 debug/os2/lib/cmn/qsecmn.tgt
 0
 0
-37
+39
 VComponent
-38
+40
 WRect
-1038
+1030
-2340
+2320
 5690
-4222
+4200
 1
 0
-39
+41
 WFileName
 28
 debug/os2/lib/sed/qsesed.tgt
 0
 3
 40
 VComponent
 41
 WRect
 409
 302
 5690
 4222
 0
 0
 42
 VComponent
 43
 WRect
 400
 280
 5690
 4200
 1
 0
 44
 WFileName
 28
 debug/os2/lib/awk/qseawk.tgt
 0
 0
-43
+45
 VComponent
-44
+46
 WRect
-321
+320
-390
+373
 5690
-4222
+4200
 1
 0
-45
+47
 WFileName
 28
 debug/os2/cmd/awk/qseawk.tgt
 0
 1
-46
+48
 VComponent
-47
+49
 WRect
-2662
+2660
 0
 5690
-4222
+4200
 1
 0
-48
+50
 WFileName
 30
 debug/dos32/lib/cmn/qsecmn.tgt
 0
 2
 49
 VComponent
 50
 WRect
 2925
 1277
 5690
 4222
 0
 0
 51
 VComponent
 52
 WRect
 2920
 1253
 5690
 4200
 1
 0
 53
 WFileName
 30
 debug/dos32/lib/awk/qseawk.tgt
 0
 0
-52
+54
 VComponent
-53
+55
 WRect
 0
-185
+160
 5690
-4222
+4200
 1
 0
-54
+56
 WFileName
 30
 debug/dos32/cmd/awk/qseawk.tgt
 0
 0
-55
+57
 VComponent
-56
+58
 WRect
 0
 0
 5690
-4222
+4200
 1
 0
-57
+59
 WFileName
 30
 debug/dos32/lib/sed/qsesed.tgt
 0
 5
-58
+60
 VComponent
-59
+61
 WRect
 570
-546
+520
 5690
-4222
+4200
 1
 0
-60
+62
 WFileName
 30
 debug/dos32/cmd/sed/qsesed.tgt
 0
 1
-61
+63
 VComponent
-62
+64
 WRect
 0
 0
 5690
-4222
+4200
 1
 0
-63
+0
 65
 WFileName
 28
 debug/os2/cmd/sed/qsesed.tgt
 0
 1
 64
 VComponent
 65
 WRect
 2596
 1063
 5690
 4222
 1
 0
 66
 VComponent
 67
 WRect
 2590
 1040
 5690
 4200
 1
 0
 68
 WFileName
 31
 debug/dos32/mod/awk/awk-sys.tgt
 0
 0
-67
+69
 VComponent
-68
+70
 WRect
-1126
+1120
-214
+200
 5690
-4222
+4200
 1
 0
-69
+71
 WFileName
 29
 debug/os2/mod/awk/awk-sys.tgt
 0
 0
-70
+72
 VComponent
-71
+73
 WRect
 460
-3052
+3040
 5690
-4242
+4240
 1
 0
-72
+74
 WFileName
 29
 debug/os2/mod/awk/awk-dir.tgt
 0
 0
-73
+75
 VComponent
-74
+76
 WRect
 570
-555
+533
 5690
-4242
+4240
 1
 0
-75
+77
 WFileName
 31
 debug/dos32/mod/awk/awk-dir.tgt
 0
 0
-76
+78
 VComponent
-77
+79
 WRect
-204
+200
-195
+173
-5705
+5700
 4320
 1
 0
-78
+80
 WFileName
 31
 debug/dos32/mod/awk/awk-str.tgt
 0
 0
-79
+81
 VComponent
-80
+82
 WRect
-416
+410
-1384
+1360
-5705
+5700
 4320
 1
 0
-81
+83
 WFileName
 29
 debug/os2/mod/awk/awk-str.tgt
 0
 0
-49
+84
 VComponent
 85
 WRect
 3050
 120
 5700
 4240
 1
 0
 86
 WFileName
 28
 debug/os2/lib/net/qsenet.tgt
 0
 0
 87
 VComponent
 88
 WRect
 290
 280
 5700
 4253
 0
 0
 89
 WFileName
 30
 debug/os2/cmd/net/qsehttpd.tgt
 0
 0
 87
--- a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
@ -42,7 +42,7 @@ WVList
 0
 10
 WPickList
-87
+89
 11
 MItem
 3
@ -143,8 +143,8 @@ WVList
 0
 35
 MItem
-33
+35
-../../../../../lib/cmn/alg-rand.c
+../../../../../lib/cmn/alg-base64.c
 36
 WString
 4
@ -161,8 +161,8 @@ WVList
 0
 39
 MItem
-35
+33
-../../../../../lib/cmn/alg-search.c
+../../../../../lib/cmn/alg-rand.c
 40
 WString
 4
@ -179,8 +179,8 @@ WVList
 0
 43
 MItem
-33
+35
-../../../../../lib/cmn/alg-sort.c
+../../../../../lib/cmn/alg-search.c
 44
 WString
 4
@ -197,8 +197,8 @@ WVList
 0
 47
 MItem
-31
+33
-../../../../../lib/cmn/assert.c
+../../../../../lib/cmn/alg-sort.c
 48
 WString
 4
@ -215,8 +215,8 @@ WVList
 0
 51
 MItem
-28
+31
-../../../../../lib/cmn/chr.c
+../../../../../lib/cmn/assert.c
 52
 WString
 4
@ -233,8 +233,8 @@ WVList
 0
 55
 MItem
-30
+28
-../../../../../lib/cmn/cp949.c
+../../../../../lib/cmn/chr.c
 56
 WString
 4
@ -252,7 +252,7 @@ WVList
 59
 MItem
 30
-../../../../../lib/cmn/cp950.c
+../../../../../lib/cmn/cp949.c
 60
 WString
 4
@ -269,8 +269,8 @@ WVList
 0
 63
 MItem
-28
+30
-../../../../../lib/cmn/dir.c
+../../../../../lib/cmn/cp950.c
 64
 WString
 4
@ -288,7 +288,7 @@ WVList
 67
 MItem
 28
-../../../../../lib/cmn/dll.c
+../../../../../lib/cmn/dir.c
 68
 WString
 4
@ -306,7 +306,7 @@ WVList
 71
 MItem
 28
-../../../../../lib/cmn/fio.c
+../../../../../lib/cmn/dll.c
 72
 WString
 4
@ -324,7 +324,7 @@ WVList
 75
 MItem
 28
-../../../../../lib/cmn/fma.c
+../../../../../lib/cmn/fio.c
 76
 WString
 4
@ -342,7 +342,7 @@ WVList
 79
 MItem
 28
-../../../../../lib/cmn/fmt.c
+../../../../../lib/cmn/fma.c
 80
 WString
 4
@ -359,8 +359,8 @@ WVList
 0
 83
 MItem
-31
+28
-../../../../../lib/cmn/fs-err.c
+../../../../../lib/cmn/fmt.c
 84
 WString
 4
@ -377,8 +377,8 @@ WVList
 0
 87
 MItem
-32
+31
-../../../../../lib/cmn/fs-move.c
+../../../../../lib/cmn/fs-err.c
 88
 WString
 4
@ -395,8 +395,8 @@ WVList
 0
 91
 MItem
-27
+32
-../../../../../lib/cmn/fs.c
+../../../../../lib/cmn/fs-move.c
 92
 WString
 4
@ -413,8 +413,8 @@ WVList
 0
 95
 MItem
-28
+27
-../../../../../lib/cmn/gdl.c
+../../../../../lib/cmn/fs.c
 96
 WString
 4
@ -431,8 +431,8 @@ WVList
 0
 99
 MItem
-29
+28
-../../../../../lib/cmn/glob.c
+../../../../../lib/cmn/gdl.c
 100
 WString
 4
@ -449,8 +449,8 @@ WVList
 0
 103
 MItem
-28
+29
-../../../../../lib/cmn/htb.c
+../../../../../lib/cmn/glob.c
 104
 WString
 4
@ -467,8 +467,8 @@ WVList
 0
 107
 MItem
-29
+28
-../../../../../lib/cmn/ipad.c
+../../../../../lib/cmn/htb.c
 108
 WString
 4
@ -485,8 +485,8 @@ WVList
 0
 111
 MItem
-28
+29
-../../../../../lib/cmn/lda.c
+../../../../../lib/cmn/ipad.c
 112
 WString
 4
@ -503,8 +503,8 @@ WVList
 0
 115
 MItem
-29
+28
-../../../../../lib/cmn/main.c
+../../../../../lib/cmn/lda.c
 116
 WString
 4
@ -521,8 +521,8 @@ WVList
 0
 119
 MItem
-33
+29
-../../../../../lib/cmn/mbwc-str.c
+../../../../../lib/cmn/main.c
 120
 WString
 4
@ -539,8 +539,8 @@ WVList
 0
 123
 MItem
-29
+33
-../../../../../lib/cmn/mbwc.c
+../../../../../lib/cmn/mbwc-str.c
 124
 WString
 4
@ -557,8 +557,8 @@ WVList
 0
 127
 MItem
-28
+29
-../../../../../lib/cmn/mem.c
+../../../../../lib/cmn/mbwc.c
 128
 WString
 4
@ -576,7 +576,7 @@ WVList
 131
 MItem
 28
-../../../../../lib/cmn/mux.c
+../../../../../lib/cmn/mem.c
 132
 WString
 4
@ -593,8 +593,8 @@ WVList
 0
 135
 MItem
-34
+28
-../../../../../lib/cmn/nwad-skad.c
+../../../../../lib/cmn/mux.c
 136
 WString
 4
@ -611,8 +611,8 @@ WVList
 0
 139
 MItem
-29
+34
-../../../../../lib/cmn/nwad.c
+../../../../../lib/cmn/nwad-skad.c
 140
 WString
 4
@ -629,8 +629,8 @@ WVList
 0
 143
 MItem
-33
+29
-../../../../../lib/cmn/nwif-cfg.c
+../../../../../lib/cmn/nwad.c
 144
 WString
 4
@ -647,8 +647,8 @@ WVList
 0
 147
 MItem
-29
+33
-../../../../../lib/cmn/nwif.c
+../../../../../lib/cmn/nwif-cfg.c
 148
 WString
 4
@ -666,7 +666,7 @@ WVList
 151
 MItem
 29
-../../../../../lib/cmn/nwio.c
+../../../../../lib/cmn/nwif.c
 152
 WString
 4
@ -683,8 +683,8 @@ WVList
 0
 155
 MItem
-28
+29
-../../../../../lib/cmn/oht.c
+../../../../../lib/cmn/nwio.c
 156
 WString
 4
@ -702,7 +702,7 @@ WVList
 159
 MItem
 28
-../../../../../lib/cmn/opt.c
+../../../../../lib/cmn/oht.c
 160
 WString
 4
@ -719,8 +719,8 @@ WVList
 0
 163
 MItem
-38
+28
-../../../../../lib/cmn/path-basename.c
+../../../../../lib/cmn/opt.c
 164
 WString
 4
@ -737,8 +737,8 @@ WVList
 0
 167
 MItem
-35
+38
-../../../../../lib/cmn/path-canon.c
+../../../../../lib/cmn/path-basename.c
 168
 WString
 4
@ -755,8 +755,8 @@ WVList
 0
 171
 MItem
-28
+35
-../../../../../lib/cmn/pio.c
+../../../../../lib/cmn/path-canon.c
 172
 WString
 4
@ -774,7 +774,7 @@ WVList
 175
 MItem
 28
-../../../../../lib/cmn/pma.c
+../../../../../lib/cmn/pio.c
 176
 WString
 4
@ -792,7 +792,7 @@ WVList
 179
 MItem
 28
-../../../../../lib/cmn/rbt.c
+../../../../../lib/cmn/pma.c
 180
 WString
 4
@ -810,7 +810,7 @@ WVList
 183
 MItem
 28
-../../../../../lib/cmn/rex.c
+../../../../../lib/cmn/rbt.c
 184
 WString
 4
@ -828,7 +828,7 @@ WVList
 187
 MItem
 28
-../../../../../lib/cmn/sio.c
+../../../../../lib/cmn/rex.c
 188
 WString
 4
@ -846,7 +846,7 @@ WVList
 191
 MItem
 28
-../../../../../lib/cmn/sll.c
+../../../../../lib/cmn/sio.c
 192
 WString
 4
@ -863,8 +863,8 @@ WVList
 0
 195
 MItem
-29
+28
-../../../../../lib/cmn/slmb.c
+../../../../../lib/cmn/sll.c
 196
 WString
 4
@ -881,8 +881,8 @@ WVList
 0
 199
 MItem
-30
+29
-../../../../../lib/cmn/stdio.c
+../../../../../lib/cmn/slmb.c
 200
 WString
 4
@ -899,8 +899,8 @@ WVList
 0
 203
 MItem
-32
+30
-../../../../../lib/cmn/str-beg.c
+../../../../../lib/cmn/stdio.c
 204
 WString
 4
@ -918,7 +918,7 @@ WVList
 207
 MItem
 32
-../../../../../lib/cmn/str-cat.c
+../../../../../lib/cmn/str-beg.c
 208
 WString
 4
@ -936,7 +936,7 @@ WVList
 211
 MItem
 32
-../../../../../lib/cmn/str-chr.c
+../../../../../lib/cmn/str-cat.c
 212
 WString
 4
@ -954,7 +954,7 @@ WVList
 215
 MItem
 32
-../../../../../lib/cmn/str-cmp.c
+../../../../../lib/cmn/str-chr.c
 216
 WString
 4
@ -972,7 +972,7 @@ WVList
 219
 MItem
 32
-../../../../../lib/cmn/str-cnv.c
+../../../../../lib/cmn/str-cmp.c
 220
 WString
 4
@ -990,7 +990,7 @@ WVList
 223
 MItem
 32
-../../../../../lib/cmn/str-cpy.c
+../../../../../lib/cmn/str-cnv.c
 224
 WString
 4
@ -1008,7 +1008,7 @@ WVList
 227
 MItem
 32
-../../../../../lib/cmn/str-del.c
+../../../../../lib/cmn/str-cpy.c
 228
 WString
 4
@ -1026,7 +1026,7 @@ WVList
 231
 MItem
 32
-../../../../../lib/cmn/str-dup.c
+../../../../../lib/cmn/str-del.c
 232
 WString
 4
@ -1043,8 +1043,8 @@ WVList
 0
 235
 MItem
-33
+32
-../../../../../lib/cmn/str-dynm.c
+../../../../../lib/cmn/str-dup.c
 236
 WString
 4
@ -1062,7 +1062,7 @@ WVList
 239
 MItem
 33
-../../../../../lib/cmn/str-dynw.c
+../../../../../lib/cmn/str-dynm.c
 240
 WString
 4
@ -1079,8 +1079,8 @@ WVList
 0
 243
 MItem
-32
+33
-../../../../../lib/cmn/str-end.c
+../../../../../lib/cmn/str-dynw.c
 244
 WString
 4
@ -1097,8 +1097,8 @@ WVList
 0
 247
 MItem
-33
+32
-../../../../../lib/cmn/str-excl.c
+../../../../../lib/cmn/str-end.c
 248
 WString
 4
@ -1116,7 +1116,7 @@ WVList
 251
 MItem
 33
-../../../../../lib/cmn/str-fcpy.c
+../../../../../lib/cmn/str-excl.c
 252
 WString
 4
@ -1133,8 +1133,8 @@ WVList
 0
 255
 MItem
-34
+33
-../../../../../lib/cmn/str-fnmat.c
+../../../../../lib/cmn/str-fcpy.c
 256
 WString
 4
@ -1151,8 +1151,8 @@ WVList
 0
 259
 MItem
-33
+34
-../../../../../lib/cmn/str-incl.c
+../../../../../lib/cmn/str-fnmat.c
 260
 WString
 4
@ -1169,8 +1169,8 @@ WVList
 0
 263
 MItem
-32
+33
-../../../../../lib/cmn/str-len.c
+../../../../../lib/cmn/str-incl.c
 264
 WString
 4
@ -1188,7 +1188,7 @@ WVList
 267
 MItem
 32
-../../../../../lib/cmn/str-pac.c
+../../../../../lib/cmn/str-len.c
 268
 WString
 4
@ -1205,8 +1205,8 @@ WVList
 0
 271
 MItem
-33
+32
-../../../../../lib/cmn/str-pbrk.c
+../../../../../lib/cmn/str-pac.c
 272
 WString
 4
@ -1223,8 +1223,8 @@ WVList
 0
 275
 MItem
-32
+33
-../../../../../lib/cmn/str-put.c
+../../../../../lib/cmn/str-pbrk.c
 276
 WString
 4
@ -1242,7 +1242,7 @@ WVList
 279
 MItem
 32
-../../../../../lib/cmn/str-rev.c
+../../../../../lib/cmn/str-put.c
 280
 WString
 4
@ -1260,7 +1260,7 @@ WVList
 283
 MItem
 32
-../../../../../lib/cmn/str-rot.c
+../../../../../lib/cmn/str-rev.c
 284
 WString
 4
@ -1278,7 +1278,7 @@ WVList
 287
 MItem
 32
-../../../../../lib/cmn/str-set.c
+../../../../../lib/cmn/str-rot.c
 288
 WString
 4
@ -1296,7 +1296,7 @@ WVList
 291
 MItem
 32
-../../../../../lib/cmn/str-spl.c
+../../../../../lib/cmn/str-set.c
 292
 WString
 4
@ -1314,7 +1314,7 @@ WVList
 295
 MItem
 32
-../../../../../lib/cmn/str-spn.c
+../../../../../lib/cmn/str-spl.c
 296
 WString
 4
@ -1332,7 +1332,7 @@ WVList
 299
 MItem
 32
-../../../../../lib/cmn/str-str.c
+../../../../../lib/cmn/str-spn.c
 300
 WString
 4
@ -1349,8 +1349,8 @@ WVList
 0
 303
 MItem
-34
+32
-../../../../../lib/cmn/str-subst.c
+../../../../../lib/cmn/str-str.c
 304
 WString
 4
@ -1367,8 +1367,8 @@ WVList
 0
 307
 MItem
-32
+34
-../../../../../lib/cmn/str-tok.c
+../../../../../lib/cmn/str-subst.c
 308
 WString
 4
@ -1386,7 +1386,7 @@ WVList
 311
 MItem
 32
-../../../../../lib/cmn/str-trm.c
+../../../../../lib/cmn/str-tok.c
 312
 WString
 4
@ -1403,8 +1403,8 @@ WVList
 0
 315
 MItem
-33
+32
-../../../../../lib/cmn/str-word.c
+../../../../../lib/cmn/str-trm.c
 316
 WString
 4
@ -1421,8 +1421,8 @@ WVList
 0
 319
 MItem
-29
+33
-../../../../../lib/cmn/task.c
+../../../../../lib/cmn/str-word.c
 320
 WString
 4
@ -1440,7 +1440,7 @@ WVList
 323
 MItem
 29
-../../../../../lib/cmn/time.c
+../../../../../lib/cmn/task.c
 324
 WString
 4
@ -1457,8 +1457,8 @@ WVList
 0
 327
 MItem
-28
+29
-../../../../../lib/cmn/tio.c
+../../../../../lib/cmn/time.c
 328
 WString
 4
@ -1475,8 +1475,8 @@ WVList
 0
 331
 MItem
-32
+28
-../../../../../lib/cmn/tre-ast.c
+../../../../../lib/cmn/tio.c
 332
 WString
 4
@ -1493,8 +1493,8 @@ WVList
 0
 335
 MItem
-36
+32
-../../../../../lib/cmn/tre-compile.c
+../../../../../lib/cmn/tre-ast.c
 336
 WString
 4
@ -1511,8 +1511,8 @@ WVList
 0
 339
 MItem
-44
+36
-../../../../../lib/cmn/tre-match-backtrack.c
+../../../../../lib/cmn/tre-compile.c
 340
 WString
 4
@ -1529,8 +1529,8 @@ WVList
 0
 343
 MItem
-43
+44
-../../../../../lib/cmn/tre-match-parallel.c
+../../../../../lib/cmn/tre-match-backtrack.c
 344
 WString
 4
@ -1547,8 +1547,8 @@ WVList
 0
 347
 MItem
-34
+43
-../../../../../lib/cmn/tre-parse.c
+../../../../../lib/cmn/tre-match-parallel.c
 348
 WString
 4
@ -1566,7 +1566,7 @@ WVList
 351
 MItem
 34
-../../../../../lib/cmn/tre-stack.c
+../../../../../lib/cmn/tre-parse.c
 352
 WString
 4
@ -1583,8 +1583,8 @@ WVList
 0
 355
 MItem
-28
+34
-../../../../../lib/cmn/tre.c
+../../../../../lib/cmn/tre-stack.c
 356
 WString
 4
@ -1601,8 +1601,8 @@ WVList
 0
 359
 MItem
-29
+28
-../../../../../lib/cmn/utf8.c
+../../../../../lib/cmn/tre.c
 360
 WString
 4
@ -1620,7 +1620,7 @@ WVList
 363
 MItem
 28
-../../../../../lib/cmn/xma.c
+../../../../../lib/cmn/uri.c
 364
 WString
 4
@ -1637,44 +1637,44 @@ WVList
 0
 367
 MItem
-3
+29
-*.h
+../../../../../lib/cmn/utf8.c
 368
 WString
-3
+4
-NIL
+COBJ
 369
 WVList
 0
 370
 WVList
 0
-1
+11
 1
 1
 0
 371
 MItem
 28
-../../../../../lib/cmn/mem.h
+../../../../../lib/cmn/xma.c
 372
 WString
-3
+4
-NIL
+COBJ
 373
 WVList
 0
 374
 WVList
 0
-367
+11
 1
 1
 0
 375
 MItem
-32
+3
-../../../../../lib/cmn/syscall.h
+*.h
 376
 WString
 3
@ -1685,7 +1685,43 @@ WVList
 378
 WVList
 0
-367
+-1
 1
 1
 0
 379
 MItem
 28
 ../../../../../lib/cmn/mem.h
 380
 WString
 3
 NIL
 381
 WVList
 0
 382
 WVList
 0
 375
 1
 1
 0
 383
 MItem
 32
 ../../../../../lib/cmn/syscall.h
 384
 WString
 3
 NIL
 385
 WVList
 0
 386
 WVList
 0
 375
 1
 1
 0
`@ -1,2 +1,2 @@`
	`SUBDIRS = awk sed`	`SUBDIRS = awk sed net`
	`DIST_SUBDIRS = $(SUBDIRS)`	`DIST_SUBDIRS = $(SUBDIRS)`