Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make awesome.spawn() live up to its documentation 

This function is documented to return "an error string if an error
occurred". However, the function actually threw a Lua error instead.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2017-08-12 16:23:35 +02:00 committed by Daniel Hahler
parent 2b6350009e
commit cc0871498c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spawn.c
View File

@ -397,7 +397,11 @@ parse_command(lua_State *L, int idx, GError **error)
{ {
lua_rawgeti(L, idx, i+1); lua_rawgeti(L, idx, i+1);
if (lua_type(L, -1) != LUA_TSTRING) if (lua_type(L, -1) != LUA_TSTRING)
luaL_error(L, "Non-string argument at table index %d", i+1); {
g_set_error(error, G_SPAWN_ERROR, 0,
"Non-string argument at table index %zd", i+1);
return NULL;
}
} }
/* From this point on nothing can go wrong and so we can safely allocate /* From this point on nothing can go wrong and so we can safely allocate
@ -412,7 +416,9 @@ parse_command(lua_State *L, int idx, GError **error)
} }
else else
{ {
luaL_error(L, "Invalid argument to spawn(), expect string or table"); g_set_error_literal(error, G_SPAWN_ERROR, 0,
"Invalid argument to spawn(), expect string or table");
return NULL;
} }
return argv; return argv;