diff --git a/hawk/Makefile.in b/hawk/Makefile.in index 4be8f379..3fbc1475 100644 --- a/hawk/Makefile.in +++ b/hawk/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +142,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -167,8 +167,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \ $(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \ $(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \ $(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \ - ac/compile ac/config.guess ac/config.sub ac/install-sh \ - ac/ltmain.sh ac/missing + ac/compile ac/config.guess ac/config.sub ac/depcomp \ + ac/install-sh ac/ltmain.sh ac/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -356,7 +356,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -394,8 +393,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -522,7 +521,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -587,7 +589,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -613,7 +615,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -631,7 +633,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -641,7 +643,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/hawk/aclocal.m4 b/hawk/aclocal.m4 index c054071c..2b31feff 100644 --- a/hawk/aclocal.m4 +++ b/hawk/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file 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. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -406,49 +405,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -457,18 +448,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -555,8 +545,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -623,7 +613,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -665,7 +655,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -686,7 +676,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -707,7 +697,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,49 +705,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -796,7 +779,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -825,7 +808,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -872,7 +855,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,7 +874,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -972,7 +955,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1032,7 +1015,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1043,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1079,7 +1062,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/hawk/bin/Makefile.in b/hawk/bin/Makefile.in index 986d6809..142ee005 100644 --- a/hawk/bin/Makefile.in +++ b/hawk/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -132,7 +132,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/hawk-main.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -325,7 +326,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -376,8 +376,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -448,7 +448,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hawk-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hawk-main.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -546,7 +552,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -618,7 +627,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/hawk-main.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -664,7 +673,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/hawk-main.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -685,7 +694,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/hawk/configure b/hawk/configure index acfdab53..e2f6d297 100755 --- a/hawk/configure +++ b/hawk/configure @@ -731,7 +731,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -789,7 +788,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -808,7 +806,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -889,7 +888,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1142,15 +1140,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1288,7 +1277,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1441,7 +1430,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2779,7 +2767,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3295,8 +3283,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3347,7 +3335,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3362,45 +3350,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -17372,7 +17360,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17418,7 +17406,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17442,7 +17430,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17487,7 +17475,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17511,7 +17499,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -23872,7 +23860,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -24871,29 +24859,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -24911,53 +24905,48 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)[^/].*/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff --git a/hawk/lib/Makefile.am b/hawk/lib/Makefile.am index d1b9c6e5..eeefd37f 100644 --- a/hawk/lib/Makefile.am +++ b/hawk/lib/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = nostdinc -##AM_CFLAGS = $(PTHREAD_CFLAGS) +AM_CFLAGS = $(PTHREAD_CFLAGS) CPPFLAGS_ALL_COMMON = \ -I$(abs_builddir) \ @@ -8,26 +8,20 @@ CPPFLAGS_ALL_COMMON = \ -I$(includedir) if ENABLE_STATIC_MODULE -LDFLAGS_ALL_COMMON = -L../mod +LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir) else -LDFLAGS_ALL_COMMON = -L. +LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir) endif ################################################## # MAIN LIBRARY ################################################## -CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) +CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined LIBADD_LIB_COMMON = $(LIBM) DEPENDENCIES_LIB_COMMON = -if ENABLE_LIBLTDL -LIBADD_LIB_COMMON += $(LTDL_LIBS) -else -LIBADD_LIB_COMMON += $(DL_LIBS) -endif - if WIN32 # you must adjust the value of DEFAULT_MODPOSTFIX according # to the first number in -version-info above @@ -153,6 +147,16 @@ libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) +if ENABLE_LIBLTDL +libhawk_la_CPPFLAGS += $(LTDLINCL) +libhawk_la_LIBADD += $(LTDL_LIBS) +else +libhawk_la_LIBADD += $(DL_LIBS) +endif +if ENABLE_LIBUNWIND +libhawk_la_LIBADD += $(UNWIND_LIBS) +endif + if ENABLE_CXX pkglib_LTLIBRARIES += libhawkxx.la libhawkxx_la_SOURCES = Hawk.cpp StdHawk.cpp @@ -174,8 +178,6 @@ libhawk_la_SOURCES += \ mod-sys.c mod-sys.h libhawk_la_LIBADD += -### mod-dir.c mod-dir.h - if ENABLE_MOD_MYSQL libhawk_la_LIBADD += -lhawk-mysql libhawk_la_DEPENDENCIES += ../mod/libhawk-mysql.la @@ -196,34 +198,28 @@ LDFLAGS_MOD_COMMON = $(LDFLAGS_ALL_COMMON) LIBADD_MOD_COMMON = -lhawk DEPENDENCIES_MOD_COMMON = libhawk.la -#modexecdir = $(libdir) -# -#modexec_LTLIBRARIES = libhawk-dir.la -#libhawk_dir_la_SOURCES = mod-dir.c mod-dir.h -#libhawk_dir_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si -#libhawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi -#libhawk_dir_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) ../../lib/si/libqsesi.la -# -#modexec_LTLIBRARIES += libhawk-math.la -#libhawk_math_la_SOURCES = mod-math.c mod-math.h -#libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -#libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) -#libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) -# -#modexec_LTLIBRARIES += libhawk-str.la -#libhawk_str_la_SOURCES = mod-str.c mod-str.h -#libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -#libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) -#libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) -# -#modexec_LTLIBRARIES += libhawk-sys.la -#libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h -#libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si -#libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi -#libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) ../../lib/si/libqsesi.la +#pkglibdir = $(libdir) +#pkglib_LTLIBRARIES = + +pkglib_LTLIBRARIES += libhawk-math.la +libhawk_math_la_SOURCES = mod-math.c mod-math.h +libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) +libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) + +pkglib_LTLIBRARIES += libhawk-str.la +libhawk_str_la_SOURCES = mod-str.c mod-str.h +libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) +libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) + +pkglib_LTLIBRARIES += libhawk-sys.la +libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h +libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) +libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) endif diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 7d7947ea..00353c98 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -87,28 +87,33 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_LIBLTDL_TRUE@am__append_1 = $(LTDL_LIBS) -@ENABLE_LIBLTDL_FALSE@am__append_2 = $(DL_LIBS) -@MACOSX_TRUE@@WIN32_FALSE@am__append_3 = -DHAWK_DEFAULT_MODPOSTFIX=\".dylib\" -@MACOSX_FALSE@@WIN32_FALSE@am__append_4 = -DHAWK_DEFAULT_MODPOSTFIX=\".so\" -@ENABLE_CXX_TRUE@am__append_5 = libhawkxx.la +@MACOSX_TRUE@@WIN32_FALSE@am__append_1 = -DHAWK_DEFAULT_MODPOSTFIX=\".dylib\" +@MACOSX_FALSE@@WIN32_FALSE@am__append_2 = -DHAWK_DEFAULT_MODPOSTFIX=\".so\" +@ENABLE_LIBLTDL_TRUE@am__append_3 = $(LTDLINCL) +@ENABLE_LIBLTDL_TRUE@am__append_4 = $(LTDL_LIBS) +@ENABLE_LIBLTDL_FALSE@am__append_5 = $(DL_LIBS) +@ENABLE_LIBUNWIND_TRUE@am__append_6 = $(UNWIND_LIBS) +@ENABLE_CXX_TRUE@am__append_7 = libhawkxx.la ################################################## # STATIC MODULES BUILT INTO MAIN LIBRARY ################################################## -@ENABLE_STATIC_MODULE_TRUE@am__append_6 = \ +@ENABLE_STATIC_MODULE_TRUE@am__append_8 = \ @ENABLE_STATIC_MODULE_TRUE@ imap-imp.h \ @ENABLE_STATIC_MODULE_TRUE@ mod-math.c mod-math.h \ @ENABLE_STATIC_MODULE_TRUE@ mod-str.c mod-str.h \ @ENABLE_STATIC_MODULE_TRUE@ mod-sys.c mod-sys.h -@ENABLE_STATIC_MODULE_TRUE@am__append_7 = +@ENABLE_STATIC_MODULE_TRUE@am__append_9 = +@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_10 = -lhawk-mysql +@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = ../mod/libhawk-mysql.la +@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_12 = -lhawk-uci +@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = ../mod/libhawk-uci.la -### mod-dir.c mod-dir.h -@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lhawk-mysql -@ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = ../mod/libhawk-mysql.la -@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_10 = -lhawk-uci -@ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = ../mod/libhawk-uci.la +#pkglibdir = $(libdir) +#pkglib_LTLIBRARIES = +@ENABLE_STATIC_MODULE_FALSE@am__append_14 = libhawk-math.la \ +@ENABLE_STATIC_MODULE_FALSE@ libhawk-str.la libhawk-sys.la subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -157,10 +162,44 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \ "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) am__DEPENDENCIES_1 = -@ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) -am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) +am__libhawk_math_la_SOURCES_DIST = mod-math.c mod-math.h +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_math_la_OBJECTS = \ +@ENABLE_STATIC_MODULE_FALSE@ libhawk_math_la-mod-math.lo +libhawk_math_la_OBJECTS = $(am_libhawk_math_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libhawk_math_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libhawk_math_la_LDFLAGS) $(LDFLAGS) \ + -o $@ +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_math_la_rpath = -rpath \ +@ENABLE_STATIC_MODULE_FALSE@ $(pkglibdir) +am__libhawk_str_la_SOURCES_DIST = mod-str.c mod-str.h +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_str_la_OBJECTS = \ +@ENABLE_STATIC_MODULE_FALSE@ libhawk_str_la-mod-str.lo +libhawk_str_la_OBJECTS = $(am_libhawk_str_la_OBJECTS) +libhawk_str_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libhawk_str_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_str_la_rpath = -rpath \ +@ENABLE_STATIC_MODULE_FALSE@ $(pkglibdir) +am__libhawk_sys_la_SOURCES_DIST = mod-sys.c mod-sys.h +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_sys_la_OBJECTS = \ +@ENABLE_STATIC_MODULE_FALSE@ libhawk_sys_la-mod-sys.lo +libhawk_sys_la_OBJECTS = $(am_libhawk_sys_la_OBJECTS) +libhawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libhawk_sys_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +@ENABLE_STATIC_MODULE_FALSE@am_libhawk_sys_la_rpath = -rpath \ +@ENABLE_STATIC_MODULE_FALSE@ $(pkglibdir) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) +@ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) am__libhawk_la_SOURCES_DIST = hawk.h hawk-chr.h hawk-cmn.h hawk-dir.h \ hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h hawk-rbt.h \ hawk-pack1.h hawk-utl.h hawk-std.h hawk-tre.h hawk-unpack.h \ @@ -200,10 +239,6 @@ am_libhawk_la_OBJECTS = $(am__objects_1) libhawk_la-arr.lo \ libhawk_la-mtx.lo libhawk_la-pio.lo libhawk_la-sio.lo \ libhawk_la-tio.lo libhawk_la-std.lo $(am__objects_2) libhawk_la_OBJECTS = $(am_libhawk_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = libhawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libhawk_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -229,7 +264,49 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libhawk_la-arr.Plo \ + ./$(DEPDIR)/libhawk_la-chr.Plo ./$(DEPDIR)/libhawk_la-cli.Plo \ + ./$(DEPDIR)/libhawk_la-dir.Plo ./$(DEPDIR)/libhawk_la-ecs.Plo \ + ./$(DEPDIR)/libhawk_la-err-sys.Plo \ + ./$(DEPDIR)/libhawk_la-err.Plo ./$(DEPDIR)/libhawk_la-fio.Plo \ + ./$(DEPDIR)/libhawk_la-fmt.Plo ./$(DEPDIR)/libhawk_la-fnc.Plo \ + ./$(DEPDIR)/libhawk_la-gem-nwif.Plo \ + ./$(DEPDIR)/libhawk_la-gem-nwif2.Plo \ + ./$(DEPDIR)/libhawk_la-gem-skad.Plo \ + ./$(DEPDIR)/libhawk_la-gem.Plo ./$(DEPDIR)/libhawk_la-hawk.Plo \ + ./$(DEPDIR)/libhawk_la-htb.Plo ./$(DEPDIR)/libhawk_la-mb8.Plo \ + ./$(DEPDIR)/libhawk_la-misc.Plo \ + ./$(DEPDIR)/libhawk_la-mod-math.Plo \ + ./$(DEPDIR)/libhawk_la-mod-str.Plo \ + ./$(DEPDIR)/libhawk_la-mod-sys.Plo \ + ./$(DEPDIR)/libhawk_la-mtx.Plo \ + ./$(DEPDIR)/libhawk_la-parse.Plo \ + ./$(DEPDIR)/libhawk_la-pio.Plo ./$(DEPDIR)/libhawk_la-rbt.Plo \ + ./$(DEPDIR)/libhawk_la-rec.Plo ./$(DEPDIR)/libhawk_la-rio.Plo \ + ./$(DEPDIR)/libhawk_la-run.Plo ./$(DEPDIR)/libhawk_la-sio.Plo \ + ./$(DEPDIR)/libhawk_la-std.Plo ./$(DEPDIR)/libhawk_la-tio.Plo \ + ./$(DEPDIR)/libhawk_la-tre-ast.Plo \ + ./$(DEPDIR)/libhawk_la-tre-compile.Plo \ + ./$(DEPDIR)/libhawk_la-tre-match-bt.Plo \ + ./$(DEPDIR)/libhawk_la-tre-match-pa.Plo \ + ./$(DEPDIR)/libhawk_la-tre-mem.Plo \ + ./$(DEPDIR)/libhawk_la-tre-parse.Plo \ + ./$(DEPDIR)/libhawk_la-tre-stack.Plo \ + ./$(DEPDIR)/libhawk_la-tre.Plo ./$(DEPDIR)/libhawk_la-tree.Plo \ + ./$(DEPDIR)/libhawk_la-utf16.Plo \ + ./$(DEPDIR)/libhawk_la-utf8.Plo \ + ./$(DEPDIR)/libhawk_la-utl-ass.Plo \ + ./$(DEPDIR)/libhawk_la-utl-skad.Plo \ + ./$(DEPDIR)/libhawk_la-utl-sort.Plo \ + ./$(DEPDIR)/libhawk_la-utl-str.Plo \ + ./$(DEPDIR)/libhawk_la-utl-sys.Plo \ + ./$(DEPDIR)/libhawk_la-utl.Plo ./$(DEPDIR)/libhawk_la-val.Plo \ + ./$(DEPDIR)/libhawk_math_la-mod-math.Plo \ + ./$(DEPDIR)/libhawk_str_la-mod-str.Plo \ + ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo \ + ./$(DEPDIR)/libhawkxx_la-Hawk.Plo \ + ./$(DEPDIR)/libhawkxx_la-StdHawk.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -267,8 +344,13 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(libhawk_la_SOURCES) $(libhawkxx_la_SOURCES) -DIST_SOURCES = $(am__libhawk_la_SOURCES_DIST) \ +SOURCES = $(libhawk_math_la_SOURCES) $(libhawk_str_la_SOURCES) \ + $(libhawk_sys_la_SOURCES) $(libhawk_la_SOURCES) \ + $(libhawkxx_la_SOURCES) +DIST_SOURCES = $(am__libhawk_math_la_SOURCES_DIST) \ + $(am__libhawk_str_la_SOURCES_DIST) \ + $(am__libhawk_sys_la_SOURCES_DIST) \ + $(am__libhawk_la_SOURCES_DIST) \ $(am__libhawkxx_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -454,7 +536,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -464,30 +545,31 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = nostdinc +AM_CFLAGS = $(PTHREAD_CFLAGS) CPPFLAGS_ALL_COMMON = \ -I$(abs_builddir) \ -I$(abs_srcdir) \ -I$(includedir) -@ENABLE_STATIC_MODULE_FALSE@LDFLAGS_ALL_COMMON = -L. -@ENABLE_STATIC_MODULE_TRUE@LDFLAGS_ALL_COMMON = -L../mod +@ENABLE_STATIC_MODULE_FALSE@LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir) +@ENABLE_STATIC_MODULE_TRUE@LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir) ################################################## # MAIN LIBRARY ################################################## -CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) +CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined -LIBADD_LIB_COMMON = $(LIBM) $(am__append_1) $(am__append_2) +LIBADD_LIB_COMMON = $(LIBM) DEPENDENCIES_LIB_COMMON = @WIN32_FALSE@CPPFLAGS_PFMOD = \ @WIN32_FALSE@ -DHAWK_DEFAULT_MODPREFIX=\"$(libdir)/libhawk-\" \ -@WIN32_FALSE@ $(am__append_3) $(am__append_4) +@WIN32_FALSE@ $(am__append_1) $(am__append_2) # you must adjust the value of DEFAULT_MODPOSTFIX according # to the first number in -version-info above @WIN32_TRUE@CPPFLAGS_PFMOD = -DHAWK_DEFAULT_MODPREFIX=\"libhawk-\" \ @WIN32_TRUE@ -DHAWK_DEFAULT_MODPOSTFIX=\"-1.dll\" \ -@WIN32_TRUE@ $(am__append_3) $(am__append_4) +@WIN32_TRUE@ $(am__append_1) $(am__append_2) pkginclude_HEADERS = \ hawk.h \ hawk-chr.h \ @@ -504,7 +586,7 @@ pkginclude_HEADERS = \ hawk-tre.h \ hawk-unpack.h -pkglib_LTLIBRARIES = libhawk.la $(am__append_5) +pkglib_LTLIBRARIES = libhawk.la $(am__append_7) $(am__append_14) libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \ fnc.c htb.c gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h \ @@ -516,13 +598,14 @@ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \ utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \ hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \ - syscall.h tio.c std-prv.h std.c $(am__append_6) -libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) + syscall.h tio.c std-prv.h std.c $(am__append_8) +libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(am__append_3) libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) -libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_7) \ - $(am__append_8) $(am__append_10) -libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) $(am__append_9) \ - $(am__append_11) +libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_9) \ + $(am__append_10) $(am__append_12) +libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) $(am__append_11) \ + $(am__append_13) @ENABLE_CXX_TRUE@libhawkxx_la_SOURCES = Hawk.cpp StdHawk.cpp @ENABLE_CXX_TRUE@libhawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) @ENABLE_CXX_TRUE@libhawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) @@ -536,6 +619,21 @@ libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) $(am__append_9) \ @ENABLE_STATIC_MODULE_FALSE@LDFLAGS_MOD_COMMON = $(LDFLAGS_ALL_COMMON) @ENABLE_STATIC_MODULE_FALSE@LIBADD_MOD_COMMON = -lhawk @ENABLE_STATIC_MODULE_FALSE@DEPENDENCIES_MOD_COMMON = libhawk.la +@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_SOURCES = mod-math.c mod-math.h +@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_SOURCES = mod-str.c mod-str.h +@ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h +@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) +@ENABLE_STATIC_MODULE_FALSE@libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) all: hawk-cfg.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -558,8 +656,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -621,6 +719,15 @@ clean-pkglibLTLIBRARIES: rm -f $${locs}; \ } +libhawk-math.la: $(libhawk_math_la_OBJECTS) $(libhawk_math_la_DEPENDENCIES) $(EXTRA_libhawk_math_la_DEPENDENCIES) + $(AM_V_CCLD)$(libhawk_math_la_LINK) $(am_libhawk_math_la_rpath) $(libhawk_math_la_OBJECTS) $(libhawk_math_la_LIBADD) $(LIBS) + +libhawk-str.la: $(libhawk_str_la_OBJECTS) $(libhawk_str_la_DEPENDENCIES) $(EXTRA_libhawk_str_la_DEPENDENCIES) + $(AM_V_CCLD)$(libhawk_str_la_LINK) $(am_libhawk_str_la_rpath) $(libhawk_str_la_OBJECTS) $(libhawk_str_la_LIBADD) $(LIBS) + +libhawk-sys.la: $(libhawk_sys_la_OBJECTS) $(libhawk_sys_la_DEPENDENCIES) $(EXTRA_libhawk_sys_la_DEPENDENCIES) + $(AM_V_CCLD)$(libhawk_sys_la_LINK) $(am_libhawk_sys_la_rpath) $(libhawk_sys_la_OBJECTS) $(libhawk_sys_la_LIBADD) $(LIBS) + libhawk.la: $(libhawk_la_OBJECTS) $(libhawk_la_DEPENDENCIES) $(EXTRA_libhawk_la_DEPENDENCIES) $(AM_V_CCLD)$(libhawk_la_LINK) -rpath $(pkglibdir) $(libhawk_la_OBJECTS) $(libhawk_la_LIBADD) $(LIBS) @@ -633,57 +740,66 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-arr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-chr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-cli.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-dir.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-ecs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-err-sys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fmt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fnc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-nwif.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-nwif2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-skad.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-hawk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-htb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mb8.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-math.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-str.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-sys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mtx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-pio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rbt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-run.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-sio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-std.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-ast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-compile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-match-bt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-match-pa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-mem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utf16.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utf8.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-ass.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-skad.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-sort.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-str.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-sys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-val.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-Hawk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-StdHawk.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-arr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-chr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-cli.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-dir.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-ecs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-err-sys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fio.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fmt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-fnc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-nwif.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-nwif2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem-skad.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-gem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-hawk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-htb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mb8.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-misc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-math.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-str.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mod-sys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-mtx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-pio.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rbt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-rio.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-run.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-sio.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-std.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tio.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-ast.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-compile.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-match-bt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-match-pa.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-mem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre-stack.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tre.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-tree.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utf16.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utf8.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-ass.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-skad.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-sort.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-str.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl-sys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-val.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_math_la-mod-math.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_str_la-mod-str.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-Hawk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-StdHawk.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -709,6 +825,27 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libhawk_math_la-mod-math.lo: mod-math.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_math_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_math_la-mod-math.lo -MD -MP -MF $(DEPDIR)/libhawk_math_la-mod-math.Tpo -c -o libhawk_math_la-mod-math.lo `test -f 'mod-math.c' || echo '$(srcdir)/'`mod-math.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_math_la-mod-math.Tpo $(DEPDIR)/libhawk_math_la-mod-math.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mod-math.c' object='libhawk_math_la-mod-math.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_math_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_math_la-mod-math.lo `test -f 'mod-math.c' || echo '$(srcdir)/'`mod-math.c + +libhawk_str_la-mod-str.lo: mod-str.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_str_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_str_la-mod-str.lo -MD -MP -MF $(DEPDIR)/libhawk_str_la-mod-str.Tpo -c -o libhawk_str_la-mod-str.lo `test -f 'mod-str.c' || echo '$(srcdir)/'`mod-str.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_str_la-mod-str.Tpo $(DEPDIR)/libhawk_str_la-mod-str.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mod-str.c' object='libhawk_str_la-mod-str.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_str_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_str_la-mod-str.lo `test -f 'mod-str.c' || echo '$(srcdir)/'`mod-str.c + +libhawk_sys_la-mod-sys.lo: mod-sys.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_sys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_sys_la-mod-sys.lo -MD -MP -MF $(DEPDIR)/libhawk_sys_la-mod-sys.Tpo -c -o libhawk_sys_la-mod-sys.lo `test -f 'mod-sys.c' || echo '$(srcdir)/'`mod-sys.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_sys_la-mod-sys.Tpo $(DEPDIR)/libhawk_sys_la-mod-sys.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mod-sys.c' object='libhawk_sys_la-mod-sys.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_sys_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_sys_la-mod-sys.lo `test -f 'mod-sys.c' || echo '$(srcdir)/'`mod-sys.c + libhawk_la-arr.lo: arr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_la-arr.lo -MD -MP -MF $(DEPDIR)/libhawk_la-arr.Tpo -c -o libhawk_la-arr.lo `test -f 'arr.c' || echo '$(srcdir)/'`arr.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-arr.Tpo $(DEPDIR)/libhawk_la-arr.Plo @@ -1169,7 +1306,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1242,7 +1382,60 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libhawk_la-arr.Plo + -rm -f ./$(DEPDIR)/libhawk_la-chr.Plo + -rm -f ./$(DEPDIR)/libhawk_la-cli.Plo + -rm -f ./$(DEPDIR)/libhawk_la-dir.Plo + -rm -f ./$(DEPDIR)/libhawk_la-ecs.Plo + -rm -f ./$(DEPDIR)/libhawk_la-err-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-err.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fmt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fnc.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-nwif.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-nwif2.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-skad.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem.Plo + -rm -f ./$(DEPDIR)/libhawk_la-hawk.Plo + -rm -f ./$(DEPDIR)/libhawk_la-htb.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mb8.Plo + -rm -f ./$(DEPDIR)/libhawk_la-misc.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-math.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-str.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mtx.Plo + -rm -f ./$(DEPDIR)/libhawk_la-parse.Plo + -rm -f ./$(DEPDIR)/libhawk_la-pio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rbt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rec.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-run.Plo + -rm -f ./$(DEPDIR)/libhawk_la-sio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-std.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-ast.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-compile.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-match-bt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-match-pa.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-mem.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-parse.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-stack.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tree.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utf16.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utf8.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-ass.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-skad.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-sort.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-str.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl.Plo + -rm -f ./$(DEPDIR)/libhawk_la-val.Plo + -rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo + -rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo + -rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo + -rm -f ./$(DEPDIR)/libhawkxx_la-Hawk.Plo + -rm -f ./$(DEPDIR)/libhawkxx_la-StdHawk.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -1288,7 +1481,60 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libhawk_la-arr.Plo + -rm -f ./$(DEPDIR)/libhawk_la-chr.Plo + -rm -f ./$(DEPDIR)/libhawk_la-cli.Plo + -rm -f ./$(DEPDIR)/libhawk_la-dir.Plo + -rm -f ./$(DEPDIR)/libhawk_la-ecs.Plo + -rm -f ./$(DEPDIR)/libhawk_la-err-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-err.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fmt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-fnc.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-nwif.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-nwif2.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem-skad.Plo + -rm -f ./$(DEPDIR)/libhawk_la-gem.Plo + -rm -f ./$(DEPDIR)/libhawk_la-hawk.Plo + -rm -f ./$(DEPDIR)/libhawk_la-htb.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mb8.Plo + -rm -f ./$(DEPDIR)/libhawk_la-misc.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-math.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-str.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mod-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-mtx.Plo + -rm -f ./$(DEPDIR)/libhawk_la-parse.Plo + -rm -f ./$(DEPDIR)/libhawk_la-pio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rbt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rec.Plo + -rm -f ./$(DEPDIR)/libhawk_la-rio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-run.Plo + -rm -f ./$(DEPDIR)/libhawk_la-sio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-std.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tio.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-ast.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-compile.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-match-bt.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-match-pa.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-mem.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-parse.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre-stack.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tre.Plo + -rm -f ./$(DEPDIR)/libhawk_la-tree.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utf16.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utf8.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-ass.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-skad.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-sort.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-str.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl-sys.Plo + -rm -f ./$(DEPDIR)/libhawk_la-utl.Plo + -rm -f ./$(DEPDIR)/libhawk_la-val.Plo + -rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo + -rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo + -rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo + -rm -f ./$(DEPDIR)/libhawkxx_la-Hawk.Plo + -rm -f ./$(DEPDIR)/libhawkxx_la-StdHawk.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1309,15 +1555,15 @@ uninstall-am: uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES .MAKE: all install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-hdr 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-pkgincludeHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-hdr 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-pkgincludeHEADERS \ install-pkglibLTLIBRARIES install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ @@ -1328,36 +1574,6 @@ uninstall-am: uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES .PRECIOUS: Makefile -#modexecdir = $(libdir) -# -#modexec_LTLIBRARIES = libhawk-dir.la -#libhawk_dir_la_SOURCES = mod-dir.c mod-dir.h -#libhawk_dir_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_dir_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si -#libhawk_dir_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi -#libhawk_dir_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) ../../lib/si/libqsesi.la -# -#modexec_LTLIBRARIES += libhawk-math.la -#libhawk_math_la_SOURCES = mod-math.c mod-math.h -#libhawk_math_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_math_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -#libhawk_math_la_LIBADD = $(LIBADD_MOD_COMMON) -#libhawk_math_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) -# -#modexec_LTLIBRARIES += libhawk-str.la -#libhawk_str_la_SOURCES = mod-str.c mod-str.h -#libhawk_str_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_str_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -#libhawk_str_la_LIBADD = $(LIBADD_MOD_COMMON) -#libhawk_str_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) -# -#modexec_LTLIBRARIES += libhawk-sys.la -#libhawk_sys_la_SOURCES = mod-sys.c mod-sys.h -#libhawk_sys_la_CPPFLAGS = $(CPPFLAGS_MOD_COMMON) -#libhawk_sys_la_LDFLAGS = $(LDFLAGS_MOD_COMMON) -L../si -#libhawk_sys_la_LIBADD = $(LIBADD_MOD_COMMON) -lqsesi -#libhawk_sys_la_DEPENDENCIES = $(DEPENDENCIES_MOD_COMMON) ../../lib/si/libqsesi.la - # 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/hawk/lib/dir.c b/hawk/lib/dir.c index d37af69e..de0c51d0 100644 --- a/hawk/lib/dir.c +++ b/hawk/lib/dir.c @@ -222,50 +222,17 @@ void hawk_dir_fini (hawk_dir_t* dir) static hawk_bch_t* wcs_to_mbuf (hawk_dir_t* dir, const hawk_uch_t* wcs, hawk_becs_t* mbuf) { -#if 0 - hawk_oow_t ml, wl; - - if (hawk_gem_convutobcstr(gem, wcs, &wl, HAWK_NULL, &ml) <= -1) return HAWK_NULL; - - if (hawk_becs_setlen(mbuf, ml) == (hawk_oow_t)-1) - { - dir->errnum = HAWK_DIR_ENOMEM; - return HAWK_NULL; - } - - hawk_wcstombs (wcs, &wl, HAWK_BECS_PTR(mbuf), &ml); - return HAWK_BECS_PTR(mbuf); - -#else - + hawk_becs_clear (mbuf); if (hawk_becs_ncatuchars(mbuf, wcs, hawk_count_ucstr(wcs), dir->gem->cmgr) == (hawk_oow_t)-1) return HAWK_NULL; return HAWK_BECS_PTR(mbuf); -#endif } static hawk_uch_t* mbs_to_wbuf (hawk_dir_t* dir, const hawk_bch_t* mbs, hawk_uecs_t* wbuf) { -#if 0 - hawk_oow_t ml, wl; - - if (hawk_mbstowcs (mbs, &ml, HAWK_NULL, &wl) <= -1) - { - dir->errnum = HAWK_DIR_EINVAL; - return HAWK_NULL; - } - if (hawk_uecs_setlen (wbuf, wl) == (hawk_oow_t)-1) - { - dir->errnum = HAWK_DIR_ENOMEM; - return HAWK_NULL; - } - - hawk_mbstowcs (mbs, &ml, HAWK_UECS_PTR(wbuf), &wl); - return HAWK_UECS_PTR(wbuf); -#else /* convert all regardless of encoding failure */ + hawk_uecs_clear (wbuf); if (hawk_uecs_ncatbchars(wbuf, mbs, hawk_count_bcstr(mbs), dir->gem->cmgr, 1) == (hawk_oow_t)-1) return HAWK_NULL; return HAWK_UECS_PTR(wbuf); -#endif } static hawk_uch_t* wcs_to_wbuf (hawk_dir_t* dir, const hawk_uch_t* wcs, hawk_uecs_t* wbuf) @@ -381,6 +348,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) #if defined(_WIN32) /* ------------------------------------------------------------------- */ const hawk_ooch_t* tptr; + HANDLE dh; dir->status &= ~STATUS_DONE; dir->status &= ~STATUS_DONE_ERR; @@ -389,7 +357,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) { hawk_bch_t* mptr; - mptr = make_mbsdos_path (dir, (const hawk_bch_t*)path); + mptr = make_mbsdos_path(dir, (const hawk_bch_t*)path); if (mptr == HAWK_NULL) return -1; #if defined(HAWK_OOCH_IS_BCH) @@ -414,13 +382,16 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) } if (tptr == HAWK_NULL) return -1; - dir->h = FindFirstFile(tptr, &dir->wfd); - if (dir->h == INVALID_HANDLE_VALUE) + dh = FindFirstFile(tptr, &dir->wfd); + if (dh == INVALID_HANDLE_VALUE) { hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError())); return -1; } + close_dir_safely (dir); + + dir->h = dh; return 0; /* ------------------------------------------------------------------- */ @@ -429,9 +400,13 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) /* ------------------------------------------------------------------- */ APIRET rc; const hawk_bch_t* mptr; - - dir->h = HDIR_CREATE; - dir->count = 1; + HDIR h = HDIR_CREATE; + #if defined(FIL_STANDARDL) + FILEFINDBUF3L ffb = { 0 }; + #else + FILEFINDBUF3 ffb = { 0 }; + #endif + ULONG count = 1; if (dir->flags & HAWK_DIR_MBSPATH) { @@ -450,11 +425,11 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) rc = DosFindFirst ( mptr, - &dir->h, + &h, FILE_DIRECTORY | FILE_READONLY, - &dir->ffb, + &ffb, HAWK_SIZEOF(dir->ffb), - &dir->count, + &count, #if defined(FIL_STANDARDL) FIL_STANDARDL #else @@ -468,6 +443,11 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) return -1; } + close_dir_safely (dir); + + dir->h = h; + dir->ffb = ffb; + dir->count = count; dir->status |= STATUS_OPENED; return 0; /* ------------------------------------------------------------------- */ @@ -477,6 +457,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) /* ------------------------------------------------------------------- */ unsigned int rc; const hawk_bch_t* mptr; + struct find_t f; dir->status &= ~STATUS_DONE; dir->status &= ~STATUS_DONE_ERR; @@ -497,13 +478,16 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) } if (mptr == HAWK_NULL) return -1; - rc = _dos_findfirst(mptr, _A_NORMAL | _A_SUBDIR, &dir->f); + rc = _dos_findfirst(mptr, _A_NORMAL | _A_SUBDIR, &f); if (rc != 0) { hawk_gem_seterrnum (dir->gem, HAWK_NULL,hawk_syserr_to_errnum(errno)); return -1; } + reset_dir_safely (dir); + + dir->f = f; dir->status |= STATUS_OPENED; return 0; /* ------------------------------------------------------------------- */ @@ -543,6 +527,8 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) return -1; } + close_dir_safely (dir); + dir->dp = dp; return 0; #endif @@ -550,13 +536,12 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path) int hawk_dir_reset (hawk_dir_t* dir, const hawk_ooch_t* path) { - close_dir_safely (dir); - if (reset_to_path (dir, path) <= -1) return -1; + if (reset_to_path(dir, path) <= -1) return -1; if (dir->flags & HAWK_DIR_SORT) { hawk_arr_clear (dir->stab); - if (read_ahead_and_sort (dir, path) <= -1) + if (read_ahead_and_sort(dir, path) <= -1) { dir->status |= STATUS_SORT_ERR; return -1; @@ -749,7 +734,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name) read: errno = 0; - de = HAWK_READDIR (dir->dp); + de = HAWK_READDIR(dir->dp); if (de == NULL) { if (errno == 0) return 0; @@ -766,13 +751,13 @@ read: if (dir->flags & HAWK_DIR_MBSPATH) { - if (mbs_to_mbuf (dir, de->d_name, &dir->mbuf) == HAWK_NULL) return -1; + if (mbs_to_mbuf(dir, de->d_name, &dir->mbuf) == HAWK_NULL) return -1; *name = HAWK_BECS_PTR(&dir->mbuf); } else { /*HAWK_ASSERT (dir->flags & HAWK_DIR_WCSPATH);*/ - if (mbs_to_wbuf (dir, de->d_name, &dir->wbuf) == HAWK_NULL) return -1; + if (mbs_to_wbuf(dir, de->d_name, &dir->wbuf) == HAWK_NULL) return -1; *name = HAWK_UECS_PTR(&dir->wbuf); } @@ -814,7 +799,11 @@ int hawk_dir_read (hawk_dir_t* dir, hawk_dir_ent_t* ent) { if (dir->flags & HAWK_DIR_SORT) { - if (dir->status & STATUS_SORT_ERR) return -1; + if (dir->status & STATUS_SORT_ERR) + { + hawk_gem_seterrnum (dir->gem, HAWK_NULL, HAWK_ESTATE); + return -1; + } if (dir->status & STATUS_POPHEAP) hawk_arr_popheap (dir->stab); else dir->status |= STATUS_POPHEAP; diff --git a/hawk/lib/err-sys.c b/hawk/lib/err-sys.c index 77468b04..423b69e1 100644 --- a/hawk/lib/err-sys.c +++ b/hawk/lib/err-sys.c @@ -170,14 +170,20 @@ hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e) #if defined(EPIPE) case EPIPE: return HAWK_EPIPE; #endif + #if defined(EINPROGRESS) + case EINPROGRESS: return HAWK_EINPROG; + #endif #if defined(ECHILD) case ECHILD: return HAWK_ECHILD; #endif #if defined(ETIMEDOUT) case ETIMEDOUT: return HAWK_ETMOUT; #endif - #if defined(EINPROGRESS) - case EINPROGRESS: return HAWK_EINPROG; + #if defined(EBADFD) + case EBADFD: return HAWK_ESTATE; + #endif + #if defined(ENOTRECOVERABLE) + case ENOTRECOVERABLE: return HAWK_ESTATE; #endif #if defined(EWOULDBLOCK) && defined(EAGAIN) && (EWOULDBLOCK == EAGAIN) diff --git a/hawk/lib/err.c b/hawk/lib/err.c index 2b81b496..acebc82f 100644 --- a/hawk/lib/err.c +++ b/hawk/lib/err.c @@ -58,6 +58,7 @@ const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum) HAWK_T("no handle"), HAWK_T("no child process"), HAWK_T("timed out"), + HAWK_T("in bad state"), HAWK_T("cannot open '${0}'"), HAWK_T("cannot read '${0}'"), diff --git a/hawk/lib/fmt-out.h b/hawk/lib/fmt-out.h deleted file mode 100644 index 88ab8089..00000000 --- a/hawk/lib/fmt-out.h +++ /dev/null @@ -1,1262 +0,0 @@ -/* - * $Id$ - * - Copyright (c) 2006-2019 Chung, Hyung-Hwan. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This file contains a formatted output routine derived from kvprintf() - * of FreeBSD. It has been heavily modified and bug-fixed. - */ - -/* - * Copyright (c) 1986, 1988, 1991, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -/* - * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse - * order; return an optional length and a pointer to the last character - * written in the buffer (i.e., the first character of the string). - * The buffer pointed to by `nbuf' must have length >= MAXNBUF. - */ -static char_t* sprintn (char_t* nbuf, hawk_uintmax_t num, int base, int *lenp, int upper) -{ - char_t *p, c; - - p = nbuf; - *p = T('\0'); - do - { - c = hex2ascii(num % base); - *++p = upper ? toupper(c) : c; - } - while (num /= base); - - if (lenp) *lenp = p - nbuf; - return p; -} - -/* NOTE: data output is aborted if the data limit is reached or - * I/O error occurs */ - -#undef PUT_CHAR -#undef PUT_BYTE_IN_HEX - -#define PUT_CHAR(c) do { \ - int xx; \ - if (data->count >= data->limit) goto done; \ - if ((xx = data->put(c, data->ctx)) <= -1) goto oops; \ - if (xx == 0) goto done; \ - data->count++; \ -} while (0) - -#define PUT_BYTE_IN_HEX(byte,extra_flags) do { \ - hawk_bch_t __xbuf[3]; \ - hawk_bytetombs ((byte), __xbuf, HAWK_COUNTOF(__xbuf), (16 | (extra_flags)), '0'); \ - PUT_CHAR(__xbuf[0]); \ - PUT_CHAR(__xbuf[1]); \ -} while (0) - -#define BYTE_PRINTABLE(x) ((x) <= 0x7F && (x) != '\\' && HAWK_ISMPRINT(x)) - -int fmtout (const char_t* fmt, fmtout_t* data, va_list ap) -{ - char_t nbuf[MAXNBUF]; - const char_t* p, * percent; - int n, base, tmp, width, neg, sign, precision, upper; - uchar_t ch; - char_t ach, padc, * sp; - ochar_t oach, * osp; - hawk_oow_t oslen, slen; - hawk_byte_t* bytep; - int lm_flag, lm_dflag, flagc, numlen; - hawk_uintmax_t num = 0; - int stop = 0; - - struct - { - hawk_bch_t sbuf[32]; - hawk_bch_t* ptr; - hawk_oow_t capa; - } fltfmt; - - struct - { - char_t sbuf[96]; - char_t* ptr; - hawk_oow_t capa; - } fltout; - - data->count = 0; - - fltfmt.ptr = fltfmt.sbuf; - fltfmt.capa = HAWK_COUNTOF(fltfmt.sbuf) - 1; - - fltout.ptr = fltout.sbuf; - fltout.capa = HAWK_COUNTOF(fltout.sbuf) - 1; - - while (1) - { - while ((ch = (uchar_t)*fmt++) != T('%') || stop) - { - if (ch == T('\0')) goto done; - PUT_CHAR (ch); - } - percent = fmt - 1; - - padc = T(' '); - width = 0; precision = 0; - neg = 0; sign = 0; upper = 0; - - lm_flag = 0; lm_dflag = 0; flagc = 0; - -reswitch: - switch (ch = (uchar_t)*fmt++) - { - case T('%'): /* %% */ - ach = ch; - goto print_lowercase_c; - break; - - /* flag characters */ - case T('.'): - if (flagc & FLAGC_DOT) goto invalid_format; - flagc |= FLAGC_DOT; - goto reswitch; - - case T('#'): - if (flagc & (FLAGC_WIDTH | FLAGC_DOT | FLAGC_LENMOD)) goto invalid_format; - flagc |= FLAGC_SHARP; - goto reswitch; - - case T(' '): - if (flagc & (FLAGC_WIDTH | FLAGC_DOT | FLAGC_LENMOD)) goto invalid_format; - flagc |= FLAGC_SPACE; - goto reswitch; - - case T('+'): /* place sign for signed conversion */ - if (flagc & (FLAGC_WIDTH | FLAGC_DOT | FLAGC_LENMOD)) goto invalid_format; - flagc |= FLAGC_SIGN; - goto reswitch; - - case T('-'): /* left adjusted */ - if (flagc & (FLAGC_WIDTH | FLAGC_DOT | FLAGC_LENMOD)) goto invalid_format; - if (flagc & FLAGC_DOT) - { - goto invalid_format; - } - else - { - flagc |= FLAGC_LEFTADJ; - if (flagc & FLAGC_ZEROPAD) - { - padc = T(' '); - flagc &= ~FLAGC_ZEROPAD; - } - } - - goto reswitch; - - case T('*'): /* take the length from the parameter */ - if (flagc & FLAGC_DOT) - { - if (flagc & (FLAGC_STAR2 | FLAGC_PRECISION)) goto invalid_format; - flagc |= FLAGC_STAR2; - - precision = va_arg(ap, int); - if (precision < 0) - { - /* if precision is less than 0, - * treat it as if no .precision is specified */ - flagc &= ~FLAGC_DOT; - precision = 0; - } - } - else - { - if (flagc & (FLAGC_STAR1 | FLAGC_WIDTH)) goto invalid_format; - flagc |= FLAGC_STAR1; - - width = va_arg(ap, int); - if (width < 0) - { - /* - if (flagc & FLAGC_LEFTADJ) - flagc &= ~FLAGC_LEFTADJ; - else - */ - flagc |= FLAGC_LEFTADJ; - width = -width; - } - } - goto reswitch; - - case T('0'): /* zero pad */ - if (flagc & FLAGC_LENMOD) goto invalid_format; - if (!(flagc & (FLAGC_DOT | FLAGC_LEFTADJ))) - { - padc = T('0'); - flagc |= FLAGC_ZEROPAD; - goto reswitch; - } - /* end of flags characters */ - - case T('1'): case T('2'): case T('3'): case T('4'): - case T('5'): case T('6'): case T('7'): case T('8'): case T('9'): - if (flagc & FLAGC_LENMOD) goto invalid_format; - for (n = 0;; ++fmt) - { - n = n * 10 + ch - T('0'); - ch = *fmt; - if (ch < T('0') || ch > T('9')) break; - } - if (flagc & FLAGC_DOT) - { - if (flagc & FLAGC_STAR2) goto invalid_format; - precision = n; - flagc |= FLAGC_PRECISION; - } - else - { - if (flagc & FLAGC_STAR1) goto invalid_format; - width = n; - flagc |= FLAGC_WIDTH; - } - goto reswitch; - - /* length modifiers */ - case T('h'): /* short int */ - case T('l'): /* long int */ - case T('q'): /* long long int */ - case T('j'): /* uintmax_t */ - case T('z'): /* size_t */ - case T('t'): /* ptrdiff_t */ - if (lm_flag & (LF_LD | LF_QD)) goto invalid_format; - - flagc |= FLAGC_LENMOD; - if (lm_dflag) - { - /* error */ - goto invalid_format; - } - else if (lm_flag) - { - if (lm_tab[ch - T('a')].dflag && lm_flag == lm_tab[ch - T('a')].flag) - { - lm_flag &= ~lm_tab[ch - T('a')].flag; - lm_flag |= lm_tab[ch - T('a')].dflag; - lm_dflag |= lm_flag; - goto reswitch; - } - else - { - /* error */ - goto invalid_format; - } - } - else - { - lm_flag |= lm_tab[ch - T('a')].flag; - goto reswitch; - } - break; - - case T('L'): /* long double */ - if (flagc & FLAGC_LENMOD) - { - /* conflict with other length modifier */ - goto invalid_format; - } - flagc |= FLAGC_LENMOD; - lm_flag |= LF_LD; - goto reswitch; - - case T('Q'): /* __float128 */ - if (flagc & FLAGC_LENMOD) - { - /* conflict with other length modifier */ - goto invalid_format; - } - flagc |= FLAGC_LENMOD; - lm_flag |= LF_QD; - goto reswitch; - - case T('I'): - { - int save_lm_flag = lm_flag; - if (fmt[0] == T('8')) - { - lm_flag |= LF_I8; - fmt += 1; - } - else if (fmt[0] == T('1') && fmt[1] == T('6')) - { - lm_flag |= LF_I16; - fmt += 2; - } - #if defined(HAWK_HAVE_INT128_T) - else if (fmt[0] == T('1') && fmt[1] == T('2') && fmt[2] == T('8')) - { - lm_flag |= LF_I128; - fmt += 3; - } - #endif - else if (fmt[0] == T('3') && fmt[1] == T('2')) - { - lm_flag |= LF_I32; - fmt += 2; - } - #if defined(HAWK_HAVE_INT64_T) - else if (fmt[0] == T('6') && fmt[1] == T('4')) - { - lm_flag |= LF_I64; - fmt += 2; - } - #endif - else - { - goto invalid_format; - } - - if (flagc & FLAGC_LENMOD) - { - /* conflict with other length modifier */ - lm_flag = save_lm_flag; - goto invalid_format; - } - flagc |= FLAGC_LENMOD; - goto reswitch; - } - - /* end of length modifiers */ - - case T('n'): - if (lm_flag & LF_J) /* j */ - *(va_arg(ap, hawk_intmax_t*)) = data->count; - else if (lm_flag & LF_Z) /* z */ - *(va_arg(ap, hawk_oow_t*)) = data->count; - #if (HAWK_SIZEOF_LONG_LONG > 0) - else if (lm_flag & LF_Q) /* ll */ - *(va_arg(ap, long long int*)) = data->count; - #endif - else if (lm_flag & LF_L) /* l */ - *(va_arg(ap, long int*)) = data->count; - else if (lm_flag & LF_H) /* h */ - *(va_arg(ap, short int*)) = data->count; - else if (lm_flag & LF_C) /* hh */ - *(va_arg(ap, char*)) = data->count; - else if (flagc & FLAGC_LENMOD) - goto oops; - else - *(va_arg(ap, int*)) = data->count; - break; - - - /* signed integer conversions */ - case T('d'): - case T('i'): /* signed conversion */ - base = 10; - sign = 1; - goto handle_sign; - /* end of signed integer conversions */ - - /* unsigned integer conversions */ - case T('o'): - base = 8; - goto handle_nosign; - case T('u'): - base = 10; - goto handle_nosign; - case T('X'): - upper = 1; - case T('x'): - base = 16; - goto handle_nosign; - case T('b'): - base = 2; - goto handle_nosign; - /* end of unsigned integer conversions */ - - case T('p'): /* pointer */ - base = 16; - - if (width == 0) flagc |= FLAGC_SHARP; - else flagc &= ~FLAGC_SHARP; - - num = (hawk_uintptr_t)va_arg(ap, void*); - goto number; - - case T('c'): - /* zeropad must not take effect for 'c' */ - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - if (((lm_flag & LF_H) && (HAWK_SIZEOF(char_t) > HAWK_SIZEOF(ochar_t))) || - ((lm_flag & LF_L) && (HAWK_SIZEOF(char_t) < HAWK_SIZEOF(ochar_t)))) goto uppercase_c; - lowercase_c: - ach = HAWK_SIZEOF(char_t) < HAWK_SIZEOF(int)? va_arg(ap, int): va_arg(ap, char_t); - - print_lowercase_c: - /* precision 0 doesn't kill the letter */ - width--; - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - PUT_CHAR (ach); - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - break; - - case T('C'): - /* zeropad must not take effect for 'C' */ - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - if (((lm_flag & LF_H) && (HAWK_SIZEOF(char_t) < HAWK_SIZEOF(ochar_t))) || - ((lm_flag & LF_L) && (HAWK_SIZEOF(char_t) > HAWK_SIZEOF(ochar_t)))) goto lowercase_c; - uppercase_c: - oach = HAWK_SIZEOF(ochar_t) < HAWK_SIZEOF(int)? va_arg(ap, int): va_arg(ap, ochar_t); - - oslen = 1; - if (data->conv (&oach, &oslen, HAWK_NULL, &slen, data->ctx) <= -1) - { - /* conversion error */ - goto oops; - } - - /* precision 0 doesn't kill the letter */ - width -= slen; - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - - { - char_t conv_buf[CONV_MAX]; - hawk_oow_t i, conv_len; - - oslen = 1; - conv_len = HAWK_COUNTOF(conv_buf); - - /* this must not fail since the dry-run above was successful */ - data->conv (&oach, &oslen, conv_buf, &conv_len, data->ctx); - - for (i = 0; i < conv_len; i++) - { - PUT_CHAR (conv_buf[i]); - } - } - - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - break; - - case T('s'): - /* zeropad must not take effect for 's' */ - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - if (((lm_flag & LF_H) && (HAWK_SIZEOF(char_t) > HAWK_SIZEOF(ochar_t))) || - ((lm_flag & LF_L) && (HAWK_SIZEOF(char_t) < HAWK_SIZEOF(ochar_t)))) goto uppercase_s; - lowercase_s: - sp = va_arg (ap, char_t*); - if (sp == HAWK_NULL) p = T("(null)"); - - print_lowercase_s: - if (flagc & FLAGC_DOT) - { - for (n = 0; n < precision && sp[n]; n++); - } - else - { - for (n = 0; sp[n]; n++); - } - - width -= n; - - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - while (n--) PUT_CHAR(*sp++); - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - break; - - case T('S'): - /* zeropad must not take effect for 'S' */ - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - if (((lm_flag & LF_H) && (HAWK_SIZEOF(char_t) < HAWK_SIZEOF(ochar_t))) || - ((lm_flag & LF_L) && (HAWK_SIZEOF(char_t) > HAWK_SIZEOF(ochar_t)))) goto lowercase_s; - uppercase_s: - - osp = va_arg (ap, ochar_t*); - if (osp == HAWK_NULL) osp = OT("(null)"); - - /* get the length */ - for (oslen = 0; osp[oslen]; oslen++); - - if (data->conv(osp, &oslen, HAWK_NULL, &slen, data->ctx) <= -1) - { - /* conversion error */ - goto oops; - } - - /* slen hold the length after conversion */ - n = slen; - if ((flagc & FLAGC_DOT) && precision < slen) n = precision; - width -= n; - - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - - { - char_t conv_buf[CONV_MAX]; - hawk_oow_t i, conv_len, src_len, tot_len = 0; - while (n > 0) - { - HAWK_ASSERT (oslen > tot_len); - - #if CONV_MAX == 1 - src_len = oslen - tot_len; - #else - src_len = 1; - #endif - conv_len = HAWK_COUNTOF(conv_buf); - - /* this must not fail since the dry-run above was successful */ - data->conv (&osp[tot_len], &src_len, conv_buf, &conv_len, data->ctx); - - tot_len += src_len; - - /* stop outputting if a converted character can't be printed - * in its entirety (limited by precision). but this is not an error */ - if (n < conv_len) break; - - for (i = 0; i < conv_len; i++) - { - PUT_CHAR (conv_buf[i]); - } - - n -= conv_len; - } - } - - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR (padc); - } - break; - - case T('k'): - case T('K'): - { - int k_hex_width; - /* zeropad must not take effect for 's'. - * 'h' & 'l' is not used to differentiate hawk_bch_t and hawk_uch_t - * because 'k' means hawk_byte_t. - * 'l', results in uppercase hexadecimal letters. - * 'h' drops the leading \x in the output - * -------------------------------------------------------- - * hk -> \x + non-printable in lowercase hex - * k -> all in lowercase hex - * lk -> \x + all in lowercase hex - * -------------------------------------------------------- - * hK -> \x + non-printable in uppercase hex - * K -> all in uppercase hex - * lK -> \x + all in uppercase hex - * -------------------------------------------------------- - * with 'k' or 'K', i don't substitute "(null)" for the NULL pointer - */ - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - - bytep = va_arg(ap, hawk_byte_t*); - k_hex_width = (lm_flag & (LF_H | LF_L))? 4: 2; - - if (lm_flag & LF_H) - { - /* to print non-printables in hex. i don't use ismprint() to avoid escaping a backslash itself. */ - if (flagc & FLAGC_DOT) - { - /* if precision is specifed, it doesn't stop at the value of zero unlike 's' or 'S' */ - for (n = 0; n < precision; n++) width -= BYTE_PRINTABLE(bytep[n])? 1: k_hex_width; - } - else - { - for (n = 0; bytep[n]; n++) width -= BYTE_PRINTABLE(bytep[n])? 1: k_hex_width; - } - } - else - { - /* to print all in hex */ - if (flagc & FLAGC_DOT) - { - /* if precision is specifed, it doesn't stop at the value of zero unlike 's' or 'S' */ - for (n = 0; n < precision; n++) /* nothing */; - } - else - { - for (n = 0; bytep[n]; n++) /* nothing */; - } - width -= (n * k_hex_width); - } - - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - - while (n--) - { - if ((lm_flag & LF_H) && BYTE_PRINTABLE(*bytep)) - { - PUT_CHAR(*bytep); - } - else - { - hawk_bch_t xbuf[3]; - hawk_bytetombs (*bytep, xbuf, HAWK_COUNTOF(xbuf), (16 | (ch == T('k')? HAWK_BYTETOSTR_LOWERCASE: 0)), HAWK_BT('0')); - if (lm_flag & (LF_H | LF_L)) - { - PUT_CHAR('\\'); - PUT_CHAR('x'); - } - PUT_CHAR(xbuf[0]); - PUT_CHAR(xbuf[1]); - } - bytep++; - } - - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - break; - } - - case T('w'): - case T('W'): - { - /* unicode string in unicode escape sequence. - * - * hw -> \uXXXX, \UXXXXXXXX, printable-byte(only in ascii range) - * w -> \uXXXX, \UXXXXXXXX - * lw -> all in \UXXXXXXXX - */ - const hawk_uch_t* usp; - hawk_oow_t uwid; - - if (flagc & FLAGC_ZEROPAD) padc = T(' '); - usp = va_arg(ap, hawk_uch_t*); - - if (flagc & FLAGC_DOT) - { - /* if precision is specifed, it doesn't stop at the value of zero unlike 's' or 'S' */ - for (n = 0; n < precision; n++) - { - if ((lm_flag & LF_H) && BYTE_PRINTABLE(usp[n])) uwid = 1; - else if (!(lm_flag & LF_L) && usp[n] <= 0xFFFF) uwid = 6; - else uwid = 10; - width -= uwid; - } - } - else - { - for (n = 0; usp[n]; n++) - { - if ((lm_flag & LF_H) && BYTE_PRINTABLE(usp[n])) uwid = 1; - else if (!(lm_flag & LF_L) && usp[n] <= 0xFFFF) uwid = 6; - else uwid = 10; - width -= uwid; - } - } - - if (!(flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - - while (n--) - { - if ((lm_flag & LF_H) && BYTE_PRINTABLE(*usp)) - { - PUT_CHAR(*usp); - } - else if (!(lm_flag & LF_L) && *usp <= 0xFFFF) - { - hawk_uint16_t u16 = *usp; - int extra_flags = ((ch) == 'w'? HAWK_BYTETOSTR_LOWERCASE: 0); - PUT_CHAR('\\'); - PUT_CHAR('u'); - PUT_BYTE_IN_HEX((u16 >> 8) & 0xFF, extra_flags); - PUT_BYTE_IN_HEX(u16 & 0xFF, extra_flags); - } - else - { - hawk_uint32_t u32 = *usp; - int extra_flags = ((ch) == 'w'? HAWK_BYTETOSTR_LOWERCASE: 0); - PUT_CHAR('\\'); - PUT_CHAR('U'); - PUT_BYTE_IN_HEX((u32 >> 24) & 0xFF, extra_flags); - PUT_BYTE_IN_HEX((u32 >> 16) & 0xFF, extra_flags); - PUT_BYTE_IN_HEX((u32 >> 8) & 0xFF, extra_flags); - PUT_BYTE_IN_HEX(u32 & 0xFF, extra_flags); - } - usp++; - } - - if ((flagc & FLAGC_LEFTADJ) && width > 0) - { - while (width--) PUT_CHAR(padc); - } - break; - } - - case T('e'): - case T('E'): - case T('f'): - case T('F'): - case T('g'): - case T('G'): - /* - case T('a'): - case T('A'): - */ - { - /* let me rely on snprintf until i implement float-point to string conversion */ - int q; - hawk_oow_t fmtlen; - #if (HAWK_SIZEOF___FLOAT128 > 0) && defined(HAVE_QUADMATH_SNPRINTF) - __float128 v_qd; - #endif - long double v_ld; - double v_d; - int dtype = 0; - hawk_oow_t newcapa; - - if (lm_flag & LF_J) - { - #if (HAWK_SIZEOF___FLOAT128 > 0) && defined(HAVE_QUADMATH_SNPRINTF) && (HAWK_SIZEOF_FLTMAX_T == HAWK_SIZEOF___FLOAT128) - v_qd = va_arg (ap, hawk_fltmax_t); - dtype = LF_QD; - #elif HAWK_SIZEOF_FLTMAX_T == HAWK_SIZEOF_DOUBLE - v_d = va_arg (ap, hawk_fltmax_t); - #elif HAWK_SIZEOF_FLTMAX_T == HAWK_SIZEOF_LONG_DOUBLE - v_ld = va_arg (ap, hawk_fltmax_t); - dtype = LF_LD; - #else - #error Unsupported hawk_flt_t - #endif - } - else if (lm_flag & LF_Z) - { - /* hawk_flt_t is limited to double or long double */ - - /* precedence goes to double if sizeof(double) == sizeof(long double) - * for example, %Lf didn't work on some old platforms. - * so i prefer the format specifier with no modifier. - */ - #if HAWK_SIZEOF_FLT_T == HAWK_SIZEOF_DOUBLE - v_d = va_arg (ap, hawk_flt_t); - #elif HAWK_SIZEOF_FLT_T == HAWK_SIZEOF_LONG_DOUBLE - v_ld = va_arg (ap, hawk_flt_t); - dtype = LF_LD; - #else - #error Unsupported hawk_flt_t - #endif - } - else if (lm_flag & (LF_LD | LF_L)) - { - v_ld = va_arg (ap, long double); - dtype = LF_LD; - } - #if (HAWK_SIZEOF___FLOAT128 > 0) && defined(HAVE_QUADMATH_SNPRINTF) - else if (lm_flag & (LF_QD | LF_Q)) - { - v_qd = va_arg(ap, __float128); - dtype = LF_QD; - } - #endif - else if (flagc & FLAGC_LENMOD) - { - goto oops; - } - else - { - v_d = va_arg (ap, double); - } - - fmtlen = fmt - percent; - if (fmtlen > fltfmt.capa) - { - if (fltfmt.ptr == fltfmt.sbuf) - { - fltfmt.ptr = HAWK_MMGR_ALLOC (HAWK_MMGR_GETDFL(), HAWK_SIZEOF(*fltfmt.ptr) * (fmtlen + 1)); - if (fltfmt.ptr == HAWK_NULL) goto oops; - } - else - { - hawk_bch_t* tmpptr; - - tmpptr = HAWK_MMGR_REALLOC (HAWK_MMGR_GETDFL(), fltfmt.ptr, HAWK_SIZEOF(*fltfmt.ptr) * (fmtlen + 1)); - if (tmpptr == HAWK_NULL) goto oops; - fltfmt.ptr = tmpptr; - } - - fltfmt.capa = fmtlen; - } - - /* compose back the format specifier */ - fmtlen = 0; - fltfmt.ptr[fmtlen++] = HAWK_BT('%'); - if (flagc & FLAGC_SPACE) fltfmt.ptr[fmtlen++] = HAWK_BT(' '); - if (flagc & FLAGC_SHARP) fltfmt.ptr[fmtlen++] = HAWK_BT('#'); - if (flagc & FLAGC_SIGN) fltfmt.ptr[fmtlen++] = HAWK_BT('+'); - if (flagc & FLAGC_LEFTADJ) fltfmt.ptr[fmtlen++] = HAWK_BT('-'); - if (flagc & FLAGC_ZEROPAD) fltfmt.ptr[fmtlen++] = HAWK_BT('0'); - - if (flagc & FLAGC_STAR1) fltfmt.ptr[fmtlen++] = HAWK_BT('*'); - else if (flagc & FLAGC_WIDTH) - { - fmtlen += hawk_fmtuintmaxtombs ( - &fltfmt.ptr[fmtlen], fltfmt.capa - fmtlen, - width, 10, -1, HAWK_BT('\0'), HAWK_NULL); - } - if (flagc & FLAGC_DOT) fltfmt.ptr[fmtlen++] = HAWK_BT('.'); - if (flagc & FLAGC_STAR2) fltfmt.ptr[fmtlen++] = HAWK_BT('*'); - else if (flagc & FLAGC_PRECISION) - { - fmtlen += hawk_fmtuintmaxtombs ( - &fltfmt.ptr[fmtlen], fltfmt.capa - fmtlen, - precision, 10, -1, HAWK_BT('\0'), HAWK_NULL); - } - - if (dtype == LF_LD) - fltfmt.ptr[fmtlen++] = HAWK_BT('L'); - #if (HAWK_SIZEOF___FLOAT128 > 0) - else if (dtype == LF_QD) - fltfmt.ptr[fmtlen++] = HAWK_BT('Q'); - #endif - - fltfmt.ptr[fmtlen++] = ch; - fltfmt.ptr[fmtlen] = HAWK_BT('\0'); - - #if defined(HAVE_SNPRINTF) - /* nothing special here */ - #else - /* best effort to avoid buffer overflow when no snprintf is available. - * i really can't do much if it happens. */ - newcapa = precision + width + 32; - if (fltout.capa < newcapa) - { - HAWK_ASSERT (fltout.ptr == fltout.sbuf); - - fltout.ptr = HAWK_MMGR_ALLOC (HAWK_MMGR_GETDFL(), HAWK_SIZEOF(char_t) * (newcapa + 1)); - if (fltout.ptr == HAWK_NULL) goto oops; - fltout.capa = newcapa; - } - #endif - - while (1) - { - - if (dtype == LF_LD) - { - #if defined(HAVE_SNPRINTF) - q = snprintf ((hawk_bch_t*)fltout.ptr, fltout.capa + 1, fltfmt.ptr, v_ld); - #else - q = sprintf ((hawk_bch_t*)fltout.ptr, fltfmt.ptr, v_ld); - #endif - } - #if (HAWK_SIZEOF___FLOAT128 > 0) && defined(HAVE_QUADMATH_SNPRINTF) - else if (dtype == LF_QD) - { - q = quadmath_snprintf ((hawk_bch_t*)fltout.ptr, fltout.capa + 1, fltfmt.ptr, v_qd); - } - #endif - else - { - #if defined(HAVE_SNPRINTF) - q = snprintf ((hawk_bch_t*)fltout.ptr, fltout.capa + 1, fltfmt.ptr, v_d); - #else - q = sprintf ((hawk_bch_t*)fltout.ptr, fltfmt.ptr, v_d); - #endif - } - if (q <= -1) goto oops; - if (q <= fltout.capa) break; - - newcapa = fltout.capa * 2; - if (newcapa < q) newcapa = q; - - if (fltout.ptr == fltout.sbuf) - { - fltout.ptr = HAWK_MMGR_ALLOC (HAWK_MMGR_GETDFL(), HAWK_SIZEOF(char_t) * (newcapa + 1)); - if (fltout.ptr == HAWK_NULL) goto oops; - } - else - { - char_t* tmpptr; - - tmpptr = HAWK_MMGR_REALLOC (HAWK_MMGR_GETDFL(), fltout.ptr, HAWK_SIZEOF(char_t) * (newcapa + 1)); - if (tmpptr == HAWK_NULL) goto oops; - fltout.ptr = tmpptr; - } - fltout.capa = newcapa; - } - - if (HAWK_SIZEOF(char_t) != HAWK_SIZEOF(hawk_bch_t)) - { - fltout.ptr[q] = T('\0'); - while (q > 0) - { - q--; - fltout.ptr[q] = ((hawk_bch_t*)fltout.ptr)[q]; - } - } - - sp = fltout.ptr; - flagc &= ~FLAGC_DOT; - width = 0; - precision = 0; - goto print_lowercase_s; - } - - handle_nosign: - sign = 0; - if (lm_flag & LF_J) - { - #if defined(__GNUC__) && \ - (HAWK_SIZEOF_UINTMAX_T > HAWK_SIZEOF_SIZE_T) && \ - (HAWK_SIZEOF_UINTMAX_T != HAWK_SIZEOF_LONG_LONG) && \ - (HAWK_SIZEOF_UINTMAX_T != HAWK_SIZEOF_LONG) - /* GCC-compiled binaries crashed when getting hawk_uintmax_t with va_arg. - * This is just a work-around for it */ - int i; - for (i = 0, num = 0; i < HAWK_SIZEOF(hawk_uintmax_t) / HAWK_SIZEOF(hawk_oow_t); i++) - { - #if defined(HAWK_ENDIAN_BIG) - num = num << (8 * HAWK_SIZEOF(hawk_oow_t)) | (va_arg (ap, hawk_oow_t)); - #else - register int shift = i * HAWK_SIZEOF(hawk_oow_t); - hawk_oow_t x = va_arg (ap, hawk_oow_t); - num |= (hawk_uintmax_t)x << (shift * 8); - #endif - } - #else - num = va_arg (ap, hawk_uintmax_t); - #endif - } - else if (lm_flag & LF_T) - num = va_arg (ap, hawk_ptrdiff_t); - else if (lm_flag & LF_Z) - num = va_arg (ap, hawk_oow_t); - #if (HAWK_SIZEOF_LONG_LONG > 0) - else if (lm_flag & LF_Q) - num = va_arg (ap, unsigned long long int); - #endif - else if (lm_flag & (LF_L | LF_LD)) - num = va_arg (ap, unsigned long int); - else if (lm_flag & LF_H) - num = (unsigned short int)va_arg (ap, int); - else if (lm_flag & LF_C) - num = (unsigned char)va_arg (ap, int); - - else if (lm_flag & LF_I8) - { - #if (HAWK_SIZEOF_UINT8_T < HAWK_SIZEOF_INT) - num = (hawk_uint8_t)va_arg (ap, unsigned int); - #else - num = va_arg (ap, hawk_uint8_t); - #endif - } - else if (lm_flag & LF_I16) - { - #if (HAWK_SIZEOF_UINT16_T < HAWK_SIZEOF_INT) - num = (hawk_uint16_t)va_arg (ap, unsigned int); - #else - num = va_arg (ap, hawk_uint16_t); - #endif - } - else if (lm_flag & LF_I32) - { - #if (HAWK_SIZEOF_UINT32_T < HAWK_SIZEOF_INT) - num = (hawk_uint32_t)va_arg (ap, unsigned int); - #else - num = va_arg (ap, hawk_uint32_t); - #endif - } - #if defined(HAWK_HAVE_UINT64_T) - else if (lm_flag & LF_I64) - { - #if (HAWK_SIZEOF_UINT64_T < HAWK_SIZEOF_INT) - num = (hawk_uint64_t)va_arg (ap, unsigned int); - #else - num = va_arg (ap, hawk_uint64_t); - #endif - } - #endif - #if defined(HAWK_HAVE_UINT128_T) - else if (lm_flag & LF_I128) - { - #if (HAWK_SIZEOF_UINT128_T < HAWK_SIZEOF_INT) - num = (hawk_uint128_t)va_arg (ap, unsigned int); - #else - num = va_arg (ap, hawk_uint128_t); - #endif - } - #endif - else - { - num = va_arg (ap, unsigned int); - } - goto number; - -handle_sign: - if (lm_flag & LF_J) - { - #if defined(__GNUC__) && \ - (HAWK_SIZEOF_INTMAX_T > HAWK_SIZEOF_SIZE_T) && \ - (HAWK_SIZEOF_UINTMAX_T != HAWK_SIZEOF_LONG_LONG) && \ - (HAWK_SIZEOF_UINTMAX_T != HAWK_SIZEOF_LONG) - /* GCC-compiled binraries crashed when getting hawk_uintmax_t with va_arg. - * This is just a work-around for it */ - int i; - for (i = 0, num = 0; i < HAWK_SIZEOF(hawk_intmax_t) / HAWK_SIZEOF(hawk_oow_t); i++) - { - #if defined(HAWK_ENDIAN_BIG) - num = num << (8 * HAWK_SIZEOF(hawk_oow_t)) | (va_arg (ap, hawk_oow_t)); - #else - register int shift = i * HAWK_SIZEOF(hawk_oow_t); - hawk_oow_t x = va_arg (ap, hawk_oow_t); - num |= (hawk_uintmax_t)x << (shift * 8); - #endif - } - #else - num = va_arg (ap, hawk_intmax_t); - #endif - } - - else if (lm_flag & LF_T) - num = va_arg(ap, hawk_ptrdiff_t); - else if (lm_flag & LF_Z) - num = va_arg (ap, hawk_ssize_t); - #if (HAWK_SIZEOF_LONG_LONG > 0) - else if (lm_flag & LF_Q) - num = va_arg (ap, long long int); - #endif - else if (lm_flag & (LF_L | LF_LD)) - num = va_arg (ap, long int); - else if (lm_flag & LF_H) - num = (short int)va_arg (ap, int); - else if (lm_flag & LF_C) - num = (char)va_arg (ap, int); - - else if (lm_flag & LF_I8) - { - #if (HAWK_SIZEOF_INT8_T < HAWK_SIZEOF_INT) - num = (hawk_int8_t)va_arg (ap, int); - #else - num = va_arg (ap, hawk_int8_t); - #endif - } - else if (lm_flag & LF_I16) - { - #if (HAWK_SIZEOF_INT16_T < HAWK_SIZEOF_INT) - num = (hawk_int16_t)va_arg (ap, int); - #else - num = va_arg (ap, hawk_int16_t); - #endif - } - else if (lm_flag & LF_I32) - { - #if (HAWK_SIZEOF_INT32_T < HAWK_SIZEOF_INT) - num = (hawk_int32_t)va_arg (ap, int); - #else - num = va_arg (ap, hawk_int32_t); - #endif - } - #if defined(HAWK_HAVE_INT64_T) - else if (lm_flag & LF_I64) - { - #if (HAWK_SIZEOF_INT64_T < HAWK_SIZEOF_INT) - num = (hawk_int64_t)va_arg (ap, int); - #else - num = va_arg (ap, hawk_int64_t); - #endif - } - #endif - #if defined(HAWK_HAVE_INT128_T) - else if (lm_flag & LF_I128) - { - #if (HAWK_SIZEOF_INT128_T < HAWK_SIZEOF_INT) - num = (hawk_int128_t)va_arg (ap, int); - #else - num = va_arg (ap, hawk_int128_t); - #endif - } - #endif - else - { - num = va_arg (ap, int); - } - -number: - if (sign && (hawk_intmax_t)num < 0) - { - neg = 1; - num = -(hawk_intmax_t)num; - } - p = sprintn (nbuf, num, base, &tmp, upper); - if ((flagc & FLAGC_SHARP) && num != 0) - { - if (base == 8) tmp++; - else if (base == 16) tmp += 2; - } - if (neg) tmp++; - else if (flagc & FLAGC_SIGN) tmp++; - else if (flagc & FLAGC_SPACE) tmp++; - - numlen = p - nbuf; - if ((flagc & FLAGC_DOT) && precision > numlen) - { - /* extra zeros fro precision specified */ - tmp += (precision - numlen); - } - - if (!(flagc & FLAGC_LEFTADJ) && !(flagc & FLAGC_ZEROPAD) && width > 0 && (width -= tmp) > 0) - { - while (width--) PUT_CHAR(padc); - } - - if (neg) PUT_CHAR(T('-')); - else if (flagc & FLAGC_SIGN) PUT_CHAR(T('+')); - else if (flagc & FLAGC_SPACE) PUT_CHAR(T(' ')); - - if ((flagc & FLAGC_SHARP) && num != 0) - { - if (base == 2) - { - PUT_CHAR(T('0')); - PUT_CHAR(T('b')); - } - else if (base == 8) - { - PUT_CHAR(T('0')); - } - else if (base == 16) - { - PUT_CHAR(T('0')); - PUT_CHAR(T('x')); - } - } - - if ((flagc & FLAGC_DOT) && precision > numlen) - { - /* extra zeros for precision specified */ - while (numlen < precision) - { - PUT_CHAR (T('0')); - numlen++; - } - } - - if (!(flagc & FLAGC_LEFTADJ) && width > 0 && (width -= tmp) > 0) - { - while (width-- > 0) PUT_CHAR (padc); - } - - while (*p) PUT_CHAR(*p--); /* output actual digits */ - - if ((flagc & FLAGC_LEFTADJ) && width > 0 && (width -= tmp) > 0) - { - while (width-- > 0) PUT_CHAR (padc); - } - break; - -invalid_format: - while (percent < fmt) PUT_CHAR(*percent++); - break; - - default: - while (percent < fmt) PUT_CHAR(*percent++); - /* - * Since we ignore an formatting argument it is no - * longer safe to obey the remaining formatting - * arguments as the arguments will no longer match - * the format specs. - */ - stop = 1; - break; - } - } - -done: - if (fltfmt.ptr != fltfmt.sbuf) - HAWK_MMGR_FREE (HAWK_MMGR_GETDFL(), fltfmt.ptr); - if (fltout.ptr != fltout.sbuf) - HAWK_MMGR_FREE (HAWK_MMGR_GETDFL(), fltout.ptr); - return 0; - -oops: - if (fltfmt.ptr != fltfmt.sbuf) - HAWK_MMGR_FREE (HAWK_MMGR_GETDFL(), fltfmt.ptr); - if (fltout.ptr != fltout.sbuf) - HAWK_MMGR_FREE (HAWK_MMGR_GETDFL(), fltout.ptr); - return (hawk_ssize_t)-1; -} -#undef PUT_CHAR - diff --git a/hawk/lib/hawk-cmn.h b/hawk/lib/hawk-cmn.h index fe296314..83f91d77 100644 --- a/hawk/lib/hawk-cmn.h +++ b/hawk/lib/hawk-cmn.h @@ -776,17 +776,18 @@ enum hawk_errnum_t HAWK_ENOENT, /**< '${0} not found */ HAWK_EEXIST, /**< '${0}' already exists */ HAWK_EIOERR, /**< I/O error */ - HAWK_EBUFFULL, /**< buffer full */ + HAWK_EBUFFULL,/**< buffer full */ HAWK_EECERR, /**< encoding conversion error */ - HAWK_EISDIR, /**< is directory */ + HAWK_EISDIR, /**< is directory */ HAWK_ENOTDIR, /**< not directory */ HAWK_EAGAIN, /**< resource temporarily unavailable */ - HAWK_EINTR, /**< interrupted */ - HAWK_EPIPE, /**< broken pipe */ - HAWK_EINPROG, /**< in progress */ + HAWK_EINTR, /**< interrupted */ + HAWK_EPIPE, /**< broken pipe */ + HAWK_EINPROG, /**< in progress */ HAWK_ENOHND, /**< no handle */ - HAWK_ECHILD, /**< no child process */ - HAWK_ETMOUT, /**< timed out */ + HAWK_ECHILD, /**< no child process */ + HAWK_ETMOUT, /**< timed out */ + HAWK_ESTATE, /**< in bad state */ /* mostly parse errors */ HAWK_EOPEN, /**< cannot open '${0}' */ diff --git a/hawk/lib/mod-dir.c b/hawk/lib/mod-dir.c deleted file mode 100644 index 55f92312..00000000 --- a/hawk/lib/mod-dir.c +++ /dev/null @@ -1,559 +0,0 @@ -/* - * $Id$ - * - Copyright (c) 2006-2019 Chung, Hyung-Hwan. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -/* -BEGIN { - x = dir::open ("/etc", dir::SORT); # dir::open ("/etc", 0) - if (x <= -1) { - print "cannot open"; - return -1; - } - - while (dir::read(x, q) > 0) { - print q; - } - dir::close (x); -} -*/ - -#include "mod-dir.h" -#include "hawk-prv.h" - -enum -{ - DIR_ENOERR, - DIR_EOTHER, - DIR_ESYSERR, - DIR_ENOMEM, - DIR_EINVAL, - DIR_EACCES, - DIR_EPERM, - DIR_ENOENT, - DIR_EMAPTOSCALAR -}; - -static int dir_err_to_errnum (hawk_dir_errnum_t num) -{ - switch (num) - { - case HAWK_DIR_ESYSERR: - return DIR_ESYSERR; - case HAWK_DIR_ENOMEM: - return DIR_ENOMEM; - case HAWK_DIR_EINVAL: - return DIR_EINVAL; - case HAWK_DIR_EACCES: - return DIR_EACCES; - case HAWK_DIR_EPERM: - return DIR_EPERM; - case HAWK_DIR_ENOENT: - return DIR_ENOENT; - default: - return DIR_EOTHER; - } -} - -static int awk_err_to_errnum (hawk_errnum_t num) -{ - switch (num) - { - case HAWK_ESYSERR: - return DIR_ESYSERR; - case HAWK_ENOMEM: - return DIR_ENOMEM; - case HAWK_EINVAL: - return DIR_EINVAL; - case HAWK_EACCES: - return DIR_EACCES; - case HAWK_EPERM: - return DIR_EPERM; - case HAWK_ENOENT: - return DIR_ENOENT; - case HAWK_EMAPTOSCALAR: - return DIR_EMAPTOSCALAR; - default: - return DIR_EOTHER; - } -} - -#define __IMAP_NODE_T_DATA hawk_dir_t* ctx; -#define __IMAP_LIST_T_DATA int errnum; -#define __IMAP_LIST_T dir_list_t -#define __IMAP_NODE_T dir_node_t -#define __MAKE_IMAP_NODE __new_dir_node -#define __FREE_IMAP_NODE __free_dir_node -#include "imap-imp.h" - -static dir_node_t* new_dir_node (hawk_rtx_t* rtx, dir_list_t* list, const hawk_ooch_t* path, hawk_int_t flags) -{ - dir_node_t* node; - hawk_dir_errnum_t oe; - - node = __new_dir_node(rtx, list); - if (!node) - { - list->errnum = DIR_ENOMEM; - return HAWK_NULL; - } - - node->ctx = hawk_dir_open(hawk_rtx_getmmgr(rtx), 0, path, flags, &oe); - if (!node->ctx) - { - list->errnum = dir_err_to_errnum(oe); - __free_dir_node (rtx, list, node); - return HAWK_NULL; - } - - return node; -} - -static void free_dir_node (hawk_rtx_t* rtx, dir_list_t* list, dir_node_t* node) -{ - if (node->ctx) - { - hawk_dir_close(node->ctx); - node->ctx = HAWK_NULL; - } - __free_dir_node (rtx, list, node); -} -/* ------------------------------------------------------------------------ */ - -static int close_byid (hawk_rtx_t* rtx, dir_list_t* list, hawk_int_t id) -{ - if (id >= 0 && id < list->map.high && list->map.tab[id]) - { - free_dir_node (rtx, list, list->map.tab[id]); - return 0; - } - else - { - list->errnum = DIR_EINVAL; - return -1; - } -} - -static int reset_byid (hawk_rtx_t* rtx, dir_list_t* list, hawk_int_t id, const hawk_ooch_t* path) -{ - if (id >= 0 && id < list->map.high && list->map.tab[id]) - { - if (hawk_dir_reset(list->map.tab[id]->ctx, path) <= -1) - { - list->errnum = dir_err_to_errnum (hawk_dir_geterrnum (list->map.tab[id]->ctx)); - return -1; - } - return 0; - } - else - { - list->errnum = DIR_EINVAL; - return -1; - } -} - -static int read_byid (hawk_rtx_t* rtx, dir_list_t* list, hawk_int_t id, hawk_val_ref_t* ref) -{ - if (id >= 0 && id < list->map.high && list->map.tab[id]) - { - int y; - hawk_dir_ent_t ent; - hawk_val_t* tmp; - - y = hawk_dir_read(list->map.tab[id]->ctx, &ent); - if (y <= -1) - { - list->errnum = dir_err_to_errnum(hawk_dir_geterrnum (list->map.tab[id]->ctx)); - return -1; - } - - if (y == 0) return 0; /* no more entry */ - - tmp = hawk_rtx_makestrvalwithoocstr(rtx, ent.name); - if (!tmp) - { - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum (rtx)); - return -1; - } - else - { - int n; - hawk_rtx_refupval (rtx, tmp); - n = hawk_rtx_setrefval (rtx, ref, tmp); - hawk_rtx_refdownval (rtx, tmp); - if (n <= -1) return -9999; - } - - return 1; /* has entry */ - } - else - { - list->errnum = DIR_EINVAL; - return -1; - } -} - -/* ------------------------------------------------------------------------ */ - -static HAWK_INLINE dir_list_t* rtx_to_list (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - hawk_rbt_pair_t* pair; - pair = hawk_rbt_search((hawk_rbt_t*)fi->mod->ctx, &rtx, HAWK_SIZEOF(rtx)); - HAWK_ASSERT (hawk_rtx_gethawk(rtx), pair != HAWK_NULL); - return (dir_list_t*)HAWK_RBT_VPTR(pair); -} - -static int fnc_dir_errno (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - hawk_val_t* retv; - - list = rtx_to_list(rtx, fi); - - retv = hawk_rtx_makeintval (rtx, list->errnum); - if (retv == HAWK_NULL) return -1; - - hawk_rtx_setretval (rtx, retv); - return 0; -} - -static hawk_ooch_t* errmsg[] = -{ - HAWK_T("no error"), - HAWK_T("other error"), - HAWK_T("system error"), - HAWK_T("insufficient memory"), - HAWK_T("invalid data"), - HAWK_T("access denied"), - HAWK_T("operation not permitted"), - HAWK_T("no entry"), - HAWK_T("cannot change a map to a scalar"), - HAWK_T("unknown error") -}; - -static int fnc_dir_errstr (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - hawk_val_t* retv; - hawk_int_t errnum; - - list = rtx_to_list(rtx, fi); - - if (hawk_rtx_getnargs(rtx) <= 0 || - hawk_rtx_valtoint(rtx, hawk_rtx_getarg (rtx, 0), &errnum) <= -1) - { - errnum = list->errnum; - } - - if (errnum < 0 || errnum >= HAWK_COUNTOF(errmsg)) errnum = HAWK_COUNTOF(errmsg) - 1; - - retv = hawk_rtx_makestrvalwithoocstr(rtx, errmsg[errnum]); - if (retv == HAWK_NULL) return -1; - - hawk_rtx_setretval (rtx, retv); - return 0; -} - -static int fnc_dir_open (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - dir_node_t* node = HAWK_NULL; - hawk_int_t ret; - hawk_ooch_t* path; - hawk_val_t* retv; - hawk_val_t* a0; - hawk_int_t flags = 0; - - list = rtx_to_list(rtx, fi); - - a0 = hawk_rtx_getarg(rtx, 0); - path = hawk_rtx_getvaloocstr(rtx, a0, HAWK_NULL); - if (path) - { - if (hawk_rtx_getnargs(rtx) >= 2 && - hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &flags) <= -1) - { - hawk_rtx_freevaloocstr (rtx, a0, path); - goto oops; - } - - node = new_dir_node(rtx, list, path, flags); - if (node) ret = node->id; - else ret = -1; - hawk_rtx_freevaloocstr (rtx, a0, path); - } - else - { - oops: - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum(rtx)); - ret = -1; - } - - /* ret may not be a statically managed number. - * error checking is required */ - retv = hawk_rtx_makeintval(rtx, ret); - if (retv == HAWK_NULL) - { - if (node) free_dir_node (rtx, list, node); - return -1; - } - - hawk_rtx_setretval (rtx, retv); - return 0; -} - -static int fnc_dir_close (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - hawk_int_t id; - int ret; - - list = rtx_to_list(rtx, fi); - - ret = hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &id); - if (ret <= -1) - { - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum(rtx)); - ret = -1; - } - else - { - ret = close_byid(rtx, list, id); - } - - hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, ret)); - return 0; -} - -static int fnc_dir_reset (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - hawk_int_t id; - int ret; - hawk_ooch_t* path; - - list = rtx_to_list(rtx, fi); - - ret = hawk_rtx_valtoint(rtx, hawk_rtx_getarg (rtx, 0), &id); - if (ret <= -1) - { - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum (rtx)); - } - else - { - hawk_val_t* a1; - - a1 = hawk_rtx_getarg(rtx, 1); - path = hawk_rtx_getvaloocstr(rtx, a1, HAWK_NULL); - if (path) - { - ret = reset_byid(rtx, list, id, path); - hawk_rtx_freevaloocstr (rtx, a1, path); - } - else - { - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum(rtx)); - ret = -1; - } - } - - /* no error check for hawk_rtx_makeintval() here since ret - * is 0 or -1. it will never fail for those numbers */ - hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, ret)); - return 0; -} - -static int fnc_dir_read (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) -{ - dir_list_t* list; - hawk_int_t id; - int ret; - - list = rtx_to_list(rtx, fi); - - ret = hawk_rtx_valtoint(rtx, hawk_rtx_getarg (rtx, 0), &id); - if (ret <= -1) - { - list->errnum = awk_err_to_errnum(hawk_rtx_geterrnum (rtx)); - } - else - { - ret = read_byid(rtx, list, id, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 1)); - if (ret == -9999) return -1; - } - - /* no error check for hawk_rtx_makeintval() here since ret - * is 0, 1, -1. it will never fail for those numbers */ - hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, ret)); - return 0; -} - -/* ------------------------------------------------------------------------ */ - -typedef struct fnctab_t fnctab_t; -struct fnctab_t -{ - const hawk_ooch_t* name; - hawk_mod_sym_fnc_t info; -}; - -typedef struct inttab_t inttab_t; -struct inttab_t -{ - const hawk_ooch_t* name; - hawk_mod_sym_int_t info; -}; - - -static fnctab_t fnctab[] = -{ - { HAWK_T("close"), { { 1, 1, HAWK_NULL }, fnc_dir_close, 0 } }, - { HAWK_T("errno"), { { 0, 0, HAWK_NULL }, fnc_dir_errno, 0 } }, - { HAWK_T("errstr"), { { 0, 1, HAWK_NULL }, fnc_dir_errstr, 0 } }, - { HAWK_T("open"), { { 1, 2, HAWK_NULL }, fnc_dir_open, 0 } }, - { HAWK_T("read"), { { 2, 2, HAWK_T("vr") }, fnc_dir_read, 0 } }, - { HAWK_T("reset"), { { 2, 2, HAWK_NULL }, fnc_dir_reset, 0 } }, -}; - -static inttab_t inttab[] = -{ - /* keep this table sorted for binary search in query(). */ - { HAWK_T("SORT"), { HAWK_DIR_SORT } } -}; - -/* ------------------------------------------------------------------------ */ - -static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym) -{ - hawk_oocs_t ea; - int left, right, mid, n; - - left = 0; right = HAWK_COUNTOF(fnctab) - 1; - - while (left <= right) - { - mid = left + (right - left) / 2; - - n = hawk_strcmp (fnctab[mid].name, name); - if (n > 0) right = mid - 1; - else if (n < 0) left = mid + 1; - else - { - sym->type = HAWK_MOD_FNC; - sym->u.fnc = fnctab[mid].info; - return 0; - } - } - - left = 0; right = HAWK_COUNTOF(inttab) - 1; - while (left <= right) - { - mid = left + (right - left) / 2; - - n = hawk_strcmp (inttab[mid].name, name); - if (n > 0) right = mid - 1; - else if (n < 0) left = mid + 1; - else - { - sym->type = HAWK_MOD_INT; - sym->u.in = inttab[mid].info; - return 0; - } - } - - ea.ptr = (hawk_ooch_t*)name; - ea.len = hawk_count_oocstr(name); - hawk_seterror (awk, HAWK_ENOENT, &ea, HAWK_NULL); - return -1; -} - -static int init (hawk_mod_t* mod, hawk_rtx_t* rtx) -{ - hawk_rbt_t* rbt; - dir_list_t list; - - rbt = (hawk_rbt_t*)mod->ctx; - - HAWK_MEMSET (&list, 0, HAWK_SIZEOF(list)); - if (hawk_rbt_insert (rbt, &rtx, HAWK_SIZEOF(rtx), &list, HAWK_SIZEOF(list)) == HAWK_NULL) return -1; - - return 0; -} - -static void fini (hawk_mod_t* mod, hawk_rtx_t* rtx) -{ - hawk_rbt_t* rbt; - hawk_rbt_pair_t* pair; - - rbt = (hawk_rbt_t*)mod->ctx; - - /* garbage clean-up */ - pair = hawk_rbt_search(rbt, &rtx, HAWK_SIZEOF(rtx)); - if (pair) - { - dir_list_t* list; - dir_node_t* node, * next; - - list = HAWK_RBT_VPTR(pair); - node = list->head; - while (node) - { - next = node->next; - free_dir_node (rtx, list, node); - node = next; - } - - hawk_rbt_delete (rbt, &rtx, HAWK_SIZEOF(rtx)); - } -} - -static void unload (hawk_mod_t* mod, hawk_t* awk) -{ - hawk_rbt_t* rbt; - - rbt = (hawk_rbt_t*)mod->ctx; - - HAWK_ASSERT (awk, HAWK_RBT_SIZE(rbt) == 0); - hawk_rbt_close (rbt); -} - -int hawk_mod_dir (hawk_mod_t* mod, hawk_t* awk) -{ - hawk_rbt_t* rbt; - - mod->query = query; - mod->unload = unload; - - mod->init = init; - mod->fini = fini; - - rbt = hawk_rbt_open(hawk_getgem(awk), 0, 1, 1); - if (rbt == HAWK_NULL) return -1; - - hawk_rbt_setstyle (rbt, hawk_get_rbt_style(HAWK_RBT_STYLE_INLINE_COPIERS)); - - mod->ctx = rbt; - return 0; -} diff --git a/hawk/lib/mod-dir.h b/hawk/lib/mod-dir.h deleted file mode 100644 index 27c85032..00000000 --- a/hawk/lib/mod-dir.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * $Id$ - * - Copyright (c) 2006-2019 Chung, Hyung-Hwan. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _HAWK_LIB_MOD_DIR_H_ -#define _HAWK_LIB_MOD_DIR_H_ - -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -HAWK_EXPORT int hawk_mod_dir (hawk_mod_t* mod, hawk_t* awk); - -#if defined(__cplusplus) -} -#endif - -#endif - diff --git a/hawk/lib/mod-sys.c b/hawk/lib/mod-sys.c index 365bc7ad..524e1dc8 100644 --- a/hawk/lib/mod-sys.c +++ b/hawk/lib/mod-sys.c @@ -147,6 +147,8 @@ typedef struct rtx_data_t rtx_data_t; /* ------------------------------------------------------------------------ */ +#define ERRNUM_TO_RC(errnum) (-((hawk_int_t)errnum)) + static HAWK_INLINE sys_rc_t syserr_to_rc (int syserr) { switch (syserr) @@ -196,7 +198,9 @@ static const hawk_ooch_t* rc_to_errstr (sys_rc_t rc) switch (rc) { case RC_EAGAIN: return HAWK_T("resource temporarily unavailable"); + case RC_EBADF: return HAWK_T("bad file descriptor"); + case RC_ECHILD: return HAWK_T("no child processes"); case RC_EEXIST: return HAWK_T("file exists"); case RC_EINTR: return HAWK_T("interrupted"); @@ -212,6 +216,12 @@ static const hawk_ooch_t* rc_to_errstr (sys_rc_t rc) }; } +static void copy_error_to_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list) +{ + /*TODO: error number */ + hawk_copy_oocstr (sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), hawk_rtx_geterrmsg(rtx)); +} + static void set_errmsg_on_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list, const hawk_ooch_t* errfmt, ...) { if (errfmt) @@ -232,7 +242,6 @@ static HAWK_INLINE void set_errmsg_on_sys_list_with_syserr (hawk_rtx_t* rtx, sys set_errmsg_on_sys_list (rtx, sys_list, HAWK_T("%hs"), strerror(errno)); } - /* ------------------------------------------------------------------------ */ static sys_node_t* new_sys_node_fd (hawk_rtx_t* rtx, sys_list_t* list, int fd) @@ -850,11 +859,12 @@ static int fnc_opendir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { sys_list_t* sys_list; sys_node_t* sys_node = HAWK_NULL; - hawk_int_t rx = RC_ERROR, flags = 0; + hawk_int_t flags = 0; hawk_ooch_t* pstr; hawk_oow_t plen; hawk_val_t* a0; hawk_dir_t* dir; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); sys_list = rtx_to_sys_list(rtx, fi); @@ -876,14 +886,14 @@ static int fnc_opendir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { hawk_dir_close(dir); - fail: - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + goto fail; } } else { - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + fail: + rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); + copy_error_to_sys_list (rtx, sys_list); } /*HAWK_ASSERT (HAWK_IN_QUICKINT_RANGE(rx));*/ @@ -895,7 +905,7 @@ static int fnc_closedir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { sys_list_t* sys_list; sys_node_t* sys_node; - int rx = RC_ERROR; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); sys_list = rtx_to_sys_list(rtx, fi); sys_node = get_sys_list_node_with_arg(rtx, sys_list, hawk_rtx_getarg(rtx, 0)); @@ -904,12 +914,12 @@ static int fnc_closedir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) /* although free_sys_node() can handle other types, sys::closedir() is allowed to * close nodes of the SYS_NODE_DATA_DIR type only */ free_sys_node (rtx, sys_list, sys_node); - rx = 0; + rx = ERRNUM_TO_RC(HAWK_ENOERR); } else { - rx = RC_EINVAL; - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + rx = ERRNUM_TO_RC(HAWK_EINVAL); + /* error information set in get_sys_lsit_node_with_arg() */ } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -920,7 +930,7 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { sys_list_t* sys_list; sys_node_t* sys_node; - hawk_int_t rx = RC_ERROR; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); sys_list = rtx_to_sys_list(rtx, fi); sys_node = get_sys_list_node_with_arg(rtx, sys_list, hawk_rtx_getarg(rtx, 0)); @@ -931,10 +941,9 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) hawk_val_t* tmp; y = hawk_dir_read(sys_node->ctx.u.dir, &ent); - if (y <= -1) + if (y <= -1) { - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + goto fail; } else if (y == 0) { @@ -945,8 +954,9 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) tmp = hawk_rtx_makestrvalwithoocstr(rtx, ent.name); if (!tmp) { - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + fail: + rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); + copy_error_to_sys_list (rtx, sys_list); } else { @@ -962,8 +972,8 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) } else { - rx = RC_EINVAL; - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + rx = ERRNUM_TO_RC(HAWK_EINVAL); + /* error information set in get_sys_lsit_node_with_arg() */ } /* the value in 'rx' never exceeds HAWK_QUICKINT_MAX as 'reqsize' has been limited to @@ -972,6 +982,47 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) return 0; } +static int fnc_resetdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) +{ + sys_list_t* sys_list; + sys_node_t* sys_node; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); + + sys_list = rtx_to_sys_list(rtx, fi); + sys_node = get_sys_list_node_with_arg(rtx, sys_list, hawk_rtx_getarg(rtx, 0)); + + if (sys_node) + { + hawk_ooch_t* path; + hawk_val_t* a1; + + a1 = hawk_rtx_getarg(rtx, 1); + path = hawk_rtx_getvaloocstr(rtx, a1, HAWK_NULL); + if (path) + { + if (hawk_dir_reset(sys_node->ctx.u.dir, path) <= -1) goto fail; + rx = ERRNUM_TO_RC(HAWK_ENOERR); /* success */ + hawk_rtx_freevaloocstr (rtx, a1, path); + } + else + { + fail: + rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); + copy_error_to_sys_list (rtx, sys_list); + } + } + else + { + rx = ERRNUM_TO_RC(HAWK_EINVAL); + /* error information set in get_sys_lsit_node_with_arg() */ + } + + /* no error check for hawk_rtx_makeintval() here since ret + * is 0 or -1. it will never fail for those numbers */ + hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); + return 0; +} + /* ------------------------------------------------------------------------ */ static int fnc_fork (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) @@ -2483,6 +2534,7 @@ static fnctab_t fnctab[] = { HAWK_T("pipe"), { { 2, 3, HAWK_T("rrv") }, fnc_pipe, 0 } }, { HAWK_T("read"), { { 2, 3, HAWK_T("vrv") }, fnc_read, 0 } }, { HAWK_T("readdir"), { { 2, 2, HAWK_T("vr") }, fnc_readdir, 0 } }, + { HAWK_T("resetdir"), { { 2, 2, HAWK_NULL }, fnc_resetdir, 0 } }, { HAWK_T("settime"), { { 1, 1, HAWK_NULL }, fnc_settime, 0 } }, { HAWK_T("sleep"), { { 1, 1, HAWK_NULL }, fnc_sleep, 0 } }, { HAWK_T("strftime"), { { 2, 3, HAWK_NULL }, fnc_strftime, 0 } }, diff --git a/hawk/lib/parse.c b/hawk/lib/parse.c index 4dd1b946..2b2fe03f 100644 --- a/hawk/lib/parse.c +++ b/hawk/lib/parse.c @@ -241,9 +241,7 @@ static hawk_htb_walk_t deparse_func (hawk_htb_t* map, hawk_htb_pair_t* pair, voi static int put_char (hawk_t* awk, hawk_ooch_t c); static int flush_out (hawk_t* awk); -static hawk_mod_t* query_module ( - hawk_t* awk, const hawk_oocs_t segs[], int nsegs, - hawk_mod_sym_t* sym); +static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nsegs, hawk_mod_sym_t* sym); typedef struct kwent_t kwent_t; @@ -6993,23 +6991,14 @@ int hawk_putsrcoochars (hawk_t* hawk, const hawk_ooch_t* str, hawk_oow_t len) #if defined(HAWK_ENABLE_STATIC_MODULE) /* let's hardcode module information */ -//#include "mod-dir.h" #include "mod-math.h" #include "mod-str.h" #include "mod-sys.h" -#if defined(HAWK_ENABLE_MOD_MPI) -#include "../awkmod/mod-mpi.h" -#endif - #if defined(HAWK_ENABLE_MOD_MYSQL) #include "../awkmod/mod-mysql.h" #endif -#if defined(HAWK_ENABLE_MOD_SED) -#include "../awkmod/mod-sed.h" -#endif - #if defined(HAWK_ENABLE_MOD_UCI) #include "../awkmod/mod-uci.h" #endif @@ -7026,16 +7015,9 @@ static struct int (*modload) (hawk_mod_t* mod, hawk_t* awk); } static_modtab[] = { -// { HAWK_T("dir"), hawk_mod_dir }, { HAWK_T("math"), hawk_mod_math }, -#if defined(HAWK_ENABLE_MOD_MPI) - { HAWK_T("mpi"), hawk_mod_mpi }, -#endif #if defined(HAWK_ENABLE_MOD_MYSQL) { HAWK_T("mysql"), hawk_mod_mysql }, -#endif -#if defined(HAWK_ENABLE_MOD_SED) - { HAWK_T("sed"), hawk_mod_sed }, #endif { HAWK_T("str"), hawk_mod_str }, { HAWK_T("sys"), hawk_mod_sys }, @@ -7047,7 +7029,6 @@ static struct static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nsegs, hawk_mod_sym_t* sym) { - hawk_rbt_pair_t* pair; hawk_mod_data_t* mdp; hawk_oocs_t ea; @@ -7143,28 +7124,26 @@ static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nseg else spec.postfix = HAWK_T(HAWK_DEFAULT_MODPOSTFIX); HAWK_MEMSET (&md, 0, HAWK_SIZEOF(md)); + spec.name = segs[0].ptr; + md.handle = HAWK_NULL; if (awk->prm.modopen && awk->prm.modgetsym && awk->prm.modclose) { - spec.name = segs[0].ptr; - md.handle = awk->prm.modopen (awk, &spec); + md.handle = awk->prm.modopen(awk, &spec); + } + else + { + hawk_seterrfmt (awk, HAWK_NULL, HAWK_EINVAL, HAWK_T("module callbacks not set properly")); } - else md.handle = HAWK_NULL; if (md.handle == HAWK_NULL) { - if (hawk_geterrnum(awk) == HAWK_ENOERR) - { - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("module '%.*js' not found"), segs[0].len, segs[0].ptr); - } - else - { - const hawk_ooch_t* olderrmsg = hawk_backuperrmsg(awk); - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("module '%.*js' not found - %js"), segs[0].len, segs[0].ptr, olderrmsg); - } + const hawk_ooch_t* bem = hawk_backuperrmsg(awk); + hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("'%js%js%js' for module '%js' not found - %js"), + (spec.prefix? spec.prefix: HAWK_T("")), spec.name, (spec.postfix? spec.postfix: HAWK_T("")), spec.name, bem); return HAWK_NULL; } - buflen = hawk_copy_oocstr_unlimited(&buf[13], segs[0].ptr); + buflen = hawk_copy_oocstr_unlimited(&buf[10], segs[0].ptr); /* attempt hawk_mod_xxx */ load = awk->prm.modgetsym(awk, md.handle, &buf[1]); if (!load) @@ -7176,20 +7155,14 @@ static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nseg hawk_seterrnum (awk, HAWK_NULL, HAWK_ENOERR); /* attempt hawk_mod_xxx_ */ - buf[13 + buflen] = HAWK_T('_'); - buf[13 + buflen + 1] = HAWK_T('\0'); + buf[10 + buflen] = HAWK_T('_'); + buf[10 + buflen + 1] = HAWK_T('\0'); load = awk->prm.modgetsym(awk, md.handle, &buf[1]); if (!load) { - if (hawk_geterrnum(awk) == HAWK_ENOERR) - { - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("module '%.*js' not found"), (12 + buflen), &buf[1]); - } - else - { - const hawk_ooch_t* bem = hawk_backuperrmsg(awk); - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("module '%.*js' not found - %js"), (12 + buflen), &buf[1], bem); - } + const hawk_ooch_t* bem = hawk_backuperrmsg(awk); + hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("module symbol '%.*js' not found - %js"), (10 + buflen), &buf[1], bem); + awk->prm.modclose (awk, md.handle); return HAWK_NULL; } @@ -7219,15 +7192,8 @@ done: n = mdp->mod.query(&mdp->mod, awk, segs[1].ptr, sym); if (n <= -1) { - if (hawk_geterrnum(awk) == HAWK_ENOERR) - { - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("unable to find '%.*js' in module '%.*js'"), segs[1].len, segs[1].ptr, segs[0].len, segs[0].ptr); - } - else - { - const hawk_ooch_t* olderrmsg = hawk_backuperrmsg(awk); - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("unable to find '%.*js' in module '%.*js' - %js"), segs[1].len, segs[1].ptr, segs[0].len, segs[0].ptr, olderrmsg); - } + const hawk_ooch_t* olderrmsg = hawk_backuperrmsg(awk); + hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("unable to find '%.*js' in module '%.*js' - %js"), segs[1].len, segs[1].ptr, segs[0].len, segs[0].ptr, olderrmsg); return HAWK_NULL; } return &mdp->mod; diff --git a/hawk/lib/std.c b/hawk/lib/std.c index 7c6c621f..239074b8 100644 --- a/hawk/lib/std.c +++ b/hawk/lib/std.c @@ -325,9 +325,7 @@ void* hawk_stdmodopen (hawk_t* awk, const hawk_mod_spec_t* spec) if (lt_dladvise_init(&adv) != 0) { - /* the only failure of lt_dladvise_init() seems to be caused - * by memory allocation failured */ - hawk_seterrnum (awk, HAWK_NULL, HAWK_ENOMEM); + hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESYSERR, HAWK_T("%hs"), lt_dlerror()); return HAWK_NULL; } @@ -359,6 +357,7 @@ void* hawk_stdmodopen (hawk_t* awk, const hawk_mod_spec_t* spec) if (!modpath) return HAWK_NULL; h = LoadLibrary (modpath); + if (!h) hawk_seterrnum (awk, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()); hawk_freemem (awk, modpath); @@ -390,7 +389,11 @@ void* hawk_stdmodopen (hawk_t* awk, const hawk_mod_spec_t* spec) /* DosLoadModule() seems to have severe limitation on * the file name it can load (max-8-letters.xxx) */ rc = DosLoadModule (errbuf, HAWK_COUNTOF(errbuf) - 1, modpath, &h); - if (rc != NO_ERROR) h = HAWK_NULL; + if (rc != NO_ERROR) + { + h = HAWK_NULL; + hawk_seterrnum (awk, HAWK_NULL, hawk_syserr_to_errnum(rc)); + } hawk_freemem (awk, modpath); @@ -420,7 +423,8 @@ void* hawk_stdmodopen (hawk_t* awk, const hawk_mod_spec_t* spec) #endif if (!modpath) return HAWK_NULL; - h = LoadModule (modpath); + h = LoadModule(modpath); + if (!h) hawk_seterrnum (awk, HAWK_NULL, HAWK_ESYSERR); hawk_freemem (awk, modpath); @@ -447,10 +451,7 @@ void* hawk_stdmodopen (hawk_t* awk, const hawk_mod_spec_t* spec) if (!modpath) return HAWK_NULL; h = dlopen(modpath, RTLD_NOW); - if (!h) - { - hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESYSERR, HAWK_T("%hs"), dlerror()); - } + if (!h) hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESYSERR, HAWK_T("%hs"), dlerror()); hawk_freemem (awk, modpath); @@ -492,19 +493,31 @@ void* hawk_stdmodgetsym (hawk_t* awk, void* handle, const hawk_ooch_t* name) #endif #if defined(USE_LTDL) - s = lt_dlsym (handle, mname); - + s = lt_dlsym(handle, mname); + if (!s) hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESYSERR, HAWK_T("%hs"), lt_dlerror()); + #elif defined(_WIN32) - s = GetProcAddress ((HMODULE)handle, mname); + s = GetProcAddress((HMODULE)handle, mname); + if (!s) hawk_seterrnum (awk, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()); #elif defined(__OS2__) - if (DosQueryProcAddr ((HMODULE)handle, 0, mname, (PFN*)&s) != NO_ERROR) s = HAWK_NULL; + { + APIRET rc; + rc = DosQueryProcAddr((HMODULE)handle, 0, mname, (PFN*)&s); + if (rc != NO_ERROR) + { + s = HAWK_NULL; + hawk_seterrnum (awk, HAWK_NULL, hawk_syserr_to_errnum(rc)); + } + } #elif defined(__DOS__) && defined(HAWK_ENABLE_DOS_DYNAMIC_MODULE) - s = GetProcAddress (handle, mname); + s = GetProcAddress(handle, mname); + if (!s) hawk_seterrnum (awk, HAWK_NULL, HAWK_ESYSERR); #elif defined(USE_DLFCN) - s = dlsym (handle, mname); + s = dlsym(handle, mname); + if (!s) hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESYSERR, HAWK_T("%hs"), dlerror()); #else s = HAWK_NULL; @@ -513,7 +526,7 @@ void* hawk_stdmodgetsym (hawk_t* awk, void* handle, const hawk_ooch_t* name) #if defined(HAWK_OOCH_IS_BCH) /* nothing to do */ #else - HAWK_MMGR_FREE (hawk_getmmgr(awk), mname); + hawk_freemem (awk, mname); #endif return s; diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in index de667927..291e72f8 100644 --- a/hawk/mod/Makefile.in +++ b/hawk/mod/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,7 +184,9 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo \ + ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -378,7 +380,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -452,8 +453,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -523,8 +524,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -622,7 +629,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -695,7 +705,8 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-pkgmodexecLTLIBRARIES mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo + -rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -741,7 +752,8 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo + -rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -762,8 +774,8 @@ uninstall-am: uninstall-pkgmodexecLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-pkgmodexecLTLIBRARIES cscopelist-am ctags ctags-am \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in index fe453e10..0d3fb1bd 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -135,7 +135,9 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/t-001.Po ./$(DEPDIR)/t-002.Po \ + ./$(DEPDIR)/t-005.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -328,7 +330,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -384,8 +385,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -464,9 +465,15 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-001.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-002.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-005.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-001.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-002.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-005.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -550,7 +557,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -622,7 +632,9 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/t-001.Po + -rm -f ./$(DEPDIR)/t-002.Po + -rm -f ./$(DEPDIR)/t-005.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -668,7 +680,9 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/t-001.Po + -rm -f ./$(DEPDIR)/t-002.Po + -rm -f ./$(DEPDIR)/t-005.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -689,7 +703,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in index 187b7375..8c922d28 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -137,7 +137,9 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/uni_case-uni-case.Po \ + ./$(DEPDIR)/uni_prop-uni-prop.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -330,7 +332,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -382,8 +383,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *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);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -458,8 +459,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_case-uni-case.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_prop-uni-prop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_case-uni-case.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_prop-uni-prop.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -571,7 +578,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -643,7 +653,8 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/uni_case-uni-case.Po + -rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -689,7 +700,8 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/uni_case-uni-case.Po + -rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -710,7 +722,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \