github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

script run: look for all three extensions if not specified

Browse source
This commit is contained in:
Philippe Teuwen 2020-05-27 00:40:01 +02:00
commit b4c715d8fb
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/src/cmdscript.c
View file

@ -34,11 +34,12 @@
#include "fileutils.h" #include "fileutils.h"
typedef enum { typedef enum {
PM3_UNSPECIFIED,
PM3_LUA, PM3_LUA,
PM3_CMD, PM3_CMD,
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
PM3_PY PM3_PY
#endif #endif
} pm3_scriptfile_t; } pm3_scriptfile_t;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -161,20 +162,20 @@ static int CmdScriptRun(const char *Cmd) {
char *extension_chk; char *extension_chk;
extension_chk = str_dup(preferredName); extension_chk = str_dup(preferredName);
str_lower(extension_chk); str_lower(extension_chk);
pm3_scriptfile_t ext = PM3_LUA; pm3_scriptfile_t ext = PM3_UNSPECIFIED;
if (str_endswith(extension_chk, ".lua")) {
if (str_endswith(extension_chk, ".cmd")) { ext = PM3_LUA;
} else if (str_endswith(extension_chk, ".cmd")) {
ext = PM3_CMD; ext = PM3_CMD;
} }
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
if (str_endswith(extension_chk, ".py")) { else if (str_endswith(extension_chk, ".py")) {
ext = PM3_PY; ext = PM3_PY;
} }
#endif #endif
char *script_path = NULL; char *script_path = NULL;
if ((ext == PM3_LUA) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) { if (((ext == PM3_LUA) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) {
int error; int error;
if (luascriptfile_idx == MAX_NESTED_LUASCRIPT) { if (luascriptfile_idx == MAX_NESTED_LUASCRIPT) {
PrintAndLogEx(ERR, "too many nested scripts, skipping %s\n", script_path); PrintAndLogEx(ERR, "too many nested scripts, skipping %s\n", script_path);
@ -230,7 +231,7 @@ static int CmdScriptRun(const char *Cmd) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
if ((ext == PM3_CMD) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) { if (((ext == PM3_CMD) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) {
PrintAndLogEx(SUCCESS, "executing Cmd " _YELLOW_("%s"), script_path); PrintAndLogEx(SUCCESS, "executing Cmd " _YELLOW_("%s"), script_path);
PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments); PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
@ -268,7 +269,7 @@ static int CmdScriptRun(const char *Cmd) {
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
if ((ext == PM3_PY) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) { if (((ext == PM3_PY) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) {
PrintAndLogEx(SUCCESS, "executing python " _YELLOW_("%s"), script_path); PrintAndLogEx(SUCCESS, "executing python " _YELLOW_("%s"), script_path);
PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments); PrintAndLogEx(SUCCESS, "args " _YELLOW_("'%s'"), arguments);
@ -323,13 +324,14 @@ static int CmdScriptRun(const char *Cmd) {
int ret = PM3_EUNDEF; int ret = PM3_EUNDEF;
if (ext == PM3_LUA) if (ext == PM3_LUA)
ret = searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", false); ret = searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", false);
else if (ext == PM3_CMD)
if (ext == PM3_CMD)
ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false); ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false);
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
if (ext == PM3_PY) else if (ext == PM3_PY)
ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false); ret = searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", false);
#endif #endif
else if (ext == PM3_UNSPECIFIED)
PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd|py]", preferredName);
free(script_path); free(script_path);
return ret; return ret;
} }