devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Lua: add touchscreen_set_mode & current_path (+ some constants)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21165 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-06-01 22:31:32 +00:00
parent 82eea9ed69
commit 9c3e679d18
3 changed files with 59 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/plugins/lua/lauxlib.c
View file

@ -560,24 +560,35 @@ static int errfile (lua_State *L, const char *what, int fnameindex) {
return LUA_ERRFILE;
}
static void make_path(char* dest, size_t dest_size, char* curfile, char* newfile)
bool get_cur_path(lua_State *L, char* dest, size_t dest_size)
{
char* pos = rb->strrchr(curfile, '/');
if(pos != NULL)
lua_Debug ar;
if(lua_getstack(L, 1, &ar))
{
unsigned int len = (unsigned int)(pos - curfile);
len = len + 1 > dest_size ? dest_size - 1 : len;
/* Try determining the base path of the current Lua chunk
and write it to dest. */
lua_getinfo(L, "S", &ar);
if(len > 0)
memcpy(dest, curfile, len);
char* curfile = (char*) &ar.source[1];
char* pos = rb->strrchr(curfile, '/');
if(pos != NULL)
{
unsigned int len = (unsigned int)(pos - curfile);
len = len + 1 > dest_size ? dest_size - 1 : len;
dest[len] = '/';
dest[len+1] = '\0';
if(len > 0)
memcpy(dest, curfile, len);
dest[len] = '/';
dest[len+1] = '\0';
return true;
}
else
return false;
}
else
dest[0] = '\0';
strncat(dest, newfile, dest_size - strlen(dest));
return false;
}
LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
@ -590,13 +601,8 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
if(lf.f < 0) {
/* Fallback */
lua_Debug ar;
if(lua_getstack(L, 1, &ar)) {
lua_getinfo(L, "S", &ar);
/* Try determining the base path of the current Lua chunk
and prepend it to filename in buffer. */
make_path(buffer, sizeof(buffer), (char*)&ar.source[1], (char*)filename);
if(get_cur_path(L, buffer, sizeof(buffer))) {
strncat(buffer, filename, sizeof(buffer) - strlen(buffer));
lf.f = rb->open(buffer, O_RDONLY);
}