diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-13 15:32:04 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-13 15:32:04 +0000 |
| commit | df11154ba3b73defc5357794dfa84be31f1aec4b (patch) | |
| tree | 4e95ce850ae321d65005648f549cf374064e1c55 | |
| parent | 15798344bfadcece86352c938a8532590cbb3ab2 (diff) | |
contrib/lar: get rid of hardcoded buffer size in larlib
| -rw-r--r-- | contrib/lar/larlib.c | 4 | ||||
| -rw-r--r-- | contrib/lar/openwrt/050-lar-source-loader.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lar/larlib.c b/contrib/lar/larlib.c index 5467ed5b9..aa9280a09 100644 --- a/contrib/lar/larlib.c +++ b/contrib/lar/larlib.c @@ -145,7 +145,7 @@ static int larlib_mkpath( const char *name, const char *path, char *buffer ) int nlen = strlen(name); int plen = strlen(path); - if( (nlen + plen + 1) <= 1024 ) + if( (nlen + plen + 1) <= LAR_FNAME_BUFFER ) { strcpy(buffer, path); @@ -451,10 +451,10 @@ int larlib_findfile( lua_State *L ) int i; const char *filename = luaL_checkstring( L, 1 ); const char *basepath = luaL_optstring( L, 2, "./" ); - char filepath[1024]; struct stat s; lar_archive *ar; lar_member *mb; + LAR_FNAME(filepath); const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR }; diff --git a/contrib/lar/openwrt/050-lar-source-loader.patch b/contrib/lar/openwrt/050-lar-source-loader.patch index 9e5e8cf85..c2e1c5966 100644 --- a/contrib/lar/openwrt/050-lar-source-loader.patch +++ b/contrib/lar/openwrt/050-lar-source-loader.patch @@ -456,7 +456,7 @@ diff -Nbur lua-5.1.4.orig/src/lar.h lua-5.1.4/src/lar.h +#endif diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c --- lua-5.1.4.orig/src/larlib.c 1970-01-01 01:00:00.000000000 +0100 -+++ lua-5.1.4/src/larlib.c 2009-04-13 16:51:15.000000000 +0200 ++++ lua-5.1.4/src/larlib.c 2009-04-13 17:24:57.000000000 +0200 @@ -0,0 +1,540 @@ +/* + * lar - Lua Archive Library @@ -605,7 +605,7 @@ diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c + int nlen = strlen(name); + int plen = strlen(path); + -+ if( (nlen + plen + 1) <= 1024 ) ++ if( (nlen + plen + 1) <= LAR_FNAME_BUFFER ) + { + strcpy(buffer, path); + @@ -911,10 +911,10 @@ diff -Nbur lua-5.1.4.orig/src/larlib.c lua-5.1.4/src/larlib.c + int i; + const char *filename = luaL_checkstring( L, 1 ); + const char *basepath = luaL_optstring( L, 2, "./" ); -+ char filepath[1024]; + struct stat s; + lar_archive *ar; + lar_member *mb; ++ LAR_FNAME(filepath); + + const char *searchpath[3] = { basepath, LUA_LDIR, LUA_CDIR }; + |