Menu
▾
▴
clisp-cvs Digest, Vol 6, Issue 15
|
From: <cli...@li...> - 2006-10-12 09:28:16
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.5415,1.5416 (Sam Steingold) 2. clisp/src/m4 libtool.m4,1.8,1.9 (Sam Steingold) 3. clisp/src/build-aux ltmain.sh, NONE, 1.1 README, 1.2, 1.3 config.dynamic, 1.2, NONE (Sam Steingold) 4. clisp/src ChangeLog,1.5416,1.5417 (Sam Steingold) 5. clisp/src configure.in,1.113,1.114 ChangeLog,1.5417,1.5418 (Sam Steingold) 6. clisp/src/autoconf aclocal.m4,1.182,1.183 (Sam Steingold) 7. clisp/src configure,1.166,1.167 (Sam Steingold) 8. clisp/modules/libsvm Makefile,1.1,1.2 (Sam Steingold) 9. clisp/modules/fastcgi fastcgi.lisp, 1.8, 1.9 fastcgi_wrappers.c, 1.3, 1.4 (J=C3=B6rg H=C3=B6hle) 10. clisp/src ChangeLog,1.5418,1.5419 (J=C3=B6rg H=C3=B6hle) ---------------------------------------------------------------------- Message: 1 Date: Thu, 12 Oct 2006 04:11:00 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.5415,1.5416 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1439/src Modified Files: ChangeLog=20 Log Message: updated Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5415 retrieving revision 1.5416 diff -u -d -r1.5415 -r1.5416 --- ChangeLog 12 Oct 2006 00:06:20 -0000 1.5415 +++ ChangeLog 12 Oct 2006 04:10:57 -0000 1.5416 @@ -1,3 +1,10 @@ +2006-10-12 Sam Steingold <sd...@gn...> + + * libcharset/build-aux/config.guess, libcharset/build-aux/config.sub: + * libcharset/build-aux/install-sh, libcharset/build-aux/ltmain.sh: + * ffcall/build-aux/config.guess, ffcall/build-aux/config.sub: + * ffcall/build-aux/ltmain.sh, src/m4/libtool.m4: updated + 2006-10-11 Sam Steingold <sd...@po...> =20 fixed FFI callbacks, broken since the 2005-10-02 patch ------------------------------ Message: 2 Date: Thu, 12 Oct 2006 04:10:59 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src/m4 libtool.m4,1.8,1.9 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src/m4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1439/src/m4 Modified Files: libtool.m4=20 Log Message: updated Index: libtool.m4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/m4/libtool.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- libtool.m4 20 Jul 2005 18:43:20 -0000 1.8 +++ libtool.m4 12 Oct 2006 04:10:56 -0000 1.9 @@ -7,7 +7,7 @@ ## unlimited permission to copy and/or distribute it, with or without ## modifications, as long as this notice is preserved. =20 -# serial 47 AC_PROG_LIBTOOL +# serial 48 AC_PROG_LIBTOOL =20 =20 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -137,7 +137,7 @@ default_ofile=3Dlibtool can_build_shared=3Dyes [...1831 lines suppressed...] @@ -5979,11 +6228,6 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" =3D no && can_build_shared=3Dno =20 -variables_saved_for_relink=3D"PATH $shlibpath_var $runpath_var" -if test "$GCC" =3D yes; then - variables_saved_for_relink=3D"$variables_saved_for_relink GCC_EXEC_PRE= FIX COMPILER_PATH LIBRARY_PATH" -fi - # # Do we need to explicitly link libc? # @@ -6011,6 +6255,7 @@ libobjs=3Dconftest.$ac_objext deplibs=3D wl=3D$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=3D$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) compiler_flags=3D-v linker_flags=3D-v verstring=3D ------------------------------ Message: 3 Date: Thu, 12 Oct 2006 04:12:17 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src/build-aux ltmain.sh, NONE, 1.1 README, 1.2, 1.3 config.dynamic, 1.2, NONE To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src/build-aux In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2218/src/build-aux Modified Files: README=20 Added Files: ltmain.sh=20 Removed Files: config.dynamic=20 Log Message: replaced src/build-aux/config.dynamic with src/build-aux/ltmain.sh Index: README =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/build-aux/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README 24 Jul 2006 18:03:04 -0000 1.2 +++ README 12 Oct 2006 04:12:14 -0000 1.3 @@ -2,9 +2,8 @@ They are not maintained by us, but updated from an external source: =20 file name how to update -config.dynamic not used - (Bruno wrote it based on libtool to replace -export-dynam= ic) config.guess gnulib/build-aux/ or ftp://ftp.gnu.org/pub/gnu/config/ config.rpath gnulib/build-aux/ config.sub gnulib/build-aux/ or ftp://ftp.gnu.org/pub/gnu/config/ install-sh gnulib/build-aux/ +ltmain.sh /usr/share/libtool/ --- config.dynamic DELETED --- --- NEW FILE: ltmain.sh --- # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun confi= gure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 # # 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 # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # 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 [...6824 lines suppressed...] # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support # them. This is particularly important on AIX, because we don't # support having both static and shared libraries enabled at the same # time on that platform, so we default to a shared-only configuration. # If a disable-shared tag is given, we'll fallback to a static-only # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared disable_libs=3Dshared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static disable_libs=3Dstatic # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: ------------------------------ Message: 4 Date: Thu, 12 Oct 2006 04:12:17 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.5416,1.5417 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2218/src Modified Files: ChangeLog=20 Log Message: replaced src/build-aux/config.dynamic with src/build-aux/ltmain.sh Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5416 retrieving revision 1.5417 diff -u -d -r1.5416 -r1.5417 --- ChangeLog 12 Oct 2006 04:10:57 -0000 1.5416 +++ ChangeLog 12 Oct 2006 04:12:15 -0000 1.5417 @@ -4,6 +4,8 @@ * libcharset/build-aux/install-sh, libcharset/build-aux/ltmain.sh: * ffcall/build-aux/config.guess, ffcall/build-aux/config.sub: * ffcall/build-aux/ltmain.sh, src/m4/libtool.m4: updated + * src/build-aux/config.dynamic: replaced with ... + * src/build-aux/ltmain.sh: added =20 2006-10-11 Sam Steingold <sd...@po...> =20 ------------------------------ Message: 5 Date: Thu, 12 Oct 2006 04:15:39 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src configure.in,1.113,1.114 ChangeLog,1.5417,1.5418 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3351/src Modified Files: configure.in ChangeLog=20 Log Message: call AC_CONFIG_AUX_DIR, AC_PROG_LIBTOOL, AC_LIBTOOL_WIN32_DLL Index: configure.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/configure.in,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- configure.in 30 Jun 2006 16:41:04 -0000 1.113 +++ configure.in 12 Oct 2006 04:15:37 -0000 1.114 @@ -18,6 +18,7 @@ AC_PREREQ(2.57) AC_INIT(GNU CLISP, m4_normalize(esyscmd([if test -f version.sh; then . .= /version.sh; else . ../version.sh; fi; echo "${VERSION_NUMBER} (${RELEASE= _DATE})"])), http://clisp.cons.org/, clisp) AC_CONFIG_SRCDIR(lispbibl.d) +AC_CONFIG_AUX_DIR(build-aux) AC_COPYRIGHT([GNU CLISP Copyright 1989-2006 by Bruno Haible and others GNU CLISP is distributed under the GNU GPL, see file COPYRIGHT])dnl AC_REVISION([$Id$])dnl @@ -48,6 +49,8 @@ CL_PROG_LN_S dnl sets variable HLN CL_PROG_HLN +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL dnl sets variable GROFF AC_CHECK_PROG(GROFF,groff,groff) dnl sets variable DVIPDF Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5417 retrieving revision 1.5418 diff -u -d -r1.5417 -r1.5418 --- ChangeLog 12 Oct 2006 04:12:15 -0000 1.5417 +++ ChangeLog 12 Oct 2006 04:15:37 -0000 1.5418 @@ -1,5 +1,10 @@ 2006-10-12 Sam Steingold <sd...@gn...> =20 + * configure.in: call AC_CONFIG_AUX_DIR, AC_PROG_LIBTOOL, + AC_LIBTOOL_WIN32_DLL + +2006-10-12 Sam Steingold <sd...@gn...> + * libcharset/build-aux/config.guess, libcharset/build-aux/config.sub: * libcharset/build-aux/install-sh, libcharset/build-aux/ltmain.sh: * ffcall/build-aux/config.guess, ffcall/build-aux/config.sub: ------------------------------ Message: 6 Date: Thu, 12 Oct 2006 04:26:05 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src/autoconf aclocal.m4,1.182,1.183 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src/autoconf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6968/src/autoconf Modified Files: aclocal.m4=20 Log Message: regenerated Index: aclocal.m4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/autoconf/aclocal.m4,v retrieving revision 1.182 retrieving revision 1.183 diff -u -d -r1.182 -r1.183 --- aclocal.m4 14 Jul 2006 15:45:47 -0000 1.182 +++ aclocal.m4 12 Oct 2006 04:26:03 -0000 1.183 @@ -4297,6 +4297,6400 @@ prefix=3D"$acl_save_prefix" ]) =20 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +# serial 48 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. [...6369 lines suppressed...] + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=3D`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=3D$lt_ac_count + lt_cv_path_SED=3D$lt_ac_sed + fi + done +done +]) +SED=3D$lt_cv_path_SED +AC_MSG_RESULT([$SED]) +]) + dnl -*- Autoconf -*- dnl Copyright (C) 1993-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU ------------------------------ Message: 7 Date: Thu, 12 Oct 2006 04:26:06 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src configure,1.166,1.167 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6968/src Modified Files: configure=20 Log Message: regenerated Index: configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/configure,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- configure 1 Oct 2006 16:13:08 -0000 1.166 +++ configure 12 Oct 2006 04:26:03 -0000 1.167 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.113 2006/06/30 16:41:04 sds Exp= . +# From configure.in Id: configure.in,v 1.114 2006/10/12 04:15:37 sds Exp= . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for GNU CLISP 2.40 (2006-09-23). # @@ -247,6 +247,160 @@ $as_unset CDPATH =20 =20 + [...15547 lines suppressed...] +s,@ac_ct_F77@,$ac_ct_F77,;t t +s,@LIBTOOL@,$LIBTOOL,;t t s,@GROFF@,$GROFF,;t t s,@DVIPDF@,$DVIPDF,;t t s,@COMPRESS@,$COMPRESS,;t t @@ -38435,14 +53816,6 @@ s,@CC_NEED_CCPAUX@,$CC_NEED_CCPAUX,;t t s,@CC_NEED_DEEMA@,$CC_NEED_DEEMA,;t t s,@AS_UNDERSCORE@,$AS_UNDERSCORE,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@LIBICONV@,$LIBICONV,;t t s,@LTLIBICONV@,$LTLIBICONV,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t ------------------------------ Message: 8 Date: Thu, 12 Oct 2006 04:28:02 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/libsvm Makefile,1.1,1.2 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/modules/libsvm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7688/modules/libsvm Modified Files: Makefile=20 Log Message: C++ --> CXX Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/modules/libsvm/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 4 Oct 2006 00:53:35 -0000 1.1 +++ Makefile 12 Oct 2006 04:28:00 -0000 1.2 @@ -1,9 +1,9 @@ # Makefile for CLISP module set libsvm =20 CC =3D gcc -C++ =3D g++ +CXX =3D g++ CPPFLAGS =3D -MYCFLAGS =3D -O3 -ffast-math -Wall +CXXFLAGS =3D -O3 -ffast-math -Wall INCLUDES=3D .. =20 CLISP =3D clisp -q -norc @@ -20,7 +20,7 @@ all : libsvm.fas svm.so =20 svm.so : svm.cpp svm.h - $(C++) $(CPPFLAGS) $(MYCFLAGS) -I$(INCLUDES) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(INCLUDES) \ -shared -o svm.so svm.cpp -lm =20 libsvm.fas : libsvm.lisp ------------------------------ Message: 9 Date: Thu, 12 Oct 2006 09:26:13 +0000 From: J=C3=B6rg H=C3=B6hle <ho...@us...> Subject: clisp/modules/fastcgi fastcgi.lisp, 1.8, 1.9 fastcgi_wrappers.c, 1.3, 1.4 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/modules/fastcgi In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19165/modules/fastc= gi Modified Files: fastcgi.lisp fastcgi_wrappers.c=20 Log Message: Fix memory leak via :malloc-free allocation, check malloc(), untabify, reindent, small Lisp and C tweaks. Please test Index: fastcgi.lisp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/modules/fastcgi/fastcgi.lisp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- fastcgi.lisp 10 Oct 2006 00:18:51 -0000 1.8 +++ fastcgi.lisp 12 Oct 2006 09:26:11 -0000 1.9 @@ -22,8 +22,8 @@ (:documentation "Minimal bindings for FastCGI use from CLISP") (:use "LISP" "FFI") (:export "GETENV" - "SLURP-STDIN" "OUT" "WRITE-STDOUT" "WRITE-STDERR" "NL" - "IS-CGI" "ACCEPT" "FINISH" "WITH-LISTENER") + "SLURP-STDIN" "OUT" "WRITE-STDOUT" "WRITE-STDERR" "NL" + "IS-CGI" "ACCEPT" "FINISH" "WITH-LISTENER") ) =20 (in-package "FASTCGI") @@ -41,7 +41,7 @@ ; IS-CGI (defun is-cgi () "Return T iff this is an old-fashioned CGI request rather than FastCGI= mode." - (not (=3D 0 (fcgi_is_cgi_wrapper)))) + (fcgi_is_cgi_wrapper)) =20 ; ACCEPT (defun accept () @@ -67,22 +67,22 @@ (defun env () "ENV - Returns the entire set of environment variables as an alist" (do* ((kv (fcgi_env)) - (result nil) - (i (- (length kv) 2) (- i 2))) - ((< i 0) result) - (push (cons (aref kv i) (aref kv (1+ i))) result))) + (result nil) + (i (- (length kv) 2) (- i 2))) + ((< i 0) result) + (push (cons (aref kv i) (aref kv (1+ i))) result))) =20 ; WRITE-STDOUT (defun write-stdout (data) "(FASTCGI::WRITE-STDOUT string) - Write a string to standard output" ;; Do it in chunks since there seems to be FFI problems with large buf= fers (do* ((chunksize 65536) - (s (to-string data)) - (totlen (length s))) - ((=3D 0 (length s)) totlen) - (let ((to-write (min (length s) chunksize))) - (fcgi_write_stdout (subseq s 0 to-write) to-write) - (setf s (subseq s to-write))))) + (s (to-string data)) + (totlen (length s))) + ((=3D 0 (length s)) totlen) + (let ((to-write (min (length s) chunksize))) + (fcgi_write_stdout (subseq s 0 to-write) to-write) + (setf s (subseq s to-write))))) =20 ; WRITE-STDERR (defun write-stderr (data) @@ -98,9 +98,9 @@ (eof nil)) (eof result) (let ((buf (fcgi_read_stdin))) - (if (=3D 0 (length buf)) - (setf eof t) - (setf result (concatenate 'string result buf)))))) + (if (=3D 0 (length buf)) + (setf eof t) + (setf result (ext:string-concat result buf)))))) =20 ; Output functions =20 @@ -111,7 +111,7 @@ =20 ; NL ; Return newline -(defun nl () "Return a newline" (format nil "~%")) +(defun nl () "Return a newline" #\Newline) =20 =20 ; ---------------- Internal functions @@ -119,7 +119,7 @@ ; CAT ; Concatenate strings (defun cat (&rest args) - (apply #'concatenate 'string (mapcar #'to-string (flatten args)))) + (apply #'ext:string-concat (mapcar #'to-string (flatten args)))) =20 ; FLATTEN ; Flatten list (lifted from Paul Graham) @@ -136,21 +136,21 @@ (cond ((null s) "") ((stringp s) s) ((symbolp s) (symbol-name s)) - (t (format nil "~A" s)))) + (t (princ-to-string s)))) =20 ; CHECK-ACTIVE-REQUEST - Sanity check on use of library function (defun check-active-request (func) (when (not *fastcgi-request-active*) - (error "You must call FASTCGI:ACCEPT before using any other FastCGI fun= ction"))) + (error "You must call FASTCGI:ACCEPT before using any other FastCGI = function"))) =20 =20 =20 ; -------------- "C" functions -(c-lines "#include \"fastcgi.h\"~%") +;(c-lines "#include \"fastcgi.h\"~%"); completely wrapped =20 ; Our wrappers (def-call-out fcgi_getenv (:arguments (var c-string)) = (:return-type c-string)) -(def-call-out fcgi_env (:arguments) = (:return-type (c-array-ptr c-string))) +(def-call-out fcgi_env (:arguments) = (:return-type (c-array-ptr c-string) :malloc-free)) (def-call-out fcgi_read_stdin (:arguments) = (:return-type c-string)) (def-call-out fcgi_write_stdout (:arguments (data c-string) (length int)= ) (:return-type int)) (def-call-out fcgi_write_stderr (:arguments (data c-string) (length int)= ) (:return-type int)) @@ -158,6 +158,6 @@ ; Direct passthroughs to FCGI library (def-call-out fcgi_accept_wrapper (:arguments) (:return-type int)) (def-call-out fcgi_finish_wrapper (:arguments) (:return-type nil)) -(def-call-out fcgi_is_cgi_wrapper (:arguments) (:return-type int)) +(def-call-out fcgi_is_cgi_wrapper (:arguments) (:return-type boolean)) =20 ; End of fastcgi.lisp Index: fastcgi_wrappers.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/modules/fastcgi/fastcgi_wrappers.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fastcgi_wrappers.c 9 Oct 2006 17:48:27 -0000 1.3 +++ fastcgi_wrappers.c 12 Oct 2006 09:26:11 -0000 1.4 @@ -47,18 +47,19 @@ =20 /* Externally visible functions */ =20 -/* Searh environment for variable */ +/* Search environment for variable */ char * fcgi_getenv(char * var) { char **envp =3D environ; for ( ; *envp !=3D NULL; envp++) { - char * equ =3D strchr(*envp, '=3D'); - if ( ! equ ) - continue; - if ( 0 =3D=3D strncmp(var, *envp, equ - *envp) ) - return equ + 1; + char * equ =3D strchr(*envp, '=3D'); + if ( ! equ ) + continue; + /* FIXME implement exact match, not prefix matching */ + if ( 0 =3D=3D strncmp(var, *envp, equ - *envp) ) + return equ + 1; } /* Variable not found in environment */ - return 0; + return NULL; } =20 =20 @@ -66,15 +67,16 @@ array, e.g.: { "KEY0", "VAL0", "KEY1", "VAL1", NULL } */ =20 char ** fcgi_env() { - char **envp =3D environ, **result =3D 0; - int nvar =3D 0, i =3D 0; + char **envp =3D environ, **result =3D NULL; + int nvar =3D 0, i; =20 /* Count up # of vars. Allocate space for array of twice that many strings (key & value for each env var) plus a terminating NULL pointer. */ for ( ; *envp !=3D NULL; envp++ ) nvar++; - result =3D (char **) malloc(sizeof *result * (2 * nvar + 1)); + result =3D (char **) malloc(sizeof(*result) * (2 * nvar + 1)); + if ( ! result ) return NULL; =20 envp =3D environ; i =3D 0; @@ -86,7 +88,7 @@ and map it to NIL; this is distinct from "VAR=3D" which will map to the empty string */ result[i] =3D strdup(*envp); - result[i+1] =3D 0; + result[i+1] =3D NULL; } else { result[i] =3D strndup(*envp, equ - *envp); @@ -95,7 +97,7 @@ } =20 /* Terminate string array */ - result[i] =3D 0; + result[i] =3D NULL; return result; } =20 @@ -116,13 +118,13 @@ } static char * read_stdio(FILE * f) { =20 - static char buf[TEMPBUFSIZE + 1]; - size_t nact =3D 0; + static char buf[TEMPBUFSIZE + 1]; + size_t nact =3D 0; =20 if ( ! feof(f) ) - nact =3D fread(buf, 1, TEMPBUFSIZE, f); + nact =3D fread(buf, 1, TEMPBUFSIZE, f); if ( ferror(f) ) - nact =3D 0; + nact =3D 0; buf[nact] =3D '\0'; return buf; } @@ -138,8 +140,12 @@ return fwrite(data, 1, len, f); } =20 -/* Wrappers. These are needed only due to the user of upper case (how - annoying) */ +/* Wrappers. Can protect from possible implementation of FastCGI + API as preprocessor macros. + Also useful to decouple prototypes as defined in fcgiapp.h and + fcgi_stdio.h from these declared on the Lisp side + (e.g. bool/int or short/long) -- rather hypothetical. + */ int fcgi_is_cgi_wrapper() { return FCGX_IsCGI(); } ------------------------------ Message: 10 Date: Thu, 12 Oct 2006 09:26:59 +0000 From: J=C3=B6rg H=C3=B6hle <ho...@us...> Subject: clisp/src ChangeLog,1.5418,1.5419 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19193/src Modified Files: ChangeLog=20 Log Message: Fix memory leak via :malloc-free allocation, check malloc(), untabify, reindent, small Lisp and C tweaks. Please test Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5418 retrieving revision 1.5419 diff -u -d -r1.5418 -r1.5419 --- ChangeLog 12 Oct 2006 04:15:37 -0000 1.5418 +++ ChangeLog 12 Oct 2006 09:26:55 -0000 1.5419 @@ -1,3 +1,9 @@ +2006-10-12 J=C3=B6rg H=C3=B6hle <ho...@us...> + + * modules/fastcgi/fastcgi.lisp, fastcgi_wrappers.c (fcgi_env): + Fix memory leak via :malloc-free allocation, check malloc(), + untabify, reindent, small Lisp and C tweaks. + 2006-10-12 Sam Steingold <sd...@gn...> =20 * configure.in: call AC_CONFIG_AUX_DIR, AC_PROG_LIBTOOL, ------------------------------ ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job ea= sier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronim= o http://sel.as-us.falkag.net/sel?cmd=3Dlnk&kid=3D120709&bid=3D263057&dat=3D= 121642 ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 6, Issue 15 **************************************** |