diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/lua/ldebug.c | 2 | ||||
-rw-r--r-- | apps/plugins/lua/rocklua.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/lua/ldebug.c b/apps/plugins/lua/ldebug.c index cf882467d0..0b3c5721f3 100644 --- a/apps/plugins/lua/ldebug.c +++ b/apps/plugins/lua/ldebug.c | |||
@@ -708,7 +708,7 @@ static void addinfo (lua_State *L, const char *msg) { | |||
708 | char buff[LUA_IDSIZE]; /* add file:line information */ | 708 | char buff[LUA_IDSIZE]; /* add file:line information */ |
709 | int line = currentline(L, ci); | 709 | int line = currentline(L, ci); |
710 | luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE); | 710 | luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE); |
711 | luaO_pushfstring(L, "%s:%d: %s", buff, line, msg); | 711 | luaO_pushfstring(L, "%s: %d: %s", buff, line, msg); |
712 | } | 712 | } |
713 | } | 713 | } |
714 | 714 | ||
diff --git a/apps/plugins/lua/rocklua.c b/apps/plugins/lua/rocklua.c index cb2b6eb161..b6e7a02261 100644 --- a/apps/plugins/lua/rocklua.c +++ b/apps/plugins/lua/rocklua.c | |||
@@ -87,7 +87,7 @@ static int db_errorfb (lua_State *L) { | |||
87 | lua_pushliteral(L, ""); | 87 | lua_pushliteral(L, ""); |
88 | else if (!lua_isstring(L, arg+1)) return 1; /* message is not a string */ | 88 | else if (!lua_isstring(L, arg+1)) return 1; /* message is not a string */ |
89 | else lua_pushliteral(L, "\n"); | 89 | else lua_pushliteral(L, "\n"); |
90 | lua_pushliteral(L, "stack traceback:"); | 90 | lua_pushliteral(L, "stack traceback: "); |
91 | while (lua_getstack(L1, level++, &ar)) { | 91 | while (lua_getstack(L1, level++, &ar)) { |
92 | if (level > LEVELS1 && firstpart) { | 92 | if (level > LEVELS1 && firstpart) { |
93 | /* no more than `LEVELS2' more levels? */ | 93 | /* no more than `LEVELS2' more levels? */ |
@@ -103,7 +103,8 @@ static int db_errorfb (lua_State *L) { | |||
103 | } | 103 | } |
104 | lua_pushliteral(L, "\n\t"); | 104 | lua_pushliteral(L, "\n\t"); |
105 | lua_getinfo(L1, "Snl", &ar); | 105 | lua_getinfo(L1, "Snl", &ar); |
106 | lua_pushfstring(L, "%s:", ar.short_src); | 106 | char* filename = strrchr(ar.short_src, '/'); |
107 | lua_pushfstring(L, "%s:", filename ? filename : ar.short_src); | ||
107 | if (ar.currentline > 0) | 108 | if (ar.currentline > 0) |
108 | lua_pushfstring(L, "%d:", ar.currentline); | 109 | lua_pushfstring(L, "%d:", ar.currentline); |
109 | if (*ar.namewhat != '\0') /* is there a name? */ | 110 | if (*ar.namewhat != '\0') /* is there a name? */ |
@@ -210,7 +211,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
210 | 211 | ||
211 | if (lu_status) { | 212 | if (lu_status) { |
212 | DEBUGF("%s\n", lua_tostring(Ls, -1)); | 213 | DEBUGF("%s\n", lua_tostring(Ls, -1)); |
213 | rb->splash(5 * HZ, lua_tostring(Ls, -1)); | 214 | rb->splash(10 * HZ, lua_tostring(Ls, -1)); |
214 | /*lua_pop(Ls, 1);*/ | 215 | /*lua_pop(Ls, 1);*/ |
215 | } | 216 | } |
216 | lua_close(Ls); | 217 | lua_close(Ls); |