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

Lua extend error splash timeout and stop cutting off info

Browse source 
Change-Id: Ia1a9e39b9f203002cbbea85ef965e66c334b83fc
This commit is contained in:
William Wilgus 2019-09-06 20:19:42 -05:00
parent 267d04d2bd
commit bbd4a6cb91
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/lua/ldebug.c
View file

@ -708,7 +708,7 @@ static void addinfo (lua_State *L, const char *msg) {
char buff[LUA_IDSIZE]; /* add file:line information */ char buff[LUA_IDSIZE]; /* add file:line information */
int line = currentline(L, ci); int line = currentline(L, ci);
luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE); luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE);
luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); luaO_pushfstring(L, "%s: %d: %s", buff, line, msg);
} }
} }

7
apps/plugins/lua/rocklua.c
View file

@ -87,7 +87,7 @@ static int db_errorfb (lua_State *L) {
lua_pushliteral(L, ""); lua_pushliteral(L, "");
else if (!lua_isstring(L, arg+1)) return 1; /* message is not a string */ else if (!lua_isstring(L, arg+1)) return 1; /* message is not a string */
else lua_pushliteral(L, "\n"); else lua_pushliteral(L, "\n");
lua_pushliteral(L, "stack traceback:"); lua_pushliteral(L, "stack traceback: ");
while (lua_getstack(L1, level++, &ar)) { while (lua_getstack(L1, level++, &ar)) {
if (level > LEVELS1 && firstpart) { if (level > LEVELS1 && firstpart) {
/* no more than `LEVELS2' more levels? */ /* no more than `LEVELS2' more levels? */
@ -103,7 +103,8 @@ static int db_errorfb (lua_State *L) {
} }
lua_pushliteral(L, "\n\t"); lua_pushliteral(L, "\n\t");
lua_getinfo(L1, "Snl", &ar); lua_getinfo(L1, "Snl", &ar);
lua_pushfstring(L, "%s:", ar.short_src); char* filename = strrchr(ar.short_src, '/');
lua_pushfstring(L, "%s:", filename ? filename : ar.short_src);
if (ar.currentline > 0) if (ar.currentline > 0)
lua_pushfstring(L, "%d:", ar.currentline); lua_pushfstring(L, "%d:", ar.currentline);
if (*ar.namewhat != '\0') /* is there a name? */ if (*ar.namewhat != '\0') /* is there a name? */
@ -210,7 +211,7 @@ enum plugin_status plugin_start(const void* parameter)
if (lu_status) { if (lu_status) {
DEBUGF("%s\n", lua_tostring(Ls, -1)); DEBUGF("%s\n", lua_tostring(Ls, -1));
rb->splash(5 * HZ, lua_tostring(Ls, -1)); rb->splash(10 * HZ, lua_tostring(Ls, -1));
/*lua_pop(Ls, 1);*/ /*lua_pop(Ls, 1);*/
} }
lua_close(Ls); lua_close(Ls);