From 11f898591de4814e0cb5cff62717dcfd2175d70e Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 2 Jan 2020 15:10:04 +0000 Subject: [PATCH] fixed a bug in fmt_put_bchars_to_uch_buf() added getpgid() and getpgrp() check to configure.ac redefined RC_XXXX in mod-sys.c changed some functions in mod-sys.c --- hawk/Makefile.in | 28 +- hawk/aclocal.m4 | 191 +++++----- hawk/bin/Makefile.in | 31 +- hawk/configure | 219 +++++------ hawk/configure.ac | 4 +- hawk/lib/Makefile.in | 300 ++++----------- hawk/lib/gem.c | 5 +- hawk/lib/hawk-cfg.h.in | 9 + hawk/lib/mod-sys.c | 831 ++++++++++++++++++++--------------------- hawk/mod/Makefile.in | 38 +- hawk/t/Makefile.in | 40 +- hawk/tools/Makefile.in | 36 +- 12 files changed, 777 insertions(+), 955 deletions(-) diff --git a/hawk/Makefile.in b/hawk/Makefile.in index 3fbc1475..4be8f379 100644 --- a/hawk/Makefile.in +++ b/hawk/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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 distdir-am dist dist-all distcheck + cscope distdir 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/depcomp \ - ac/install-sh ac/ltmain.sh ac/missing + ac/compile ac/config.guess ac/config.sub ac/install-sh \ + ac/ltmain.sh ac/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -356,6 +356,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -393,8 +394,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -521,10 +522,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -589,7 +587,7 @@ distdir-am: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -615,7 +613,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) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -633,7 +631,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -643,7 +641,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/hawk/aclocal.m4 b/hawk/aclocal.m4 index 2b31feff..c054071c 100644 --- a/hawk/aclocal.m4 +++ b/hawk/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 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-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 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.16' +[am__api_version='1.15' 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.16.1], [], +m4_if([$1], [1.15], [], [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.16.1])dnl +[AM_AUTOMAKE_VERSION([1.15])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-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 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-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 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-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 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-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -392,12 +392,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 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], @@ -405,41 +406,49 @@ 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. - # 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]) + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - 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 + 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 # limit of 2048, but all sed's we know have understand at least 4000. - 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=$? + 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 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 @@ -448,17 +457,18 @@ 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. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. +# 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. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -545,8 +555,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. @@ -613,7 +623,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 @@ -655,7 +665,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-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +686,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -697,7 +707,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -705,42 +715,49 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. +# Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' +[am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .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= -# 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])]) +_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 +]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -779,7 +796,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -808,7 +825,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -855,7 +872,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -874,7 +891,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -955,7 +972,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1015,7 +1032,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1043,7 +1060,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1062,7 +1079,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 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 142ee005..986d6809 100644 --- a/hawk/bin/Makefile.in +++ b/hawk/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -132,8 +132,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/hawk-main.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -326,6 +325,7 @@ 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__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -448,13 +448,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@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) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hawk-main.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -552,10 +546,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -627,7 +618,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/hawk-main.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -673,7 +664,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/hawk-main.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -694,7 +685,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am 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 e2f6d297..25397996 100755 --- a/hawk/configure +++ b/hawk/configure @@ -731,6 +731,7 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE +am__quote am__include DEPDIR OBJEXT @@ -788,6 +789,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -806,8 +808,7 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -am__quote' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -888,6 +889,7 @@ 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}' @@ -1140,6 +1142,15 @@ 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=* \ @@ -1277,7 +1288,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 + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1430,6 +1441,7 @@ 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] @@ -2767,7 +2779,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.16' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3283,8 +3295,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 @@ -3335,7 +3347,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 @@ -3350,45 +3362,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ $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_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .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= -# 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 ;; #( - *) : - ;; +_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 - 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; } +# 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 + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -17360,7 +17372,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 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17406,7 +17418,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 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17430,7 +17442,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 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17475,7 +17487,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 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17499,7 +17511,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 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18805,7 +18817,7 @@ _ACEOF fi done -for ac_func in clock_nanosleep nanosleep usleep +for ac_func in clock_nanosleep nanosleep usleep select do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -18817,7 +18829,7 @@ _ACEOF fi done -for ac_func in sigaction signal +for ac_func in sigaction signal getpgid getpgrp do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -23860,7 +23872,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -24859,35 +24871,29 @@ $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. - # 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 + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - 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 + 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 # limit of 2048, but all sed's we know have understand at least 4000. - 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" | + 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 '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -24905,48 +24911,53 @@ $as_echo X"$am_mf" | q } s/.*/./; q'` - 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 '/^.*\/\([^/][^/]*\)\/*$/{ + 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\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q } - /^X\/\(\/\/\)$/{ + /^X\(\/\/\)[^/].*/{ s//\1/ q } - /^X\/\(\/\).*/{ + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` - { 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=$? + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done 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/configure.ac b/hawk/configure.ac index 3a8f11c9..709dba5f 100644 --- a/hawk/configure.ac +++ b/hawk/configure.ac @@ -203,8 +203,8 @@ AC_CHECK_FUNCS([gettimeofday settimeofday clock_gettime clock_settime getitimer AC_CHECK_FUNCS([timelocal timegm localtime_r gmtime_r]) AC_CHECK_FUNCS([backtrace backtrace_symbols]) AC_CHECK_FUNCS([makecontext swapcontext getcontext setcontext]) -AC_CHECK_FUNCS([clock_nanosleep nanosleep usleep]) -AC_CHECK_FUNCS([sigaction signal]) +AC_CHECK_FUNCS([clock_nanosleep nanosleep usleep select]) +AC_CHECK_FUNCS([sigaction signal getpgid getpgrp]) AC_CHECK_FUNCS([snprintf _vsnprintf _vsnwprintf strerror_r random_r random]) AC_CHECK_FUNCS([accept4 pipe2 epoll_create epoll_create1 kqueue kqueue1]) AC_CHECK_FUNCS([isatty mmap munmap]) diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 00353c98..72f5eba4 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -264,49 +264,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -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__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -536,6 +494,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -656,8 +615,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__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -740,66 +699,60 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@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) +@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)/libhawk_math_la-mod-math.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_str_la-mod-str.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_sys_la-mod-sys.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@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1306,10 +1259,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1382,60 +1332,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -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 -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -1481,60 +1378,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -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 -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1555,15 +1399,15 @@ uninstall-am: uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES .MAKE: all install-am install-strip -.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 \ +.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 \ install-pkglibLTLIBRARIES install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ diff --git a/hawk/lib/gem.c b/hawk/lib/gem.c index 2d00c5e6..e9f56556 100644 --- a/hawk/lib/gem.c +++ b/hawk/lib/gem.c @@ -459,9 +459,10 @@ static int fmt_put_bchars_to_uch_buf (hawk_fmtout_t* fmtout, const hawk_bch_t* p hawk_oow_t bcslen, ucslen; int n; - bcslen = b->capa - b->len; - ucslen = len; + bcslen = len; + ucslen = b->capa - b->len; n = hawk_conv_bchars_to_uchars_with_cmgr(ptr, &bcslen, &b->ptr[b->len], &ucslen, b->gem->cmgr, 1); + b->len += ucslen; if (n <= -1) { if (n == -2) diff --git a/hawk/lib/hawk-cfg.h.in b/hawk/lib/hawk-cfg.h.in index 72957eb3..a45879be 100644 --- a/hawk/lib/hawk-cfg.h.in +++ b/hawk/lib/hawk-cfg.h.in @@ -214,6 +214,12 @@ /* Define to 1 if you have the `getitimer' function. */ #undef HAVE_GETITIMER +/* Define to 1 if you have the `getpgid' function. */ +#undef HAVE_GETPGID + +/* Define to 1 if you have the `getpgrp' function. */ +#undef HAVE_GETPGRP + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -373,6 +379,9 @@ /* Define to 1 if you have the `roundq' function. */ #undef HAVE_ROUNDQ +/* Define to 1 if you have the `select' function. */ +#undef HAVE_SELECT + /* Define to 1 if you have the `setcontext' function. */ #undef HAVE_SETCONTEXT diff --git a/hawk/lib/mod-sys.c b/hawk/lib/mod-sys.c index 524e1dc8..013c5dcc 100644 --- a/hawk/lib/mod-sys.c +++ b/hawk/lib/mod-sys.c @@ -58,23 +58,6 @@ #define CLOSE_KEEPFD (1 << 0) -enum sys_rc_t -{ - RC_ERROR = -1, - RC_ENOIMPL = -2, - RC_ENOSYS = -3, - RC_ENOMEM = -4, - RC_EAGAIN = -5, - RC_EINTR = -6, - RC_EINVAL = -7, - RC_ECHILD = -8, - RC_EPERM = -9, - RC_EBADF = -10, - RC_ENOENT = -11, - RC_EEXIST = -12, - RC_ENOTDIR = -13 -}; -typedef enum sys_rc_t sys_rc_t; /* ------------------------------------------------------------------------ */ @@ -149,77 +132,37 @@ 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) +static hawk_int_t copy_error_to_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list) { - switch (syserr) - { - #if defined(EAGAIN) && defined(EWOULDBLOCK) && (EAGAIN == EWOULDBLOCK) - case EAGAIN: return RC_EAGAIN; - #elif defined(EAGAIN) && defined(EWOULDBLOCK) && (EAGAIN != EWOULDBLOCK) - case EAGAIN: case EWOULDBLOCK: return RC_EAGAIN; - #elif defined(EAGAIN) - case EAGAIN: return RC_EAGAIN; - #elif defined(EWOULDBLOCK) - case EWOULDBLOCK: return RC_EAGAIN; - #endif - - case EBADF: return RC_EBADF; - case ECHILD: return RC_ECHILD; - case EEXIST: return RC_EEXIST; - case EINTR: return RC_EINTR; - case EINVAL: return RC_EINVAL; - case ENOENT: return RC_ENOENT; - case ENOMEM: return RC_ENOMEM; - case ENOSYS: return RC_ENOSYS; - case EPERM: return RC_EPERM; - default: return RC_ERROR; - } -} - -static HAWK_INLINE sys_rc_t hawkerr_to_rc (hawk_errnum_t hawkerr) -{ - switch (hawkerr) - { - case HAWK_EAGAIN: return RC_EAGAIN; - case HAWK_ECHILD: return RC_ECHILD; - case HAWK_EEXIST: return RC_EEXIST; - case HAWK_EINTR: return RC_EINTR; - case HAWK_EINVAL: return RC_EINVAL; - case HAWK_ENOENT: return RC_ENOENT; - case HAWK_ENOIMPL: return RC_ENOIMPL; - case HAWK_ENOMEM: return RC_ENOMEM; - case HAWK_EPERM: return RC_EPERM; - default: return RC_ERROR; - } -} - -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"); - case RC_EINVAL: return HAWK_T("invalid argument"); - case RC_ENOENT: return HAWK_T("no such file or directory"); - case RC_ENOIMPL: return HAWK_T("not implemented"); /* not implemented in this module */ - case RC_ENOMEM: return HAWK_T("not enough space"); - case RC_ENOTDIR: return HAWK_T("not a directory"); - case RC_ENOSYS: return HAWK_T("not implemented in system"); - case RC_EPERM: return HAWK_T("operation not permitted"); - case RC_ERROR: return HAWK_T("error"); - default: return HAWK_T("unknown error"); - }; -} - -static void copy_error_to_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list) -{ - /*TODO: error number */ + hawk_errnum_t errnum = hawk_rtx_geterrnum(rtx); hawk_copy_oocstr (sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), hawk_rtx_geterrmsg(rtx)); + return ERRNUM_TO_RC(errnum); +} + +static hawk_int_t set_error_on_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list, hawk_errnum_t errnum, const hawk_ooch_t* errfmt, ...) +{ + va_list ap; + if (errfmt) + { + va_start (ap, errfmt); + hawk_rtx_vfmttooocstr (rtx, sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), errfmt, ap); + va_end (ap); + } + else + { + hawk_rtx_fmttooocstr (rtx, sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), HAWK_T("%js"), hawk_geterrstr(hawk_rtx_gethawk(rtx))(hawk_rtx_gethawk(rtx), errnum)); + } + return ERRNUM_TO_RC(errnum); +} + +static hawk_int_t set_error_on_sys_list_with_syserr (hawk_rtx_t* rtx, sys_list_t* sys_list, const hawk_ooch_t* title) +{ + int err = errno; + if (title) + hawk_rtx_fmttooocstr (rtx, sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), HAWK_T("%js - %hs"), title, strerror(err)); + else + hawk_rtx_fmttooocstr (rtx, sys_list->ctx.errmsg, HAWK_COUNTOF(sys_list->ctx.errmsg), HAWK_T("%hs"), strerror(err)); + return ERRNUM_TO_RC(hawk_syserr_to_errnum(err)); } static void set_errmsg_on_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list, const hawk_ooch_t* errfmt, ...) @@ -237,11 +180,6 @@ static void set_errmsg_on_sys_list (hawk_rtx_t* rtx, sys_list_t* sys_list, const } } -static HAWK_INLINE void set_errmsg_on_sys_list_with_syserr (hawk_rtx_t* rtx, sys_list_t* sys_list) -{ - 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) @@ -351,7 +289,7 @@ static int fnc_close (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); hawk_int_t cflags; sys_list = rtx_to_sys_list(rtx, fi); @@ -369,12 +307,12 @@ static int fnc_close (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) } 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_list_node_with_arg() */ } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -393,7 +331,7 @@ static int fnc_open (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { sys_list_t* sys_list; - hawk_int_t rx = RC_ERROR, oflags = 0, mode = DEFAULT_MODE; + hawk_int_t rx, oflags = 0, mode = DEFAULT_MODE; int fd; hawk_bch_t* pstr; hawk_oow_t plen; @@ -410,31 +348,33 @@ static int fnc_open (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) a0 = hawk_rtx_getarg(rtx, 0); pstr = hawk_rtx_getvalbcstr(rtx, a0, &plen); - if (!pstr) goto fail; - fd = open(pstr, oflags, mode); - hawk_rtx_freevalbcstr (rtx, a0, pstr); - - if (fd >= 0) + if (pstr) { - sys_node_t* new_node; + fd = open(pstr, oflags, mode); + hawk_rtx_freevalbcstr (rtx, a0, pstr); - new_node = new_sys_node_fd(rtx, sys_list, fd); - if (new_node) + if (fd >= 0) { + sys_node_t* new_node; + + new_node = new_sys_node_fd(rtx, sys_list, fd); + if (!new_node) + { + close (fd); + goto fail; + } rx = new_node->id; + HAWK_ASSERT (rx >= 0); } - else + else { - close (fd); - fail: - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_T("unable to open")); } } else { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, sys_list); + fail: + rx = copy_error_to_sys_list(rtx, sys_list); } HAWK_ASSERT (HAWK_IN_QUICKINT_RANGE(rx)); @@ -455,35 +395,29 @@ static int fnc_openfd (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) /* wrap a raw system file descriptor into the internal management node */ sys_list_t* sys_list; - hawk_int_t rx = RC_ERROR; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); hawk_int_t fd; sys_list = rtx_to_sys_list(rtx, fi); if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &fd) <= -1) { - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + fail: + rx = copy_error_to_sys_list(rtx, sys_list); } else if (fd >= 0 && fd <= HAWK_TYPE_MAX(int)) { sys_node_t* sys_node; sys_node = new_sys_node_fd(rtx, sys_list, fd); - if (sys_node) - { - rx = sys_node->id; - } - else - { - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); - } + if (!sys_node) goto fail; + + rx = sys_node->id; + HAWK_ASSERT (rx >= 0); } else { - rx = RC_EINVAL; - set_errmsg_on_sys_list (rtx, sys_list, rc_to_errstr(rx)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_EINVAL, HAWK_T("invalid file descriptor %jd"), (hawk_intmax_t)fd); } /*HAWK_ASSERT (HAWK_IN_QUICKINT_RANGE(rx));*/ @@ -496,7 +430,7 @@ static int fnc_read (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); hawk_int_t reqsize = 8192; if (hawk_rtx_getnargs(rtx) >= 3 && (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 2), &reqsize) <= -1 || reqsize <= 0)) reqsize = 8192; @@ -511,7 +445,7 @@ static int fnc_read (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) hawk_bch_t* tmp = hawk_rtx_reallocmem(rtx, sys_list->ctx.readbuf, reqsize); if (!tmp) { - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + rx = copy_error_to_sys_list(rtx, sys_list); goto done; } sys_list->ctx.readbuf = tmp; @@ -521,11 +455,7 @@ static int fnc_read (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) rx = read(sys_node->ctx.u.fd, sys_list->ctx.readbuf, reqsize); if (rx <= 0) { - if (rx <= -1) - { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr(rtx, sys_list); - } + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_T("unable to read")); goto done; } else @@ -544,8 +474,8 @@ static int fnc_read (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_list_node_with_arg() */ } done: @@ -559,7 +489,7 @@ static int fnc_write (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)); @@ -574,22 +504,18 @@ static int fnc_write (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) if (dptr) { rx = write(sys_node->ctx.u.fd, dptr, dlen); - if (rx <= -1) - { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr(rtx, sys_list); - } + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_T("unable to write")); hawk_rtx_freevalbcstr (rtx, a1, dptr); } else { - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + rx = copy_error_to_sys_list(rtx, sys_list); } } 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_list_node_with_arg() */ } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -621,7 +547,7 @@ static int fnc_dup (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { sys_list_t* sys_list; sys_node_t* sys_node, * sys_node2 = HAWK_NULL; - hawk_int_t rx = RC_ERROR; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); hawk_int_t oflags = 0; sys_list = rtx_to_sys_list(rtx, fi); @@ -667,8 +593,7 @@ static int fnc_dup (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) } else { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, sys_list); + rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); } } else @@ -686,22 +611,20 @@ static int fnc_dup (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { close (fd); - rx = hawkerr_to_rc(hawk_rtx_geterrnum(rtx)); - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + rx = copy_error_to_sys_list(rtx, sys_list); } } else { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, sys_list); + rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); } } } else { fail_einval: - 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_list_node_with_arg() */ } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -725,6 +648,46 @@ static int fnc_dup (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) sys::close (p1); } else if (a == 0) + { + ## child + printf ("child.... %d %d %d\n", sys::getpid(), p0, p1); + sys::close (p1); + while (1) + { + n = sys::read(p0, k, 3); + if (n <= 0) + { + if (n == sys::RC_EAGAIN) continue; ## nonblock but data not available + if (n != 0) print "ERROR: " sys::errmsg(); + break; + } + print k; + } + sys::close (p0); + } + else + { + ## parent + printf ("parent.... %d %d %d\n", sys::getpid(), p0, p1); + sys::close (p0); + sys::write (p1, B"hello"); + sys::write (p1, B"world"); + sys::close (p1); + sys::wait(a); + }##if (sys::pipe(p0, p1) <= -1) + if (sys::pipe(p0, p1, sys::O_NONBLOCK | sys::O_CLOEXEC) <= -1) + { + print "pipe error"; + return -1; + } + a = sys::fork(); + if (a <= -1) + { + print "fork error"; + sys::close (p0); + sys::close (p1); + } + else if (a == 0) { ## child printf ("child.... %d %d %d\n", sys::getpid(), p0, p1); @@ -759,7 +722,7 @@ static int fnc_pipe (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) /* create low-level pipes */ sys_list_t* sys_list; - int rx = RC_ERROR; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); int fds[2]; hawk_int_t flags = 0; @@ -813,30 +776,29 @@ static int fnc_pipe (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) return -1; } hawk_rtx_refupval (rtx, v); - x = hawk_rtx_setrefval (rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 0), v); + x = hawk_rtx_setrefval(rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 0), v); hawk_rtx_refdownval (rtx, v); if (x <= -1) goto fail; v = hawk_rtx_makeintval(rtx, node2->id); if (!v) goto fail; hawk_rtx_refupval (rtx, v); - x = hawk_rtx_setrefval (rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 1), v); + x = hawk_rtx_setrefval(rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 1), v); hawk_rtx_refdownval (rtx, v); if (x <= -1) goto fail; - rx = 0; + rx = ERRNUM_TO_RC(HAWK_ENOERR); } else { - set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); + rx = copy_error_to_sys_list(rtx, sys_list); if (node2) free_sys_node (rtx, sys_list, node2); if (node1) free_sys_node (rtx, sys_list, node1); } } else { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, sys_list); + rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -892,8 +854,7 @@ static int fnc_opendir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { fail: - rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); - copy_error_to_sys_list (rtx, sys_list); + rx = copy_error_to_sys_list(rtx, sys_list); } /*HAWK_ASSERT (HAWK_IN_QUICKINT_RANGE(rx));*/ @@ -919,7 +880,7 @@ static int fnc_closedir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { rx = ERRNUM_TO_RC(HAWK_EINVAL); - /* error information set in get_sys_lsit_node_with_arg() */ + /* error information set in get_sys_list_node_with_arg() */ } hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); @@ -955,8 +916,7 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) if (!tmp) { fail: - rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); - copy_error_to_sys_list (rtx, sys_list); + rx = copy_error_to_sys_list(rtx, sys_list); } else { @@ -973,7 +933,7 @@ static int fnc_readdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { rx = ERRNUM_TO_RC(HAWK_EINVAL); - /* error information set in get_sys_lsit_node_with_arg() */ + /* error information set in get_sys_list_node_with_arg() */ } /* the value in 'rx' never exceeds HAWK_QUICKINT_MAX as 'reqsize' has been limited to @@ -1007,14 +967,13 @@ static int fnc_resetdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else { fail: - rx = ERRNUM_TO_RC(hawk_rtx_geterrnum(rtx)); - copy_error_to_sys_list (rtx, sys_list); + rx = 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() */ + /* error information set in get_sys_list_node_with_arg() */ } /* no error check for hawk_rtx_makeintval() here since ret @@ -1027,31 +986,25 @@ static int fnc_resetdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_fork (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t pid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - pid = fork(); - if (pid <= -1) - { - pid = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, rtx_to_sys_list(rtx, fi)); - } + rx = fork(); + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); #endif - retv = hawk_rtx_makeintval(rtx, pid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1062,45 +1015,40 @@ static int fnc_wait (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { hawk_int_t pid; hawk_val_t* retv; - int rx; + hawk_int_t rx; hawk_oow_t nargs; hawk_int_t opts = 0; int status; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); nargs = hawk_rtx_getnargs(rtx); - if (nargs >= 3) + if (nargs >= 3 && hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 2), &opts) <= -1) { - if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 2), &opts) <= -1) return -1; + fail: + rx = copy_error_to_sys_list(rtx, sys_list); + goto done; } - rx = hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &pid); - if (rx >= 0) - { + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &pid) <= -1) goto fail; + #if defined(_WIN32) - /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); - status = 0; + /* TOOD: implement this*/ + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); + status = 0; #elif defined(__OS2__) - /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); - status = 0; + /* TOOD: implement this*/ + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); + status = 0; #elif defined(__DOS__) - /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); - status = 0; + /* TOOD: implement this*/ + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); + status = 0; #else - rx = waitpid(pid, &status, opts); - if (rx <= -1) - { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, rtx_to_sys_list(rtx, fi)); - } + rx = waitpid(pid, &status, opts); + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); #endif - } +done: retv = hawk_rtx_makeintval(rtx, rx); if (!retv) return -1; @@ -1185,34 +1133,28 @@ static int fnc_kill (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { hawk_int_t pid, sig; hawk_val_t* retv; - int rx; + hawk_int_t rx; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); - if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg (rtx, 0), &pid) <= -1 || - hawk_rtx_valtoint(rtx, hawk_rtx_getarg (rtx, 1), &sig) <= -1) + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &pid) <= -1 || + hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &sig) <= -1) { - rx = RC_ERROR; + rx = copy_error_to_sys_list(rtx, sys_list); } else { #if defined(_WIN32) /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - rx = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(rx)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else rx = kill(pid, sig); - if (rx <= -1) - { - rx = syserr_to_rc(errno); - set_errmsg_on_sys_list_with_syserr (rtx, rtx_to_sys_list(rtx, fi)); - } + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); #endif } @@ -1225,36 +1167,33 @@ static int fnc_kill (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getpgid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t pid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else /* TODO: support specifing calling process id other than 0 */ #if defined(HAVE_GETPGID) - pid = getpgid(0); - if (pid <= -1) set_errmsg_on_sys_list_with_syserr (rtx, rtx_to_sys_list(rtx, fi)); + rx = getpgid(0); + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); #elif defined(HAVE_GETPGRP) - pid = getpgrp(); - if (pid <= -1) set_errmsg_on_sys_list_with_syserr (rtx, rtx_to_sys_list(rtx, fi)); + rx = getpgrp(); + if (rx <= -1) rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_NULL); #else - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #endif #endif - retv = hawk_rtx_makeintval(rtx, pid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1263,29 +1202,39 @@ static int fnc_getpgid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getpid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t pid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) - pid = GetCurrentProcessId(); + rx = GetCurrentProcessId(); + /* never fails */ #elif defined(__OS2__) PTIB tib; PPIB pib; + APIRET rc; - pid = (DosGetInfoBlocks(&tib, &pib) == NO_ERROR)? pib->pib_ulpid: -1; + rc = DosGetInfoBlocks(&tib, &pib); + if (rc == NO_ERROR) + { + rx = pib->pib_ulpid; + } + else + { + rx = set_error_on_sys_list (rtx, sys_list, hawk_syserr_to_errnum(rc), HAWK_NULL); + } #elif defined(__DOS__) /* TOOD: implement this*/ - pid = RC_ENOIMPL; - set_errmsg_on_sys_list (rtx, rtx_to_sys_list(rtx, fi), rc_to_errstr(pid)); + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - pid = getpid (); + rx = getpid (); /* getpid() never fails */ #endif - retv = hawk_rtx_makeintval (rtx, pid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1296,6 +1245,7 @@ static int fnc_gettid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { hawk_intptr_t pid; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) pid = GetCurrentThreadId(); @@ -1309,7 +1259,7 @@ static int fnc_gettid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) #elif defined(__DOS__) /* TOOD: implement this*/ - pid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else #if defined(SYS_gettid) && defined(HAWK_SYSCALL0) @@ -1317,11 +1267,11 @@ static int fnc_gettid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) #elif defined(SYS_gettid) pid = syscall(SYS_gettid); #else - pid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #endif #endif - retv = hawk_rtx_makeintval (rtx, (hawk_int_t)pid); + retv = hawk_rtx_makeintval(rtx, (hawk_int_t)pid); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1330,26 +1280,27 @@ static int fnc_gettid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getppid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t pid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - pid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - pid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - pid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - pid = getppid (); + rx = getppid(); #endif - retv = hawk_rtx_makeintval (rtx, pid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1358,26 +1309,27 @@ static int fnc_getppid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getuid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t uid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - uid = getuid (); + rx = getuid(); #endif - retv = hawk_rtx_makeintval (rtx, uid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1386,26 +1338,27 @@ static int fnc_getuid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getgid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t gid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - gid = -1; - + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); + #elif defined(__OS2__) /* TOOD: implement this*/ - gid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - gid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - gid = getgid (); + rx = getgid(); #endif - retv = hawk_rtx_makeintval (rtx, gid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1414,26 +1367,27 @@ static int fnc_getgid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_geteuid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t uid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__DOS__) /* TOOD: implement this*/ - uid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - uid = geteuid (); + rx = geteuid(); #endif - retv = hawk_rtx_makeintval (rtx, uid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1442,26 +1396,27 @@ static int fnc_geteuid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) static int fnc_getegid (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - hawk_int_t gid; + hawk_int_t rx; hawk_val_t* retv; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); #if defined(_WIN32) /* TOOD: implement this*/ - gid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #elif defined(__OS2__) /* TOOD: implement this*/ - gid = -1; - + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); + #elif defined(__DOS__) /* TOOD: implement this*/ - gid = -1; + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ENOIMPL, HAWK_NULL); #else - gid = getegid (); + rx = getegid(); #endif - retv = hawk_rtx_makeintval (rtx, gid); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1473,7 +1428,7 @@ static int fnc_sleep (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) hawk_int_t lv; hawk_flt_t fv; hawk_val_t* retv; - int rx; + hawk_int_t rx; rx = hawk_rtx_valtonum(rtx, hawk_rtx_getarg (rtx, 0), &lv, &fv); if (rx == 0) @@ -1558,7 +1513,7 @@ static int fnc_settime (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) hawk_val_t* retv; hawk_ntime_t now; hawk_int_t tmp; - int rx; + hawk_int_t rx; now.nsec = 0; @@ -1570,7 +1525,7 @@ static int fnc_settime (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) else rx = 0; } - retv = hawk_rtx_makeintval (rtx, rx); + retv = hawk_rtx_makeintval(rtx, rx); if (retv == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, retv); @@ -1860,7 +1815,7 @@ static int fnc_getifcfg (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) sys_list_t* sys_list; hawk_ifcfg_t cfg; hawk_rtx_valtostr_out_t out; - int ret = -1; + hawk_int_t rx; sys_list = rtx_to_sys_list(rtx, fi); @@ -1872,82 +1827,79 @@ static int fnc_getifcfg (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) if (hawk_rtx_valtostr(rtx, hawk_rtx_getarg(rtx, 0), &out) >= 0) { hawk_int_t type; - int rx; + hawk_int_t index, mtu; + hawk_ooch_t addr[128]; + hawk_ooch_t mask[128]; + hawk_ooch_t ethw[32]; + hawk_val_map_data_t md[7]; + hawk_val_t* tmp; + int x; + + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &type) <= -1) goto fail; + + cfg.type = type; + if (hawk_gem_getifcfg(hawk_rtx_getgem(rtx), &cfg) <= -1) goto fail; + + /* make a map value containg configuration */ + HAWK_MEMSET (md, 0, HAWK_SIZEOF(md)); - rx = hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &type); - if (rx >= 0) + md[0].key.ptr = HAWK_T("index"); + md[0].key.len = 5; + md[0].type = HAWK_VAL_MAP_DATA_INT; + index = cfg.index; + md[0].vptr = &index; + + md[1].key.ptr = HAWK_T("mtu"); + md[1].key.len = 3; + md[1].type = HAWK_VAL_MAP_DATA_INT; + mtu = cfg.mtu; + md[1].vptr = &mtu; + + md[2].key.ptr = HAWK_T("addr"); + md[2].key.len = 4; + md[2].type = HAWK_VAL_MAP_DATA_STR; + hawk_gem_skadtooocstr (hawk_rtx_getgem(rtx), &cfg.addr, addr, HAWK_COUNTOF(addr), HAWK_SKAD_TO_OOCSTR_ADDR); + md[2].vptr = addr; + + md[3].key.ptr = HAWK_T("mask"); + md[3].key.len = 4; + md[3].type = HAWK_VAL_MAP_DATA_STR; + hawk_gem_skadtooocstr (hawk_rtx_getgem(rtx), &cfg.mask, mask, HAWK_COUNTOF(mask), HAWK_SKAD_TO_OOCSTR_ADDR); + md[3].vptr = mask; + + md[4].key.ptr = HAWK_T("ethw"); + md[4].key.len = 4; + md[4].type = HAWK_VAL_MAP_DATA_STR; + hawk_rtx_fmttooocstr (rtx, ethw, HAWK_COUNTOF(ethw), HAWK_T("%02X:%02X:%02X:%02X:%02X:%02X"), + cfg.ethw[0], cfg.ethw[1], cfg.ethw[2], cfg.ethw[3], cfg.ethw[4], cfg.ethw[5]); + md[4].vptr = ethw; + + if (cfg.flags & (HAWK_IFCFG_LINKUP | HAWK_IFCFG_LINKDOWN)) { - cfg.type = type; - - if (hawk_gem_getifcfg(hawk_rtx_getgem(rtx), &cfg) >= 0) - { - /* make a map value containg configuration */ - hawk_int_t index, mtu; - hawk_ooch_t addr[128]; - hawk_ooch_t mask[128]; - hawk_ooch_t ethw[32]; - hawk_val_map_data_t md[7]; - hawk_val_t* tmp; - - HAWK_MEMSET (md, 0, HAWK_SIZEOF(md)); - - md[0].key.ptr = HAWK_T("index"); - md[0].key.len = 5; - md[0].type = HAWK_VAL_MAP_DATA_INT; - index = cfg.index; - md[0].vptr = &index; - - md[1].key.ptr = HAWK_T("mtu"); - md[1].key.len = 3; - md[1].type = HAWK_VAL_MAP_DATA_INT; - mtu = cfg.mtu; - md[1].vptr = &mtu; - - md[2].key.ptr = HAWK_T("addr"); - md[2].key.len = 4; - md[2].type = HAWK_VAL_MAP_DATA_STR; - hawk_gem_skadtooocstr (hawk_rtx_getgem(rtx), &cfg.addr, addr, HAWK_COUNTOF(addr), HAWK_SKAD_TO_OOCSTR_ADDR); - md[2].vptr = addr; - - md[3].key.ptr = HAWK_T("mask"); - md[3].key.len = 4; - md[3].type = HAWK_VAL_MAP_DATA_STR; - hawk_gem_skadtooocstr (hawk_rtx_getgem(rtx), &cfg.mask, mask, HAWK_COUNTOF(mask), HAWK_SKAD_TO_OOCSTR_ADDR); - md[3].vptr = mask; - - md[4].key.ptr = HAWK_T("ethw"); - md[4].key.len = 4; - md[4].type = HAWK_VAL_MAP_DATA_STR; - hawk_rtx_fmttooocstr (rtx, ethw, HAWK_COUNTOF(ethw), HAWK_T("%02X:%02X:%02X:%02X:%02X:%02X"), - cfg.ethw[0], cfg.ethw[1], cfg.ethw[2], cfg.ethw[3], cfg.ethw[4], cfg.ethw[5]); - md[4].vptr = ethw; - - if (cfg.flags & (HAWK_IFCFG_LINKUP | HAWK_IFCFG_LINKDOWN)) - { - md[5].key.ptr = HAWK_T("link"); - md[5].key.len = 4; - md[5].type = HAWK_VAL_MAP_DATA_STR; - md[5].vptr = (cfg.flags & HAWK_IFCFG_LINKUP)? HAWK_T("up"): HAWK_T("down"); - } - - tmp = hawk_rtx_makemapvalwithdata(rtx, md); - if (tmp) - { - int x; - hawk_rtx_refupval (rtx, tmp); - x = hawk_rtx_setrefval(rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 2), tmp); - hawk_rtx_refdownval (rtx, tmp); - if (x <= -1) return -1; - ret = 0; - } - } + md[5].key.ptr = HAWK_T("link"); + md[5].key.len = 4; + md[5].type = HAWK_VAL_MAP_DATA_STR; + md[5].vptr = (cfg.flags & HAWK_IFCFG_LINKUP)? HAWK_T("up"): HAWK_T("down"); } + + tmp = hawk_rtx_makemapvalwithdata(rtx, md); + if (!tmp) return -1; /* hard failure */ + + hawk_rtx_refupval (rtx, tmp); + x = hawk_rtx_setrefval(rtx, (hawk_val_ref_t*)hawk_rtx_getarg(rtx, 2), tmp); + hawk_rtx_refdownval (rtx, tmp); + if (x <= -1) return -1; /* hard failure */ + + rx = ERRNUM_TO_RC(HAWK_ENOERR); + } + else + { + fail: + rx = copy_error_to_sys_list(rtx, sys_list); } - - if (ret <= -1) set_errmsg_on_sys_list (rtx, sys_list, HAWK_NULL); /* no error check for hawk_rtx_makeintval() since ret is 0 or -1 */ - hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, ret)); + hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); return 0; } /* ------------------------------------------------------------ */ @@ -1994,7 +1946,7 @@ static int fnc_system (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) skip_system: hawk_rtx_freevaloocstr (rtx, a0, str); - v = hawk_rtx_makeintval (rtx, (hawk_int_t)n); + v = hawk_rtx_makeintval(rtx, (hawk_int_t)n); if (v == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, v); @@ -2045,7 +1997,7 @@ static int fnc_chmod (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) skip_mkdir: hawk_rtx_freevaloocstr (rtx, a0, str); - v = hawk_rtx_makeintval (rtx, (hawk_int_t)n); + v = hawk_rtx_makeintval(rtx, (hawk_int_t)n); if (v == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, v); @@ -2097,7 +2049,7 @@ static int fnc_mkdir (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) skip_mkdir: hawk_rtx_freevaloocstr (rtx, a0, str); - v = hawk_rtx_makeintval (rtx, (hawk_int_t)n); + v = hawk_rtx_makeintval(rtx, (hawk_int_t)n); if (v == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, v); @@ -2146,7 +2098,7 @@ static int fnc_unlink (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) skip_unlink: hawk_rtx_freevaloocstr (rtx, a0, str); - v = hawk_rtx_makeintval (rtx, (hawk_int_t)n); + v = hawk_rtx_makeintval(rtx, (hawk_int_t)n); if (v == HAWK_NULL) return -1; hawk_rtx_setretval (rtx, v); @@ -2156,9 +2108,9 @@ skip_unlink: /* ------------------------------------------------------------ */ /* - * sys::openlog("remote://192.168.1.23:1234/test", sys::LOG_OPT_PID | sys::LOG_OPT_NDELAY, sys::LOG_FAC_LOCAL0); - * for (i = 0; i < 10; i++) sys::writelog(sys::LOG_PRI_DEBUG, "hello world " i); - * sys::closelog(); + sys::openlog("remote://192.168.1.23:1234/test", sys::LOG_OPT_PID | sys::LOG_OPT_NDELAY, sys::LOG_FAC_LOCAL0); + for (i = 0; i < 10; i++) sys::writelog(sys::LOG_PRI_DEBUG, "hello world " i); + sys::closelog(); */ static void open_remote_log_socket (hawk_rtx_t* rtx, mod_ctx_t* mctx) { @@ -2213,25 +2165,34 @@ done: static int fnc_openlog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - int rx = -1; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); hawk_int_t opt, fac; - hawk_val_t* retv; hawk_ooch_t* ident = HAWK_NULL, * actual_ident; hawk_oow_t ident_len; hawk_bch_t* mbs_ident; mod_ctx_t* mctx = (mod_ctx_t*)fi->mod->ctx; hawk_skad_t skad; syslog_type_t log_type = SYSLOG_LOCAL; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); ident = hawk_rtx_getvaloocstr(rtx, hawk_rtx_getarg(rtx, 0), &ident_len); - if (!ident) goto done; + if (!ident) + { + fail: + rx = copy_error_to_sys_list(rtx, sys_list); + goto done; + } /* the target name contains a null character. * make system return -1 */ - if (hawk_find_oochar(ident, ident_len, '\0')) goto done; + if (hawk_find_oochar(ident, ident_len, '\0')) + { + rx = set_error_on_sys_list(rtx, sys_list, HAWK_EINVAL, HAWK_T("invalid identifier of length %zu containing '\\0'"), ident_len); + goto done; + } - if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &opt) <= -1) goto done; - if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 2), &fac) <= -1) goto done; + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 1), &opt) <= -1) goto fail; + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 2), &fac) <= -1) goto fail; if (hawk_comp_oocstr_limited(ident, HAWK_T("remote://"), 9, 0) == 0) { @@ -2241,8 +2202,16 @@ static int fnc_openlog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) log_type = SYSLOG_REMOTE; actual_ident = ident + 9; slash = hawk_find_oochar_in_oocstr(actual_ident, '/'); - if (!slash) goto done; - if (hawk_gem_oocharstoskad (hawk_rtx_getgem(rtx), actual_ident, slash - actual_ident, &skad) <= -1) goto done; + if (!slash) + { + rx = set_error_on_sys_list(rtx, sys_list, HAWK_EINVAL, HAWK_T("invalid identifier '%js' with remote address"), ident); + goto done; + } + if (hawk_gem_oocharstoskad(hawk_rtx_getgem(rtx), actual_ident, slash - actual_ident, &skad) <= -1) + { + rx = copy_error_to_sys_list(rtx, sys_list); + goto done; + } actual_ident = slash + 1; } else if (hawk_comp_oocstr_limited(ident, HAWK_T("local://"), 8, 0) == 0) @@ -2260,7 +2229,11 @@ static int fnc_openlog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) #else mbs_ident = hawk_rtx_duputobcstr(rtx, actual_ident, HAWK_NULL); #endif - if (!mbs_ident) goto done; + if (!mbs_ident) + { + rx = copy_error_to_sys_list(rtx, sys_list); + goto done; + } if (mctx->log.ident) hawk_rtx_freemem (rtx, mctx->log.ident); mctx->log.ident = mbs_ident; @@ -2298,22 +2271,18 @@ static int fnc_openlog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) if ((opt & LOG_NDELAY) && mctx->log.sck <= -1) open_remote_log_socket (rtx, mctx); } - rx = 0; + rx = ERRNUM_TO_RC(HAWK_ENOERR); done: if (ident) hawk_rtx_freevaloocstr(rtx, hawk_rtx_getarg(rtx, 0), ident); - retv = hawk_rtx_makeintval(rtx, rx); - if (retv == HAWK_NULL) return -1; - - hawk_rtx_setretval (rtx, retv); + hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); return 0; } static int fnc_closelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - int rx = -1; - hawk_val_t* retv; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); mod_ctx_t* mctx = (mod_ctx_t*)fi->mod->ctx; switch (mctx->log.type) @@ -2359,31 +2328,37 @@ static int fnc_closelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) * without another openlog() after this closelog() */ mctx->log.type = SYSLOG_LOCAL; - rx = 0; + rx = ERRNUM_TO_RC(HAWK_ENOERR); - retv = hawk_rtx_makeintval(rtx, rx); - if (retv == HAWK_NULL) return -1; - - hawk_rtx_setretval (rtx, retv); + hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); return 0; } static int fnc_writelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { - int rx = -1; - hawk_val_t* retv; + hawk_int_t rx = ERRNUM_TO_RC(HAWK_EOTHER); hawk_int_t pri; hawk_ooch_t* msg = HAWK_NULL; hawk_oow_t msglen; mod_ctx_t* mctx = (mod_ctx_t*)fi->mod->ctx; + sys_list_t* sys_list = rtx_to_sys_list(rtx, fi); - if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &pri) <= -1) goto done; + if (hawk_rtx_valtoint(rtx, hawk_rtx_getarg(rtx, 0), &pri) <= -1) + { + fail: + rx = copy_error_to_sys_list(rtx, sys_list); + goto done; + } msg = hawk_rtx_getvaloocstr(rtx, hawk_rtx_getarg(rtx, 1), &msglen); - if (!msg) goto done; + if (!msg) goto fail; - if (hawk_find_oochar(msg, msglen, '\0')) goto done; + if (hawk_find_oochar(msg, msglen, '\0')) + { + rx = set_error_on_sys_list(rtx, sys_list, HAWK_EINVAL, HAWK_T("invalid message of length %zu containing '\\0'"), msglen); + goto done; + } if (mctx->log.type == SYSLOG_LOCAL) { @@ -2394,7 +2369,7 @@ static int fnc_writelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) { hawk_bch_t* mbs; mbs = hawk_rtx_duputobcstr(rtx, msg, HAWK_NULL); - if (!mbs) goto done; + if (!mbs) goto fail; syslog(pri, "%s", mbs); hawk_rtx_freemem (rtx, mbs); } @@ -2421,10 +2396,17 @@ static int fnc_writelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) struct tm tm, * tmx; time_t t; - if (!mctx->log.dmsgbuf) mctx->log.dmsgbuf = hawk_becs_open(hawk_rtx_getgem(rtx), 0, 0); - if (!mctx->log.dmsgbuf) goto done; + if (!mctx->log.dmsgbuf) + { + mctx->log.dmsgbuf = hawk_becs_open(hawk_rtx_getgem(rtx), 0, 0); + if (!mctx->log.dmsgbuf) goto fail; + } - if (hawk_get_time(&now) <= -1) goto done; + if (hawk_get_time(&now) <= -1) + { + rx = set_error_on_sys_list(rtx, sys_list, HAWK_ESYSERR, HAWK_T("unable to get time")); + goto done; + } t = now.sec; #if defined(HAVE_LOCALTIME_R) @@ -2432,33 +2414,31 @@ static int fnc_writelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) #else tmx = localtime(&t); #endif - if (!tmx) goto done; + if (!tmx) + { + rx = set_error_on_sys_list_with_syserr(rtx, sys_list, HAWK_T("unable to get local time")); + goto done; + } if (hawk_becs_fmt( - mctx->log.dmsgbuf, HAWK_BT("<%d>%s %02d %02d:%02d:%02d "), + mctx->log.dmsgbuf, HAWK_BT("<%d>%hs %02d %02d:%02d:%02d "), (int)(mctx->log.fac | pri), __syslog_month_names[tmx->tm_mon], tmx->tm_mday, - tmx->tm_hour, tmx->tm_min, tmx->tm_sec) == (hawk_oow_t)-1) goto done; + tmx->tm_hour, tmx->tm_min, tmx->tm_sec) == (hawk_oow_t)-1) goto fail; if (mctx->log.ident || (mctx->log.opt & LOG_PID)) { /* if the identifier is set or LOG_PID is set, the produced tag won't be empty. * so appending ':' is kind of ok */ - - if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%hs"), (mctx->log.ident? mctx->log.ident: HAWK_BT(""))) == (hawk_oow_t)-1) goto done; - - if (mctx->log.opt & LOG_PID) - { - if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("[%d]"), (int)HAWK_GETPID()) == (hawk_oow_t)-1) goto done; - } - - if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT(": ")) == (hawk_oow_t)-1) goto done; + if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%hs"), (mctx->log.ident? mctx->log.ident: HAWK_BT(""))) == (hawk_oow_t)-1) goto fail; + if ((mctx->log.opt & LOG_PID) && hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("[%d]"), (int)HAWK_GETPID()) == (hawk_oow_t)-1) goto fail; + if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT(": ")) == (hawk_oow_t)-1) goto fail; } #if defined(HAWK_OOCH_IS_BCH) - if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%hs"), msg) == (hawk_oow_t)-1) goto done; + if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%hs"), msg) == (hawk_oow_t)-1) goto fail; #else - if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%ls"), msg) == (hawk_oow_t)-1) goto done; + if (hawk_becs_fcat(mctx->log.dmsgbuf, HAWK_BT("%ls"), msg) == (hawk_oow_t)-1) goto fail; #endif /* don't care about output failure */ @@ -2468,15 +2448,12 @@ static int fnc_writelog (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi) #endif } - rx = 0; + rx = ERRNUM_TO_RC(HAWK_ENOERR); done: if (msg) hawk_rtx_freevaloocstr(rtx, hawk_rtx_getarg(rtx, 1), msg); - retv = hawk_rtx_makeintval(rtx, rx); - if (retv == HAWK_NULL) return -1; - - hawk_rtx_setretval (rtx, retv); + hawk_rtx_setretval (rtx, hawk_rtx_makeintval(rtx, rx)); return 0; } @@ -2670,19 +2647,31 @@ static inttab_t inttab[] = { HAWK_T("O_WRONLY"), { O_WRONLY } }, #endif - { HAWK_T("RC_EAGAIN"), { RC_EAGAIN } }, - { HAWK_T("RC_EBADF"), { RC_EBADF } }, - { HAWK_T("RC_ECHILD"), { RC_ECHILD } }, - { HAWK_T("RC_EEXIST"), { RC_EEXIST } }, - { HAWK_T("RC_EINTR"), { RC_EINTR } }, - { HAWK_T("RC_EINVAL"), { RC_EINVAL } }, - { HAWK_T("RC_ENOENT"), { RC_ENOENT } }, - { HAWK_T("RC_ENOIMPL"), { RC_ENOIMPL } }, - { HAWK_T("RC_ENOMEM"), { RC_ENOMEM } }, - { HAWK_T("RC_ENOTDIR"), { RC_ENOTDIR } }, - { HAWK_T("RC_ENOSYS"), { RC_ENOSYS } }, - { HAWK_T("RC_EPERM"), { RC_EPERM } }, - { HAWK_T("RC_ERROR"), { RC_ERROR } }, + { HAWK_T("RC_EACCES"), { -HAWK_EACCES } }, + { HAWK_T("RC_EAGAIN"), { -HAWK_EAGAIN } }, + { HAWK_T("RC_EBUFFULL"),{ -HAWK_EBUFFULL} }, + { HAWK_T("RC_EBUSY"), { -HAWK_EBUSY} }, + { HAWK_T("RC_ECHILD"), { -HAWK_ECHILD } }, + { HAWK_T("RC_EECERR"), { -HAWK_EECERR } }, + { HAWK_T("RC_EEXIST"), { -HAWK_EEXIST } }, + { HAWK_T("RC_EINPROG"), { -HAWK_EINPROG } }, + { HAWK_T("RC_EINTERN"), { -HAWK_EINTERN } }, + { HAWK_T("RC_EINTR"), { -HAWK_EINTR } }, + { HAWK_T("RC_EINVAL"), { -HAWK_EINVAL } }, + { HAWK_T("RC_EIOERR"), { -HAWK_EIOERR } }, + { HAWK_T("RC_EISDIR"), { -HAWK_EISDIR } }, + { HAWK_T("RC_ENOENT"), { -HAWK_ENOENT } }, + { HAWK_T("RC_ENOHND"), { -HAWK_ENOHND } }, + { HAWK_T("RC_ENOIMPL"), { -HAWK_ENOIMPL } }, + { HAWK_T("RC_ENOMEM"), { -HAWK_ENOMEM } }, + { HAWK_T("RC_ENOSUP"), { -HAWK_ENOSUP } }, + { HAWK_T("RC_ENOTDIR"), { -HAWK_ENOTDIR } }, + { HAWK_T("RC_EOTHER"), { -HAWK_EOTHER } }, + { HAWK_T("RC_EPERM"), { -HAWK_EPERM } }, + { HAWK_T("RC_EPIPE"), { -HAWK_EPIPE } }, + { HAWK_T("RC_ESTATE"), { -HAWK_ESTATE } }, + { HAWK_T("RC_ESYSERR"), { -HAWK_ESYSERR } }, + { HAWK_T("RC_ETMOUT"), { -HAWK_ETMOUT } }, { HAWK_T("SIGABRT"), { SIGABRT } }, { HAWK_T("SIGALRM"), { SIGALRM } }, diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in index 291e72f8..de667927 100644 --- a/hawk/mod/Makefile.in +++ b/hawk/mod/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,9 +184,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo \ - ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -380,6 +378,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -453,8 +452,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__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -524,14 +523,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@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) +@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@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -629,10 +622,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -705,8 +695,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-pkgmodexecLTLIBRARIES mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo - -rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -752,8 +741,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo - -rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -774,8 +762,8 @@ uninstall-am: uninstall-pkgmodexecLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am 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 0d3fb1bd..fe453e10 100644 --- a/hawk/t/Makefile.in +++ b/hawk/t/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -135,9 +135,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/t-001.Po ./$(DEPDIR)/t-002.Po \ - ./$(DEPDIR)/t-005.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -330,6 +328,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -385,8 +384,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__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -465,15 +464,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@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) +@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@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -557,10 +550,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -632,9 +622,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/t-001.Po - -rm -f ./$(DEPDIR)/t-002.Po - -rm -f ./$(DEPDIR)/t-005.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -680,9 +668,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/t-001.Po - -rm -f ./$(DEPDIR)/t-002.Po - -rm -f ./$(DEPDIR)/t-005.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -703,7 +689,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am 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 8c922d28..187b7375 100644 --- a/hawk/tools/Makefile.in +++ b/hawk/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -137,9 +137,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/ac/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/uni_case-uni-case.Po \ - ./$(DEPDIR)/uni_prop-uni-prop.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -332,6 +330,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -383,8 +382,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__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -459,14 +458,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@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) +@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@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -578,10 +571,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -653,8 +643,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/uni_case-uni-case.Po - -rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -700,8 +689,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/uni_case-uni-case.Po - -rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -722,7 +710,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am 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 \