X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/77cd612f15cb8b50229dbba5e8ec18c8a0bca6f5..3e750be37cd8e3231ae02260be6899391d206cb4:/client/cmdscript.c?ds=sidebyside diff --git a/client/cmdscript.c b/client/cmdscript.c index 928a216d..e9ec5871 100644 --- a/client/cmdscript.c +++ b/client/cmdscript.c @@ -64,7 +64,7 @@ int str_ends_with(const char * str, const char * suffix) { */ int CmdHelp(const char * Cmd) { - PrintAndLog("This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. "); + PrintAndLog("This is a feature to run Lua-scripts. You can place lua-scripts within the ´client/scripts/´ folder."); return 0; } @@ -83,8 +83,8 @@ int CmdList(const char *Cmd) { while ((ep = readdir (dp)) != NULL) { - if(ep->d_name != NULL && str_ends_with(ep->d_name, ".lua")) - PrintAndLog("%-16s %s", ep->d_name, "A script file"); + if(str_ends_with(ep->d_name, ".lua")) + PrintAndLog("%-21s %s", ep->d_name, "A script file"); } (void) closedir (dp); } @@ -98,10 +98,10 @@ int CmdList(const char *Cmd) * @param Cmd * @return */ -int CmdScript(const char *Cmd) -{ - CmdsParse(CommandTable, Cmd); - return 0; +int CmdScript(const char *Cmd) { + clearCommandBuffer(); + CmdsParse(CommandTable, Cmd); + return 0; } /** * Utility to check the ending of a string (used to check file suffix) @@ -152,17 +152,13 @@ int CmdRun(const char *Cmd) char buf[256]; snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix); - printf("--- Executing: %s, args'%s'\n",buf,arguments); - - - + printf("--- Executing: %s, args'%s'\n", buf, arguments); // run the Lua script int error = luaL_loadfile(lua_state, buf); if(!error) { - lua_pushstring(lua_state, arguments); lua_setglobal(lua_state, "args");