X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0a85b72549d294b127c3224610870be4f9382f9a..dca8220f729d7855b12c89ecb402958ce6dbc81b:/client/cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index 8c1acf27..0d19f496 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -25,12 +25,11 @@
 #include "cmdscript.h"
 #include "cmdhfmf.h"
 #include "pm3_binlib.h"
-
+#include "pm3_bitlib.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);
@@ -77,13 +76,19 @@ int CmdList(const char *Cmd)
 {
     DIR *dp;
     struct dirent *ep;
-    dp = opendir ("./scripts/");
+	char const * exedir = get_my_executable_directory();
+	if (exedir == NULL)
+	    return 0;
+	char script_directory_path[strlen(exedir) + strlen(LUA_SCRIPTS_DIRECTORY) + 1];
+	strcpy(script_directory_path, exedir);
+	strcat(script_directory_path, LUA_SCRIPTS_DIRECTORY);
+    dp = opendir(script_directory_path);
 
     if (dp != NULL)
     {
         while ((ep = readdir (dp)) != NULL)
         {
-            if(ep->d_name != NULL && str_ends_with(ep->d_name, ".lua"))
+            if(str_ends_with(ep->d_name, ".lua"))
                 PrintAndLog("%-16s %s", ep->d_name, "A script file");
         }
         (void) closedir (dp);
@@ -133,6 +138,8 @@ int CmdRun(const char *Cmd)
     //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};
@@ -147,17 +154,19 @@ int CmdRun(const char *Cmd)
         suffix = ".lua";
     }
 
-    char buf[256];
-    snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
-
-    printf("--- Executing: %s, args'%s'\n",buf,arguments);
+	char script_path[strlen(get_my_executable_directory()) + strlen(LUA_SCRIPTS_DIRECTORY) + strlen(script_name) + strlen(suffix) + 1];
+	strcpy(script_path, get_my_executable_directory());
+	strcat(script_path, LUA_SCRIPTS_DIRECTORY);
+	strcat(script_path, script_name);
+	strcat(script_path, suffix);
 
+    printf("--- Executing: %s%s, args '%s'\n", script_name, suffix, arguments);
 
 
 
     // run the Lua script
 
-    int error = luaL_loadfile(lua_state, buf);
+    int error = luaL_loadfile(lua_state, script_path);
     if(!error)
     {