Reintegrated scripting-branch into trunk. yay

[proxmark3-svn] / client / cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index f9bbe56e0ed61a50b1bf8dbe4b6b31251c21d20b..f57724af24d898b9776d5f82d30ca1eb2c2e1acd 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -24,6 +24,7 @@
 #include "cmdmain.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"
+#include "pm3_binlib.h"
 
 #include <lua.h>
 #include <lualib.h>
@@ -64,6 +65,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. ");
+    return 0;
 }
 
 /**
@@ -76,9 +78,10 @@ int CmdList(const char *Cmd)
     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");
@@ -86,7 +89,7 @@ int CmdList(const char *Cmd)
         (void) closedir (dp);
     }
     else
-        PrintAndLog ("Couldn't open the directory");
+        PrintAndLog ("Couldn't open the scripts-directory");
     return 0;
 }
 /**
@@ -187,7 +190,14 @@ static void set_cmdlibraries(lua_State *L)
 
     //-- 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));
 }
 
 /**
@@ -210,20 +220,45 @@ int CmdRun(const char *Cmd)
 
     //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);
+
+//    char cmd_name[32];
+//    memset(cmd_name, 0, 32);
+//    sscanf(Cmd, "%31s%n", cmd_name, &len);
+
+    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---------------------------\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
@@ -235,12 +270,13 @@ int CmdRun(const char *Cmd)
         // 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("-----------------Finished\n");
+    printf("\n-----Finished\n");
+    return 0;
 }