consolidated syserr_to_errnum macros to a single hawk_syserr_to_errnum() function

This commit is contained in:
hyung-hwan 2020-01-01 05:20:28 +00:00
parent 05cb4dc080
commit 49e3eec642
31 changed files with 2553 additions and 2736 deletions

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -142,7 +142,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \ $(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets) $(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ 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) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input, # Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is # and print each of them once, without duplicates. Input order is
@ -356,6 +356,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -393,8 +394,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \ echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \ $(SHELL) ./config.status;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(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 TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)" test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@ -589,7 +587,7 @@ distdir-am: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)" || chmod -R a+r "$(distdir)"
dist-gzip: 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) $(am__post_remove_distdir)
dist-bzip2: distdir dist-bzip2: distdir
@ -615,7 +613,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \ @echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2 "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&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) $(am__post_remove_distdir)
dist-zip: distdir dist-zip: distdir
@ -633,7 +631,7 @@ dist dist-all:
distcheck: dist distcheck: dist
case '$(DIST_ARCHIVES)' in \ case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \ *.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*) \ *.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \ *.tar.lz*) \
@ -643,7 +641,7 @@ distcheck: dist
*.tar.Z*) \ *.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \ *.shar.gz*) \
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \ *.zip*) \
unzip $(distdir).zip ;;\ unzip $(distdir).zip ;;\
esac esac

View File

@ -4,7 +4,7 @@
me=ar-lib me=ar-lib
scriptversion=2012-03-01.08; # UTC scriptversion=2012-03-01.08; # UTC
# Copyright (C) 2010-2018 Free Software Foundation, Inc. # Copyright (C) 2010-2014 Free Software Foundation, Inc.
# Written by Peter Rosin <peda@lysator.liu.se>. # Written by Peter Rosin <peda@lysator.liu.se>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a

View File

@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# Wrapper for compilers which do not understand '-c -o'. # Wrapper for compilers which do not understand '-c -o'.
scriptversion=2018-03-07.03; # UTC scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
@ -255,8 +255,7 @@ EOF
echo "compile $scriptversion" echo "compile $scriptversion"
exit $? exit $?
;; ;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return... func_cl_wrapper "$@" # Doesn't return...
;; ;;
esac esac
@ -340,9 +339,9 @@ exit $ret
# Local Variables: # Local Variables:
# mode: shell-script # mode: shell-script
# sh-indentation: 2 # sh-indentation: 2
# eval: (add-hook 'before-save-hook 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC" # time-stamp-end: "; # UTC"
# End: # End:

666
hawk/ac/config.guess vendored

File diff suppressed because it is too large Load Diff

2711
hawk/ac/config.sub vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# depcomp - compile a program generating dependencies as side-effects # depcomp - compile a program generating dependencies as side-effects
scriptversion=2018-03-07.03; # UTC scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@ scriptversion=2018-03-07.03; # UTC
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
@ -783,9 +783,9 @@ exit 0
# Local Variables: # Local Variables:
# mode: shell-script # mode: shell-script
# sh-indentation: 2 # sh-indentation: 2
# eval: (add-hook 'before-save-hook 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC" # time-stamp-end: "; # UTC"
# End: # End:

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # install - install a program, script, or datafile
scriptversion=2018-03-11.20; # UTC scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
@ -271,18 +271,15 @@ do
fi fi
dst=$dst_arg dst=$dst_arg
# If destination is a directory, append the input filename. # If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then if test -d "$dst"; then
if test "$is_target_a_directory" = never; then if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2 echo "$0: $dst_arg: Is a directory" >&2
exit 1 exit 1
fi fi
dstdir=$dst dstdir=$dst
dstbase=`basename "$src"` dst=$dstdir/`basename "$src"`
case $dst in
*/) dst=$dst$dstbase;;
*) dst=$dst/$dstbase;;
esac
dstdir_status=0 dstdir_status=0
else else
dstdir=`dirname "$dst"` dstdir=`dirname "$dst"`
@ -291,11 +288,6 @@ do
fi fi
fi fi
case $dstdir in
*/) dstdirslash=$dstdir;;
*) dstdirslash=$dstdir/;;
esac
obsolete_mkdir_used=false obsolete_mkdir_used=false
if test $dstdir_status != 0; then if test $dstdir_status != 0; then
@ -332,16 +324,14 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0. # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;; ;;
*) *)
# Note that $RANDOM variable is not portable (e.g. dash); Use it # $RANDOM is not portable (e.g. dash); use it when possible to
# here however when possible just to lower collision chance. # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
# Because "mkdir -p" follows existing symlinks and we likely work # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
# directly in world-writeable /tmp, make sure that the '$tmpdir' # create the $tmpdir first (and fail if unsuccessful) to make sure
# directory is successfully created first before we actually test # that nobody tries to guess the $tmpdir name.
# 'mkdir -p' feature.
if (umask $mkdir_umask && if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" && $mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
@ -444,8 +434,8 @@ do
else else
# Make a couple of temp file names in the proper directory. # Make a couple of temp file names in the proper directory.
dsttmp=${dstdirslash}_inst.$$_ dsttmp=$dstdir/_inst.$$_
rmtmp=${dstdirslash}_rm.$$_ rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit. # Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@ -510,9 +500,9 @@ do
done done
# Local variables: # Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC" # time-stamp-end: "; # UTC"
# End: # End:

View File

@ -31,7 +31,7 @@
PROGRAM=libtool PROGRAM=libtool
PACKAGE=libtool PACKAGE=libtool
VERSION=2.4.6 VERSION="2.4.6 Debian-2.4.6-2"
package_revision=2.4.6 package_revision=2.4.6
@ -2068,12 +2068,12 @@ include the following information:
compiler: $LTCC compiler: $LTCC
compiler flags: $LTCFLAGS compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld) linker: $LD (gnu? $with_gnu_ld)
version: $progname (GNU libtool) 2.4.6 version: $progname $scriptversion Debian-2.4.6-2
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>. Report bugs to <bug-libtool@gnu.org>.
GNU libtool home page: <http://www.gnu.org/software/libtool/>. GNU libtool home page: <http://www.gnu.org/s/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>." General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0 exit 0
} }
@ -2124,7 +2124,7 @@ fi
# a configuration failure hint, and exit. # a configuration failure hint, and exit.
func_fatal_configuration () func_fatal_configuration ()
{ {
func_fatal_error ${1+"$@"} \ func__fatal_error ${1+"$@"} \
"See the $PACKAGE documentation for more information." \ "See the $PACKAGE documentation for more information." \
"Fatal configuration error." "Fatal configuration error."
} }
@ -7274,10 +7274,11 @@ func_mode_link ()
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files # -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang # -stdlib=* select c++ std lib with clang
# -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*) -specs=*|-fsanitize=*)
func_quote_for_eval "$arg" func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result arg=$func_quote_for_eval_result
func_append compile_command " $arg" func_append compile_command " $arg"
@ -7570,7 +7571,10 @@ func_mode_link ()
case $pass in case $pass in
dlopen) libs=$dlfiles ;; dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;; dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; link)
libs="$deplibs %DEPLIBS%"
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
;;
esac esac
fi fi
if test lib,dlpreopen = "$linkmode,$pass"; then if test lib,dlpreopen = "$linkmode,$pass"; then
@ -7889,19 +7893,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects. # It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library" func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library"
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
func_append tmp_libs " $deplib"
done
elif test prog != "$linkmode" && test lib != "$linkmode"; then elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library" func_fatal_error "'$lib' is not a convenience library"
fi fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
func_append tmp_libs " $deplib"
done
continue continue
fi # $pass = conv fi # $pass = conv
@ -8825,6 +8829,9 @@ func_mode_link ()
revision=$number_minor revision=$number_minor
lt_irix_increment=no lt_irix_increment=no
;; ;;
*)
func_fatal_configuration "$modename: unknown library version type '$version_type'"
;;
esac esac
;; ;;
no) no)

View File

@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# Common wrapper for a few potentially missing GNU programs. # Common wrapper for a few potentially missing GNU programs.
scriptversion=2018-03-07.03; # UTC scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
@ -101,9 +101,9 @@ else
exit $st exit $st
fi fi
perl_URL=https://www.perl.org/ perl_URL=http://www.perl.org/
flex_URL=https://github.com/westes/flex flex_URL=http://flex.sourceforge.net/
gnu_software_URL=https://www.gnu.org/software gnu_software_URL=http://www.gnu.org/software
program_details () program_details ()
{ {
@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
exit $st exit $st
# Local variables: # Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion=" # time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0" # time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC" # time-stamp-end: "; # UTC"
# End: # End:

191
hawk/aclocal.m4 vendored
View File

@ -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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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. 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'.])]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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. # generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.) # (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION], 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 Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. 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 [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. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 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_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -118,7 +118,7 @@ AC_SUBST([AR])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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.]]) Usually this means the macro was only invoked conditionally.]])
fi])]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# _AM_OUTPUT_DEPENDENCY_COMMANDS # _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------ # ------------------------------
AC_DEFUN([_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 # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval # are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting. # if we detect the quoting.
# TODO: see whether this extra hack can be removed once we start case $CONFIG_FILES in
# requiring Autoconf 2.70 or later. *\'*) eval set x "$CONFIG_FILES" ;;
AS_CASE([$CONFIG_FILES], *) set x $CONFIG_FILES ;;
[*\'*], [eval set x "$CONFIG_FILES"], esac
[*], [set x $CONFIG_FILES])
shift shift
# Used to flag and report bootstrapping failures. for mf
am_rc=0
for am_mf
do do
# Strip MF so we end up with the name of the file. # Strip MF so we end up with the name of the file.
am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes # Check whether this is an Automake generated Makefile or not.
# dependency-tracking related rules and includes. # We used to match only the files named 'Makefile.in', but
# Grep'ing the whole file directly is not great: AIX grep has a line # 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. # 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 \ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|| continue dirpart=`AS_DIRNAME("$mf")`
am_dirpart=`AS_DIRNAME(["$am_mf"])` else
am_filepart=`AS_BASENAME(["$am_mf"])` continue
AM_RUN_LOG([cd "$am_dirpart" \ fi
&& sed -e '/# am--include-marker/d' "$am_filepart" \ # Extract the definition of DEPDIR, am__include, and am__quote
| $MAKE -f - am--depfiles]) || am_rc=$? # 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 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 ])# _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 macro should only be invoked once -- use via AC_REQUIRE.
# #
# This code is only required when automatic dependency tracking is enabled. # This code is only required when automatic dependency tracking
# This creates each '.Po' and '.Plo' makefile fragment that we'll need in # is enabled. FIXME. This creates each '.P' file that we will
# order to bootstrap the dependency handling code. # need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles], [AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], [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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x # For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see: # dies out for good. For more background, see:
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)']) AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The # We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms. # system "awk" is bad on some platforms.
@ -613,7 +623,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue. Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <https://www.gnu.org/software/coreutils/>. that behaves properly: <http://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@ -655,7 +665,7 @@ for _am_header in $config_headers :; do
done done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -676,7 +686,7 @@ if test x"${install_sh+set}" != xset; then
fi fi
AC_SUBST([install_sh])]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -705,42 +715,49 @@ AC_SUBST([am__leading_dot])])
# AM_MAKE_INCLUDE() # AM_MAKE_INCLUDE()
# ----------------- # -----------------
# Check whether make has an 'include' directive that can support all # Check to see how make treats includes.
# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE], AC_DEFUN([AM_MAKE_INCLUDE],
[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) [am_make=${MAKE-make}
cat > confinc.mk << 'END' cat > confinc << 'END'
am__doit: am__doit:
@echo this is the am__doit target >confinc.out @echo this is the am__doit target
.PHONY: am__doit .PHONY: am__doit
END 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__include="#"
am__quote= am__quote=
# BSD make does it like this. _am_result=none
echo '.include "confinc.mk" # ignored' > confmf.BSD # First try GNU make style include.
# Other make implementations (GNU, Solaris 10, AIX) do it like this. echo "include confinc" > confmf
echo 'include confinc.mk # ignored' > confmf.GNU # Ignore all kinds of additional output from 'make'.
_am_result=no case `$am_make -s -f confmf 2> /dev/null` in #(
for s in GNU BSD; do *the\ am__doit\ target*)
AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) am__include=include
AS_CASE([$?:`cat confinc.out 2>/dev/null`], am__quote=
['0:this is the am__doit target'], _am_result=GNU
[AS_CASE([$s], ;;
[BSD], [am__include='.include' am__quote='"'], esac
[am__include='include' am__quote=''])]) # Now try BSD make style include.
if test "$am__include" != "#"; then if test "$am__include" = "#"; then
_am_result="yes ($s style)" echo '.include "confinc"' > confmf
break case `$am_make -s -f confmf 2> /dev/null` in #(
fi *the\ am__doit\ target*)
done am__include=.include
rm -f confinc.* confmf.* am__quote="\""
AC_MSG_RESULT([${_am_result}]) _am_result=BSD
AC_SUBST([am__include])]) ;;
AC_SUBST([am__quote])]) 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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -779,7 +796,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -808,7 +825,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION], AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) [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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -855,7 +872,7 @@ AC_LANG_POP([C])])
# For backward compatibility. # For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -955,7 +972,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -1015,7 +1032,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -1043,7 +1060,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])]) 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # 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 -*- # 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 # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -132,8 +132,7 @@ am__v_at_0 = @
am__v_at_1 = am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__depfiles_maybe = depfiles
am__depfiles_remade = ./$(DEPDIR)/hawk-main.Po
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -326,6 +325,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -376,8 +376,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \ *config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -448,13 +448,7 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hawk-main.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hawk-main.Po@am__quote@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.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: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \ list='$(DISTFILES)'; \
@ -627,7 +618,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/hawk-main.Po -rm -rf ./$(DEPDIR)
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags distclean-tags
@ -673,7 +664,7 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/hawk-main.Po -rm -rf ./$(DEPDIR)
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
@ -694,7 +685,7 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip .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 \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \

265
hawk/configure vendored
View File

@ -731,6 +731,7 @@ am__nodep
AMDEPBACKSLASH AMDEPBACKSLASH
AMDEP_FALSE AMDEP_FALSE
AMDEP_TRUE AMDEP_TRUE
am__quote
am__include am__include
DEPDIR DEPDIR
OBJEXT OBJEXT
@ -788,6 +789,7 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@ -806,8 +808,7 @@ PACKAGE_VERSION
PACKAGE_TARNAME PACKAGE_TARNAME
PACKAGE_NAME PACKAGE_NAME
PATH_SEPARATOR PATH_SEPARATOR
SHELL SHELL'
am__quote'
ac_subst_files='' ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
@ -888,6 +889,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1140,6 +1142,15 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; 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) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1277,7 +1288,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir libdir localedir mandir runstatedir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
@ -1430,6 +1441,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/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 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), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # 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 # For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see: # dies out for good. For more background, see:
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)' mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The # 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. Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <https://www.gnu.org/software/coreutils/>. that behaves properly: <http://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM '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" 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; } am_make=${MAKE-make}
cat > confinc.mk << 'END' cat > confinc << 'END'
am__doit: am__doit:
@echo this is the am__doit target >confinc.out @echo this is the am__doit target
.PHONY: am__doit .PHONY: am__doit
END 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__include="#"
am__quote= am__quote=
# BSD make does it like this. _am_result=none
echo '.include "confinc.mk" # ignored' > confmf.BSD # First try GNU make style include.
# Other make implementations (GNU, Solaris 10, AIX) do it like this. echo "include confinc" > confmf
echo 'include confinc.mk # ignored' > confmf.GNU # Ignore all kinds of additional output from 'make'.
_am_result=no case `$am_make -s -f confmf 2> /dev/null` in #(
for s in GNU BSD; do *the\ am__doit\ target*)
{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 am__include=include
(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 am__quote=
ac_status=$? _am_result=GNU
echo "$as_me:$LINENO: \$? = $ac_status" >&5 ;;
(exit $ac_status); }
case $?:`cat confinc.out 2>/dev/null` in #(
'0:this is the am__doit target') :
case $s in #(
BSD) :
am__include='.include' am__quote='"' ;; #(
*) :
am__include='include' am__quote='' ;;
esac ;; #(
*) :
;;
esac esac
if test "$am__include" != "#"; then # Now try BSD make style include.
_am_result="yes ($s style)" if test "$am__include" = "#"; then
break echo '.include "confinc"' > confmf
fi case `$am_make -s -f confmf 2> /dev/null` in #(
done *the\ am__doit\ target*)
rm -f confinc.* confmf.* am__include=.include
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 am__quote="\""
$as_echo "${_am_result}" >&6; } _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. # Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then : if test "${enable_dependency_tracking+set}" = set; then :
@ -7179,7 +7191,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else else
@ -10881,6 +10893,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd* | bitrig*) openbsd* | bitrig*)
with_gnu_ld=no with_gnu_ld=no
;; ;;
linux* | k*bsd*-gnu | gnu*)
link_all_deplibs=no
;;
esac esac
ld_shlibs=yes ld_shlibs=yes
@ -11135,7 +11150,7 @@ _LT_EOF
fi fi
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc= wlarc=
@ -11805,6 +11820,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
if test yes = "$lt_cv_irix_exported_symbol"; then if test yes = "$lt_cv_irix_exported_symbol"; then
archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi fi
link_all_deplibs=no
else else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@ -11826,7 +11842,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
esac esac
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else else
@ -12921,9 +12937,6 @@ fi
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directores which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
@ -12932,7 +12945,7 @@ fi
# appending ld.so.conf contents (and includes) to the search path. # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
@ -12944,6 +12957,18 @@ fi
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
@ -15838,7 +15863,7 @@ lt_prog_compiler_static_CXX=
;; ;;
esac esac
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
;; ;;
*qnx* | *nto*) *qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise # QNX uses GNU C++, but need to define -shared option too, otherwise
@ -16213,6 +16238,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;; ;;
esac esac
;; ;;
linux* | k*bsd*-gnu | gnu*)
link_all_deplibs_CXX=no
;;
*) *)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;; ;;
@ -16886,9 +16914,6 @@ fi
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directores which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
@ -16897,7 +16922,7 @@ fi
# appending ld.so.conf contents (and includes) to the search path. # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
@ -16909,6 +16934,18 @@ fi
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
@ -17335,7 +17372,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ 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 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -17381,7 +17418,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ 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 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -17405,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, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ 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 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -17450,7 +17487,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ 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 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -17474,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, We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */ 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 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1) && LARGE_OFF_T % 2147483647 == 1)
? 1 : -1]; ? 1 : -1];
@ -23835,7 +23872,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# #
# INIT-COMMANDS # 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 # The HP-UX ksh and POSIX shell print the target directory to stdout
@ -24834,35 +24871,29 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Older Autoconf quotes --file arguments for eval, but not when files # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval # are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting. # if we detect the quoting.
# TODO: see whether this extra hack can be removed once we start case $CONFIG_FILES in
# requiring Autoconf 2.70 or later. *\'*) eval set x "$CONFIG_FILES" ;;
case $CONFIG_FILES in #( *) set x $CONFIG_FILES ;;
*\'*) : esac
eval set x "$CONFIG_FILES" ;; #(
*) :
set x $CONFIG_FILES ;; #(
*) :
;;
esac
shift shift
# Used to flag and report bootstrapping failures. for mf
am_rc=0
for am_mf
do do
# Strip MF so we end up with the name of the file. # Strip MF so we end up with the name of the file.
am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes # Check whether this is an Automake generated Makefile or not.
# dependency-tracking related rules and includes. # We used to match only the files named 'Makefile.in', but
# Grep'ing the whole file directly is not great: AIX grep has a line # 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. # 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 \ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|| continue dirpart=`$as_dirname -- "$mf" ||
am_dirpart=`$as_dirname -- "$am_mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \
X"$am_mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \
X"$am_mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || $as_echo X"$mf" |
$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/ s//\1/
q q
@ -24880,48 +24911,53 @@ $as_echo X"$am_mf" |
q q
} }
s/.*/./; q'` s/.*/./; q'`
am_filepart=`$as_basename -- "$am_mf" || else
$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ continue
X"$am_mf" : 'X\(//\)$' \| \ fi
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || # Extract the definition of DEPDIR, am__include, and am__quote
$as_echo X/"$am_mf" | # from the Makefile without running 'make'.
sed '/^.*\/\([^/][^/]*\)\/*$/{ 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/ s//\1/
q q
} }
/^X\/\(\/\/\)$/{ /^X\(\/\/\)[^/].*/{
s//\1/ s//\1/
q q
} }
/^X\/\(\/\).*/{ /^X\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
s//\1/ s//\1/
q q
} }
s/.*/./; q'` s/.*/./; q'`
{ echo "$as_me:$LINENO: cd "$am_dirpart" \ as_dir=$dirpart/$fdir; as_fn_mkdir_p
&& sed -e '/# am--include-marker/d' "$am_filepart" \ # echo "creating $dirpart/$file"
| $MAKE -f - am--depfiles" >&5 echo '# dummy' > "$dirpart/$file"
(cd "$am_dirpart" \ done
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } || am_rc=$?
done 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) "libtool":C)
@ -24939,7 +24975,6 @@ See \`config.log' for more details" "$LINENO" 5; }
cat <<_LT_EOF >> "$cfgfile" cat <<_LT_EOF >> "$cfgfile"
#! $SHELL #! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION # Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services. # Provide generalized library-building support services.

View File

@ -79,6 +79,7 @@ libhawk_la_SOURCES = \
ecs.c \ ecs.c \
err-prv.h \ err-prv.h \
err.c \ err.c \
err-sys.c \
fmt-imp.h \ fmt-imp.h \
fmt.c \ fmt.c \
fnc-prv.h \ fnc-prv.h \
@ -143,7 +144,6 @@ libhawk_la_SOURCES += \
pio.c \ pio.c \
sio.c \ sio.c \
syscall.h \ syscall.h \
syserr.h \
tio.c \ tio.c \
std-prv.h \ std-prv.h \
std.c std.c

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -164,36 +164,36 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
am__libhawk_la_SOURCES_DIST = hawk.h hawk-chr.h hawk-cmn.h hawk-dir.h \ am__libhawk_la_SOURCES_DIST = hawk.h hawk-chr.h hawk-cmn.h hawk-dir.h \
hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h hawk-rbt.h \ hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h hawk-rbt.h \
hawk-pack1.h hawk-utl.h hawk-std.h hawk-tre.h hawk-unpack.h \ hawk-pack1.h hawk-utl.h hawk-std.h hawk-tre.h hawk-unpack.h \
arr.c chr.c dir.c ecs-imp.h ecs.c err-prv.h err.c fmt-imp.h \ arr.c chr.c dir.c ecs-imp.h ecs.c err-prv.h err.c err-sys.c \
fmt.c fnc-prv.h fnc.c htb.c gem.c gem-skad.c gem-nwif.c \ fmt-imp.h fmt.c fnc-prv.h fnc.c htb.c gem.c gem-skad.c \
gem-nwif2.c hawk-prv.h hawk.c mb8.c misc-prv.h misc.c \ gem-nwif.c gem-nwif2.c hawk-prv.h hawk.c mb8.c misc-prv.h \
parse-prv.h parse.c rbt.c rec.c rio-prv.h rio.c run-prv.h \ misc.c parse-prv.h parse.c rbt.c rec.c rio-prv.h rio.c \
run.c tre-prv.h tre-ast.c tre-ast.h tre-compile.c \ run-prv.h run.c tre-prv.h tre-ast.c tre-ast.h tre-compile.c \
tre-compile.h tre-match-bt.c tre-match-pa.c tre-match-ut.h \ tre-compile.h tre-match-bt.c tre-match-pa.c tre-match-ut.h \
tre-mem.c tre-mem.h tre-parse.c tre-parse.h tre-stack.c \ tre-mem.c tre-mem.h tre-parse.c tre-parse.h tre-stack.c \
tre-stack.h tre.c tree-prv.h tree.c utf16.c utf8.c utl-ass.c \ tre-stack.h tre.c tree-prv.h tree.c utf16.c utf8.c utl-ass.c \
utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c utl.c \ utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c utl.c \
val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h hawk-pio.h \ val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h hawk-pio.h \
hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c syscall.h \ hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c syscall.h \
syserr.h tio.c std-prv.h std.c imap-imp.h mod-math.c \ tio.c std-prv.h std.c imap-imp.h mod-math.c mod-math.h \
mod-math.h mod-str.c mod-str.h mod-sys.c mod-sys.h mod-str.c mod-str.h mod-sys.c mod-sys.h
am__objects_1 = am__objects_1 =
@ENABLE_STATIC_MODULE_TRUE@am__objects_2 = libhawk_la-mod-math.lo \ @ENABLE_STATIC_MODULE_TRUE@am__objects_2 = libhawk_la-mod-math.lo \
@ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-str.lo \ @ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-str.lo \
@ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-sys.lo @ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-sys.lo
am_libhawk_la_OBJECTS = $(am__objects_1) libhawk_la-arr.lo \ am_libhawk_la_OBJECTS = $(am__objects_1) libhawk_la-arr.lo \
libhawk_la-chr.lo libhawk_la-dir.lo libhawk_la-ecs.lo \ libhawk_la-chr.lo libhawk_la-dir.lo libhawk_la-ecs.lo \
libhawk_la-err.lo libhawk_la-fmt.lo libhawk_la-fnc.lo \ libhawk_la-err.lo libhawk_la-err-sys.lo libhawk_la-fmt.lo \
libhawk_la-htb.lo libhawk_la-gem.lo libhawk_la-gem-skad.lo \ libhawk_la-fnc.lo libhawk_la-htb.lo libhawk_la-gem.lo \
libhawk_la-gem-nwif.lo libhawk_la-gem-nwif2.lo \ libhawk_la-gem-skad.lo libhawk_la-gem-nwif.lo \
libhawk_la-hawk.lo libhawk_la-mb8.lo libhawk_la-misc.lo \ libhawk_la-gem-nwif2.lo libhawk_la-hawk.lo libhawk_la-mb8.lo \
libhawk_la-parse.lo libhawk_la-rbt.lo libhawk_la-rec.lo \ libhawk_la-misc.lo libhawk_la-parse.lo libhawk_la-rbt.lo \
libhawk_la-rio.lo libhawk_la-run.lo libhawk_la-tre-ast.lo \ libhawk_la-rec.lo libhawk_la-rio.lo libhawk_la-run.lo \
libhawk_la-tre-compile.lo libhawk_la-tre-match-bt.lo \ libhawk_la-tre-ast.lo libhawk_la-tre-compile.lo \
libhawk_la-tre-match-pa.lo libhawk_la-tre-mem.lo \ libhawk_la-tre-match-bt.lo libhawk_la-tre-match-pa.lo \
libhawk_la-tre-parse.lo libhawk_la-tre-stack.lo \ libhawk_la-tre-mem.lo libhawk_la-tre-parse.lo \
libhawk_la-tre.lo libhawk_la-tree.lo libhawk_la-utf16.lo \ libhawk_la-tre-stack.lo libhawk_la-tre.lo libhawk_la-tree.lo \
libhawk_la-utf8.lo libhawk_la-utl-ass.lo \ libhawk_la-utf16.lo libhawk_la-utf8.lo libhawk_la-utl-ass.lo \
libhawk_la-utl-skad.lo libhawk_la-utl-sort.lo \ libhawk_la-utl-skad.lo libhawk_la-utl-sort.lo \
libhawk_la-utl-str.lo libhawk_la-utl-sys.lo libhawk_la-utl.lo \ libhawk_la-utl-str.lo libhawk_la-utl-sys.lo libhawk_la-utl.lo \
libhawk_la-val.lo libhawk_la-cli.lo libhawk_la-fio.lo \ libhawk_la-val.lo libhawk_la-cli.lo libhawk_la-fio.lo \
@ -229,45 +229,7 @@ am__v_at_0 = @
am__v_at_1 = am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__depfiles_maybe = 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.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)/libhawkxx_la-Hawk.Plo \
./$(DEPDIR)/libhawkxx_la-StdHawk.Plo
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -492,6 +454,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -543,9 +506,9 @@ pkginclude_HEADERS = \
pkglib_LTLIBRARIES = libhawk.la $(am__append_5) pkglib_LTLIBRARIES = libhawk.la $(am__append_5)
libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \
ecs.c err-prv.h err.c fmt-imp.h fmt.c fnc-prv.h fnc.c htb.c \ ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \
gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h hawk.c \ fnc.c htb.c gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h \
mb8.c misc-prv.h misc.c parse-prv.h parse.c rbt.c rec.c \ hawk.c mb8.c misc-prv.h misc.c parse-prv.h parse.c rbt.c rec.c \
rio-prv.h rio.c run-prv.h run.c tre-prv.h tre-ast.c tre-ast.h \ rio-prv.h rio.c run-prv.h run.c tre-prv.h tre-ast.c tre-ast.h \
tre-compile.c tre-compile.h tre-match-bt.c tre-match-pa.c \ tre-compile.c tre-compile.h tre-match-bt.c tre-match-pa.c \
tre-match-ut.h tre-mem.c tre-mem.h tre-parse.c tre-parse.h \ tre-match-ut.h tre-mem.c tre-mem.h tre-parse.c tre-parse.h \
@ -553,7 +516,7 @@ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \
utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \ utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \
utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \ utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \
hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \ hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \
syscall.h syserr.h tio.c std-prv.h std.c $(am__append_6) syscall.h tio.c std-prv.h std.c $(am__append_6)
libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_7) \ libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_7) \
@ -595,8 +558,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \ *config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -670,62 +633,57 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -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-arr.Plo@am__quote@
@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-chr.Plo@am__quote@
@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-cli.Plo@am__quote@
@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-dir.Plo@am__quote@
@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-ecs.Plo@am__quote@
@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-err-sys.Plo@am__quote@
@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-err.Plo@am__quote@
@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-fio.Plo@am__quote@
@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-fmt.Plo@am__quote@
@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-fnc.Plo@am__quote@
@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-nwif.Plo@am__quote@
@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-nwif2.Plo@am__quote@
@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-gem-skad.Plo@am__quote@
@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-gem.Plo@am__quote@
@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-hawk.Plo@am__quote@
@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-htb.Plo@am__quote@
@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-mb8.Plo@am__quote@
@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-misc.Plo@am__quote@
@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-math.Plo@am__quote@
@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-mod-str.Plo@am__quote@
@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-mod-sys.Plo@am__quote@
@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-mtx.Plo@am__quote@
@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-parse.Plo@am__quote@
@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-pio.Plo@am__quote@
@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-rbt.Plo@am__quote@
@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-rec.Plo@am__quote@
@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-rio.Plo@am__quote@
@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-run.Plo@am__quote@
@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-sio.Plo@am__quote@
@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-std.Plo@am__quote@
@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-tio.Plo@am__quote@
@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-ast.Plo@am__quote@
@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-compile.Plo@am__quote@
@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-match-bt.Plo@am__quote@
@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-match-pa.Plo@am__quote@
@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-mem.Plo@am__quote@
@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-parse.Plo@am__quote@
@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-tre-stack.Plo@am__quote@
@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-tre.Plo@am__quote@
@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-tree.Plo@am__quote@
@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-utf16.Plo@am__quote@
@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-utf8.Plo@am__quote@
@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-ass.Plo@am__quote@
@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-skad.Plo@am__quote@
@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-sort.Plo@am__quote@
@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-str.Plo@am__quote@
@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-utl-sys.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-val.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-utl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-Hawk.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-val.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-StdHawk.Plo@am__quote@ # am--include-marker @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@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@ -786,6 +744,13 @@ libhawk_la-err.lo: err.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_la-err.lo `test -f 'err.c' || echo '$(srcdir)/'`err.c @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_la-err.lo `test -f 'err.c' || echo '$(srcdir)/'`err.c
libhawk_la-err-sys.lo: err-sys.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_la-err-sys.lo -MD -MP -MF $(DEPDIR)/libhawk_la-err-sys.Tpo -c -o libhawk_la-err-sys.lo `test -f 'err-sys.c' || echo '$(srcdir)/'`err-sys.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-err-sys.Tpo $(DEPDIR)/libhawk_la-err-sys.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='err-sys.c' object='libhawk_la-err-sys.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_la-err-sys.lo `test -f 'err-sys.c' || echo '$(srcdir)/'`err-sys.c
libhawk_la-fmt.lo: fmt.c libhawk_la-fmt.lo: fmt.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_la-fmt.lo -MD -MP -MF $(DEPDIR)/libhawk_la-fmt.Tpo -c -o libhawk_la-fmt.lo `test -f 'fmt.c' || echo '$(srcdir)/'`fmt.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_la-fmt.lo -MD -MP -MF $(DEPDIR)/libhawk_la-fmt.Tpo -c -o libhawk_la-fmt.lo `test -f 'fmt.c' || echo '$(srcdir)/'`fmt.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-fmt.Tpo $(DEPDIR)/libhawk_la-fmt.Plo @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-fmt.Tpo $(DEPDIR)/libhawk_la-fmt.Plo
@ -1204,10 +1169,7 @@ cscopelist-am: $(am__tagged_files)
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \ list='$(DISTFILES)'; \
@ -1280,56 +1242,7 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo -rm -rf ./$(DEPDIR)
-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.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)/libhawkxx_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-StdHawk.Plo
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags distclean-hdr distclean-tags
@ -1375,56 +1288,7 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo -rm -rf ./$(DEPDIR)
-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.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)/libhawkxx_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-StdHawk.Plo
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
@ -1445,15 +1309,15 @@ uninstall-am: uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
.MAKE: all install-am install-strip .MAKE: all 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-generic \
clean-generic clean-libtool clean-pkglibLTLIBRARIES \ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
cscopelist-am ctags ctags-am distclean distclean-compile \ ctags-am distclean distclean-compile distclean-generic \
distclean-generic distclean-hdr distclean-libtool \ distclean-hdr distclean-libtool distclean-tags distdir dvi \
distclean-tags distdir dvi dvi-am html html-am info info-am \ dvi-am html html-am info info-am install install-am \
install install-am install-data install-data-am install-dvi \ install-data install-data-am install-dvi install-dvi-am \
install-dvi-am install-exec install-exec-am install-html \ install-exec install-exec-am install-html install-html-am \
install-html-am install-info install-info-am install-man \ install-info install-info-am install-man install-pdf \
install-pdf install-pdf-am install-pkgincludeHEADERS \ install-pdf-am install-pkgincludeHEADERS \
install-pkglibLTLIBRARIES install-ps install-ps-am \ install-pkglibLTLIBRARIES install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \ install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \ maintainer-clean maintainer-clean-generic mostlyclean \

View File

@ -87,9 +87,6 @@ static void close_dir_safely (hawk_dir_t* dir);
static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path); static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path);
static int read_ahead_and_sort (hawk_dir_t* dir, const hawk_ooch_t* path); static int read_ahead_and_sort (hawk_dir_t* dir, const hawk_ooch_t* path);
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
hawk_dir_t* hawk_dir_open (hawk_gem_t* gem, hawk_oow_t xtnsize, const hawk_ooch_t* path, int flags) hawk_dir_t* hawk_dir_open (hawk_gem_t* gem, hawk_oow_t xtnsize, const hawk_ooch_t* path, int flags)
{ {
hawk_dir_t* dir; hawk_dir_t* dir;
@ -420,7 +417,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path)
dir->h = FindFirstFile(tptr, &dir->wfd); dir->h = FindFirstFile(tptr, &dir->wfd);
if (dir->h == INVALID_HANDLE_VALUE) if (dir->h == INVALID_HANDLE_VALUE)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -467,7 +464,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path)
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -503,7 +500,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path)
rc = _dos_findfirst(mptr, _A_NORMAL | _A_SUBDIR, &dir->f); rc = _dos_findfirst(mptr, _A_NORMAL | _A_SUBDIR, &dir->f);
if (rc != 0) if (rc != 0)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL,syserr_to_errnum(errno)); hawk_gem_seterrnum (dir->gem, HAWK_NULL,hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -542,7 +539,7 @@ static int reset_to_path (hawk_dir_t* dir, const hawk_ooch_t* path)
if (dp == HAWK_NULL) if (dp == HAWK_NULL)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -595,7 +592,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
} }
else else
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum(x)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(x));
dir->status |= STATUS_DONE; dir->status |= STATUS_DONE;
dir->status |= STATUS_DONE_ERR; dir->status |= STATUS_DONE_ERR;
return -1; return -1;
@ -630,7 +627,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
if (x == ERROR_NO_MORE_FILES) dir->status |= STATUS_DONE; if (x == ERROR_NO_MORE_FILES) dir->status |= STATUS_DONE;
else else
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (x)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(x));
dir->status |= STATUS_DONE; dir->status |= STATUS_DONE;
dir->status |= STATUS_DONE_ERR; dir->status |= STATUS_DONE_ERR;
} }
@ -659,7 +656,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
} }
else if (rc != NO_ERROR) else if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (rc)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
} }
@ -682,7 +679,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
if (rc == ERROR_NO_MORE_FILES) dir->count = 0; if (rc == ERROR_NO_MORE_FILES) dir->count = 0;
else if (rc != NO_ERROR) else if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (rc)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -709,7 +706,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
} }
else else
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (errno)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
dir->status |= STATUS_DONE; dir->status |= STATUS_DONE;
dir->status |= STATUS_DONE_ERR; dir->status |= STATUS_DONE_ERR;
return -1; return -1;
@ -736,7 +733,7 @@ static int read_dir_to_buf (hawk_dir_t* dir, void** name)
if (errno == ENOENT) dir->status |= STATUS_DONE; if (errno == ENOENT) dir->status |= STATUS_DONE;
else else
{ {
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (errno)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
dir->status |= STATUS_DONE; dir->status |= STATUS_DONE;
dir->status |= STATUS_DONE_ERR; dir->status |= STATUS_DONE_ERR;
} }
@ -756,7 +753,7 @@ read:
if (de == NULL) if (de == NULL)
{ {
if (errno == 0) return 0; if (errno == 0) return 0;
hawk_gem_seterrnum (dir->gem, HAWK_NULL, syserr_to_errnum (errno)); hawk_gem_seterrnum (dir->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }

View File

@ -33,6 +33,9 @@ extern "C" {
const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum); const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum);
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif

198
hawk/lib/err-sys.c Normal file
View File

@ -0,0 +1,198 @@
/*
* $Id$
*
Copyright (c) 2006-2019 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <hawk-cmn.h>
#if defined(_WIN32)
# include <windows.h>
#elif defined(__OS2__)
# define INCL_DOSERRORS
# include <os2.h>
#elif defined(vms) || defined(__vms)
# define __NEW_STARLET 1
# include <starlet.h>
# include <rms.h>
#elif defined(__DOS__)
# include <errno.h>
#else
# include <errno.h>
#endif
#if defined(_WIN32)
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e) /* actually DWORD */
{
switch (e)
{
case ERROR_NOT_ENOUGH_MEMORY:
case ERROR_OUTOFMEMORY:
return HAWK_ENOMEM;
case ERROR_INVALID_PARAMETER:
case ERROR_INVALID_HANDLE:
case ERROR_INVALID_NAME:
return HAWK_EINVAL;
case ERROR_ACCESS_DENIED:
case ERROR_SHARING_VIOLATION:
return HAWK_EACCES;
case ERROR_FILE_NOT_FOUND:
case ERROR_PATH_NOT_FOUND:
return HAWK_ENOENT;
case ERROR_ALREADY_EXISTS:
case ERROR_FILE_EXISTS:
return HAWK_EEXIST;
case ERROR_BROKEN_PIPE:
return HAWK_EPIPE;
default:
return HAWK_ESYSERR;
}
}
#elif defined(__OS2__)
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e) /* actually APIRET */
{
switch (e)
{
case ERROR_NOT_ENOUGH_MEMORY:
return HAWK_ENOMEM;
case ERROR_INVALID_PARAMETER:
case ERROR_INVALID_HANDLE:
case ERROR_INVALID_NAME:
return HAWK_EINVAL;
case ERROR_ACCESS_DENIED:
case ERROR_SHARING_VIOLATION:
return HAWK_EACCES;
case ERROR_FILE_NOT_FOUND:
case ERROR_PATH_NOT_FOUND:
return HAWK_ENOENT;
case ERROR_ALREADY_EXISTS:
return HAWK_EEXIST;
case ERROR_BROKEN_PIPE:
return HAWK_EPIPE;
default:
return HAWK_ESYSERR;
}
}
#elif defined(__DOS__)
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e)
{
switch (e)
{
case ENOMEM: return HAWK_ENOMEM;
case EINVAL: return HAWK_EINVAL;
case EACCES: return HAWK_EACCES;
case ENOENT: return HAWK_ENOENT;
case EEXIST: return HAWK_EEXIST;
default: return HAWK_ESYSERR;
}
}
#elif defined(vms) || defined(__vms)
/* TODO: */
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e) /* actually unsigned long */
{
switch (e)
{
case RMS$_NORMAL: return HAWK_ENOERR;
default: return HAWK_ESYSERR;
}
}
#else
hawk_errnum_t hawk_syserr_to_errnum (hawk_intptr_t e)
{
switch (e)
{
#if defined(ENOMEM)
case ENOMEM: return HAWK_ENOMEM;
#endif
#if defined(EINVAL)
case EINVAL: return HAWK_EINVAL;
#endif
#if defined(EBUSY)
case EBUSY: return HAWK_EBUSY;
#endif
#if defined(EACCES)
case EACCES: return HAWK_EACCES;
#endif
#if defined(EPERM)
case EPERM: return HAWK_EPERM;
#endif
#if defined(EISDIR)
case EISDIR: return HAWK_EISDIR;
#endif
#if defined(ENOTDIR)
case ENOTDIR: return HAWK_ENOTDIR;
#endif
#if defined(ENXIO)
case ENXIO: return HAWK_ENOENT; /* ENODEV mapped to ENOENT */
#endif
#if defined(ENODEV)
case ENODEV: return HAWK_ENOENT; /* ENODEV mapped to ENOENT */
#endif
#if defined(ENOENT)
case ENOENT: return HAWK_ENOENT;
#endif
#if defined(EEXIST)
case EEXIST: return HAWK_EEXIST;
#endif
#if defined(EINTR)
case EINTR: return HAWK_EINTR;
#endif
#if defined(EPIPE)
case EPIPE: return HAWK_EPIPE;
#endif
#if defined(ECHILD)
case ECHILD: return HAWK_ECHILD;
#endif
#if defined(ETIMEDOUT)
case ETIMEDOUT: return HAWK_ETMOUT;
#endif
#if defined(EINPROGRESS)
case EINPROGRESS: return HAWK_EINPROG;
#endif
#if defined(EWOULDBLOCK) && defined(EAGAIN) && (EWOULDBLOCK == EAGAIN)
case EAGAIN: return HAWK_EAGAIN;
#else
#if defined(EWOULDBLOCK)
case EWOULDBLOCK: return HAWK_EAGAIN;
#endif
#if defined(EAGAIN)
case EAGAIN: return HAWK_EAGAIN;
#endif
#endif
default: return HAWK_ESYSERR;
}
}
#endif

View File

@ -655,3 +655,4 @@ void hawk_gem_seterrufmt (hawk_gem_t* gem, const hawk_loc_t* errloc, hawk_errnum
gem->errnum = errnum; gem->errnum = errnum;
gem->errloc = (errloc? *errloc: _nullloc); gem->errloc = (errloc? *errloc: _nullloc);
} }

View File

@ -60,9 +60,6 @@ enum
STATUS_WIN32_STDIN = (1 << 2) STATUS_WIN32_STDIN = (1 << 2)
}; };
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
#if defined(_WIN32) #if defined(_WIN32)
typedef DWORD WINAPI (*getmappedfilename_t) ( typedef DWORD WINAPI (*getmappedfilename_t) (
@ -312,13 +309,13 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
} }
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
} }
else else
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
return -1; return -1;
} }
} }
@ -328,7 +325,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
#if 0 #if 0
if (GetFileType(handle) == FILE_TYPE_UNKNOWN) if (GetFileType(handle) == FILE_TYPE_UNKNOWN)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
CloseHandle (handle); CloseHandle (handle);
return -1; return -1;
} }
@ -463,7 +460,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return -1; return -1;
} }
} }
@ -549,7 +546,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
if (handle <= -1) if (handle <= -1)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
} }
@ -652,7 +649,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
#else #else
if (path_mb != path_mb_buf) hawk_gem_freemem (fio->gem, path_mb); if (path_mb != path_mb_buf) hawk_gem_freemem (fio->gem, path_mb);
#endif #endif
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(r0)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(r0));
return -1; return -1;
} }
@ -665,7 +662,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
#else #else
if (path_mb != path_mb_buf) hawk_gem_freemem (fio->gem, path_mb); if (path_mb != path_mb_buf) hawk_gem_freemem (fio->gem, path_mb);
#endif #endif
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(r0)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(r0));
return -1; return -1;
} }
@ -771,7 +768,7 @@ int hawk_fio_init (hawk_fio_t* fio, hawk_gem_t* gem, const hawk_ooch_t* path, in
#endif #endif
if (handle == -1) if (handle == -1)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
else else
@ -859,7 +856,7 @@ hawk_fio_off_t hawk_fio_seek (hawk_fio_t* fio, hawk_fio_off_t offset, hawk_fio_o
fio->handle, x.LowPart, &x.HighPart, seek_map[origin]); fio->handle, x.LowPart, &x.HighPart, seek_map[origin]);
if (x.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) if (x.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return (hawk_fio_off_t)-1; return (hawk_fio_off_t)-1;
} }
return (hawk_fio_off_t)x.QuadPart; return (hawk_fio_off_t)x.QuadPart;
@ -887,7 +884,7 @@ hawk_fio_off_t hawk_fio_seek (hawk_fio_t* fio, hawk_fio_off_t offset, hawk_fio_o
ret = dos_set_file_ptr_l (fio->handle, pos, seek_map[origin], &newpos); ret = dos_set_file_ptr_l (fio->handle, pos, seek_map[origin], &newpos);
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return (hawk_fio_off_t)-1; return (hawk_fio_off_t)-1;
} }
@ -902,7 +899,7 @@ hawk_fio_off_t hawk_fio_seek (hawk_fio_t* fio, hawk_fio_off_t offset, hawk_fio_o
ret = DosSetFilePtr (fio->handle, offset, seek_map[origin], &newpos); ret = DosSetFilePtr (fio->handle, offset, seek_map[origin], &newpos);
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return (hawk_fio_off_t)-1; return (hawk_fio_off_t)-1;
} }
@ -942,7 +939,7 @@ hawk_fio_off_t hawk_fio_seek (hawk_fio_t* fio, hawk_fio_off_t offset, hawk_fio_o
&tmp, &tmp,
seek_map[origin]) == -1) seek_map[origin]) == -1)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return (hawk_fio_off_t)-1; return (hawk_fio_off_t)-1;
} }
@ -960,7 +957,7 @@ int hawk_fio_truncate (hawk_fio_t* fio, hawk_fio_off_t size)
if (hawk_fio_seek (fio, size, HAWK_FIO_BEGIN) == (hawk_fio_off_t)-1) return -1; if (hawk_fio_seek (fio, size, HAWK_FIO_BEGIN) == (hawk_fio_off_t)-1) return -1;
if (SetEndOfFile(fio->handle) == FALSE) if (SetEndOfFile(fio->handle) == FALSE)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return 0; return 0;
@ -989,7 +986,7 @@ int hawk_fio_truncate (hawk_fio_t* fio, hawk_fio_off_t size)
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return -1; return -1;
} }
return 0; return 0;
@ -998,7 +995,7 @@ int hawk_fio_truncate (hawk_fio_t* fio, hawk_fio_off_t size)
int n; int n;
n = chsize (fio->handle, size); n = chsize (fio->handle, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#elif defined(vms) || defined(__vms) #elif defined(vms) || defined(__vms)
@ -1009,7 +1006,7 @@ int hawk_fio_truncate (hawk_fio_t* fio, hawk_fio_off_t size)
if ((r0 = sys$rewind (rab, 0, 0)) != RMS$_NORMAL || if ((r0 = sys$rewind (rab, 0, 0)) != RMS$_NORMAL ||
(r0 = sys$truncate (rab, 0, 0)) != RMS$_NORMAL) (r0 = sys$truncate (rab, 0, 0)) != RMS$_NORMAL)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(r0)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(r0));
return -1; return -1;
} }
@ -1019,7 +1016,7 @@ int hawk_fio_truncate (hawk_fio_t* fio, hawk_fio_off_t size)
int n; int n;
n = HAWK_FTRUNCATE (fio->handle, size); n = HAWK_FTRUNCATE (fio->handle, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#else #else
@ -1044,7 +1041,7 @@ hawk_ooi_t hawk_fio_read (hawk_fio_t* fio, void* buf, hawk_oow_t size)
* assuming that ERROR_BROKEN_PIPE doesn't occur with normal * assuming that ERROR_BROKEN_PIPE doesn't occur with normal
* input streams, i treat the condition as a normal EOF indicator. */ * input streams, i treat the condition as a normal EOF indicator. */
if ((fio->status & STATUS_WIN32_STDIN) && e == ERROR_BROKEN_PIPE) return 0; if ((fio->status & STATUS_WIN32_STDIN) && e == ERROR_BROKEN_PIPE) return 0;
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1058,7 +1055,7 @@ hawk_ooi_t hawk_fio_read (hawk_fio_t* fio, void* buf, hawk_oow_t size)
ret = DosRead (fio->handle, buf, (ULONG)size, &count); ret = DosRead (fio->handle, buf, (ULONG)size, &count);
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1069,7 +1066,7 @@ hawk_ooi_t hawk_fio_read (hawk_fio_t* fio, void* buf, hawk_oow_t size)
if (size > (HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int))) if (size > (HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int)))
size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int); size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int);
n = read (fio->handle, buf, size); n = read (fio->handle, buf, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#elif defined(vms) || defined(__vms) #elif defined(vms) || defined(__vms)
@ -1085,7 +1082,7 @@ hawk_ooi_t hawk_fio_read (hawk_fio_t* fio, void* buf, hawk_oow_t size)
r0 = sys$get (rab, 0, 0); r0 = sys$get (rab, 0, 0);
if (r0 != RMS$_NORMAL) if (r0 != RMS$_NORMAL)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(r0)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(r0));
return -1; return -1;
} }
@ -1095,7 +1092,7 @@ hawk_ooi_t hawk_fio_read (hawk_fio_t* fio, void* buf, hawk_oow_t size)
hawk_ooi_t n; hawk_ooi_t n;
if (size > HAWK_TYPE_MAX(hawk_ooi_t)) size = HAWK_TYPE_MAX(hawk_ooi_t); if (size > HAWK_TYPE_MAX(hawk_ooi_t)) size = HAWK_TYPE_MAX(hawk_ooi_t);
n = HAWK_READ (fio->handle, buf, size); n = HAWK_READ (fio->handle, buf, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#endif #endif
} }
@ -1124,7 +1121,7 @@ hawk_ooi_t hawk_fio_write (hawk_fio_t* fio, const void* data, hawk_oow_t size)
if (WriteFile (fio->handle, if (WriteFile (fio->handle,
data, (DWORD)size, &count, HAWK_NULL) == FALSE) data, (DWORD)size, &count, HAWK_NULL) == FALSE)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1161,7 +1158,7 @@ hawk_ooi_t hawk_fio_write (hawk_fio_t* fio, const void* data, hawk_oow_t size)
(PVOID)data, (ULONG)size, &count); (PVOID)data, (ULONG)size, &count);
if (ret != NO_ERROR) if (ret != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(ret)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(ret));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1172,7 +1169,7 @@ hawk_ooi_t hawk_fio_write (hawk_fio_t* fio, const void* data, hawk_oow_t size)
if (size > (HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int))) if (size > (HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int)))
size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int); size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int);
n = write (fio->handle, data, size); n = write (fio->handle, data, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#elif defined(vms) || defined(__vms) #elif defined(vms) || defined(__vms)
@ -1188,7 +1185,7 @@ hawk_ooi_t hawk_fio_write (hawk_fio_t* fio, const void* data, hawk_oow_t size)
r0 = sys$put (rab, 0, 0); r0 = sys$put (rab, 0, 0);
if (r0 != RMS$_NORMAL) if (r0 != RMS$_NORMAL)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(r0)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(r0));
return -1; return -1;
} }
@ -1199,7 +1196,7 @@ hawk_ooi_t hawk_fio_write (hawk_fio_t* fio, const void* data, hawk_oow_t size)
hawk_ooi_t n; hawk_ooi_t n;
if (size > HAWK_TYPE_MAX(hawk_ooi_t)) size = HAWK_TYPE_MAX(hawk_ooi_t); if (size > HAWK_TYPE_MAX(hawk_ooi_t)) size = HAWK_TYPE_MAX(hawk_ooi_t);
n = HAWK_WRITE (fio->handle, data, size); n = HAWK_WRITE (fio->handle, data, size);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#endif #endif
} }
@ -1223,7 +1220,7 @@ static int get_devname_from_handle (
psapi = LoadLibrary (HAWK_T("PSAPI.DLL")); psapi = LoadLibrary (HAWK_T("PSAPI.DLL"));
if (!psapi) if (!psapi)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -1231,7 +1228,7 @@ static int get_devname_from_handle (
GetProcAddress (psapi, HAWK_BT("GetMappedFileName")); GetProcAddress (psapi, HAWK_BT("GetMappedFileName"));
if (!getmappedfilename) if (!getmappedfilename)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
FreeLibrary (psapi); FreeLibrary (psapi);
return -1; return -1;
} }
@ -1247,7 +1244,7 @@ static int get_devname_from_handle (
); );
if (map == NULL) if (map == NULL)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
FreeLibrary (psapi); FreeLibrary (psapi);
return -1; return -1;
} }
@ -1256,7 +1253,7 @@ static int get_devname_from_handle (
mem = MapViewOfFile (map, FILE_MAP_READ, 0, 0, 1); mem = MapViewOfFile (map, FILE_MAP_READ, 0, 0, 1);
if (mem == NULL) if (mem == NULL)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
CloseHandle (map); CloseHandle (map);
FreeLibrary (psapi); FreeLibrary (psapi);
return -1; return -1;
@ -1265,7 +1262,7 @@ static int get_devname_from_handle (
olen = getmappedfilename (GetCurrentProcess(), mem, buf, len); olen = getmappedfilename (GetCurrentProcess(), mem, buf, len);
if (olen == 0) if (olen == 0)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
UnmapViewOfFile (mem); UnmapViewOfFile (mem);
CloseHandle (map); CloseHandle (map);
FreeLibrary (psapi); FreeLibrary (psapi);
@ -1297,7 +1294,7 @@ static int get_volname_from_handle (hawk_fio_t* fio, hawk_ooch_t* buf, hawk_oow_
if (n == 0 /* error */ || if (n == 0 /* error */ ||
n > HAWK_COUNTOF(drives) /* buffer small */) n > HAWK_COUNTOF(drives) /* buffer small */)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -1348,7 +1345,7 @@ int hawk_fio_chmod (hawk_fio_t* fio, int mode)
if (!(mode & HAWK_FIO_WUSR)) flags = FILE_ATTRIBUTE_READONLY; if (!(mode & HAWK_FIO_WUSR)) flags = FILE_ATTRIBUTE_READONLY;
if (SetFileAttributes (name, flags) == FALSE) if (SetFileAttributes (name, flags) == FALSE)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return 0; return 0;
@ -1371,7 +1368,7 @@ int hawk_fio_chmod (hawk_fio_t* fio, int mode)
#endif #endif
if (n != NO_ERROR) if (n != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
@ -1385,7 +1382,7 @@ int hawk_fio_chmod (hawk_fio_t* fio, int mode)
#endif #endif
if (n != NO_ERROR) if (n != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
@ -1413,7 +1410,7 @@ int hawk_fio_chmod (hawk_fio_t* fio, int mode)
#elif defined(HAVE_FCHMOD) #elif defined(HAVE_FCHMOD)
int n; int n;
n = HAWK_FCHMOD (fio->handle, mode); n = HAWK_FCHMOD (fio->handle, mode);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#else #else
@ -1429,7 +1426,7 @@ int hawk_fio_sync (hawk_fio_t* fio)
if (FlushFileBuffers (fio->handle) == FALSE) if (FlushFileBuffers (fio->handle) == FALSE)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return 0; return 0;
@ -1440,7 +1437,7 @@ int hawk_fio_sync (hawk_fio_t* fio)
n = DosResetBuffer (fio->handle); n = DosResetBuffer (fio->handle);
if (n != NO_ERROR) if (n != NO_ERROR)
{ {
hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
return 0; return 0;
@ -1449,7 +1446,7 @@ int hawk_fio_sync (hawk_fio_t* fio)
int n; int n;
n = fsync (fio->handle); n = fsync (fio->handle);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#elif defined(vms) || defined(__vms) #elif defined(vms) || defined(__vms)
@ -1462,7 +1459,7 @@ int hawk_fio_sync (hawk_fio_t* fio)
int n; int n;
n = HAWK_FSYNC(fio->handle); n = HAWK_FSYNC(fio->handle);
if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (fio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#else #else
hawk_gem_seterrnum (fio->gem, HAWK_NULL, HAWK_ENOIMPL); hawk_gem_seterrnum (fio->gem, HAWK_NULL, HAWK_ENOIMPL);

View File

@ -49,9 +49,6 @@
# endif # endif
#endif #endif
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
#if defined(SIOCGIFCONF) && (defined(SIOCGIFANUM) || defined(SIOCGIFNUM)) #if defined(SIOCGIFCONF) && (defined(SIOCGIFANUM) || defined(SIOCGIFNUM))
static int get_sco_ifconf (hawk_gem_t* gem, struct ifconf* ifc) static int get_sco_ifconf (hawk_gem_t* gem, struct ifconf* ifc)
{ {
@ -63,7 +60,7 @@ static int get_sco_ifconf (hawk_gem_t* gem, struct ifconf* ifc)
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -73,13 +70,13 @@ static int get_sco_ifconf (hawk_gem_t* gem, struct ifconf* ifc)
#if defined(SIOCGIFANUM) #if defined(SIOCGIFANUM)
if (ioctl(h, SIOCGIFANUM, &num) <= -1) if (ioctl(h, SIOCGIFANUM, &num) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
#else #else
if (ioctl(h, SIOCGIFNUM, &num) <= -1) if (ioctl(h, SIOCGIFNUM, &num) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
#endif #endif
@ -97,7 +94,7 @@ static int get_sco_ifconf (hawk_gem_t* gem, struct ifconf* ifc)
if (ioctl(h, SIOCGIFCONF, ifc) <= -1) if (ioctl(h, SIOCGIFCONF, ifc) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
HAWK_CLOSE (h); h = -1; HAWK_CLOSE (h); h = -1;
@ -140,7 +137,7 @@ int hawk_gem_bcstrtoifindex (hawk_gem_t* gem, const hawk_bch_t* ptr, unsigned in
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -173,7 +170,7 @@ int hawk_gem_bcstrtoifindex (hawk_gem_t* gem, const hawk_bch_t* ptr, unsigned in
tmpidx = if_nametoindex(tmp); tmpidx = if_nametoindex(tmp);
if (tmpidx == 0) if (tmpidx == 0)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
*index = tmpidx; *index = tmpidx;
@ -227,7 +224,7 @@ int hawk_gem_bcharstoifindex (hawk_gem_t* gem, const hawk_bch_t* ptr, hawk_oow_t
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -257,7 +254,7 @@ int hawk_gem_bcharstoifindex (hawk_gem_t* gem, const hawk_bch_t* ptr, hawk_oow_t
tmpidx = if_nametoindex(tmp); tmpidx = if_nametoindex(tmp);
if (tmpidx == 0) if (tmpidx == 0)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
*index = tmpidx; *index = tmpidx;
@ -311,7 +308,7 @@ int hawk_gem_ucstrtoifindex (hawk_gem_t* gem, const hawk_uch_t* ptr, unsigned in
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -343,7 +340,7 @@ int hawk_gem_ucstrtoifindex (hawk_gem_t* gem, const hawk_uch_t* ptr, unsigned in
tmpidx = if_nametoindex(tmp); tmpidx = if_nametoindex(tmp);
if (tmpidx == 0) if (tmpidx == 0)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
*index = tmpidx; *index = tmpidx;
@ -403,7 +400,7 @@ int hawk_gem_ucharstoifindex (hawk_gem_t* gem, const hawk_uch_t* ptr, hawk_oow_t
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -437,7 +434,7 @@ int hawk_gem_ucharstoifindex (hawk_gem_t* gem, const hawk_uch_t* ptr, hawk_oow_t
tmpidx = if_nametoindex(tmp); tmpidx = if_nametoindex(tmp);
if (tmpidx == 0) if (tmpidx == 0)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
*index = tmpidx; *index = tmpidx;
@ -498,7 +495,7 @@ int hawk_gem_ifindextobcstr (hawk_gem_t* gem, unsigned int index, hawk_bch_t* bu
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -514,7 +511,7 @@ int hawk_gem_ifindextobcstr (hawk_gem_t* gem, unsigned int index, hawk_bch_t* bu
if (x <= -1) if (x <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -524,7 +521,7 @@ int hawk_gem_ifindextobcstr (hawk_gem_t* gem, unsigned int index, hawk_bch_t* bu
hawk_bch_t tmp[IF_NAMESIZE + 1]; hawk_bch_t tmp[IF_NAMESIZE + 1];
if (if_indextoname (index, tmp) == HAWK_NULL) if (if_indextoname (index, tmp) == HAWK_NULL)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
return hawk_copy_bcstr(buf, len, tmp); return hawk_copy_bcstr(buf, len, tmp);
@ -579,7 +576,7 @@ int hawk_gem_ifindextoucstr (hawk_gem_t* gem, unsigned int index, hawk_uch_t* bu
h = socket(AF_INET, SOCK_DGRAM, 0); h = socket(AF_INET, SOCK_DGRAM, 0);
if (h <= -1) if (h <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -595,7 +592,7 @@ int hawk_gem_ifindextoucstr (hawk_gem_t* gem, unsigned int index, hawk_uch_t* bu
if (x <= -1) if (x <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -612,7 +609,7 @@ int hawk_gem_ifindextoucstr (hawk_gem_t* gem, unsigned int index, hawk_uch_t* bu
if (if_indextoname(index, tmp) == HAWK_NULL) if (if_indextoname(index, tmp) == HAWK_NULL)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
wl = len; wl = len;

View File

@ -87,9 +87,6 @@
# endif # endif
#endif #endif
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
#if defined(AF_INET6) #if defined(AF_INET6)
static int prefix_to_in6 (int prefix, struct in6_addr* in6) static int prefix_to_in6 (int prefix, struct in6_addr* in6)
{ {
@ -165,7 +162,7 @@ static int get_nwifs (hawk_gem_t* gem, int s, int f, hawk_xptl_t* nwifs)
ifn.lifn_flags = 0; ifn.lifn_flags = 0;
if (ioctl(s, SIOCGLIFNUM, &ifn) <= -1) if (ioctl(s, SIOCGLIFNUM, &ifn) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
@ -182,7 +179,7 @@ static int get_nwifs (hawk_gem_t* gem, int s, int f, hawk_xptl_t* nwifs)
b.ptr = hawk_gem_allocmem(gem, b.len); b.ptr = hawk_gem_allocmem(gem, b.len);
if (b.ptr == HAWK_NULL) if (b.ptr == HAWK_NULL)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
@ -193,7 +190,7 @@ static int get_nwifs (hawk_gem_t* gem, int s, int f, hawk_xptl_t* nwifs)
if (ioctl(s, SIOCGLIFCONF, &ifc) <= -1) if (ioctl(s, SIOCGLIFCONF, &ifc) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
@ -317,7 +314,7 @@ int hawk_gem_getifcfg (hawk_gem_t* gem, hawk_ifcfg_t* cfg)
return 0; return 0;
sys_oops: sys_oops:
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
oops: oops:
if (head) free_nwifcfg (cfg->mmgr, head); if (head) free_nwifcfg (cfg->mmgr, head);
if (nwifs.ptr) hawk_gem_freemem (gem, nwifs.ptr); if (nwifs.ptr) hawk_gem_freemem (gem, nwifs.ptr);
@ -500,7 +497,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
#if defined(SIOCGIFINDEX) #if defined(SIOCGIFINDEX)
if (ioctl(s, SIOCGIFINDEX, ifr) <= -1) if (ioctl(s, SIOCGIFINDEX, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
#if defined(HAVE_STRUCT_IFREQ_IFR_IFINDEX) #if defined(HAVE_STRUCT_IFREQ_IFR_IFINDEX)
@ -514,7 +511,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
if (ioctl(s, SIOCGIFFLAGS, ifr) <= -1) if (ioctl(s, SIOCGIFFLAGS, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
cfg->flags = 0; cfg->flags = 0;
@ -525,7 +522,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
if (ioctl(s, SIOCGIFMTU, ifr) <= -1) if (ioctl(s, SIOCGIFMTU, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
#if defined(HAVE_STRUCT_IFREQ_IFR_MTU) #if defined(HAVE_STRUCT_IFREQ_IFR_MTU)
@ -624,7 +621,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
#if defined(SIOCGIFINDEX) #if defined(SIOCGIFINDEX)
if (ioctl(s, SIOCGIFINDEX, ifr) <= -1) if (ioctl(s, SIOCGIFINDEX, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -640,7 +637,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
if (ioctl (s, SIOCGIFFLAGS, ifr) <= -1) if (ioctl (s, SIOCGIFFLAGS, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
cfg->flags = 0; cfg->flags = 0;
@ -651,7 +648,7 @@ static int get_ifcfg (hawk_gem_t* gem, int s, hawk_ifcfg_t* cfg, struct ifreq* i
if (ioctl(s, SIOCGIFMTU, ifr) <= -1) if (ioctl(s, SIOCGIFMTU, ifr) <= -1)
{ {
hawk_gem_seterrnum (gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
#if defined(HAVE_STRUCT_IFREQ_IFR_MTU) #if defined(HAVE_STRUCT_IFREQ_IFR_MTU)

View File

@ -50,7 +50,7 @@ static int init_token (hawk_t* hawk, hawk_tok_t* tok)
{ {
tok->name = hawk_ooecs_open(hawk_getgem(hawk), 0, 128); tok->name = hawk_ooecs_open(hawk_getgem(hawk), 0, 128);
if (!tok->name) return -1; if (!tok->name) return -1;
tok->type = 0; tok->type = 0;
tok->loc.file = HAWK_NULL; tok->loc.file = HAWK_NULL;
tok->loc.line = 0; tok->loc.line = 0;

View File

@ -50,9 +50,6 @@
# include <pthread.h> # include <pthread.h>
#endif #endif
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
hawk_mtx_t* hawk_mtx_open (hawk_gem_t* gem, hawk_oow_t xtnsize) hawk_mtx_t* hawk_mtx_open (hawk_gem_t* gem, hawk_oow_t xtnsize)
{ {
hawk_mtx_t* mtx; hawk_mtx_t* mtx;
@ -86,7 +83,7 @@ int hawk_mtx_init (hawk_mtx_t* mtx, hawk_gem_t* gem)
mtx->hnd = CreateMutex(HAWK_NULL, FALSE, HAWK_NULL); mtx->hnd = CreateMutex(HAWK_NULL, FALSE, HAWK_NULL);
if (mtx->hnd == HAWK_NULL) if (mtx->hnd == HAWK_NULL)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -99,7 +96,7 @@ int hawk_mtx_init (hawk_mtx_t* mtx, hawk_gem_t* gem)
rc = DosCreateMutexSem(HAWK_NULL, &m, DC_SEM_SHARED, FALSE); rc = DosCreateMutexSem(HAWK_NULL, &m, DC_SEM_SHARED, FALSE);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -128,7 +125,7 @@ int hawk_mtx_init (hawk_mtx_t* mtx, hawk_gem_t* gem)
n = pthread_mutex_init((pthread_mutex_t*)&mtx->hnd, HAWK_NULL); n = pthread_mutex_init((pthread_mutex_t*)&mtx->hnd, HAWK_NULL);
if (n != 0) if (n != 0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
} }
@ -185,7 +182,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
} }
else if (ret != WAIT_OBJECT_0) else if (ret != WAIT_OBJECT_0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
} }
@ -193,7 +190,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
{ {
if (WaitForSingleObject(mtx->hnd, INFINITE) == WAIT_FAILED) if (WaitForSingleObject(mtx->hnd, INFINITE) == WAIT_FAILED)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
} }
@ -207,7 +204,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
rc = DosRequestMutexSem(mtx->hnd, msec); rc = DosRequestMutexSem(mtx->hnd, msec);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
} }
@ -217,7 +214,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
rc = DosRequestMutexSem(mtx->hnd, SEM_INDEFINITE_WAIT); rc = DosRequestMutexSem(mtx->hnd, SEM_INDEFINITE_WAIT);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
} }
@ -244,7 +241,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
n = pthread_mutex_timedlock((pthread_mutex_t*)&mtx->hnd, &ts); n = pthread_mutex_timedlock((pthread_mutex_t*)&mtx->hnd, &ts);
if (n != 0) if (n != 0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
} }
@ -255,7 +252,7 @@ int hawk_mtx_lock (hawk_mtx_t* mtx, const hawk_ntime_t* waiting_time)
n = pthread_mutex_lock((pthread_mutex_t*)&mtx->hnd); n = pthread_mutex_lock((pthread_mutex_t*)&mtx->hnd);
if (n != 0) if (n != 0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) #if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
@ -271,7 +268,7 @@ int hawk_mtx_unlock (hawk_mtx_t* mtx)
#if defined(_WIN32) #if defined(_WIN32)
if (ReleaseMutex(mtx->hnd) == FALSE) if (ReleaseMutex(mtx->hnd) == FALSE)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -280,7 +277,7 @@ int hawk_mtx_unlock (hawk_mtx_t* mtx)
rc = DosReleaseMutexSem(mtx->hnd); rc = DosReleaseMutexSem(mtx->hnd);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -293,7 +290,7 @@ int hawk_mtx_unlock (hawk_mtx_t* mtx)
n = pthread_mutex_unlock((pthread_mutex_t*)&mtx->hnd); n = pthread_mutex_unlock((pthread_mutex_t*)&mtx->hnd);
if (n != 0) if (n != 0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
#endif #endif
@ -305,7 +302,7 @@ int hawk_mtx_trylock (hawk_mtx_t* mtx)
#if defined(_WIN32) #if defined(_WIN32)
if (WaitForSingleObject(mtx->hnd, 0) != WAIT_OBJECT_0) if (WaitForSingleObject(mtx->hnd, 0) != WAIT_OBJECT_0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
#elif defined(__OS2__) #elif defined(__OS2__)
@ -313,7 +310,7 @@ int hawk_mtx_trylock (hawk_mtx_t* mtx)
rc = DosRequestMutexSem(mtx->hnd, 0); rc = DosRequestMutexSem(mtx->hnd, 0);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -339,7 +336,7 @@ int hawk_mtx_trylock (hawk_mtx_t* mtx)
#endif #endif
if (n != 0) if (n != 0)
{ {
hawk_gem_seterrnum (mtx->gem, HAWK_NULL, syserr_to_errnum(n)); hawk_gem_seterrnum (mtx->gem, HAWK_NULL, hawk_syserr_to_errnum(n));
return -1; return -1;
} }
/* -------------------------------------------------- */ /* -------------------------------------------------- */

View File

@ -51,9 +51,6 @@
static hawk_ooi_t pio_input (hawk_tio_t* tio, hawk_tio_cmd_t cmd, void* buf, hawk_oow_t size); static hawk_ooi_t pio_input (hawk_tio_t* tio, hawk_tio_cmd_t cmd, void* buf, hawk_oow_t size);
static hawk_ooi_t pio_output (hawk_tio_t* tio, hawk_tio_cmd_t cmd, void* buf, hawk_oow_t size); static hawk_ooi_t pio_output (hawk_tio_t* tio, hawk_tio_cmd_t cmd, void* buf, hawk_oow_t size);
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
#if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__) #if !defined(_WIN32) && !defined(__OS2__) && !defined(__DOS__)
static int get_highest_fd (hawk_pio_t* pio) static int get_highest_fd (hawk_pio_t* pio)
{ {
@ -424,14 +421,14 @@ static int assert_executable (hawk_pio_t* pio, const hawk_bch_t* path)
if (HAWK_ACCESS(path, X_OK) <= -1) if (HAWK_ACCESS(path, X_OK) <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
/*if (HAWK_LSTAT(path, &st) <= -1)*/ /*if (HAWK_LSTAT(path, &st) <= -1)*/
if (HAWK_STAT(path, &st) <= -1) if (HAWK_STAT(path, &st) <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -473,7 +470,7 @@ static hawk_pio_pid_t standard_fork_and_exec (hawk_pio_t* pio, int pipes[], para
pid = HAWK_FORK(); pid = HAWK_FORK();
if (pid <= -1) if (pid <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return -1; return -1;
} }
@ -613,7 +610,7 @@ static int set_pipe_nonblock (hawk_pio_t* pio, hawk_pio_hnd_t fd, int enabled)
int flag = HAWK_FCNTL (fd, F_GETFL, 0); int flag = HAWK_FCNTL (fd, F_GETFL, 0);
if (flag >= 0) flag = HAWK_FCNTL (fd, F_SETFL, (enabled? (flag | O_NONBLOCK): (flag & ~O_NONBLOCK))); if (flag >= 0) flag = HAWK_FCNTL (fd, F_SETFL, (enabled? (flag | O_NONBLOCK): (flag & ~O_NONBLOCK)));
if (flag <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (flag <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return flag; return flag;
#else #else
@ -729,7 +726,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
/* child reads, parent writes */ /* child reads, parent writes */
if (CreatePipe(&handle[0], &handle[1], &secattr, 0) == FALSE) if (CreatePipe(&handle[0], &handle[1], &secattr, 0) == FALSE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
goto oops; goto oops;
} }
@ -741,7 +738,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
{ {
/* SetHandleInformation() is not implemented on win9x. /* SetHandleInformation() is not implemented on win9x.
* so let's care only if it is implemented */ * so let's care only if it is implemented */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
goto oops; goto oops;
} }
} }
@ -754,7 +751,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
/* child writes, parent reads */ /* child writes, parent reads */
if (CreatePipe(&handle[2], &handle[3], &secattr, 0) == FALSE) if (CreatePipe(&handle[2], &handle[3], &secattr, 0) == FALSE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
goto oops; goto oops;
} }
@ -766,7 +763,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
{ {
/* SetHandleInformation() is not implemented on win9x. /* SetHandleInformation() is not implemented on win9x.
* so let's care only if it is implemented */ * so let's care only if it is implemented */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
goto oops; goto oops;
} }
} }
@ -780,7 +777,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
/* child writes, parent reads */ /* child writes, parent reads */
if (CreatePipe(&handle[4], &handle[5], &secattr, 0) == FALSE) if (CreatePipe(&handle[4], &handle[5], &secattr, 0) == FALSE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
goto oops; goto oops;
} }
@ -792,7 +789,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
{ {
/* SetHandleInformation() is not implemented on win9x. /* SetHandleInformation() is not implemented on win9x.
* so let's care only if it is implemented */ * so let's care only if it is implemented */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
goto oops; goto oops;
} }
} }
@ -818,7 +815,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
); );
if (windevnul == INVALID_HANDLE_VALUE) if (windevnul == INVALID_HANDLE_VALUE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
goto oops; goto oops;
} }
} }
@ -841,7 +838,7 @@ int hawk_pio_init (hawk_pio_t* pio, hawk_gem_t* gem, const hawk_ooch_t* cmd, int
startup.hStdOutput == INVALID_HANDLE_VALUE || startup.hStdOutput == INVALID_HANDLE_VALUE ||
startup.hStdError == INVALID_HANDLE_VALUE) startup.hStdError == INVALID_HANDLE_VALUE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
goto oops; goto oops;
} }
@ -960,7 +957,7 @@ create_process:
goto create_process; goto create_process;
} }
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(e)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(e));
goto oops; goto oops;
} }
@ -995,7 +992,7 @@ create_process:
rc = DosDupHandle(x,y); \ rc = DosDupHandle(x,y); \
if (rc != NO_ERROR) \ if (rc != NO_ERROR) \
{ \ { \
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); \ hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc)); \
goto oops; \ goto oops; \
} \ } \
) )
@ -1006,7 +1003,7 @@ create_process:
rc = DosCreatePipe (&handle[0], &handle[1], pipe_size); rc = DosCreatePipe (&handle[0], &handle[1], pipe_size);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1015,7 +1012,7 @@ create_process:
rc = DosSetFHState (handle[1], OPEN_FLAGS_NOINHERIT); rc = DosSetFHState (handle[1], OPEN_FLAGS_NOINHERIT);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1033,7 +1030,7 @@ create_process:
rc = DosCreatePipe (&handle[2], &handle[3], pipe_size); rc = DosCreatePipe (&handle[2], &handle[3], pipe_size);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1042,7 +1039,7 @@ create_process:
rc = DosSetFHState(handle[2], OPEN_FLAGS_NOINHERIT); rc = DosSetFHState(handle[2], OPEN_FLAGS_NOINHERIT);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1056,7 +1053,7 @@ create_process:
rc = DosCreatePipe(&handle[4], &handle[5], pipe_size); rc = DosCreatePipe(&handle[4], &handle[5], pipe_size);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1065,7 +1062,7 @@ create_process:
rc = DosSetFHState (handle[4], OPEN_FLAGS_NOINHERIT); rc = DosSetFHState (handle[4], OPEN_FLAGS_NOINHERIT);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
@ -1104,7 +1101,7 @@ create_process:
); );
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
} }
@ -1114,20 +1111,20 @@ create_process:
rc = DosDupHandle (std_in, &old_in); rc = DosDupHandle (std_in, &old_in);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
rc = DosDupHandle (std_out, &old_out); rc = DosDupHandle (std_out, &old_out);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
DosClose (old_in); old_in = HAWK_PIO_HND_NIL; DosClose (old_in); old_in = HAWK_PIO_HND_NIL;
goto oops; goto oops;
} }
rc = DosDupHandle (std_err, &old_err); rc = DosDupHandle (std_err, &old_err);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
DosClose (old_out); old_out = HAWK_PIO_HND_NIL; DosClose (old_out); old_out = HAWK_PIO_HND_NIL;
DosClose (old_in); old_in = HAWK_PIO_HND_NIL; DosClose (old_in); old_in = HAWK_PIO_HND_NIL;
goto oops; goto oops;
@ -1299,7 +1296,7 @@ create_process:
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
goto oops; goto oops;
} }
pio->child = child_rc.codeTerminate; pio->child = child_rc.codeTerminate;
@ -1316,7 +1313,7 @@ create_process:
{ {
if (HAWK_PIPE(&handle[0]) <= -1) if (HAWK_PIPE(&handle[0]) <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
minidx = 0; maxidx = 1; minidx = 0; maxidx = 1;
@ -1326,7 +1323,7 @@ create_process:
{ {
if (HAWK_PIPE(&handle[2]) <= -1) if (HAWK_PIPE(&handle[2]) <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
if (minidx == -1) minidx = 2; if (minidx == -1) minidx = 2;
@ -1337,7 +1334,7 @@ create_process:
{ {
if (HAWK_PIPE(&handle[4]) <= -1) if (HAWK_PIPE(&handle[4]) <= -1)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
goto oops; goto oops;
} }
if (minidx == -1) minidx = 4; if (minidx == -1) minidx = 4;
@ -1364,7 +1361,7 @@ create_process:
if ((pserr = posix_spawn_file_actions_init(&fa)) != 0) if ((pserr = posix_spawn_file_actions_init(&fa)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
fa_inited = 1; fa_inited = 1;
@ -1374,17 +1371,17 @@ create_process:
/* child should read */ /* child should read */
if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[1])) != 0) if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[1])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_adddup2(&fa, handle[0], 0)) != 0) if ((pserr = posix_spawn_file_actions_adddup2(&fa, handle[0], 0)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[0])) != 0) if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[0])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
} }
@ -1394,23 +1391,23 @@ create_process:
/* child should write */ /* child should write */
if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[2])) != 0) if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[2])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_adddup2(&fa, handle[3], 1)) != 0) if ((pserr = posix_spawn_file_actions_adddup2(&fa, handle[3], 1)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_ERRTOOUT) && if ((flags & HAWK_PIO_ERRTOOUT) &&
(pserr = posix_spawn_file_actions_adddup2 (&fa, handle[3], 2)) != 0) (pserr = posix_spawn_file_actions_adddup2 (&fa, handle[3], 2)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[3])) != 0) if ((pserr = posix_spawn_file_actions_addclose(&fa, handle[3])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
} }
@ -1420,23 +1417,23 @@ create_process:
/* child should write */ /* child should write */
if ((pserr = posix_spawn_file_actions_addclose (&fa, handle[4])) != 0) if ((pserr = posix_spawn_file_actions_addclose (&fa, handle[4])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_adddup2 (&fa, handle[5], 2)) != 0) if ((pserr = posix_spawn_file_actions_adddup2 (&fa, handle[5], 2)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_OUTTOERR) && if ((flags & HAWK_PIO_OUTTOERR) &&
(pserr = posix_spawn_file_actions_adddup2 (&fa, handle[5], 1)) != 0) (pserr = posix_spawn_file_actions_adddup2 (&fa, handle[5], 1)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((pserr = posix_spawn_file_actions_addclose (&fa, handle[5])) != 0) if ((pserr = posix_spawn_file_actions_addclose (&fa, handle[5])) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
} }
@ -1450,19 +1447,19 @@ create_process:
if ((flags & HAWK_PIO_INTONUL) && if ((flags & HAWK_PIO_INTONUL) &&
(pserr = posix_spawn_file_actions_addopen (&fa, 0, HAWK_BT("/dev/null"), oflags, 0)) != 0) (pserr = posix_spawn_file_actions_addopen (&fa, 0, HAWK_BT("/dev/null"), oflags, 0)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_OUTTONUL) && if ((flags & HAWK_PIO_OUTTONUL) &&
(pserr = posix_spawn_file_actions_addopen (&fa, 1, HAWK_BT("/dev/null"), oflags, 0)) != 0) (pserr = posix_spawn_file_actions_addopen (&fa, 1, HAWK_BT("/dev/null"), oflags, 0)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_ERRTONUL) && if ((flags & HAWK_PIO_ERRTONUL) &&
(pserr = posix_spawn_file_actions_addopen (&fa, 2, HAWK_BT("/dev/null"), oflags, 0)) != 0) (pserr = posix_spawn_file_actions_addopen (&fa, 2, HAWK_BT("/dev/null"), oflags, 0)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
} }
@ -1475,19 +1472,19 @@ create_process:
if ((flags & HAWK_PIO_DROPIN) && is_fd_valid(0) && if ((flags & HAWK_PIO_DROPIN) && is_fd_valid(0) &&
(pserr = posix_spawn_file_actions_addclose (&fa, 0)) != 0) (pserr = posix_spawn_file_actions_addclose (&fa, 0)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_DROPOUT) && is_fd_valid(1) && if ((flags & HAWK_PIO_DROPOUT) && is_fd_valid(1) &&
(pserr = posix_spawn_file_actions_addclose (&fa, 1)) != 0) (pserr = posix_spawn_file_actions_addclose (&fa, 1)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
if ((flags & HAWK_PIO_DROPERR) && is_fd_valid(2) && if ((flags & HAWK_PIO_DROPERR) && is_fd_valid(2) &&
(pserr = posix_spawn_file_actions_addclose (&fa, 2)) != 0) (pserr = posix_spawn_file_actions_addclose (&fa, 2)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
@ -1507,7 +1504,7 @@ create_process:
if (is_fd_valid_and_nocloexec(fd) && if (is_fd_valid_and_nocloexec(fd) &&
(pserr = posix_spawn_file_actions_addclose (&fa, fd)) != 0) (pserr = posix_spawn_file_actions_addclose (&fa, fd)) != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
} }
@ -1549,7 +1546,7 @@ create_process:
} }
if (pserr != 0) if (pserr != 0)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(pserr)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(pserr));
goto oops; goto oops;
} }
@ -1935,7 +1932,7 @@ static hawk_ooi_t pio_read (hawk_pio_t* pio, void* buf, hawk_oow_t size, hawk_pi
/* ReadFile receives ERROR_BROKEN_PIPE when the write end /* ReadFile receives ERROR_BROKEN_PIPE when the write end
* is closed in the child process */ * is closed in the child process */
if (GetLastError() == ERROR_BROKEN_PIPE) return 0; if (GetLastError() == ERROR_BROKEN_PIPE) return 0;
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1949,7 +1946,7 @@ static hawk_ooi_t pio_read (hawk_pio_t* pio, void* buf, hawk_oow_t size, hawk_pi
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
if (rc == ERROR_BROKEN_PIPE) return 0; /* TODO: check this */ if (rc == ERROR_BROKEN_PIPE) return 0; /* TODO: check this */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -1961,7 +1958,7 @@ static hawk_ooi_t pio_read (hawk_pio_t* pio, void* buf, hawk_oow_t size, hawk_pi
size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int); size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int);
n = read (hnd, buf, size); n = read (hnd, buf, size);
if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#else #else
@ -1981,7 +1978,7 @@ reread:
} }
else else
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
} }
} }
@ -2023,7 +2020,7 @@ static hawk_ooi_t pio_write (hawk_pio_t* pio, const void* data, hawk_oow_t size,
if (WriteFile (hnd, data, (DWORD)size, &count, HAWK_NULL) == FALSE) if (WriteFile (hnd, data, (DWORD)size, &count, HAWK_NULL) == FALSE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -2036,7 +2033,7 @@ static hawk_ooi_t pio_write (hawk_pio_t* pio, const void* data, hawk_oow_t size,
rc = DosWrite (hnd, (PVOID)data, (ULONG)size, &count); rc = DosWrite (hnd, (PVOID)data, (ULONG)size, &count);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
return (hawk_ooi_t)count; return (hawk_ooi_t)count;
@ -2047,7 +2044,7 @@ static hawk_ooi_t pio_write (hawk_pio_t* pio, const void* data, hawk_oow_t size,
size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int); size = HAWK_TYPE_MAX(hawk_ooi_t) & HAWK_TYPE_MAX(unsigned int);
n = write (hnd, data, size); n = write (hnd, data, size);
if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#else #else
@ -2067,7 +2064,7 @@ rewrite:
} }
else else
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
} }
} }
return n; return n;
@ -2146,7 +2143,7 @@ int hawk_pio_wait (hawk_pio_t* pio)
if (w != WAIT_OBJECT_0) if (w != WAIT_OBJECT_0)
{ {
/* WAIT_FAILED, WAIT_ABANDONED */ /* WAIT_FAILED, WAIT_ABANDONED */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
@ -2156,7 +2153,7 @@ int hawk_pio_wait (hawk_pio_t* pio)
{ {
/* close the handle anyway to prevent further /* close the handle anyway to prevent further
* errors when this function is called again */ * errors when this function is called again */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
CloseHandle (pio->child); CloseHandle (pio->child);
pio->child = HAWK_PIO_PID_NIL; pio->child = HAWK_PIO_PID_NIL;
return -1; return -1;
@ -2204,7 +2201,7 @@ int hawk_pio_wait (hawk_pio_t* pio)
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
/* WAIT_FAILED, WAIT_ABANDONED */ /* WAIT_FAILED, WAIT_ABANDONED */
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
@ -2251,7 +2248,7 @@ int hawk_pio_wait (hawk_pio_t* pio)
if (!(pio->flags & HAWK_PIO_WAITNORETRY)) continue; if (!(pio->flags & HAWK_PIO_WAITNORETRY)) continue;
} }
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
break; break;
} }
@ -2318,7 +2315,7 @@ int hawk_pio_kill (hawk_pio_t* pio)
n = TerminateProcess(pio->child, 255 + 1 + 9); n = TerminateProcess(pio->child, 255 + 1 + 9);
if (n == FALSE) if (n == FALSE)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
return 0; return 0;
@ -2328,7 +2325,7 @@ int hawk_pio_kill (hawk_pio_t* pio)
rc = DosKillProcess(pio->child, DKP_PROCESSTREE); rc = DosKillProcess(pio->child, DKP_PROCESSTREE);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(rc)); hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(rc));
return -1; return -1;
} }
return 0; return 0;
@ -2340,7 +2337,7 @@ int hawk_pio_kill (hawk_pio_t* pio)
#else #else
n = HAWK_KILL(pio->child, SIGKILL); n = HAWK_KILL(pio->child, SIGKILL);
if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, syserr_to_errnum(errno)); if (n <= -1) hawk_gem_seterrnum (pio->gem, HAWK_NULL, hawk_syserr_to_errnum(errno));
return n; return n;
#endif #endif
} }

View File

@ -37,9 +37,6 @@
# include "syscall.h" # include "syscall.h"
#endif #endif
#include "syserr.h"
IMPLEMENT_SYSERR_TO_ERRNUM (hawk, HAWK)
#define LOCK_OUTPUT(sio) do { if ((sio)->mtx) hawk_mtx_lock ((sio)->mtx, HAWK_NULL); } while(0) #define LOCK_OUTPUT(sio) do { if ((sio)->mtx) hawk_mtx_lock ((sio)->mtx, HAWK_NULL); } while(0)
#define UNLOCK_OUTPUT(sio) do { if ((sio)->mtx) hawk_mtx_unlock ((sio)->mtx); } while(0) #define UNLOCK_OUTPUT(sio) do { if ((sio)->mtx) hawk_mtx_unlock ((sio)->mtx); } while(0)
@ -461,7 +458,7 @@ hawk_ooi_t hawk_sio_putucstr (hawk_sio_t* sio, const hawk_uch_t* str)
{ {
if (WriteConsoleW(sio->file.handle, cur, left, &count, HAWK_NULL) == FALSE) if (WriteConsoleW(sio->file.handle, cur, left, &count, HAWK_NULL) == FALSE)
{ {
hawk_gem_seterrnum (sio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (sio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
if (count == 0) break; if (count == 0) break;
@ -525,7 +522,7 @@ hawk_ooi_t hawk_sio_putuchars (hawk_sio_t* sio, const hawk_uch_t* str, hawk_oow_
{ {
if (WriteConsoleW(sio->file.handle, cur, left, &count, HAWK_NULL) == FALSE) if (WriteConsoleW(sio->file.handle, cur, left, &count, HAWK_NULL) == FALSE)
{ {
hawk_gem_seterrnum (sio->gem, HAWK_NULL, syserr_to_errnum(GetLastError())); hawk_gem_seterrnum (sio->gem, HAWK_NULL, hawk_syserr_to_errnum(GetLastError()));
return -1; return -1;
} }
if (count == 0) break; if (count == 0) break;

View File

@ -1,253 +0,0 @@
/*
* $Id$
*
Copyright (c) 2006-2019 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* this file is intended for internal use only.
* you can include this file and use IMPLEMENT_SYSERR_TO_ERRNUM.
*
* #include "syserr.h"
* IMPLEMENT_SYSERR_TO_ERRNUM (pio, PIO)
*
* header files defining system error codes must be included
* before this file.
*/
#if defined(__cplusplus)
# define __SYSERRTYPE__(obj) obj
# define __SYSERRNUM__(obj,num) (obj E_ ## num)
#else
/*# define __SYSERRTYPE__(obj) hawk_ ## obj ## _errnum_t
# define __SYSERRNUM__(obj,num) (HAWK_ ## obj ## _ ## num)*/
# define __SYSERRTYPE__(obj) obj ## _errnum_t
# define __SYSERRNUM__(obj,num) (obj ## _ ## num)
#endif
#if defined(_WIN32)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (DWORD e) \
{ \
switch (e) \
{ \
case ERROR_NOT_ENOUGH_MEMORY: \
case ERROR_OUTOFMEMORY: \
return __SYSERRNUM__ (obj2, ENOMEM); \
case ERROR_INVALID_PARAMETER: \
case ERROR_INVALID_HANDLE: \
case ERROR_INVALID_NAME: \
return __SYSERRNUM__ (obj2, EINVAL); \
case ERROR_ACCESS_DENIED: \
case ERROR_SHARING_VIOLATION: \
return __SYSERRNUM__ (obj2, EACCES); \
case ERROR_FILE_NOT_FOUND: \
case ERROR_PATH_NOT_FOUND: \
return __SYSERRNUM__ (obj2, ENOENT); \
case ERROR_ALREADY_EXISTS: \
case ERROR_FILE_EXISTS: \
return __SYSERRNUM__ (obj2, EEXIST); \
case ERROR_BROKEN_PIPE: \
return __SYSERRNUM__ (obj2, EPIPE); \
default: \
return __SYSERRNUM__ (obj2, ESYSERR); \
} \
}
#elif defined(__OS2__)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (APIRET e) \
{ \
switch (e) \
{ \
case ERROR_NOT_ENOUGH_MEMORY: \
return __SYSERRNUM__ (obj2, ENOMEM); \
case ERROR_INVALID_PARAMETER: \
case ERROR_INVALID_HANDLE: \
case ERROR_INVALID_NAME: \
return __SYSERRNUM__ (obj2, EINVAL); \
case ERROR_ACCESS_DENIED: \
case ERROR_SHARING_VIOLATION: \
return __SYSERRNUM__ (obj2, EACCES); \
case ERROR_FILE_NOT_FOUND: \
case ERROR_PATH_NOT_FOUND: \
return __SYSERRNUM__ (obj2, ENOENT); \
case ERROR_ALREADY_EXISTS: \
return __SYSERRNUM__ (obj2, EEXIST); \
case ERROR_BROKEN_PIPE: \
return __SYSERRNUM__ (obj2, EPIPE); \
default: \
return __SYSERRNUM__ (obj2, ESYSERR); \
} \
}
/*
#elif defined(__DOS__)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (int e) \
{ \
switch (e) \
{ \
case ENOMEM: return __SYSERRNUM__ (obj2, ENOMEM); \
case EINVAL: return __SYSERRNUM__ (obj2, EINVAL); \
case EACCES: return __SYSERRNUM__ (obj2, EACCES); \
case ENOENT: return __SYSERRNUM__ (obj2, ENOENT); \
case EEXIST: return __SYSERRNUM__ (obj2, EEXIST); \
default: return __SYSERRNUM__ (obj2, ESYSERR); \
} \
}
*/
#elif defined(vms) || defined(__vms)
/* TODO: */
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (unsigned long e) \
{ \
switch (e) \
{ \
case RMS$_NORMAL: return __SYSERRNUM__ (obj2, ENOERR); \
default: return __SYSERRNUM__ (obj2, ESYSERR); \
} \
}
#else
#if defined(EWOULDBLOCK) && defined(EAGAIN) && (EWOULDBLOCK != EAGAIN)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (int e) \
{ \
switch (e) \
{ \
case ENOMEM: return __SYSERRNUM__(obj2, ENOMEM); \
case EINVAL: return __SYSERRNUM__(obj2, EINVAL); \
case EBUSY: return _SYSERRNUM__(obj2, EBUSY); \
case EACCES: return __SYSERRNUM__(obj2, EACCES); \
case EPERM: return __SYSERRNUM__(obj2, EPERM); \
case EISDIR: return __SYSERRNUM__(obj2, EISDIR); \
case ENOTDIR: return __SYSERRNUM__(obj2, ENOTDIR); \
case ENXIO: \
case ENODEV: \
case ENOENT: return __SYSERRNUM__(obj2, ENOENT); \
case EEXIST: return __SYSERRNUM__(obj2, EEXIST); \
case EINTR: return __SYSERRNUM__(obj2, EINTR); \
case EPIPE: return __SYSERRNUM__(obj2, EPIPE); \
case ECHILD: return __SYSERRNUM__(obj2, ECHILD); \
case ETIMEDOUT: return __SYSERRNUM__(obj2, ETMOUT); \
case EINPROGRESS: return __SYSERRNUM__(obj2, EINPROG); \
case EWOULDBLOCK: \
case EAGAIN: return __SYSERRNUM__(obj2, EAGAIN); \
default: return __SYSERRNUM__(obj2, ESYSERR); \
} \
}
#elif defined(EAGAIN)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (int e) \
{ \
switch (e) \
{ \
case ENOMEM: return __SYSERRNUM__(obj2, ENOMEM); \
case EINVAL: return __SYSERRNUM__(obj2, EINVAL); \
case EBUSY: return __SYSERRNUM__(obj2, EBUSY); \
case EACCES: return __SYSERRNUM__(obj2, EACCES); \
case EPERM: return __SYSERRNUM__(obj2, EPERM); \
case EISDIR: return __SYSERRNUM__(obj2, EISDIR); \
case ENOTDIR: return __SYSERRNUM__(obj2, ENOTDIR); \
case ENXIO: \
case ENODEV: \
case ENOENT: return __SYSERRNUM__(obj2, ENOENT); \
case EEXIST: return __SYSERRNUM__(obj2, EEXIST); \
case EINTR: return __SYSERRNUM__(obj2, EINTR); \
case EPIPE: return __SYSERRNUM__(obj2, EPIPE); \
case ECHILD: return __SYSERRNUM__(obj2, ECHILD); \
case ETIMEDOUT: return __SYSERRNUM__(obj2, ETMOUT); \
case EINPROGRESS: return __SYSERRNUM__(obj2, EINPROG); \
case EAGAIN: return __SYSERRNUM__(obj2, EAGAIN); \
default: return __SYSERRNUM__(obj2, ESYSERR); \
} \
}
#elif defined(EWOULDBLOCK)
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (int e) \
{ \
switch (e) \
{ \
case ENOMEM: return __SYSERRNUM__(obj2, ENOMEM); \
case EINVAL: return __SYSERRNUM__(obj2, EINVAL); \
case EBUSY: return __SYSERRNUM__(obj2, EBUSY); \
case EACCES: return __SYSERRNUM__(obj2, EACCES); \
case EPERM: return __SYSERRNUM__(obj2, EPERM); \
case EISDIR: return __SYSERRNUM__(obj2, EISDIR); \
case ENOTDIR: return __SYSERRNUM__(obj2, ENOTDIR); \
case ENXIO: \
case ENODEV: \
case ENOENT: return __SYSERRNUM__(obj2, ENOENT); \
case EEXIST: return __SYSERRNUM__(obj2, EEXIST); \
case EINTR: return __SYSERRNUM__(obj2, EINTR); \
case EPIPE: return __SYSERRNUM__(obj2, EPIPE); \
case ECHILD: return __SYSERRNUM__(obj2, ECHILD); \
case ETIMEDOUT: return __SYSERRNUM__(obj2, ETMOUT); \
case EINPROGRESS: return __SYSERRNUM__(obj2, EINPROG); \
case EWOULDBLOCK: return __SYSERRNUM__(obj2, EAGAIN); \
default: return __SYSERRNUM__(obj2, ESYSERR); \
} \
}
#else
#define IMPLEMENT_SYSERR_TO_ERRNUM(obj1,obj2) \
static __SYSERRTYPE__(obj1) syserr_to_errnum (int e) \
{ \
switch (e) \
{ \
case ENOMEM: return __SYSERRNUM__(obj2, ENOMEM); \
case EINVAL: return __SYSERRNUM__(obj2, EINVAL); \
case EBUSY: return __SYSERRNUM__(obj2, EBUSY); \
case EACCES: return __SYSERRNUM__(obj2, EACCES); \
case EPERM: return __SYSERRNUM__(obj2, EPERM); \
case EISDIR: return __SYSERRNUM__(obj2, EISDIR); \
case ENOTDIR: return __SYSERRNUM__(obj2, ENOTDIR); \
case ENXIO: \
case ENODEV: \
case ENOENT: return __SYSERRNUM__(obj2, ENOENT); \
case EEXIST: return __SYSERRNUM__(obj2, EEXIST); \
case EINTR: return __SYSERRNUM__(obj2, EINTR); \
case EPIPE: return __SYSERRNUM__(obj2, EPIPE); \
case ECHILD: return __SYSERRNUM__(obj2, ECHILD); \
case ETIMEDOUT: return __SYSERRNUM__(obj2, ETMOUT); \
case EINPROGRESS: return __SYSERRNUM__(obj2, EINPROG); \
default: return __SYSERRNUM__(obj2, ESYSERR); \
} \
}
#endif
#endif

View File

@ -224,9 +224,9 @@ int hawk_tre_execx (
return -1; return -1;
} }
#if defined(HAWK_OOCH_IS_UCH) #if defined(HAWK_OOCH_IS_UCH)
ret = tre_match (tre, str, len, STR_WIDE, nmatch, pmatch, eflags); ret = tre_match(tre, str, len, STR_WIDE, nmatch, pmatch, eflags);
#else #else
ret = tre_match (tre, str, len, STR_BYTE, nmatch, pmatch, eflags); ret = tre_match(tre, str, len, STR_BYTE, nmatch, pmatch, eflags);
#endif #endif
if (ret > 0) if (ret > 0)
{ {

33
hawk/m4/libtool.m4 vendored
View File

@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile" cat <<_LT_EOF >> "$cfgfile"
#! $SHELL #! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION # Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services. # Provide generalized library-building support services.
@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# before this can be enabled. # before this can be enabled.
hardcode_into_libs=yes hardcode_into_libs=yes
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Ideally, we could use ldconfig to report *all* directores which are # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not # searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command # being certain /sbin/ldconfig is available, command
@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
# appending ld.so.conf contents (and includes) to the search path. # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
dynamic_linker='GNU/Linux ld.so' dynamic_linker='GNU/Linux ld.so'
;; ;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*) netbsd*)
version_type=sunos version_type=sunos
need_lib_prefix=no need_lib_prefix=no
@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else else
@ -4427,7 +4435,7 @@ m4_if([$1], [CXX], [
;; ;;
esac esac
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
;; ;;
*qnx* | *nto*) *qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise # QNX uses GNU C++, but need to define -shared option too, otherwise
@ -4939,6 +4947,9 @@ m4_if([$1], [CXX], [
;; ;;
esac esac
;; ;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
*) *)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;; ;;
@ -5001,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd* | bitrig*) openbsd* | bitrig*)
with_gnu_ld=no with_gnu_ld=no
;; ;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
esac esac
_LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(ld_shlibs, $1)=yes
@ -5255,7 +5269,7 @@ _LT_EOF
fi fi
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc= wlarc=
@ -5776,6 +5790,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi fi
_LT_TAGVAR(link_all_deplibs, $1)=no
else else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@ -5797,7 +5812,7 @@ _LT_EOF
esac esac
;; ;;
netbsd*) netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else else

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -184,9 +184,7 @@ am__v_at_0 = @
am__v_at_1 = am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__depfiles_maybe = depfiles
am__depfiles_remade = ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo \
./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -380,6 +378,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -453,8 +452,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \ *config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -524,14 +523,8 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -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_mysql_la-mod-mysql.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo@am__quote@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.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: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \ list='$(DISTFILES)'; \
@ -705,8 +695,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-pkgmodexecLTLIBRARIES mostlyclean-am clean-pkgmodexecLTLIBRARIES mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags distclean-tags
@ -752,8 +741,7 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/libhawk_uci_la-mod-uci.Plo
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
@ -774,8 +762,8 @@ uninstall-am: uninstall-pkgmodexecLTLIBRARIES
.MAKE: install-am install-strip .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-generic \
clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-libtool clean-noinstLTLIBRARIES \
clean-pkgmodexecLTLIBRARIES cscopelist-am ctags ctags-am \ clean-pkgmodexecLTLIBRARIES cscopelist-am ctags ctags-am \
distclean distclean-compile distclean-generic \ distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -135,9 +135,7 @@ am__v_at_0 = @
am__v_at_1 = am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__depfiles_maybe = depfiles
am__depfiles_remade = ./$(DEPDIR)/t-001.Po ./$(DEPDIR)/t-002.Po \
./$(DEPDIR)/t-005.Po
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -330,6 +328,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -385,8 +384,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \ *config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -465,15 +464,9 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -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-001.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-002.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-002.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-005.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-005.Po@am__quote@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.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: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \ list='$(DISTFILES)'; \
@ -632,9 +622,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/t-001.Po -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/t-002.Po
-rm -f ./$(DEPDIR)/t-005.Po
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags distclean-tags
@ -680,9 +668,7 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/t-001.Po -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/t-002.Po
-rm -f ./$(DEPDIR)/t-005.Po
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
@ -703,7 +689,7 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip .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 \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \

View File

@ -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@ # @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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -137,9 +137,7 @@ am__v_at_0 = @
am__v_at_1 = am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__depfiles_maybe = depfiles
am__depfiles_remade = ./$(DEPDIR)/uni_case-uni-case.Po \
./$(DEPDIR)/uni_prop-uni-prop.Po
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -332,6 +330,7 @@ pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
@ -383,8 +382,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \ *config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \ *) \
echo ' 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__maybe_remake_depfiles);; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac; esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -459,14 +458,8 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -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_case-uni-case.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_prop-uni-prop.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uni_prop-uni-prop.Po@am__quote@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o: .c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.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: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES) distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \ list='$(DISTFILES)'; \
@ -653,8 +643,7 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/uni_case-uni-case.Po -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags distclean-tags
@ -700,8 +689,7 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/uni_case-uni-case.Po -rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/uni_prop-uni-prop.Po
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
@ -722,7 +710,7 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip .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 \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \ distclean-libtool distclean-tags distdir dvi dvi-am html \