Reintegrated scripting-branch into trunk. yay

[proxmark3-svn] / client / cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index 74d2228a5934cd1b600174774c795ceacc19498a..f57724af24d898b9776d5f82d30ca1eb2c2e1acd 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -65,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;

 }
 
 /**
 }
 
 /**


@@ -80,7 +81,7 @@ int CmdList(const char *Cmd)
 
     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");


@@ -189,7 +190,6 @@ static void set_cmdlibraries(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)
 }
 /**
  * Utility to check the ending of a string (used to check file suffix)


@@ -228,8 +228,8 @@ int CmdRun(const char *Cmd)
 //    memset(cmd_name, 0, 32);
 //    sscanf(Cmd, "%31s%n", cmd_name, &len);
 
 //    memset(cmd_name, 0, 32);
 //    sscanf(Cmd, "%31s%n", cmd_name, &len);
 

-    char script_name[128];
-    char arguments[256];
+    char script_name[128] = {0};
+    char arguments[256] = {0};

 
     int name_len = 0;
     int arg_len = 0;
 
     int name_len = 0;
     int arg_len = 0;


@@ -244,7 +244,7 @@ int CmdRun(const char *Cmd)
     char buf[256];
     snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
 
     char buf[256];
     snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
 

-    printf("---Executing: %s with arguments '%s'\n",buf,arguments);
+    printf("--- Executing: %s, args'%s'\n",buf,arguments);

 
 
 
 
 
 


@@ -270,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);
         // 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");
     }
 
     //luaL_dofile(lua_state, buf);
     // close the Lua state
     lua_close(lua_state);
     printf("\n-----Finished\n");

+    return 0;

 }
 
 }