github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-31 03:50:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

In the middle of some work to get arguments into scripts. Also fixed so you don't have to specify .lua on 'script run foobar'

Browse source
This commit is contained in:
martin.holst@gmail.com 2013-09-16 19:04:29 +00:00
parent 500c972914
commit a403a55959
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
client/cmdscript.c
View file

@ -77,6 +77,7 @@ int CmdList(const char *Cmd)
DIR *dp; DIR *dp;
struct dirent *ep; struct dirent *ep;
dp = opendir ("./scripts/"); dp = opendir ("./scripts/");
if (dp != NULL) if (dp != NULL)
{ {
while (ep = readdir (dp)) while (ep = readdir (dp))
@ -87,7 +88,7 @@ int CmdList(const char *Cmd)
(void) closedir (dp); (void) closedir (dp);
} }
else else
PrintAndLog ("Couldn't open the directory"); PrintAndLog ("Couldn't open the scripts-directory");
return 0; return 0;
} }
/** /**
@ -190,6 +191,14 @@ static void set_cmdlibraries(lua_State *L)
lua_pop(L, 1); lua_pop(L, 1);
return 1; return 1;
} }
/**
* Utility to check the ending of a string (used to check file suffix)
*/
bool endsWith (char* base, char* str) {
int blen = strlen(base);
int slen = strlen(str);
return (blen >= slen) && (0 == strcmp(base + blen - slen, str));
}
/** /**
* @brief CmdRun - executes a script file. * @brief CmdRun - executes a script file.
@ -215,20 +224,41 @@ int CmdRun(const char *Cmd)
//Add the 'bin' library //Add the 'bin' library
set_bin_library(lua_state); set_bin_library(lua_state);
char cmd_name[32]; // char cmd_name[32];
int len = 0; // memset(cmd_name, 0, 32);
memset(cmd_name, 0, 32); // sscanf(Cmd, "%31s%n", cmd_name, &len);
sscanf(Cmd, "%31s%n", cmd_name, &len);
char script_name[128];
char arguments[256];
int name_len = 0;
int arg_len = 0;
sscanf(Cmd, "%127s%n %255[^\n\r]%n", script_name,&name_len, arguments, &arg_len);
char *suffix = "";
if(!endsWith(script_name,".lua"))
{
suffix = ".lua";
}
char buf[256]; char buf[256];
snprintf(buf, sizeof buf, "./scripts/%s", cmd_name); snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
printf("---Executing: %s with arguments '%s'\n",buf,arguments);
printf("-----Executing file '%s'\n" , cmd_name);
// run the Lua script // run the Lua script
int error = luaL_loadfile(lua_state, buf); int error = luaL_loadfile(lua_state, buf);
if(!error) if(!error)
{ {
lua_pushstring(lua_state, arguments);
lua_setglobal(lua_state, "args");
//Call it with 0 arguments
error = lua_pcall(lua_state, 0, LUA_MULTRET, 0); // once again, returns non-0 on error, error = lua_pcall(lua_state, 0, LUA_MULTRET, 0); // once again, returns non-0 on error,
} }
if(error) // if non-0, then an error if(error) // if non-0, then an error