#include "cmdmain.h"
#include "cmdscript.h"
#include "cmdhfmf.h"
-
+#include "pm3_binlib.h"
+#include "pm3_bitlib.h"
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
*/
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;
}
/**
DIR *dp;
struct dirent *ep;
dp = opendir ("./scripts/");
+
if (dp != NULL)
{
- while (ep = readdir (dp))
+ 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);
}
else
- PrintAndLog ("Couldn't open the directory");
+ PrintAndLog ("Couldn't open the scripts-directory");
return 0;
}
/**
* @param Cmd
* @return
*/
-int CmdScript(const char *Cmd)
-{
- CmdsParse(CommandTable, Cmd);
- return 0;
-}
-/*
-static int l_hfmf (lua_State *L) {
- return CmdHFMF("wohoo");
-
+int CmdScript(const char *Cmd) {
+ clearCommandBuffer();
+ CmdsParse(CommandTable, Cmd);
+ return 0;
}
-*/
-//static int l_CmdHelp(lua_State *L){ return CmdHelp(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfDbg(lua_State *L){ return CmdHF14AMfDbg(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfRdBl(lua_State *L){ return CmdHF14AMfRdBl(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfRdSc(lua_State *L){ return CmdHF14AMfRdSc(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfDump(lua_State *L){ return CmdHF14AMfDump(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMifare(lua_State *L){ return CmdHF14AMifare(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfWrBl(lua_State *L){ return CmdHF14AMfWrBl(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfChk(lua_State *L){ return CmdHF14AMfChk(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfNested(lua_State *L){ return CmdHF14AMfNested(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfRestore(lua_State *L){ return CmdHF14AMfRestore(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfSniff(lua_State *L){ return CmdHF14AMfSniff(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMf1kSim(lua_State *L){ return CmdHF14AMf1kSim(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfEClear(lua_State *L){ return CmdHF14AMfEClear(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfEGet(lua_State *L){ return CmdHF14AMfEGet(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfESet(lua_State *L){ return CmdHF14AMfESet(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfELoad(lua_State *L){ return CmdHF14AMfELoad(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfESave(lua_State *L){ return CmdHF14AMfESave(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfECFill(lua_State *L){ return CmdHF14AMfECFill(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfEKeyPrn(lua_State *L){ return CmdHF14AMfEKeyPrn(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCSetUID(lua_State *L){ return CmdHF14AMfCSetUID(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCSetBlk(lua_State *L){ return CmdHF14AMfCSetBlk(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCGetBlk(lua_State *L){ return CmdHF14AMfCGetBlk(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCGetSc(lua_State *L){ return CmdHF14AMfCGetSc(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCLoad(lua_State *L){ return CmdHF14AMfCLoad(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfCSave(lua_State *L){ return CmdHF14AMfCSave(luaL_checkstring(L, 1));}
-
-
-
-
-static void set_cmdlibraries(lua_State *L)
-{
- static const luaL_Reg hfmf_lib[] = {
- {"dbg", l_CmdHF14AMfDbg},
- {"rdbl", l_CmdHF14AMfRdBl},
- {"rdsc", l_CmdHF14AMfRdSc},
- {"dump", l_CmdHF14AMfDump},
- {"restore", l_CmdHF14AMfRestore},
- {"wrbl", l_CmdHF14AMfWrBl},
- {"chk", l_CmdHF14AMfChk},
- {"mifare", l_CmdHF14AMifare},
- {"nested", l_CmdHF14AMfNested},
- {"sniff", l_CmdHF14AMfSniff},
- {"sim", l_CmdHF14AMf1kSim},
- {"eclr", l_CmdHF14AMfEClear},
- {"eget", l_CmdHF14AMfEGet},
- {"eset", l_CmdHF14AMfESet},
- {"eload", l_CmdHF14AMfELoad},
- {"esave", l_CmdHF14AMfESave},
- {"ecfill", l_CmdHF14AMfECFill},
- {"ekeyprn", l_CmdHF14AMfEKeyPrn},
- {"csetuid", l_CmdHF14AMfCSetUID},
- {"csetblk", l_CmdHF14AMfCSetBlk},
- {"cgetblk", l_CmdHF14AMfCGetBlk},
- {"cgetsc", l_CmdHF14AMfCGetSc},
- {"cload", l_CmdHF14AMfCLoad},
- {"csave", l_CmdHF14AMfCSave},
- {NULL, NULL}
- };
-
- lua_pushglobaltable(L);
- // Core library is in this table. Contains 'hf'
-
- //this is 'hf' table
- lua_newtable(L);
-
- //this is the mf table
- lua_newtable(L);
-
- //Put the function into the hash table.
- for (int i = 0; hfmf_lib[i].name; i++) {
- lua_pushcfunction(L, hfmf_lib[i].func);
- lua_setfield(L, -2, hfmf_lib[i].name);//set the name, pop stack
- }
- //Name of 'mf'
- lua_setfield(L, -2, "mf");
-
- //Name of 'hf'
- lua_setfield(L, -2, "hf");
-
- //-- remove the global environment table from the stack
- lua_pop(L, 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));
}
/**
//Sets the pm3 core libraries, that go a bit 'under the hood'
set_pm3_libraries(lua_state);
- //Sets the 'command line' libraries, basically just the commandline stuff
- set_cmdlibraries(lua_state);
- char cmd_name[32];
- int len = 0;
- memset(cmd_name, 0, 32);
- sscanf(Cmd, "%31s%n", cmd_name, &len);
+ //Add the 'bin' library
+ set_bin_library(lua_state);
+
+ //Add the 'bit' library
+ set_bit_library(lua_state);
+
+ char script_name[128] = {0};
+ char arguments[256] = {0};
+
+ 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];
- snprintf(buf, sizeof buf, "./scripts/%s", cmd_name);
+ snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
+
+ printf("--- Executing: %s, args'%s'\n", buf, arguments);
- printf("-----Executing file '%s'\n" , cmd_name);
// run the Lua script
int error = luaL_loadfile(lua_state, buf);
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,
}
if(error) // if non-0, then an error
// get the top of the stack as the error and pop it off
const char * str = lua_tostring(lua_state, lua_gettop(lua_state));
lua_pop(lua_state, 1);
- printf(str);
+ puts(str);
}
//luaL_dofile(lua_state, buf);
// close the Lua state
lua_close(lua_state);
printf("\n-----Finished\n");
+ return 0;
}
projects / proxmark3-svn / blobdiff