d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: Print error messages from command failures at the prompt

Browse Source 
Previously lualoader would remain silent, rather than printing
command_errmsg or noting that a command had failed or was not found.

Approved by:	re (gjb)
This commit is contained in:
Kyle Evans 2018-08-31 15:02:53 +00:00
parent 505e91f500
commit 2ac6dfb0c2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stand/common/interp_lua.c
View File

@ -135,7 +135,7 @@ interp_run(const char *line)
char **argv;
lua_State *luap;
struct interp_lua_softc *softc = &lua_softc;
int status;
int status, ret;
luap = softc->luap;
LDBG("executing line...");
@ -147,14 +147,16 @@ interp_run(const char *line)
* run it through cli_execute. If that fails, then we'll try it
* as a builtin.
*/
command_errmsg = NULL;
if (parse(&argc, &argv, line) == 0) {
lua_getglobal(luap, "cli_execute");
for (nargc = 0; nargc < argc; ++nargc) {
lua_pushstring(luap, argv[nargc]);
}
status = lua_pcall(luap, argc, 1, 0);
ret = lua_tointeger(luap, 1);
lua_pop(luap, 1);
if (status != 0) {
if (status != 0 || ret != 0) {
/*
* Lua cli_execute will pass the function back
* through loader.command, which is a proxy to
@ -166,7 +168,10 @@ interp_run(const char *line)
status = interp_builtin_cmd(argc, argv);
}
if (status != 0) {
printf("Command failed\n");
if (command_errmsg != NULL)
printf("%s\n", command_errmsg);
else
printf("Command failed\n");
status = CMD_ERROR;
}
free(argv);