gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix package.searchpath().

Browse Source
This commit is contained in:
Mike Pall 2012-09-21 16:14:17 +02:00
parent 40afe71c3f
commit 98f05808fa
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib_package.c
View File

@ -279,10 +279,13 @@ static const char *pushnexttemplate(lua_State *L, const char *path)
} }
static const char *searchpath (lua_State *L, const char *name, static const char *searchpath (lua_State *L, const char *name,
const char *path) const char *path, const char *sep,
const char *dirsep)
{ {
name = luaL_gsub(L, name, ".", LUA_DIRSEP); luaL_Buffer msg; /* to build error message */
lua_pushliteral(L, ""); /* error accumulator */ luaL_buffinit(L, &msg);
if (*sep != '\0') /* non-empty separator? */
name = luaL_gsub(L, name, sep, dirsep); /* replace it by 'dirsep' */
while ((path = pushnexttemplate(L, path)) != NULL) { while ((path = pushnexttemplate(L, path)) != NULL) {
const char *filename = luaL_gsub(L, lua_tostring(L, -1), const char *filename = luaL_gsub(L, lua_tostring(L, -1),
LUA_PATH_MARK, name); LUA_PATH_MARK, name);
@ -291,14 +294,18 @@ static const char *searchpath (lua_State *L, const char *name,
return filename; /* return that file name */ return filename; /* return that file name */
lua_pushfstring(L, "\n\tno file " LUA_QS, filename); lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
lua_remove(L, -2); /* remove file name */ lua_remove(L, -2); /* remove file name */
lua_concat(L, 2); /* add entry to possible error message */ luaL_addvalue(&msg); /* concatenate error msg. entry */
} }
luaL_pushresult(&msg); /* create error message */
return NULL; /* not found */ return NULL; /* not found */
} }
static int lj_cf_package_searchpath(lua_State *L) static int lj_cf_package_searchpath(lua_State *L)
{ {
const char *f = searchpath(L, luaL_checkstring(L, 1), luaL_checkstring(L, 2)); const char *f = searchpath(L, luaL_checkstring(L, 1),
luaL_checkstring(L, 2),
luaL_optstring(L, 3, "."),
luaL_optstring(L, 4, LUA_DIRSEP));
if (f != NULL) { if (f != NULL) {
return 1; return 1;
} else { /* error message is on top of the stack */ } else { /* error message is on top of the stack */
@ -316,7 +323,7 @@ static const char *findfile(lua_State *L, const char *name,
path = lua_tostring(L, -1); path = lua_tostring(L, -1);
if (path == NULL) if (path == NULL)
luaL_error(L, LUA_QL("package.%s") " must be a string", pname); luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
return searchpath(L, name, path); return searchpath(L, name, path, ".", LUA_DIRSEP);
} }
static void loaderror(lua_State *L, const char *filename) static void loaderror(lua_State *L, const char *filename)