diff --git a/qse/configure b/qse/configure index 1a876e66..c049ab2b 100755 --- a/qse/configure +++ b/qse/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for qse 0.5.7. +# Generated by GNU Autoconf 2.68 for qse 0.6.0. # # Report bugs to . # @@ -574,8 +574,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='qse' PACKAGE_TARNAME='qse' -PACKAGE_VERSION='0.5.7' -PACKAGE_STRING='qse 0.5.7' +PACKAGE_VERSION='0.6.0' +PACKAGE_STRING='qse 0.6.0' PACKAGE_BUGREPORT='Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)' PACKAGE_URL='http://code.abiyo.net/@qse' @@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures qse 0.5.7 to adapt to many kinds of systems. +\`configure' configures qse 0.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qse 0.5.7:";; + short | recursive ) echo "Configuration of qse 0.6.0:";; esac cat <<\_ACEOF @@ -1577,7 +1577,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -qse configure 0.5.7 +qse configure 0.6.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2402,7 +2402,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by qse $as_me 0.5.7, which was +It was created by qse $as_me 0.6.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3229,7 +3229,7 @@ fi # Define the identity of the package. PACKAGE='qse' - VERSION='0.5.7' + VERSION='0.6.0' cat >>confdefs.h <<_ACEOF @@ -20723,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 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" +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/Doxyfile tools/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -21317,7 +21317,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by qse $as_me 0.5.7, which was +This file was extended by qse $as_me 0.6.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21384,7 +21384,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -qse config.status 0.5.7 +qse config.status 0.6.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -21921,8 +21921,6 @@ do "regress/sed/Makefile") CONFIG_FILES="$CONFIG_FILES regress/sed/Makefile" ;; "regress/sed/regress.sh") CONFIG_FILES="$CONFIG_FILES regress/sed/regress.sh" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/page/Makefile") CONFIG_FILES="$CONFIG_FILES doc/page/Makefile" ;; - "doc/image/Makefile") CONFIG_FILES="$CONFIG_FILES doc/image/Makefile" ;; "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; diff --git a/qse/configure.ac b/qse/configure.ac index c45e7a7e..fa27a528 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -4,7 +4,7 @@ dnl Make sure you change the version information dnl in include/qse/conf_*.h whenever you change the version dnl here. Those files don't depend on autoconf, thus requiring dnl manual change. -AC_INIT([qse],[0.5.7],[Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)],[],[http://code.abiyo.net/@qse]) +AC_INIT([qse],[0.6.0],[Chung, Hyung-Hwan (hyunghwan.chung@gmail.com)],[],[http://code.abiyo.net/@qse]) AC_CONFIG_HEADER([include/qse/config.h]) AC_CONFIG_AUX_DIR([ac]) @@ -512,8 +512,6 @@ AC_CONFIG_FILES([ regress/sed/Makefile regress/sed/regress.sh doc/Makefile - doc/page/Makefile - doc/image/Makefile doc/Doxyfile tools/Makefile ]) diff --git a/qse/doc/Makefile.am b/qse/doc/Makefile.am index 2b2a0e2c..4455ff68 100644 --- a/qse/doc/Makefile.am +++ b/qse/doc/Makefile.am @@ -1,6 +1,16 @@ AUTOMAKE_OPTIONS = no-dependencies -EXTRA_DIST = Doxyfile.in gendoc.sh +EXTRA_DIST = \ + Doxyfile.in \ + gendoc.sh \ + page/mainpage.md \ + page/installation.md \ + page/mem.doc \ + page/cenc.doc \ + page/io.doc \ + page/awk.doc \ + page/awk-lang.md \ + page/sed.doc \ + image/qse-logo.png -SUBDIRS = page image diff --git a/qse/doc/Makefile.in b/qse/doc/Makefile.in index 2d66c1d1..94c73389 100644 --- a/qse/doc/Makefile.in +++ b/qse/doc/Makefile.in @@ -53,47 +53,7 @@ depcomp = am__depfiles_maybe = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ @@ -266,9 +226,20 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = no-dependencies -EXTRA_DIST = Doxyfile.in gendoc.sh -SUBDIRS = page image -all: all-recursive +EXTRA_DIST = \ + Doxyfile.in \ + gendoc.sh \ + page/mainpage.md \ + page/installation.md \ + page/mem.doc \ + page/cenc.doc \ + page/io.doc \ + page/awk.doc \ + page/awk-lang.md \ + page/sed.doc \ + image/qse-logo.png + +all: all-am .SUFFIXES: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -309,141 +280,12 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -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: -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - 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: ctags-recursive $(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 +CTAGS: -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'`; \ @@ -475,48 +317,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done check-am: all-am -check: check-recursive +check: check-am all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +installdirs: +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-recursive +installcheck: installcheck-am install-strip: if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -538,88 +351,84 @@ distclean-generic: 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-recursive +clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-generic -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am html-am: -info: info-recursive +info: info-am info-am: install-data-am: -install-dvi: install-dvi-recursive +install-dvi: install-dvi-am install-dvi-am: install-exec-am: -install-html: install-html-recursive +install-html: install-html-am install-html-am: -install-info: install-info-recursive +install-info: install-info-am install-info-am: install-man: -install-pdf: install-pdf-recursive +install-pdf: install-pdf-am install-pdf-am: -install-ps: install-ps-recursive +install-ps: install-ps-am install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am 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 installdirs-am maintainer-clean \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/qse/doc/image/Makefile.am b/qse/doc/image/Makefile.am deleted file mode 100644 index 83178d89..00000000 --- a/qse/doc/image/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = \ - qse-logo.png diff --git a/qse/doc/image/Makefile.in b/qse/doc/image/Makefile.in deleted file mode 100644 index 3a3b7c45..00000000 --- a/qse/doc/image/Makefile.in +++ /dev/null @@ -1,423 +0,0 @@ -# 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@ -subdir = doc/image -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 = -depcomp = -am__depfiles_maybe = -SOURCES = -DIST_SOURCES = -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 = no-dependencies -EXTRA_DIST = \ - qse-logo.png - -all: all-am - -.SUFFIXES: -$(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 doc/image/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/image/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): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 -installdirs: -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-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -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-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 -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# 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: diff --git a/qse/doc/page/Makefile.am b/qse/doc/page/Makefile.am deleted file mode 100644 index 545ffb42..00000000 --- a/qse/doc/page/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = \ - main.md \ - mem.doc \ - cenc.doc \ - io.doc \ - awk.doc \ - awk-lang.md \ - sed.doc diff --git a/qse/doc/page/Makefile.in b/qse/doc/page/Makefile.in deleted file mode 100644 index 009b0a9b..00000000 --- a/qse/doc/page/Makefile.in +++ /dev/null @@ -1,429 +0,0 @@ -# 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@ -subdir = doc/page -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 = -depcomp = -am__depfiles_maybe = -SOURCES = -DIST_SOURCES = -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 = no-dependencies -EXTRA_DIST = \ - main.md \ - mem.doc \ - cenc.doc \ - io.doc \ - awk.doc \ - awk-lang.md \ - sed.doc - -all: all-am - -.SUFFIXES: -$(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 doc/page/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/page/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): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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 -installdirs: -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-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -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-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 -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# 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: diff --git a/qse/doc/page/awk-lang.md b/qse/doc/page/awk-lang.md index 9d2b54af..35fc7420 100644 --- a/qse/doc/page/awk-lang.md +++ b/qse/doc/page/awk-lang.md @@ -1,4 +1,4 @@ -QSEAWK LANGUAGE {#awk-lang} +QSEAWK Language {#awk-lang} =============== QSEAWK implements the language described in the diff --git a/qse/doc/page/installation.md b/qse/doc/page/installation.md new file mode 100644 index 00000000..a8034c0d --- /dev/null +++ b/qse/doc/page/installation.md @@ -0,0 +1,97 @@ +Installation {#installation} +============ + +## Source Package ## + +You can download the source package from + + http://code.google.com/p/qse/downloads/list + +A source package has this naming format of *qse-.tar.gz*. + +Alternatively, you can check out the lastest source files from the subversion +repository by executing the following command: + + svn checkout http://qse.googlecode.com/svn/trunk/qse/ + +## Building on Unix/Linux ## + +The project uses the standard autoconf/automake generated script files for +buildiing. If you work on the systems where these scripts can run, you can +follow the standard procedures of configuring and making the project. + + $ ./configure + $ make + $ make install + +You can use this method of building for MinGW or Cygwin on Windows. + +## Cross-compiling for WIN32 ## + +While the autoconf/automake scripts may not support your native compilers, +you can cross-compile it for WIN32/WIN64 with a cross-compiler. Get a +cross-compiler installed first and run the *configure* script with a host +and a target. + +With MINGW-W64, you may run *configure* as shown below: + + $ ./configure --host=i686-w64-mingw32 --target=i686-w64-mingw32 + $ make + $ make install + +With MINGW-W64, you may run *configure* as shown below: + + $ ./configure --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 + $ make + $ make install + +The actual host and target names may vary depending on the cross-compiler +installed. + +## Native Makefiles ## + +The project provides makefiles for some selected compilers and platforms. +The makefiles were generated with bakefile (www.bakefile.org) and can be +found in the *bld* subdirectory. + + - os2-watcom/makefile (Watcom C/C++ for OS/2) + - win32-watcom/makefile (Watcom C/C++ for Windows) + - win32-borland/makefile (Borland C/C++ for Windows) + - win32-msvc/makefile (Microsoft Visual C/C++ for Windows) + +You can execute your native make utility for building in each subdirectory. + +## Build Options ## + +### MULTI-BYTE CHARACTER MODE ### + +By default, the package is compiled for the wide character mode. However, +you can compile it for the multi-byte character mode by running @b configure +@b --disable-wchar. + +@code +$ ./configure --disable-wchar +$ make +$ make install +@endcode + +Under the multi-byte character mode: +- #QSE_CHAR_IS_MCHAR is defined. +- #qse_char_t maps to #qse_mchar_t. + +Under the wide character mode: +- #QSE_CHAR_IS_WCHAR is defined. +- #qse_char_t maps to #qse_wchar_t. + +#qse_mchar_t maps to @b char and #qse_wchar_t maps to @b wchar_t or equivalent. + +### TCPV40HDRS ### + +The option, when turned on, enables you to use *tcp32dll.dll* and *so32dll.dll* +instead of *tcpip32.dll*. Doing so allows a resulting program to run on OS/2 +systems without the 32-bit TCP/IP stack. This option is off by default and +available for the native makefile for Watcom C/C++ for OS/2 only. + + wmake TCPV40HDRS=on + + diff --git a/qse/doc/page/main.md b/qse/doc/page/main.md deleted file mode 100644 index b09c5d39..00000000 --- a/qse/doc/page/main.md +++ /dev/null @@ -1,103 +0,0 @@ -QSE {#mainpage} -=================== -@image html qse-logo.png - -@section qse_intro INTRODUCTION - -The QSE library implements AWK, SED, and Unix commands in an embeddable form -and defines data types, functions, and classes that you can use when you embed -them into an application. It also provides more fundamental data types and -funtions needed when you deal with memory, streams, data structures. -The interface has been designed to be flexible enough to access various -aspects of embedding application and an embedded object from each other. - -The library is licensed under the GNU Lesser General Public License version 3: -http://www.gnu.org/licenses/ - -The project webpage: http://code.abiyo.net/@qse - -For further information, contact: -Chung, Hyung-Hwan - -@section components MODULES - -See the subpages for various modules available in this library. - -- @subpage mem "Memory Management" -- @subpage cenc "Character Encoding" -- @subpage io "I/O Handling" -- @subpage awk "AWK Interpreter" -- @subpage sed "SED Stream Editor" -- @subpage awk-lang "QSEAWK Language" - -@section installation INSTALLATION - -@subsection build_from_source BUILINDG FROM A SOURCE PACKAGE - -The package uses the standard autoconf build systems. Briefly, you can run -@b configure and @b make to compile and install it. Here is the simple -instruction. - -Unpack the latest source package downloaded from: -- http://code.google.com/p/qse/downloads/list - -Alternatively, you can check out the lastest source code from the subversion -repository by executing the following command: -- svn checkout http://qse.googlecode.com/svn/trunk/qse/ - -Run @b configure and @b make to compile and install it: - -@code -$ ./configure -$ make -$ make install -@endcode - -For additional command line options to @b configure, run @b configure @b --help. - -@subsection crosscompile_win32 CROSS-COMPILING FOR WIN32 - -While the package does not provide build files for native WIN32/WIN64 compilers, -you can cross-compile it for WIN32/WIN64 with a cross-compiler. Get a -cross-compiler installed first and run @b configure with a host and a target. - -With MINGW-W64, you may run @b configure as shown below for WIN32: - -@code -$ ./configure --host=i686-w64-mingw32 --target=i686-w64-mingw32 -$ make -$ make install -@endcode - -With MINGW-W64, you may run @b configure as shown below for WIN64: - -@code -$ ./configure --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 -$ make -$ make install -@endcode - -The actual host and target names may vary depending on the cross-compiler -installed. - -@subsection mchar_mode MULTI-BYTE CHARACTER MODE - -By default, the package is compiled for wide character mode. However, -you can compile it for multi-byte character mode by running @b configure -@b --disable-wchar. - -@code -$ ./configure --disable-wchar -$ make -$ make install -@endcode - -Under the multi-byte character mode: -- #QSE_CHAR_IS_MCHAR is defined. -- #qse_char_t maps to #qse_mchar_t. - -Under the wide character mode: -- #QSE_CHAR_IS_WCHAR is defined. -- #qse_char_t maps to #qse_wchar_t. - -#qse_mchar_t maps to @b char and #qse_wchar_t maps to @b wchar_t or equivalent. diff --git a/qse/doc/page/mainpage.md b/qse/doc/page/mainpage.md new file mode 100644 index 00000000..208361d7 --- /dev/null +++ b/qse/doc/page/mainpage.md @@ -0,0 +1,29 @@ +QSE {#mainpage} +=================== +@image html qse-logo.png + +The QSE library implements AWK, SED, and Unix commands in an embeddable form +and defines data types, functions, and classes that you can use when you embed +them into an application. It also provides more fundamental data types and +funtions needed when you deal with memory, streams, data structures. +The interface has been designed to be flexible enough to access various +aspects of embedding application and an embedded object from each other. + +The library is licensed under the GNU Lesser General Public License version 3: +http://www.gnu.org/licenses/ + +The project webpage: http://code.abiyo.net/@qse + +For further information, contact: +Chung, Hyung-Hwan + +See the subpages for more information. + +- @subpage installation +- @subpage mem "Memory Management" +- @subpage cenc "Character Encoding" +- @subpage io "I/O Handling" +- @subpage awk "AWK Interpreter" +- @subpage sed "SED Stream Editor" +- @subpage awk-lang + diff --git a/qse/include/qse/cmn/nwio.h b/qse/include/qse/cmn/nwio.h index 6a1ef868..29520504 100644 --- a/qse/include/qse/cmn/nwio.h +++ b/qse/include/qse/cmn/nwio.h @@ -66,6 +66,8 @@ enum qse_nwio_errnum_t QSE_NWIO_EINTR, /**< interrupted */ QSE_NWIO_ETMOUT, /**< timed out */ QSE_NWIO_EPIPE, /**< broken pipe */ + QSE_NWIO_EAGAIN, /**< resource not available temporarily */ + QSE_NWIO_ECONN, /**< connection refused */ QSE_NWIO_EILSEQ, /**< illegal sequence */ QSE_NWIO_EICSEQ, /**< incomplete sequence */ diff --git a/qse/include/qse/conf-inf.h b/qse/include/qse/conf-inf.h index dc499143..96237e6c 100644 --- a/qse/include/qse/conf-inf.h +++ b/qse/include/qse/conf-inf.h @@ -4,9 +4,9 @@ /* change this information whenever you update * package version in configure.ac */ -#define QSE_PACKAGE_VERSION "0.5.7" +#define QSE_PACKAGE_VERSION "0.6.0" #define QSE_PACKAGE_VERSION_MAJOR 0 -#define QSE_PACKAGE_VERSION_MINOR 5 -#define QSE_PACKAGE_VERSION_PATCH 7 +#define QSE_PACKAGE_VERSION_MINOR 6 +#define QSE_PACKAGE_VERSION_PATCH 0 #endif diff --git a/qse/include/qse/net/httpd.h b/qse/include/qse/net/httpd.h index e0dc2912..699fec1d 100644 --- a/qse/include/qse/net/httpd.h +++ b/qse/include/qse/net/httpd.h @@ -49,6 +49,7 @@ enum qse_httpd_errnum_t QSE_HTTPD_EPIPE, QSE_HTTPD_EAGAIN, + QSE_HTTPD_ECONN, QSE_HTTPD_ENOBUF, /* no buffer available */ QSE_HTTPD_EDISCON, /* client disconnnected */ QSE_HTTPD_EBADREQ, /* bad request */ diff --git a/qse/lib/awk/std.c b/qse/lib/awk/std.c index 22b32e1c..48ad24da 100644 --- a/qse/lib/awk/std.c +++ b/qse/lib/awk/std.c @@ -1729,16 +1729,6 @@ static qse_ssize_t awk_rio_console ( if (sio) qse_sio_close (sio); } - #if defined(_WIN32) - /* DIRTY HACK FOR WIN32. - * ReadFile returns failure with ERROR_BROKEN_PIPE - * when an anonymous pipe is closed. it doesn't return EOF. - * Let me handle that specially here for console only. - */ - if (nn <= -1 && - qse_sio_geterrnum ((qse_sio_t*)riod->handle) == QSE_SIO_EPIPE) return 0; - #endif - return nn; } diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index 6e52cd36..e8743e58 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -51,8 +51,9 @@ /* internal status codes */ enum { - STATUS_APPEND = (1 << 0), - STATUS_NOCLOSE = (1 << 1) + STATUS_APPEND = (1 << 0), + STATUS_NOCLOSE = (1 << 1), + STATUS_WIN32_STDIN = (1 << 2) }; #include "syserr.h" @@ -230,6 +231,9 @@ int qse_fio_init ( handle != INVALID_HANDLE_VALUE, "Do not specify an invalid handle value" ); + + if (handle == GetStdHandle (STD_INPUT_HANDLE)) + fio->status |= STATUS_WIN32_STDIN; } else { @@ -1073,7 +1077,7 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size) sz.ulLo = (ULONG)(size&0xFFFFFFFFlu); sz.ulHi = (ULONG)(size>>32); - ret = DosSetFileSizeL (fio->handle, sz); + ret = dos_set_file_size_l (fio->handle, sz); } else { @@ -1128,7 +1132,13 @@ qse_ssize_t qse_fio_read (qse_fio_t* fio, void* buf, qse_size_t size) size = QSE_TYPE_MAX(qse_ssize_t) & QSE_TYPE_MAX(DWORD); if (ReadFile (fio->handle, buf, (DWORD)size, &count, QSE_NULL) == FALSE) { - fio->errnum = syserr_to_errnum (GetLastError()); + DWORD e = GetLastError(); + /* special case when ReadFile returns failure with ERROR_BROKEN_PIPE. + * this happens when an anonymous pipe is a standard input for redirection. + * assuming that ERROR_BROKEN_PIPE doesn't occur with normal + * input streams, i treat the condition as a normal EOF indicator. */ + if ((fio->status & STATUS_WIN32_STDIN) && e == ERROR_BROKEN_PIPE) return 0; + fio->errnum = syserr_to_errnum (e); return -1; } return (qse_ssize_t)count; diff --git a/qse/lib/cmn/mux.c b/qse/lib/cmn/mux.c index 1aeae808..b066b493 100644 --- a/qse/lib/cmn/mux.c +++ b/qse/lib/cmn/mux.c @@ -109,43 +109,31 @@ struct qse_mux_t int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse_size_t capahint); void qse_mux_fini (qse_mux_t* mux); -#if defined(_WIN32) -/* TODO: change the error code handling. this is wrong... use WSA error codes .... */ -static qse_mux_errnum_t syserr_to_errnum (DWORD e) -{ +#if defined(_WIN32) +static qse_mux_errnum_t skerr_to_errnum (DWORD e) +{ switch (e) { - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_OUTOFMEMORY: + case WSA_NOT_ENOUGH_MEMORY: return QSE_MUX_ENOMEM; - case ERROR_INVALID_PARAMETER: - case ERROR_INVALID_HANDLE: - case ERROR_INVALID_NAME: + case WSA_INVALID_PARAMETER: + case WSA_INVALID_HANDLE: return QSE_MUX_EINVAL; - case ERROR_ACCESS_DENIED: - case ERROR_SHARING_VIOLATION: + case WSAEACCES: return QSE_MUX_EACCES; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_MUX_ENOENT; - - case ERROR_ALREADY_EXISTS: - case ERROR_FILE_EXISTS: - return QSE_MUX_EEXIST; - - case ERROR_BROKEN_PIPE: - return QSE_MUX_EPIPE; + case WSAEINTR: + return QSE_MUX_EINTR; default: return QSE_MUX_ESYSERR; } } #elif defined(__OS2__) -static qse_mux_errnum_t syserr_to_errnum (int e) +static qse_mux_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -165,7 +153,7 @@ static qse_mux_errnum_t syserr_to_errnum (int e) return QSE_MUX_ENOENT; #endif - #if defined(SOCEEXIST) + #if defined(SOCEXIST) case SOCEEXIST: return QSE_MUX_EEXIST; #endif @@ -173,37 +161,22 @@ static qse_mux_errnum_t syserr_to_errnum (int e) case SOCEINTR: return QSE_MUX_EINTR; + case SOCEPIPE: + return QSE_MUX_EPIPE; + default: return QSE_MUX_ESYSERR; } } + #elif defined(__DOS__) -static qse_mux_errnum_t syserr_to_errnum (int e) +static qse_mux_errnum_t skerr_to_errnum (int e) { - switch (e) - { - case ENOMEM: - return QSE_MUX_ENOMEM; - - case EINVAL: - return QSE_MUX_EINVAL; - - case EACCES: - return QSE_MUX_EACCES; - - case ENOENT: - return QSE_MUX_ENOENT; - - case EEXIST: - return QSE_MUX_EEXIST; - - default: - return QSE_MUX_ESYSERR; - } + /* TODO: */ + return QSE_MUX_ESYSERR; } - #else -static qse_mux_errnum_t syserr_to_errnum (int e) +static qse_mux_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -213,12 +186,12 @@ static qse_mux_errnum_t syserr_to_errnum (int e) case EINVAL: return QSE_MUX_EINVAL; - case ENOENT: - return QSE_MUX_ENOENT; - case EACCES: return QSE_MUX_EACCES; + case ENOENT: + return QSE_MUX_ENOENT; + case EEXIST: return QSE_MUX_EEXIST; @@ -286,7 +259,7 @@ int qse_mux_init (qse_mux_t* mux, qse_mmgr_t* mmgr, qse_mux_evtfun_t evtfun, qse #endif if (mux->fd <= -1) { - mux->errnum = syserr_to_errnum (errno); + mux->errnum = skerr_to_errnum (errno); return -1; } @@ -507,7 +480,7 @@ int qse_mux_insert (qse_mux_t* mux, const qse_mux_evt_t* evt) if (epoll_ctl (mux->fd, EPOLL_CTL_ADD, evt->hnd, &ev) == -1) { - mux->errnum = syserr_to_errnum (errno); + mux->errnum = skerr_to_errnum (errno); return -1; } @@ -626,7 +599,7 @@ done: if (epoll_ctl (mux->fd, EPOLL_CTL_DEL, evt->hnd, QSE_NULL) <= -1) { - mux->errnum = syserr_to_errnum(errno); + mux->errnum = skerr_to_errnum(errno); return -1; } @@ -680,11 +653,11 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout) if (n <= -1) { #if defined(_WIN32) - mux->errnum = syserr_to_errnum(WSAGetLastError()); + mux->errnum = skerr_to_errnum(WSAGetLastError()); #elif defined(__OS2__) - mux->errnum = syserr_to_errnum(sock_errno()); + mux->errnum = skerr_to_errnum(sock_errno()); #else - mux->errnum = syserr_to_errnum(errno); + mux->errnum = skerr_to_errnum(errno); #endif return -1; } @@ -722,7 +695,7 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout) ); if (nfds <= -1) { - mux->errnum = syserr_to_errnum(errno); + mux->errnum = skerr_to_errnum(errno); return -1; } @@ -779,7 +752,7 @@ int qse_mux_poll (qse_mux_t* mux, const qse_ntime_t* tmout) n = os2_select (mux->fdarr, rcount, wcount, 0, tv); if (n <= -1) { - mux->errnum = syserr_to_errnum(sock_errno()); + mux->errnum = skerr_to_errnum(sock_errno()); return -1; } diff --git a/qse/lib/cmn/nwio.c b/qse/lib/cmn/nwio.c index 62d7bd13..61980d67 100644 --- a/qse/lib/cmn/nwio.c +++ b/qse/lib/cmn/nwio.c @@ -64,7 +64,7 @@ static qse_ssize_t socket_input ( #define TMOUT_ENABLED(tmout) (tmout.sec >= 0 && tmout.nsec >= 0) #if defined(_WIN32) -static qse_nwio_errnum_t syserr_to_errnum (DWORD e) +static qse_nwio_errnum_t skerr_to_errnum (DWORD e) { switch (e) { @@ -92,7 +92,7 @@ static qse_nwio_errnum_t syserr_to_errnum (DWORD e) } } #elif defined(__OS2__) -static qse_nwio_errnum_t syserr_to_errnum (int e) +static qse_nwio_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -135,13 +135,13 @@ static qse_nwio_errnum_t syserr_to_errnum (int e) } #elif defined(__DOS__) -static qse_nwio_errnum_t syserr_to_errnum (int e) +static qse_nwio_errnum_t skerr_to_errnum (int e) { /* TODO: */ return QSE_NWIO_ESYSERR; } #else -static qse_nwio_errnum_t syserr_to_errnum (int e) +static qse_nwio_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -166,6 +166,9 @@ static qse_nwio_errnum_t syserr_to_errnum (int e) case EPIPE: return QSE_NWIO_EPIPE; + case EAGAIN: + return QSE_NWIO_EAGAIN; + #if defined(ECONNREFUSED) || defined(ENETUNREACH) || defined(EHOSTUNREACH) || defined(EHOSTDOWN) #if defined(ECONNREFUSED) case ECONNREFUSED: @@ -235,11 +238,11 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) #endif { #if defined(_WIN32) - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); #elif defined(__OS2__) - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); #else - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); #endif return -1; } @@ -260,7 +263,7 @@ static int wait_for_data (qse_nwio_t* nwio, const qse_ntime_t* tmout, int what) xret = os2_select (&nwio->handle, count[0], count[1], 0, tmout_msecs); if (xret <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); return -1; } else if (xret == 0) @@ -325,11 +328,11 @@ 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()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); #elif defined(__OS2__) - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); #else - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); #endif return -1; /* tried to set but failed */ } @@ -348,11 +351,11 @@ static int preset_tmout (qse_nwio_t* nwio) if (setsockopt (nwio->handle, SOL_SOCKET, SO_SNDTIMEO, (void*)&tv, QSE_SIZEOF(tv)) <= -1) { #if defined(_WIN32) - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); #elif defined(__OS2__) - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); #else - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); #endif return -1; /* tried to set but failed */ } @@ -416,7 +419,7 @@ int qse_nwio_init ( nwio->handle = socket (family, type, 0); if (nwio->handle == INVALID_SOCKET) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } @@ -438,7 +441,7 @@ int qse_nwio_init ( if (bind (nwio->handle, (struct sockaddr*)&addr, addrlen) == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } @@ -446,7 +449,7 @@ int qse_nwio_init ( { if (listen (nwio->handle, 10) == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } @@ -456,7 +459,7 @@ int qse_nwio_init ( handle = accept (nwio->handle, (struct sockaddr*)&addr, &addrlen); if (handle == INVALID_SOCKET) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } @@ -478,7 +481,7 @@ int qse_nwio_init ( if (ioctlsocket(nwio->handle, FIONBIO, &cmd) == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } } @@ -492,7 +495,7 @@ int qse_nwio_init ( if ((xret == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) || ioctlsocket (nwio->handle, FIONBIO, &cmd) == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } @@ -505,12 +508,12 @@ int qse_nwio_init ( xlen = QSE_SIZEOF(xerr); if (getsockopt (nwio->handle, SOL_SOCKET, SO_ERROR, (char*)&xerr, &xlen) == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } else if (xerr != 0) { - nwio->errnum = syserr_to_errnum (xerr); + nwio->errnum = skerr_to_errnum (xerr); goto oops; } } @@ -519,7 +522,7 @@ int qse_nwio_init ( { if (xret == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); goto oops; } } @@ -529,7 +532,7 @@ int qse_nwio_init ( nwio->handle = socket (family, type, 0); if (nwio->handle <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } @@ -551,7 +554,7 @@ int qse_nwio_init ( if (bind (nwio->handle, (struct sockaddr*)&addr, addrlen) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } @@ -559,7 +562,7 @@ int qse_nwio_init ( { if (listen (nwio->handle, 10) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } @@ -569,7 +572,7 @@ int qse_nwio_init ( handle = accept (nwio->handle, (struct sockaddr*)&addr, &addrlen); if (handle <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } @@ -591,7 +594,7 @@ int qse_nwio_init ( if (ioctl (nwio->handle, FIONBIO, (void*)&noblk, QSE_SIZEOF(noblk)) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } } @@ -605,7 +608,7 @@ int qse_nwio_init ( if ((xret <= -1 && sock_errno() != SOCEINPROGRESS) || ioctl (nwio->handle, FIONBIO, (void*)&noblk, QSE_SIZEOF(noblk)) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } @@ -617,12 +620,12 @@ int qse_nwio_init ( xlen = QSE_SIZEOF(xerr); if (getsockopt (nwio->handle, SOL_SOCKET, SO_ERROR, (char*)&xerr, &xlen) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } else if (xerr != 0) { - nwio->errnum = syserr_to_errnum (xerr); + nwio->errnum = skerr_to_errnum (xerr); goto oops; } } @@ -631,7 +634,7 @@ int qse_nwio_init ( { if (xret <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); goto oops; } } @@ -649,7 +652,7 @@ int qse_nwio_init ( #endif if (nwio->handle <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -680,7 +683,7 @@ int qse_nwio_init ( if (bind (nwio->handle, (struct sockaddr*)&addr, addrlen) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -688,7 +691,7 @@ int qse_nwio_init ( { if (listen (nwio->handle, 10) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -698,7 +701,7 @@ int qse_nwio_init ( handle = accept (nwio->handle, (struct sockaddr*)&addr, &addrlen); if (handle <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -722,7 +725,7 @@ int qse_nwio_init ( if (orgfl <= -1 || fcntl (nwio->handle, F_SETFL, orgfl | O_NONBLOCK) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -731,7 +734,7 @@ int qse_nwio_init ( if ((xret <= -1 && errno != EINPROGRESS) || fcntl (nwio->handle, F_SETFL, orgfl) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } @@ -746,12 +749,12 @@ int qse_nwio_init ( xlen = QSE_SIZEOF(xret); if (getsockopt (nwio->handle, SOL_SOCKET, SO_ERROR, (char*)&xret, &xlen) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } else if (xret != 0) { - nwio->errnum = syserr_to_errnum (xret); + nwio->errnum = skerr_to_errnum (xret); goto oops; } } @@ -761,7 +764,7 @@ int qse_nwio_init ( xret = connect (nwio->handle, (struct sockaddr*)&addr, addrlen); if (xret <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); goto oops; } } @@ -940,7 +943,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) (struct sockaddr*)&addr, &addrlen); if (count == SOCKET_ERROR) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); } else if (count >= 1) { @@ -948,7 +951,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) * first sender */ if (connect (nwio->handle, (struct sockaddr*)&addr, addrlen) <= -1) { - nwio->errnum = syserr_to_errnum (WSAGetLastError()); + nwio->errnum = skerr_to_errnum (WSAGetLastError()); return -1; } nwio->status &= ~STATUS_UDP_CONNECT; @@ -961,7 +964,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) wait_for_data (nwio, &nwio->tmout.r, 0) <= -1) return -1; count = recv (nwio->handle, buf, size, 0); - if (count == SOCKET_ERROR) nwio->errnum = syserr_to_errnum (WSAGetLastError()); + if (count == SOCKET_ERROR) nwio->errnum = skerr_to_errnum (WSAGetLastError()); } return count; @@ -985,7 +988,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) (struct sockaddr*)&addr, &addrlen); if (n <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); } else if (n >= 1) { @@ -993,7 +996,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) * first sender */ if (connect (nwio->handle, (struct sockaddr*)&addr, addrlen) <= -1) { - nwio->errnum = syserr_to_errnum (sock_errno()); + nwio->errnum = skerr_to_errnum (sock_errno()); return -1; } nwio->status &= ~STATUS_UDP_CONNECT; @@ -1006,7 +1009,7 @@ static qse_ssize_t nwio_read (qse_nwio_t* nwio, void* buf, qse_size_t size) wait_for_data (nwio, &nwio->tmout.r, 0) <= -1) return -1; n = recv (nwio->handle, buf, size, 0); - if (n <= -1) nwio->errnum = syserr_to_errnum (sock_errno()); + if (n <= -1) nwio->errnum = skerr_to_errnum (sock_errno()); } return n; @@ -1054,7 +1057,7 @@ reread: } else { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); } } else if (n >= 1) @@ -1063,7 +1066,7 @@ reread: * first sender */ if (connect (nwio->handle, (struct sockaddr*)&addr, addrlen) <= -1) { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); return -1; } nwio->status &= ~STATUS_UDP_CONNECT; @@ -1086,7 +1089,7 @@ reread: } else { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); } } } @@ -1134,7 +1137,7 @@ static qse_ssize_t nwio_write (qse_nwio_t* nwio, const void* data, qse_size_t si wait_for_data (nwio, &nwio->tmout.w, 1) <= -1) return -1; count = send (nwio->handle, data, size, 0); - if (count == SOCKET_ERROR) nwio->errnum = syserr_to_errnum (WSAGetLastError()); + if (count == SOCKET_ERROR) nwio->errnum = skerr_to_errnum (WSAGetLastError()); return count; #elif defined(__OS2__) @@ -1147,7 +1150,7 @@ static qse_ssize_t nwio_write (qse_nwio_t* nwio, const void* data, qse_size_t si wait_for_data (nwio, &nwio->tmout.w, 1) <= -1) return -1; n = send (nwio->handle, data, size, 0); - if (n <= -1) nwio->errnum = syserr_to_errnum (sock_errno()); + if (n <= -1) nwio->errnum = skerr_to_errnum (sock_errno()); return n; #elif defined(__DOS__) @@ -1176,7 +1179,7 @@ rewrite: } else { - nwio->errnum = syserr_to_errnum (errno); + nwio->errnum = skerr_to_errnum (errno); } } return n; diff --git a/qse/lib/cmn/stdio.c b/qse/lib/cmn/stdio.c index e44ebdc7..93043861 100644 --- a/qse/lib/cmn/stdio.c +++ b/qse/lib/cmn/stdio.c @@ -161,13 +161,13 @@ int qse_vsprintf (qse_char_t* buf, qse_size_t size, const qse_char_t* fmt, va_li if (nf == NULL) return -1; #if defined(QSE_CHAR_IS_MCHAR) - #if defined(_MSC_VER) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) + #if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) n = _vsnprintf (buf, size, nf, ap); #else n = vsnprintf (buf, size, nf, ap); #endif #else - #if defined(_MSC_VER) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) + #if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) n = _vsnwprintf (buf, size, nf, ap); #else n = vswprintf (buf, size, nf, ap); diff --git a/qse/lib/net/http.c b/qse/lib/net/http.c index c9eafe0b..1f534cd4 100644 --- a/qse/lib/net/http.c +++ b/qse/lib/net/http.c @@ -24,7 +24,7 @@ #include #include "../cmn/mem.h" -#include /* for snprintf. TODO: remove this. */ +#include /* for snprintf. TODO: remove this. */ int qse_comparehttpversions ( const qse_http_version_t* v1, diff --git a/qse/lib/net/httpd-cgi.c b/qse/lib/net/httpd-cgi.c index 4b90fb52..16630261 100644 --- a/qse/lib/net/httpd-cgi.c +++ b/qse/lib/net/httpd-cgi.c @@ -24,7 +24,7 @@ #include #include -#include /* TOOD: remove this */ +#include /* TODO: remove this */ typedef struct task_cgi_arg_t task_cgi_arg_t; struct task_cgi_arg_t diff --git a/qse/lib/net/httpd-dir.c b/qse/lib/net/httpd-dir.c index 385fd8c0..e6525596 100644 --- a/qse/lib/net/httpd-dir.c +++ b/qse/lib/net/httpd-dir.c @@ -23,8 +23,6 @@ #include #include -#include /* TODO: remove this */ - typedef struct task_dir_t task_dir_t; struct task_dir_t { diff --git a/qse/lib/net/httpd-file.c b/qse/lib/net/httpd-file.c index b90520c3..f85fad71 100644 --- a/qse/lib/net/httpd-file.c +++ b/qse/lib/net/httpd-file.c @@ -23,18 +23,6 @@ #include #include -#if defined(_WIN32) - /* TODO: */ -#elif defined(__OS2__) - /* TODO: */ -#elif defined(__DOS__) - /* TODO: */ -#else -# include "../cmn/syscall.h" -#endif - -#include /* TODO: remove this */ - #define ETAG_LEN_MAX 127 typedef struct task_file_t task_file_t; diff --git a/qse/lib/net/httpd-proxy.c b/qse/lib/net/httpd-proxy.c index a8476d0e..59a0258a 100644 --- a/qse/lib/net/httpd-proxy.c +++ b/qse/lib/net/httpd-proxy.c @@ -24,7 +24,7 @@ #include #include -#include /* TODO: remove this.*/ +#include /* TODO: remove this.*/ typedef struct task_proxy_arg_t task_proxy_arg_t; struct task_proxy_arg_t @@ -1317,7 +1317,8 @@ qse_printf (QSE_T("task_main_proxy_1....\n")); { /* improve error conversion */ if (httpd->errnum == QSE_HTTPD_ENOENT) http_errnum = 404; - else if (httpd->errnum == QSE_HTTPD_EACCES) http_errnum = 403; + else if (httpd->errnum == QSE_HTTPD_EACCES || + httpd->errnum == QSE_HTTPD_ECONN) http_errnum = 403; qse_printf (QSE_T("task_main_proxy_1.... ERROR \n")); goto oops; } @@ -1388,7 +1389,8 @@ qse_printf (QSE_T("task_main_proxy....\n")); { /* TODO: translate error code to http error... */ if (httpd->errnum == QSE_HTTPD_ENOENT) http_errnum = 404; - else if (httpd->errnum == QSE_HTTPD_EACCES) http_errnum = 403; + else if (httpd->errnum == QSE_HTTPD_EACCES || + httpd->errnum == QSE_HTTPD_ECONN) http_errnum = 403; qse_printf (QSE_T("caanot open peer....\n")); goto oops; } diff --git a/qse/lib/net/httpd-std.c b/qse/lib/net/httpd-std.c index d31a553e..9cc9d0d4 100644 --- a/qse/lib/net/httpd-std.c +++ b/qse/lib/net/httpd-std.c @@ -84,7 +84,7 @@ # include #endif -#include /* TODO: remove this */ +#include /* TODO: remove this */ #define DEFAULT_PORT 80 #define DEFAULT_SECURE_PORT 443 @@ -122,44 +122,42 @@ struct server_xtn_t /* ------------------------------------------------------------------- */ -#if defined(_WIN32) -/* TODO: change the error code handling. this is wrong... use WSA error codes .... */ -/* sockerr_to_errnum??? */ -static qse_httpd_errnum_t syserr_to_errnum (DWORD e) -{ +#include "../cmn/syserr.h" +IMPLEMENT_SYSERR_TO_ERRNUM (httpd, HTTPD) +#if defined(_WIN32) +static qse_httpd_errnum_t skerr_to_errnum (DWORD e) +{ switch (e) { - case ERROR_NOT_ENOUGH_MEMORY: - case ERROR_OUTOFMEMORY: + case WSA_NOT_ENOUGH_MEMORY: return QSE_HTTPD_ENOMEM; - case ERROR_INVALID_PARAMETER: - case ERROR_INVALID_HANDLE: - case ERROR_INVALID_NAME: + case WSA_INVALID_PARAMETER: + case WSA_INVALID_HANDLE: return QSE_HTTPD_EINVAL; - case ERROR_ACCESS_DENIED: - case ERROR_SHARING_VIOLATION: + case WSAEACCES: return QSE_HTTPD_EACCES; - case ERROR_FILE_NOT_FOUND: - case ERROR_PATH_NOT_FOUND: - return QSE_HTTPD_ENOENT; + case WSAEINTR: + return QSE_HTTPD_EINTR; - case ERROR_ALREADY_EXISTS: - case ERROR_FILE_EXISTS: - return QSE_HTTPD_EEXIST; - - case ERROR_BROKEN_PIPE: - return QSE_HTTPD_EPIPE; + case WSAECONNREFUSED: + case WSAENETUNREACH: + case WSAEHOSTUNREACH: + case WSAEHOSTDOWN: + return QSE_HTTPD_ECONN; default: return QSE_HTTPD_ESYSERR; } } + +#define SKERR_TO_ERRNUM() skerr_to_errnum(WSAGetLastError()) + #elif defined(__OS2__) -static qse_httpd_errnum_t syserr_to_errnum (int e) +static qse_httpd_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -179,7 +177,7 @@ static qse_httpd_errnum_t syserr_to_errnum (int e) return QSE_HTTPD_ENOENT; #endif - #if defined(SOCEEXIST) + #if defined(SOCEXIST) case SOCEEXIST: return QSE_HTTPD_EEXIST; #endif @@ -187,12 +185,33 @@ static qse_httpd_errnum_t syserr_to_errnum (int e) case SOCEINTR: return QSE_HTTPD_EINTR; + case SOCEPIPE: + return QSE_HTTPD_EPIPE; + + case SOCECONNREFUSED: + case SOCENETUNREACH: + case SOCEHOSTUNREACH: + case SOCEHOSTDOWN: + return QSE_HTTPD_ECONN; + default: return QSE_HTTPD_ESYSERR; } } + +#define SKERR_TO_ERRNUM() skerr_to_errnum(sock_errno()) + #elif defined(__DOS__) -static qse_httpd_errnum_t syserr_to_errnum (int e) +static qse_httpd_errnum_t skerr_to_errnum (int e) +{ + /* TODO: */ + return QSE_HTTPD_ESYSERR; +} + +#define SKERR_TO_ERRNUM() skerr_to_errnum(errno) + +#else +static qse_httpd_errnum_t skerr_to_errnum (int e) { switch (e) { @@ -211,50 +230,37 @@ static qse_httpd_errnum_t syserr_to_errnum (int e) case EEXIST: return QSE_HTTPD_EEXIST; - default: - return QSE_HTTPD_ESYSERR; - } -} - -#else -static qse_httpd_errnum_t syserr_to_errnum (int e) -{ - switch (e) - { - case ENOMEM: - return QSE_HTTPD_ENOMEM; - - case EINVAL: - return QSE_HTTPD_EINVAL; - - case EACCES: - case ECONNREFUSED: - return QSE_HTTPD_EACCES; - - case ENOENT: - case ENOTDIR: - /* ENOTDIR can be returned in this situation. - * i want to access /tmp/t1.cgi/abc/def - * while /tmp/t1.cgi is an existing file. - * I'm not sure if it is really good to translate - * ENOTDIR to QSE_HTTPD_ENOENT. - */ - return QSE_HTTPD_ENOENT; - - case EEXIST: - return QSE_HTTPD_EEXIST; - case EINTR: return QSE_HTTPD_EINTR; + case EPIPE: + return QSE_HTTPD_EPIPE; + case EAGAIN: - /*case EWOULDBLOCK:*/ return QSE_HTTPD_EAGAIN; +#if defined(ECONNREFUSED) || defined(ENETUNREACH) || defined(EHOSTUNREACH) || defined(EHOSTDOWN) + #if defined(ECONNREFUSED) + case ECONNREFUSED: + #endif + #if defined(ENETUNREACH) + case ENETUNREACH: + #endif + #if defined(EHOSTUNREACH) + case EHOSTUNREACH: + #endif + #if defined(EHOSTDOWN) + case EHOSTDOWN: + #endif + return QSE_HTTPD_ECONN; +#endif + default: return QSE_HTTPD_ESYSERR; } } + +#define SKERR_TO_ERRNUM() skerr_to_errnum(errno) #endif @@ -683,16 +689,14 @@ IP_TRANSPRENT is needed for: return 0; oops: + qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); #if defined(_WIN32) - qse_httpd_seterrnum (httpd, syserr_to_errnum(WSAGetLastError())); if (fd != INVALID_SOCKET) closesocket (fd); #elif defined(__OS2__) - qse_httpd_seterrnum (httpd, syserr_to_errnum(sock_errno())); if (fd >= 0) soclose (fd); #elif defined(__DOS__) /* TODO: */ #else - qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); if (fd >= 0) QSE_CLOSE (fd); #endif return -1; @@ -727,7 +731,7 @@ static int server_accept ( fd = accept (server->handle.i, (struct sockaddr*)&addr, &addrlen); if (fd <= -1) { - qse_httpd_seterrnum (httpd, syserr_to_errnum (errno)); + qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); return -1; } @@ -879,16 +883,14 @@ static int peer_open (qse_httpd_t* httpd, qse_httpd_peer_t* peer) return connected; oops: + qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); #if defined(_WIN32) - qse_httpd_seterrnum (httpd, syserr_to_errnum(WSAGetLastError())); if (fd != INVALID_SOCKET) closesocket (fd); #elif defined(__OS2__) - qse_httpd_seterrnum (httpd, syserr_to_errnum(sock_errno())); if (fd >= 0) soclose (fd); #elif defined(__DOS__) /* TODO: */ #else - qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); if (fd >= 0) QSE_CLOSE (fd); #endif return -1; @@ -916,14 +918,14 @@ static int peer_connected (qse_httpd_t* httpd, qse_httpd_peer_t* peer) len = QSE_SIZEOF(ret); if (getsockopt (peer->handle.i, SOL_SOCKET, SO_ERROR, (char*)&ret, &len) == SOCKET_ERROR) { - qse_httpd_seterrnum (httpd, syserr_to_errnum (ret)); + qse_httpd_seterrnum (httpd, skerr_to_errnum (ret)); return -1; } if (ret == WSAEWOULDBLOCK) return 0; if (ret != 0) { - qse_httpd_seterrnum (httpd, syserr_to_errnum (ret)); + qse_httpd_seterrnum (httpd, skerr_to_errnum (ret)); return -1; } @@ -949,14 +951,14 @@ static int peer_connected (qse_httpd_t* httpd, qse_httpd_peer_t* peer) len = QSE_SIZEOF(ret); if (getsockopt (peer->handle.i, SOL_SOCKET, SO_ERROR, &ret, &len) <= -1) { - qse_httpd_seterrnum (httpd, syserr_to_errnum (ret)); + qse_httpd_seterrnum (httpd, skerr_to_errnum (ret)); return -1; } if (ret == EINPROGRESS) return 0; if (ret != 0) { - qse_httpd_seterrnum (httpd, syserr_to_errnum (ret)); + qse_httpd_seterrnum (httpd, skerr_to_errnum (ret)); return -1; } @@ -969,7 +971,7 @@ static qse_ssize_t peer_recv ( qse_mchar_t* buf, qse_size_t bufsize) { qse_ssize_t ret = recv (peer->handle.i, buf, bufsize, 0); - if (ret <= -1) qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); + if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); return ret; } @@ -978,7 +980,7 @@ static qse_ssize_t peer_send ( const qse_mchar_t* buf, qse_size_t bufsize) { qse_ssize_t ret = send (peer->handle.i, buf, bufsize, 0); - if (ret <= -1) qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); + if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); return ret; } @@ -1503,7 +1505,7 @@ static qse_ssize_t client_recv ( { qse_ssize_t ret; ret = recv (client->handle.i, buf, bufsize, 0); - if (ret <= -1) qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); + if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); return ret; } } @@ -1531,7 +1533,7 @@ static qse_ssize_t client_send ( else { qse_ssize_t ret = send (client->handle.i, buf, bufsize, 0); - if (ret <= -1) qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); + if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); return ret; } } diff --git a/qse/lib/net/httpd-task.c b/qse/lib/net/httpd-task.c index d388a540..9b3c99fb 100644 --- a/qse/lib/net/httpd-task.c +++ b/qse/lib/net/httpd-task.c @@ -23,9 +23,8 @@ #include #include "../cmn/mem.h" - #include -#include /* TODO: remove this */ +#include /* TODO: remove this */ /* TODO: diff --git a/qse/lib/net/httpd.h b/qse/lib/net/httpd.h index 2f93fc9b..b7e1fbf2 100644 --- a/qse/lib/net/httpd.h +++ b/qse/lib/net/httpd.h @@ -25,6 +25,8 @@ #include +#include /* TODO: remove this.. only for debugging at this moment */ + struct qse_httpd_t { qse_mmgr_t* mmgr; @@ -86,8 +88,7 @@ struct qse_httpd_t #define CLIENT_HANDLE_IN_MUX (CLIENT_HANDLE_READ_IN_MUX|CLIENT_HANDLE_WRITE_IN_MUX) #define CLIENT_TASK_TRIGGER_IN_MUX(i) (1 << ((i) + 8)) - -#if defined(_MSC_VER) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) +#if defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) # define snprintf _snprintf # define vsnprintf _vsnprintf #endif