From f98c4d366692382c5fd0c014a54369c37e4cfebd Mon Sep 17 00:00:00 2001 From: lxsang Date: Sat, 30 Nov 2019 19:46:03 +0000 Subject: [PATCH] fix lib --- .gitignore | 5 ++++- APIs/std.lua | 2 +- lib/ann/Makefile | 26 +++++++++++++------------- plugin-wrapper.c | 6 +++--- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 139e1cd..5de591d 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,7 @@ config.sub configure aclocal.m4 ltmain.sh -Makefile.in \ No newline at end of file +Makefile.in +# others +3rd/lua-5.3.4/lua +3rd/lua-5.3.4/luac diff --git a/APIs/std.lua b/APIs/std.lua index d4d76fd..81e9d2e 100644 --- a/APIs/std.lua +++ b/APIs/std.lua @@ -46,7 +46,7 @@ function std.f(v) std._f(HTTP_REQUEST.id,v) end function std.fb(v) - std._fb(HTTP_REQUEST.id,v) + std._f(HTTP_REQUEST.id,v) end function std.setCookie(t,v,p) p = p or "" diff --git a/lib/ann/Makefile b/lib/ann/Makefile index 7aa6586..a535aa9 100644 --- a/lib/ann/Makefile +++ b/lib/ann/Makefile @@ -240,21 +240,21 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -ACLOCAL = ${SHELL} /home/mrsang/build/antd-lua-plugin/missing aclocal-1.15 +ACLOCAL = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /home/mrsang/build/antd-lua-plugin/missing autoconf -AUTOHEADER = ${SHELL} /home/mrsang/build/antd-lua-plugin/missing autoheader -AUTOMAKE = ${SHELL} /home/mrsang/build/antd-lua-plugin/missing automake-1.15 -AWK = gawk +AUTOCONF = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/missing autoconf +AUTOHEADER = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/missing autoheader +AUTOMAKE = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/missing automake-1.15 +AWK = mawk CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 CPP = gcc -E CPPFLAGS = CYGPATH_W = echo -DEFS = -DPACKAGE_NAME=\"lua\" -DPACKAGE_TARNAME=\"lua\" -DPACKAGE_VERSION=\"0.5.2b\" -DPACKAGE_STRING=\"lua\ 0.5.2b\" -DPACKAGE_BUGREPORT=\"xsang.le@gmail.com\" -DPACKAGE_URL=\"\" -DPACKAGE=\"lua\" -DVERSION=\"0.5.2b\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBANTD=1 -DUSE_DB=1 -DHAVE_LIBSQLITE3=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBDL=1 -DHAVE_LIBM=1 -DHAVE_LIBREADLINE=1 -D_GNU_SOURCE=1 -DLINUX=1 -DHAVE_LIBCRYPT=1 +DEFS = -DPACKAGE_NAME=\"lua\" -DPACKAGE_TARNAME=\"lua\" -DPACKAGE_VERSION=\"0.5.2b\" -DPACKAGE_STRING=\"lua\ 0.5.2b\" -DPACKAGE_BUGREPORT=\"xsang.le@gmail.com\" -DPACKAGE_URL=\"\" -DPACKAGE=\"lua\" -DVERSION=\"0.5.2b\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBANTD=1 -DUSE_DB=1 -DHAVE_LIBSQLITE3=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBDL=1 -DHAVE_LIBM=1 -DHAVE_LIBREADLINE=1 -D_GNU_SOURCE=1 -DDEBUG=1 -DLINUX=1 -DHAVE_LIBCRYPT=1 DEPDIR = .deps DLLTOOL = false DSYMUTIL = @@ -280,7 +280,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /home/mrsang/build/antd-lua-plugin/missing makeinfo +MAKEINFO = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B @@ -303,10 +303,10 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip VERSION = 0.5.2b -abs_builddir = /home/mrsang/build/antd-lua-plugin/lib/ann -abs_srcdir = /home/mrsang/build/antd-lua-plugin/lib/ann -abs_top_builddir = /home/mrsang/build/antd-lua-plugin -abs_top_srcdir = /home/mrsang/build/antd-lua-plugin +abs_builddir = /src/cwp/ant-plugins/antd-lua-plugin/lib/ann +abs_srcdir = /src/cwp/ant-plugins/antd-lua-plugin/lib/ann +abs_top_builddir = /src/cwp/ant-plugins/antd-lua-plugin +abs_top_srcdir = /src/cwp/ant-plugins/antd-lua-plugin ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -336,7 +336,7 @@ host_vendor = pc htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/mrsang/build/antd-lua-plugin/install-sh +install_sh = ${SHELL} /src/cwp/ant-plugins/antd-lua-plugin/install-sh libdir = $(prefix)/lib/lua/ libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -345,7 +345,7 @@ mandir = ${datarootdir}/man mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr/local +prefix = /src/www program_transform_name = s,x,x, psdir = ${docdir} runstatedir = ${localstatedir}/run diff --git a/plugin-wrapper.c b/plugin-wrapper.c index e9d2181..8c5511e 100644 --- a/plugin-wrapper.c +++ b/plugin-wrapper.c @@ -112,12 +112,12 @@ static int l_f (lua_State *L) { } //int __fb(int, const char*); -static int l_fb (lua_State *L) { +/*static int l_fb (lua_State *L) { void* client = lua_touserdata (L, 1); const char* v = luaL_checkstring(L, 2); lua_pushnumber(L, __fb(client,v)); return 1; -} +}*/ //int upload(const char*, const char*); static int l_upload (lua_State *L) { @@ -497,7 +497,7 @@ static const struct luaL_Reg standard [] = { {"_ti", l_ti} , {"_t", l_t} , {"_f", l_f} , - {"_fb", l_fb} , + //{"_fb", l_fb} , {"trim", l_trim}, {"upload", l_upload} , {"route", l_route} ,