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

cppchecker and some renaming

Browse source
This commit is contained in:
iceman1001 2021-04-20 11:00:39 +02:00
commit 8172c708c3
1 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

56
client/src/cmdscript.c
View file

@ -249,15 +249,20 @@ static int CmdScriptRun(const char *Cmd) {
arg_param_end arg_param_end
}; };
char preferredName[128] = {0}; int fnlen = 0;
char arguments[256] = {0}; char filename[128] = {0};
int name_len = 0;
int arg_len = 0; int arg_len = 0;
static uint8_t luascriptfile_idx = 0; char arguments[256] = {0};
sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
if ((strlen(preferredName) == 0) || sscanf(Cmd, "%127s%n %255[^\n\r]%n", filename, &fnlen, arguments, &arg_len);
(strcmp(preferredName, "-h") == 0) ||
(strcmp(preferredName, "--help") == 0)) { // hack
// since we don't want to use "-f" for script filename,
// and be able to send in parameters into script meanwhile
// being able to "-h" here too.
if ((strlen(filename) == 0) ||
(strcmp(filename, "-h") == 0) ||
(strcmp(filename, "--help") == 0)) {
ctx->argtable = argtable; ctx->argtable = argtable;
ctx->argtableLen = arg_getsize(argtable); ctx->argtableLen = arg_getsize(argtable);
CLIParserPrintHelp(ctx); CLIParserPrintHelp(ctx);
@ -265,8 +270,10 @@ static int CmdScriptRun(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
} }
CLIParserFree(ctx); CLIParserFree(ctx);
// try to detect a valid script file extention, case-insensitive
char *extension_chk; char *extension_chk;
extension_chk = str_dup(preferredName); extension_chk = str_dup(filename);
str_lower(extension_chk); str_lower(extension_chk);
pm3_scriptfile_t ext = PM3_UNSPECIFIED; pm3_scriptfile_t ext = PM3_UNSPECIFIED;
@ -282,8 +289,9 @@ static int CmdScriptRun(const char *Cmd) {
#endif #endif
free(extension_chk); free(extension_chk);
static uint8_t luascriptfile_idx = 0;
char *script_path = NULL; char *script_path = NULL;
if (((ext == PM3_LUA) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, preferredName, ".lua", true) == PM3_SUCCESS)) { if (((ext == PM3_LUA) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, LUA_SCRIPTS_SUBDIR, filename, ".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);
@ -337,11 +345,11 @@ static int CmdScriptRun(const char *Cmd) {
// close the Lua state // close the Lua state
lua_close(lua_state); lua_close(lua_state);
luascriptfile_idx--; luascriptfile_idx--;
PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName); PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), filename);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
if (((ext == PM3_CMD) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", true) == PM3_SUCCESS)) { if (((ext == PM3_CMD) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, CMD_SCRIPTS_SUBDIR, filename, ".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);
@ -379,14 +387,14 @@ static int CmdScriptRun(const char *Cmd) {
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
if (((ext == PM3_PY) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, preferredName, ".py", true) == PM3_SUCCESS)) { if (((ext == PM3_PY) || (ext == PM3_UNSPECIFIED)) && (searchFile(&script_path, PYTHON_SCRIPTS_SUBDIR, filename, ".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);
wchar_t *program = Py_DecodeLocale(preferredName, NULL); wchar_t *program = Py_DecodeLocale(filename, NULL);
if (program == NULL) { if (program == NULL) {
PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), preferredName); PrintAndLogEx(ERR, "could not decode " _YELLOW_("%s"), filename);
free(script_path); free(script_path);
return PM3_ESOFT; return PM3_ESOFT;
} }
@ -403,7 +411,7 @@ static int CmdScriptRun(const char *Cmd) {
char *argv[128]; char *argv[128];
int argc = split(arguments, argv); int argc = split(arguments, argv);
wchar_t *py_args[argc]; wchar_t *py_args[argc];
py_args[0] = Py_DecodeLocale(preferredName, NULL); py_args[0] = Py_DecodeLocale(filename, NULL);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
py_args[i + 1] = Py_DecodeLocale(argv[i], NULL); py_args[i + 1] = Py_DecodeLocale(argv[i], NULL);
} }
@ -424,15 +432,15 @@ static int CmdScriptRun(const char *Cmd) {
free(script_path); free(script_path);
return PM3_ESOFT; return PM3_ESOFT;
} }
int ret = Pm3PyRun_SimpleFileNoExit(f, preferredName); int ret = Pm3PyRun_SimpleFileNoExit(f, filename);
Py_Finalize(); Py_Finalize();
PyMem_RawFree(program); PyMem_RawFree(program);
free(script_path); free(script_path);
if (ret) { if (ret) {
PrintAndLogEx(WARNING, "\nfinished " _YELLOW_("%s") " with exception", preferredName); PrintAndLogEx(WARNING, "\nfinished " _YELLOW_("%s") " with exception", filename);
return PM3_ESOFT; return PM3_ESOFT;
} else { } else {
PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), preferredName); PrintAndLogEx(SUCCESS, "\nfinished " _YELLOW_("%s"), filename);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
} }
@ -441,17 +449,17 @@ static int CmdScriptRun(const char *Cmd) {
// file not found, let's search again to display the error messages // file not found, let's search again to display the error messages
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, filename, ".lua", false);
else if (ext == PM3_CMD) else if (ext == PM3_CMD)
ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, preferredName, ".cmd", false); ret = searchFile(&script_path, CMD_SCRIPTS_SUBDIR, filename, ".cmd", false);
#ifdef HAVE_PYTHON #ifdef HAVE_PYTHON
else 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, filename, ".py", false);
else if (ext == PM3_UNSPECIFIED) else if (ext == PM3_UNSPECIFIED)
PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd|py]", preferredName); PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd|py]", filename);
#else #else
else if (ext == PM3_UNSPECIFIED) else if (ext == PM3_UNSPECIFIED)
PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd]", preferredName); PrintAndLogEx(FAILED, "Error - can't find %s.[lua|cmd]", filename);
#endif #endif
free(script_path); free(script_path);
return ret; return ret;