diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-05 02:33:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-05 02:33:41 +0000 |
| commit | 7890792f4967f636a74f6033f30b12273057e47a (patch) | |
| tree | 0a3bb2079cd2f021b6d61ab276d8a40a9d4630d6 /package/lua/patches-host | |
| parent | 666ebf2004f9529689e0d3763dc0ebbf960dcf93 (diff) | |
| download | upstream-7890792f4967f636a74f6033f30b12273057e47a.tar.gz upstream-7890792f4967f636a74f6033f30b12273057e47a.tar.bz2 upstream-7890792f4967f636a74f6033f30b12273057e47a.zip | |
[package] lua: add zlib build dependency, fix inaccuracy in gzip loader
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15109 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/lua/patches-host')
| -rw-r--r-- | package/lua/patches-host/040-gzip-source-loader.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package/lua/patches-host/040-gzip-source-loader.patch b/package/lua/patches-host/040-gzip-source-loader.patch index 6fbafa206d..8214ae9f87 100644 --- a/package/lua/patches-host/040-gzip-source-loader.patch +++ b/package/lua/patches-host/040-gzip-source-loader.patch @@ -12,7 +12,7 @@ diff -ur lua-5.1.4.orig/src/Makefile lua-5.1.4/src/Makefile MYLDFLAGS= diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c --- lua-5.1.4.orig/src/lauxlib.c 2009-04-04 23:06:04.000000000 +0200 -+++ lua-5.1.4/src/lauxlib.c 2009-04-05 00:03:33.000000000 +0200 ++++ lua-5.1.4/src/lauxlib.c 2009-04-05 03:35:24.000000000 +0200 @@ -11,6 +11,7 @@ #include <stdio.h> #include <stdlib.h> @@ -34,7 +34,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c static const char *getF (lua_State *L, void *ud, size_t *size) { LoadF *lf = (LoadF *)ud; -@@ -550,6 +557,26 @@ +@@ -550,6 +557,28 @@ } @@ -47,7 +47,9 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c + if (*size > 0) { + if (lf->first_chunk) { + lf->first_chunk = 0; -+ if (strstr(lf->buffer, "#!") && (sp=strstr(lf->buffer, "\n")) != NULL) { ++ if ((lf->buffer[0] == '#') && (lf->buffer[1] == '!') && ++ (sp=strstr(lf->buffer, "\n")) != NULL) ++ { + *size -= ((uint)sp - (uint)lf->buffer); + return sp; + } @@ -61,7 +63,7 @@ diff -ur lua-5.1.4.orig/src/lauxlib.c lua-5.1.4/src/lauxlib.c static int errfile (lua_State *L, const char *what, int fnameindex) { const char *serr = strerror(errno); const char *filename = lua_tostring(L, fnameindex) + 1; -@@ -560,6 +587,31 @@ +@@ -560,6 +589,31 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) { |