Only superficial changes, to get rid of compiler warnings

[proxmark3-svn] / client / cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index fde6d62d1eb7882545913016119259cefe007fc2..f57724af24d898b9776d5f82d30ca1eb2c2e1acd 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -1,11 +1,11 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+// Copyright (C) 2013 m h swende <martin at swende.se>

 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Data and Graph commands
+// Some lua scripting glue to proxmark core.

 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>


@@ -16,6 +16,7 @@
 #include <dirent.h>
 
 #include "proxmark3.h"
 #include <dirent.h>
 
 #include "proxmark3.h"

+#include "scripting.h"

 #include "data.h"
 #include "ui.h"
 #include "graph.h"
 #include "data.h"
 #include "ui.h"
 #include "graph.h"


@@ -23,13 +24,13 @@
 #include "cmdmain.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"
 #include "cmdmain.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"

+#include "pm3_binlib.h"

 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
 
 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
 

-

 static int CmdHelp(const char *Cmd);
 static int CmdList(const char *Cmd);
 static int CmdRun(const char *Cmd);
 static int CmdHelp(const char *Cmd);
 static int CmdList(const char *Cmd);
 static int CmdRun(const char *Cmd);


@@ -37,8 +38,8 @@ static int CmdRun(const char *Cmd);
 command_t CommandTable[] =
 {
   {"help",  CmdHelp, 1, "This help"},
 command_t CommandTable[] =
 {
   {"help",  CmdHelp, 1, "This help"},

-  {"list",  CmdList, 1, "<name> -- List available scripts"},
-  {"run",   CmdRun,  1, "Execute a script"},
+  {"list",  CmdList, 1, "List available scripts"},
+  {"run",   CmdRun,  1, "<name> -- Execute a script"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 


@@ -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. ");
 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/");
     DIR *dp;
     struct dirent *ep;
     dp = opendir ("./scripts/");

+

     if (dp != NULL)
     {
     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(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
         (void) closedir (dp);
     }
     else

-        PrintAndLog ("Couldn't open the directory");
+        PrintAndLog ("Couldn't open the scripts-directory");

     return 0;
 }
 /**
     return 0;
 }
 /**


@@ -135,10 +138,9 @@ static int l_CmdHF14AMfCSave(lua_State *L){ return CmdHF14AMfCSave(luaL_checkstr
 
 
 
 
 
 

-static void set_libraries(lua_State *L)
+static void set_cmdlibraries(lua_State *L)

 {
     static const luaL_Reg hfmf_lib[] = {
 {
     static const luaL_Reg hfmf_lib[] = {

-        //{"help",    l_CmdHelp},

         {"dbg",     l_CmdHF14AMfDbg},
         {"rdbl",    l_CmdHF14AMfRdBl},
         {"rdsc",    l_CmdHF14AMfRdSc},
         {"dbg",     l_CmdHF14AMfDbg},
         {"rdbl",    l_CmdHF14AMfRdBl},
         {"rdsc",    l_CmdHF14AMfRdSc},


@@ -188,7 +190,14 @@ static void set_libraries(lua_State *L)
 
     //-- remove the global environment table from the stack
     lua_pop(L, 1);
 
     //-- 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));

 }
 
 /**
 }
 
 /**


@@ -205,20 +214,69 @@ int CmdRun(const char *Cmd)
 
     // load Lua libraries
     luaL_openlibs(lua_state);
 
     // load Lua libraries
     luaL_openlibs(lua_state);

-    set_libraries(lua_state);
-    char cmd_name[32];
-    int len = 0;
-    memset(cmd_name, 0, 32);
-    sscanf(Cmd, "%31s%n", cmd_name, &len);
+
+    //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);
+
+    //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];
 
     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
     // run the Lua script

-    luaL_dofile(lua_state, buf);
+
+    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
+    {
+        // the top of the stack should be the error string
+        if (!lua_isstring(lua_state, lua_gettop(lua_state)))
+            printf( "Error - but no 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);
+        puts(str);
+    }
+
+    //luaL_dofile(lua_state, buf);

     // close the Lua state
     lua_close(lua_state);
     // close the Lua state
     lua_close(lua_state);

-    printf("-----------------Finished\n");
+    printf("\n-----Finished\n");
+    return 0;

 }
 
 }