ADD: some more keys

[proxmark3-svn] / client / cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index fd02d13a9151b10c01a1249ca712013cb8a463ed..87544a99114bbf74468d2806be67a460a5a6e6bf 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -64,7 +64,7 @@ int str_ends_with(const char * str, const char * suffix) {
  */
 int CmdHelp(const char * Cmd)
 {
  */
 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;
 }
 
     return 0;
 }
 


@@ -72,36 +72,37 @@ int CmdHelp(const char * Cmd)
 * Generate list of available commands, what it does is 
 * generate a file listing of the script-directory for files
 * ending with .lua
 * Generate list of available commands, what it does is 
 * generate a file listing of the script-directory for files
 * ending with .lua

+*

 */
 int CmdList(const char *Cmd)
 {
 */
 int CmdList(const char *Cmd)
 {

-    DIR *dp;

     struct dirent *ep;
     struct dirent *ep;

-    dp = opendir ("./scripts/");
-
-    if (dp != NULL)
-    {
-        while ((ep = readdir (dp)) != NULL)
-        {
-            if( str_ends_with(ep->d_name, ".lua"))
-                PrintAndLog("%-16s %s", ep->d_name, "A script file");
-        }
-        (void) closedir (dp);
-    }
-    else
-        PrintAndLog ("Couldn't open the scripts-directory");
+    DIR *dp = opendir ("./scripts/");
+       if ( dp == NULL ) {
+               PrintAndLog ("Couldn't open the scripts-directory");
+               return 1;
+       }
+
+       while ((ep = readdir (dp)) != NULL)
+       {
+               if(str_ends_with(ep->d_name, ".lua"))
+                       PrintAndLog("%-21s %s", ep->d_name, "A script file");
+       }
+       (void) closedir (dp);

     return 0;
 }
     return 0;
 }

+
+

 /**
  * Finds a matching script-file
  * @brief CmdScript
  * @param Cmd
  * @return
  */
 /**
  * Finds a matching script-file
  * @brief CmdScript
  * @param Cmd
  * @return
  */

-int CmdScript(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+int CmdScript(const char *Cmd) {
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0;

 }
 /**
  * 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)


@@ -152,17 +153,13 @@ 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, args'%s'\n",buf,arguments);
-
-
-
+    printf("--- Executing: %s, args'%s'\n", buf, arguments);

 
     // run the Lua script
 
     int error = luaL_loadfile(lua_state, buf);
     if(!error)
     {
 
     // run the Lua script
 
     int error = luaL_loadfile(lua_state, buf);
     if(!error)
     {

-

         lua_pushstring(lua_state, arguments);
         lua_setglobal(lua_state, "args");
 
         lua_pushstring(lua_state, arguments);
         lua_setglobal(lua_state, "args");