diff options
| author | Nathan Angelacos <nangel@alpinelinux.org> | 2011-05-10 01:22:50 +0000 |
|---|---|---|
| committer | Nathan Angelacos <nangel@alpinelinux.org> | 2011-05-10 01:22:50 +0000 |
| commit | 1251e3c4b2b4845fc5a0ee01b56a6c2669437cad (patch) | |
| tree | e0b55195cde4d5f2f4844132fdb286e2906c947e | |
| parent | dd3a2d24cb75eb4c8f9c65dddd79e23546bf36b0 (diff) | |
| download | haserl-1251e3c4b2b4845fc5a0ee01b56a6c2669437cad.tar.bz2 haserl-1251e3c4b2b4845fc5a0ee01b56a6c2669437cad.tar.xz | |
0.9.29 candidate
| -rw-r--r-- | COPYING | 41 | ||||
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | THANKS | 34 | ||||
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | aclocal.m4 | 951 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/common.c | 34 | ||||
| -rw-r--r-- | src/common.h | 23 | ||||
| -rw-r--r-- | src/h_bash.c | 29 | ||||
| -rw-r--r-- | src/h_bash.h | 23 | ||||
| -rw-r--r-- | src/h_error.c | 41 | ||||
| -rw-r--r-- | src/h_error.h | 25 | ||||
| -rw-r--r-- | src/h_lua.c | 28 | ||||
| -rw-r--r-- | src/h_lua.h | 20 | ||||
| -rw-r--r-- | src/h_lua_common.c | 27 | ||||
| -rw-r--r-- | src/h_lua_common.h | 20 | ||||
| -rw-r--r-- | src/h_luac.c | 41 | ||||
| -rw-r--r-- | src/h_luac.h | 20 | ||||
| -rw-r--r-- | src/h_script.c | 30 | ||||
| -rw-r--r-- | src/h_script.h | 23 | ||||
| -rw-r--r-- | src/haserl.c | 27 | ||||
| -rw-r--r-- | src/haserl.h | 20 | ||||
| -rw-r--r-- | src/haserl_lualib.lua | 39 | ||||
| -rw-r--r-- | src/lua2c.c | 104 | ||||
| -rw-r--r-- | src/rfc2388.c | 60 | ||||
| -rw-r--r-- | src/rfc2388.h | 20 | ||||
| -rw-r--r-- | src/sliding_buffer.c | 35 | ||||
| -rw-r--r-- | src/sliding_buffer.h | 20 | ||||
| -rw-r--r-- | tests/Makefile.am | 14 | ||||
| -rw-r--r-- | tests/minunit.h | 6 | ||||
| -rw-r--r-- | tests/utest_common.c | 46 |
32 files changed, 511 insertions, 1323 deletions
@@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. @@ -1,9 +1,23 @@ +2011-05-09 + 0.9.29 + * Jan Rome reported an off-by one error in handling array input (formvar[]) + * Chow Loong Jin reported multiple header files with no copyright information + This is part of the process to get haserl into Ubuntu. + * Chow Loong Jin noticed haserl_lua.inc is no longer necessary in the + tarball (sf id 3298883) + * Oliver Metz noted that haserl aborted on SIGPIPE from a custom upload + handler. Haserl now ignores the signal. + (Example: uploading to a 'tar xvf' handler) + text data bss dec hex filename + 19637 836 176 20649 50a9 src/haserl + 2011-03-25 0.9.28 - * Lua script did not have variables in the correct tables (Mixure for FORM. and POST_, GET_ - They should now be in the correct table format + * Lua script did not have variables in the correct tables (Mixure for + FORM. and POST_, GET_ They should now be in the correct table format * Natanael Copa provided patches to compile lua2c if necessary - * Chow Loong Jin proposes using printf '%s' instead of echo -n; no reason not to. + * Chow Loong Jin proposes using printf '%s' instead of echo -n; + no reason not to. text data bss dec hex filename 28598 948 176 29722 741a src/haserl diff --git a/Makefile.am b/Makefile.am index 574b847..058a544 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ PACKAGE=@PACKAGE_TARNAME@ LIBS= -SUBDIRS = src doc tests +SUBDIRS = src doc EXTRA_DIST = README.BashExtensions docdir=$(datadir)/$(PACKAGE) datarootdir=@datarootdir@ @@ -1,34 +1,2 @@ -Haserl THANKS file +See the Changelog for all the people who deserve thanks. -Haserl was written by Nathan Angelacos. - -It was the result of work done by Cameron Banta and David Krause, who -wrote a web-configuration engine using AWK scripts. - -Natanael Copa assisted with the autoconf scripts, as well as general -support of the project. - -Arne Bernin submitted the first patch to make the shell variables -survive code blocks. His comments and ideas got the whole sub-shell -thing going. - -Erich Titl helped with some of the configure automake checks. - -Vladislav Moskovets suggested the include directive. - -Andreas Brodmann provided the incentive to add lua support. - -Robin Haberkorn supplied the luac (precompiled lua) support, and then -did so a second time after the entire source tree was reformatted. - -Diego Santa Cruz from spinetix.com provided fixes to some really -annoying (and sporadic) deadlocks with IE, thttpd, POST requests. - -Scott did the COOKIE_, POST_, GET_ parsing (he's also responsible for -the bash extensions) - -Mark Blythe identified differences between BSD/OSX and Linux shell -handling of #! scripts, and how argv[1] looks. Then he supplied the -fix. - -Peter Korsgaard found a buffer overflow error in http array handling. @@ -1,15 +1,7 @@ -15 Feb 2008 -* multiselect needs to return an array of values. PHP handles it like this: - if the variable is foo[] then an array is returned. If the variable name - in the form is foo, then the last value is returned. For shell, make it - a \n delimited array, so that you can do for a in $foo; do (bb ash doesnt - support real arrays.) Lua could though. (Scott) - DONE - but lua is newline - terminated, not as a table. 25 Jan 2008 * change sliding_buffer into a circular buffer to reduce mem moves. * turn haserl core into a busybox applet 20 Nov 2007 -* Add option to separate FORM into COOKIE, GET, POST tables (DONE - Scott) * Make it easier for people like Scott to make new haserl tags * Release a 0.10.0 or 1.0.0 version already 12 Jul 2007 diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index eba341b..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,951 +0,0 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -[m4_warning([this file was generated for autoconf 2.67. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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 -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - diff --git a/configure.ac b/configure.ac index 161fc3e..91404c3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([haserl],[0.9.28],[Nathan Angelacos - nangel@users.sourceforge.net],[haserl]) +AC_INIT([haserl],[0.9.29],[Nathan Angelacos - nangel@users.sourceforge.net],[haserl]) AM_INIT_AUTOMAKE([haserl],[$PACKAGE_VERSION]) # Checks for programs. @@ -185,7 +185,6 @@ CFLAGS="$CFLAGS -Wall" AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile - tests/Makefile ]) diff --git a/src/common.c b/src/common.c index 8362171..319891d 100644 --- a/src/common.c +++ b/src/common.c @@ -1,24 +1,22 @@ -/* - * -------------------------------------------------------------------------- - * Common library functions for the haserl suite - * Copyright (c) 2005-2007 Nathan Angelacos (nangel@users.sourceforge.net) +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 2, as published by the - * Free Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - * ------------------------------------------------------------------------- - */ - + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> #endif @@ -186,7 +184,7 @@ argc_argv (char *instr, argv_t ** argv, char *commentstr) ALLOC_CHUNK)); } - if (argv_array == NULL) + if (argv_array == NULL) { return (-1); } diff --git a/src/common.h b/src/common.h index b9ee5f3..1bc8210 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,23 @@ -/* - * $Id: common.h,v 1.5 2005/11/21 22:05:34 nangel Exp $ - */ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _COMMON_H #define _COMMON_H 1 diff --git a/src/h_bash.c b/src/h_bash.c index 8c9c64c..e955acd 100644 --- a/src/h_bash.c +++ b/src/h_bash.c @@ -1,21 +1,22 @@ -/*----------------------------------------------------------------- - * haserl functions specific to a bash/ash/dash shell - * Copyright (c) 2003-2007 Nathan Angelacos (nangel@users.sourceforge.net) +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 2, as published by the Free - * Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> diff --git a/src/h_bash.h b/src/h_bash.h index d827aa6..a9314af 100644 --- a/src/h_bash.h +++ b/src/h_bash.h @@ -1,6 +1,23 @@ -/* - * $Id: haserl.h,v 1.14 2005/11/18 14:43:10 nangel Exp $ - */ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef H_SUBSHELL_H #define H_SUBSHELL_H 1 diff --git a/src/h_error.c b/src/h_error.c index 46bd6e1..0dcd638 100644 --- a/src/h_error.c +++ b/src/h_error.c @@ -1,23 +1,22 @@ -/* - * -------------------------------------------------------------------------- - * Error functions for haserl - * Copyright (c) 2003-2006 Nathan Angelacos (nangel@users.sourceforge.net) +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 2, as published by the Free - * Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - * ------------------------------------------------------------------------- - */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> @@ -66,9 +65,9 @@ die_with_error (char *msg) void die_with_message (void *sp, char *where, const char *s, ...) { - #ifndef JUST_LUACSHELL +#ifndef JUST_LUACSHELL script_t *script = sp; - #endif +#endif va_list p; FILE *fo = stderr; @@ -85,14 +84,14 @@ die_with_message (void *sp, char *where, const char *s, ...) va_start (p, s); vfprintf (fo, s, p); va_end (p); - #ifndef JUST_LUACSHELL +#ifndef JUST_LUACSHELL if (where && sp) - { + { fprintf (fo, " near line %d of %s\n", count_lines (script->buf, script->size, where), script->name); } - #endif +#endif printf ("\n"); if (getenv ("REQUEST_METHOD")) diff --git a/src/h_error.h b/src/h_error.h index af8d9aa..76a1496 100644 --- a/src/h_error.h +++ b/src/h_error.h @@ -1,6 +1,25 @@ -/* - * $Id: haserl.h,v 1.14 2005/11/18 14:43:10 nangel Exp $ - */ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + + + #ifndef H_ERROR_H #define H_ERROR_H 1 diff --git a/src/h_lua.c b/src/h_lua.c index 38d318e..e7fb2b4 100644 --- a/src/h_lua.c +++ b/src/h_lua.c @@ -1,21 +1,22 @@ /* -------------------------------------------------------------------------- - * lua language specific functions - * Copyright (c) 2003-2007 Nathan Angelacos (nangel@users.sourceforge.net) + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> @@ -152,4 +153,3 @@ lua_eval (buffer_t * buf, char *str, size_t len) buffer_add (buf, str, len); buffer_add (buf, end, strlen (end)); } - diff --git a/src/h_lua.h b/src/h_lua.h index 1b1e8af..f85efdc 100644 --- a/src/h_lua.h +++ b/src/h_lua.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef H_LUA_H #define H_LUA_H 1 diff --git a/src/h_lua_common.c b/src/h_lua_common.c index e29c97b..4230515 100644 --- a/src/h_lua_common.c +++ b/src/h_lua_common.c @@ -1,21 +1,22 @@ /* -------------------------------------------------------------------------- - * functions shared among both Lua shells - * Copyright (c) 2003-2007 Nathan Angelacos (nangel@users.sourceforge.net) + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> diff --git a/src/h_lua_common.h b/src/h_lua_common.h index 18b0e68..ba59d92 100644 --- a/src/h_lua_common.h +++ b/src/h_lua_common.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _H_LUA_COMMON_H #define _H_LUA_COMMON_H diff --git a/src/h_luac.c b/src/h_luac.c index 55e4083..f98e0a5 100644 --- a/src/h_luac.c +++ b/src/h_luac.c @@ -1,21 +1,22 @@ /* -------------------------------------------------------------------------- - * lua language specific functions (for compiled Lua chunks) - * Copyright (c) 2003-2007 Nathan Angelacos (nangel@users.sourceforge.net) + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> @@ -33,23 +34,25 @@ extern lua_State *lua_vm; /* tokenizer was not used, so script is NULL, but name is the filename to process */ void -luac_doscript (buffer_t *script, char *name) +luac_doscript (buffer_t * script, char *name) { - if (luaL_loadfile (lua_vm, name) || lua_pcall(lua_vm, 0, LUA_MULTRET, 0)) + if (luaL_loadfile (lua_vm, name) || lua_pcall (lua_vm, 0, LUA_MULTRET, 0)) { - die_with_message (NULL, NULL, "Cannot load lua and execute chunk: %s", lua_tostring(lua_vm, -1)); + die_with_message (NULL, NULL, "Cannot load lua and execute chunk: %s", + lua_tostring (lua_vm, -1)); } } int -h_luac_loadfile (lua_State *L) +h_luac_loadfile (lua_State * L) { const char *filename = luaL_checkstring (L, 1); if (luaL_loadfile (L, filename)) { - die_with_message (NULL, NULL, "Cannot load file '%s': %s", filename, lua_tostring(L, -1)); - } /* no error: function is on the stack */ + die_with_message (NULL, NULL, "Cannot load file '%s': %s", filename, + lua_tostring (L, -1)); + } /* no error: function is on the stack */ return 1; } diff --git a/src/h_luac.h b/src/h_luac.h index 37c6536..9502fdb 100644 --- a/src/h_luac.h +++ b/src/h_luac.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _H_LUAC_H #define _H_LUAC_H diff --git a/src/h_script.c b/src/h_script.c index 646be6e..534c672 100644 --- a/src/h_script.c +++ b/src/h_script.c @@ -1,22 +1,22 @@ -/*-------------------------------------------------------------------------- - * functions related to opening, tokenizing and parsing a haserl script - * Copyright (c) 2006-2007 Nathan Angelacos (nangel@users.sourceforge.net) +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> diff --git a/src/h_script.h b/src/h_script.h index e1098fe..de49ff5 100644 --- a/src/h_script.h +++ b/src/h_script.h @@ -1,6 +1,23 @@ -/* - * $Id: haserl.h,v 1.14 2005/11/18 14:43:10 nangel Exp $ - */ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef H_SCRIPT_H #define H_SCRIPT_H 1 diff --git a/src/haserl.c b/src/haserl.c index 9d8a30f..22ac396 100644 --- a/src/haserl.c +++ b/src/haserl.c @@ -1,19 +1,20 @@ /* -------------------------------------------------------------------------- - * core of haserl.cgi - a poor-man's php for embedded/lightweight environments - * Copyright (c) 2003-2011 Nathan Angelacos (nangel@users.sourceforge.net) + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 2, as published by the Free - * Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * * ----- * The x2c() and unescape_url() routines were taken from @@ -269,7 +270,7 @@ myputenv (list_t * cur, char *str, char *prefix) /* if an array, create a new string with this * value added to the end of the old value(s) */ - temp = xmalloc (strlen (cur->buf) + strlen (entry) - len + 1); + temp = xmalloc (strlen (cur->buf) + strlen (entry) - len + 2); memmove (temp, cur->buf, strlen (cur->buf) + 1); strcat (temp, "\n"); strcat (temp, str + keylen + 3); diff --git a/src/haserl.h b/src/haserl.h index 4fcfe8c..6791e74 100644 --- a/src/haserl.h +++ b/src/haserl.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _HASERL_H #define _HASERL_H 1 diff --git a/src/haserl_lualib.lua b/src/haserl_lualib.lua index 5360bd1..b3adfbe 100644 --- a/src/haserl_lualib.lua +++ b/src/haserl_lualib.lua @@ -1,21 +1,24 @@ --- -------------------------------------------------------------------------- --- haserl luascript library --- Copyright (c) 2003-2011 Nathan Angelacos (nangel@users.sourceforge.net) --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License, version 2, --- as published by the Free Software Foundation. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- --- -------------------------------------------------------------------------- +--[[ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ +]]-- haserl, FORM, ENV, COOKIE, HASERL, GET, POST = {}, {}, {}, {}, {}, {}, {} diff --git a/src/lua2c.c b/src/lua2c.c index f1f7abe..063ac20 100644 --- a/src/lua2c.c +++ b/src/lua2c.c @@ -1,22 +1,22 @@ /* -------------------------------------------------------------------------- - * a simple lua 2 c function converter - a simple luac + bin2c - * Copyright (c) 2007 Nathan Angelacos (nangel@users.sourceforge.net) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * ------------------------------------------------------------------------- */ - + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ /* This program loads the source file, and then uses lua_dump to output it * to a c const char array. Because lua_dump is used instead of the internal @@ -47,51 +47,59 @@ static void loadit (char *filename) { -lua_vm = luaL_newstate(); -luaL_openlibs (lua_vm); + lua_vm = luaL_newstate (); + luaL_openlibs (lua_vm); + + if (luaL_loadfile (lua_vm, filename)) + { + puts (lua_tostring (lua_vm, -1)); + exit (-1); + } -if (luaL_loadfile(lua_vm, filename)) { - puts (lua_tostring(lua_vm, -1)); - exit (-1); - } - } -static int writer (lua_State* L, const void* p, size_t size, void* u) +static int +writer (lua_State * L, const void *p, size_t size, void *u) { - static int count = 0; - int i; - for (i=0; i < size; i++ ) { - if ((count) && (count % 16) == 0 ) printf ("\n "); - printf ("%3d,", *((unsigned char *) (p+i))); - count++; - } - - return (0); + static int count = 0; + int i; + for (i = 0; i < size; i++) + { + if ((count) && (count % 16) == 0) + printf ("\n "); + printf ("%3d,", *((unsigned char *) (p + i))); + count++; + } + + return (0); } -static void -dumpit() +static void +dumpit () { -lua_dump (lua_vm, writer, NULL); + lua_dump (lua_vm, writer, NULL); } int -main (int argc, char *argv[]) { - if (argc != 3) { - printf("usage: %s varname luasource >output\n", argv[0]); - return (-1); - } +main (int argc, char *argv[]) +{ + if (argc != 3) + { + printf ("usage: %s varname luasource >output\n", argv[0]); + return (-1); + } - loadit (argv[2]); + loadit (argv[2]); - printf ("/* This file was automatically generated from %s. DO NOT EDIT */\n\n", argv[2]); - printf ("static const unsigned char %s[] = { \n ", argv[1]); - dumpit(); - printf ("\n};\n"); + printf + ("/* This file was automatically generated from %s. DO NOT EDIT */\n\n", + argv[2]); + printf ("static const unsigned char %s[] = { \n ", argv[1]); + dumpit (); + printf ("\n};\n"); - return (0); + return (0); } diff --git a/src/rfc2388.c b/src/rfc2388.c index 0548868..32c21df 100644 --- a/src/rfc2388.c +++ b/src/rfc2388.c @@ -1,21 +1,23 @@ /* -------------------------------------------------------------------------- - * multipart/form-data handler functions (obviously, see rfc2388 for info) - * Copyright (c) 2007 Nathan Angelacos (nangel@users.sourceforge.net) + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 2, as published by the Free - * Software Foundation. + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. * - ------------------------------------------------------------------------- */ + * ------------------------------------------------------------------------ */ + #if HAVE_CONFIG_H #include <config.h> @@ -70,6 +72,7 @@ void mime_var_destroy (mime_var_t * obj) { int status; + struct sigaction new_action; if (obj->name) { @@ -94,10 +97,14 @@ mime_var_destroy (mime_var_t * obj) buffer_destroy (&(obj->value)); if (obj->fh) { - close (obj->fh); + close (abs (obj->fh)); if (global.uploadhandler) { wait (&status); + new_action.sa_handler = SIG_DFL; + sigemptyset (&new_action.sa_mask); + new_action.sa_flags = 0; + sigaction (SIGPIPE, &new_action, NULL); } obj->fh = 0; } @@ -205,6 +212,9 @@ mime_exec (mime_var_t * obj, char *fifo) char *type, *filename, *name; char *c; int fh; + struct sigaction new_action; + + pid = fork (); if (pid == -1) @@ -254,7 +264,11 @@ mime_exec (mime_var_t * obj, char *fifo) } else { - /* I'm parent */ + /* I'm parent - ignore SIGPIPE from the child */ + new_action.sa_handler = SIG_IGN; + sigemptyset (&new_action.sa_mask); + new_action.sa_flags = 0; + sigaction (SIGPIPE, &new_action, NULL); } /* control should get to this point only in the parent. @@ -298,7 +312,9 @@ mime_var_open_target (mime_var_t * obj) close (obj->fh); unlink (tmpname); if (mkfifo (tmpname, 0600)) - ok = 0; + { + ok = 0; + } /* you must open the fifo for reading before writing * on non linux systems */ @@ -336,6 +352,8 @@ mime_var_open_target (mime_var_t * obj) void mime_var_writer (mime_var_t * obj, char *str, int len) { + int err; + /* if not a file upload, then just a normal variable */ if (!obj->filename) { @@ -347,9 +365,15 @@ mime_var_writer (mime_var_t * obj, char *str, int len) mime_var_open_target (obj); /* if we have an open file, write the chunk */ - if (obj->fh) + if (obj->fh > 0) { - write (obj->fh, str, len); + err = write (obj->fh, str, len); + /* if there was an error, invert the filehandle; we need the + handle for later when we close it */ + if (err == -1) + { + obj->fh = abs (obj->fh) * -1; + } } } diff --git a/src/rfc2388.h b/src/rfc2388.h index acad1ac..a087960 100644 --- a/src/rfc2388.h +++ b/src/rfc2388.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _RFC2388_H #define _RFC2388_H 1 diff --git a/src/sliding_buffer.c b/src/sliding_buffer.c index 2b5ef33..f93ebe0 100644 --- a/src/sliding_buffer.c +++ b/src/sliding_buffer.c @@ -1,17 +1,22 @@ -/* - * -------------------------------------------------------------------------- - * Sliding Buffer functions for haserl Copyright (c) 2007 Nathan Angelacos - * (nangel@users.sourceforge.net) This program is free software; you can - * redistribute it and/or modify it under the terms of the GNU General Public - * License, version 2, as published by the Free Software Foundation. This - * program is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * ------------------------------------------------------------------------- - */ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ #if HAVE_CONFIG_H #include <config.h> @@ -100,7 +105,7 @@ s_buffer_read (sliding_buffer_t * sbuf, char *matchstr) else { size_t n = sbuf->maxsize - len; - if ( sbuf->maxread && sbuf->maxread < sbuf->nrread + n) + if (sbuf->maxread && sbuf->maxread < sbuf->nrread + n) n = sbuf->maxread - sbuf->nrread; r = read (sbuf->fh, sbuf->buf + len, n); } diff --git a/src/sliding_buffer.h b/src/sliding_buffer.h index 167e461..34f156b 100644 --- a/src/sliding_buffer.h +++ b/src/sliding_buffer.h @@ -1,3 +1,23 @@ +/* -------------------------------------------------------------------------- + * Copyright 2003-2011 (inclusive) Nathan Angelacos + * (nangel@users.sourceforge.net) + * + * This file is part of haserl. + * + * Haserl is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * Haserl is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with haserl. If not, see <http://www.gnu.org/licenses/>. + * + * ------------------------------------------------------------------------ */ + #ifndef _SLIDING_BUF_H #define _SLIDING_BUF_H 1 diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 358ac94..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -PACKAGE=@PACKAGE_TARNAME@ -EXTRA_DIST=minunit.h -datarootdir=@datarootdir@ - - -#--------- Unit Tests ---------------------- -TESTS = utest_common - -check_PROGRAMS = utest_common - -utest_common: ../src/common.c utest_common.c - -#--------- End Unit Tests ------------------- - diff --git a/tests/minunit.h b/tests/minunit.h deleted file mode 100644 index 749c746..0000000 --- a/tests/minunit.h +++ /dev/null @@ -1,6 +0,0 @@ -/* file: minunit.h */ - -#define mu_assert(message, test) do { if (!(test)) return message; } while (0) -#define mu_run_test(test) do { char *message = test(); tests_run++; \ - if (message) return message; } while (0) -extern int tests_run; diff --git a/tests/utest_common.c b/tests/utest_common.c deleted file mode 100644 index 0085cb4..0000000 --- a/tests/utest_common.c +++ /dev/null @@ -1,46 +0,0 @@ -/* file minunit_example.c */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "../src/common.h" -#include "minunit.h" - -int tests_run = 0; - - -void * xmalloc=malloc; -void * xrealloc=realloc; - - -char *test_lowercase() { - char source[] = "This is a Test!"; - int result; - - lowercase(source); - result=memcmp("this is a test!", source, strlen(source)); - - mu_assert("lowercase failed",result == 0); - return 0; - } - - -char *all_tests() { - mu_run_test(test_lowercase); - return 0; - } - -int main(int argc, char **argv) { - char *result = all_tests(); - printf ("%d\n", (int) result); - if (result != 0) { - printf("%s\n", result); - } - else { - printf("ALL TESTS PASSED\n"); - } - printf("Tests run: %d\n", tests_run); - - return result != 0; - } - |