github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-13 18:17:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull filenamemcopy out of searchFile

Browse source
This commit is contained in:
Philippe Teuwen 2019-08-23 23:07:05 +02:00
commit b09849c91b
3 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/cmdscript.c
View file

@ -59,18 +59,23 @@ static int CmdScriptRun(const char *Cmd) {
//Add the 'bit' library //Add the 'bit' library
set_bit_library(lua_state); set_bit_library(lua_state);
char script_name[128] = {0}; char preferredName[128] = {0};
char arguments[256] = {0}; char arguments[256] = {0};
int name_len = 0; int name_len = 0;
int arg_len = 0; int arg_len = 0;
sscanf(Cmd, "%127s%n %255[^\n\r]%n", script_name, &name_len, arguments, &arg_len); sscanf(Cmd, "%127s%n %255[^\n\r]%n", preferredName, &name_len, arguments, &arg_len);
char *script_name = filenamemcopy(preferredName, ".lua");
if (script_name == NULL) return PM3_EMALLOC;
char *script_path = searchFile(LUA_SCRIPTS_SUBDIR, script_name);
char *script_path = searchFile(LUA_SCRIPTS_SUBDIR, ".lua", script_name);
if (script_path == NULL) { if (script_path == NULL) {
PrintAndLogEx(FAILED, "Error - can't find script %s", script_name); PrintAndLogEx(FAILED, "Error - can't find script %s", script_name);
free(script_name);
return PM3_EFILE; return PM3_EFILE;
} }
free(script_name);
int error; int error;
PrintAndLogEx(SUCCESS, "Executing: %s, args '%s'\n", script_path, arguments); PrintAndLogEx(SUCCESS, "Executing: %s, args '%s'\n", script_path, arguments);
error = luaL_loadfile(lua_state, script_path); error = luaL_loadfile(lua_state, script_path);

43
client/fileutils.c
View file

@ -69,7 +69,7 @@ int fileExists(const char *filename) {
return result == 0; return result == 0;
} }
static char *filenamemcopy(const char *preferredName, const char *suffix) { char *filenamemcopy(const char *preferredName, const char *suffix) {
if (preferredName == NULL) return NULL; if (preferredName == NULL) return NULL;
if (suffix == NULL) return NULL; if (suffix == NULL) return NULL;
char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t)); char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t));
@ -521,11 +521,16 @@ out:
int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt) { int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint16_t *keycnt) {
if (data == NULL) return PM3_ESOFT;
if (data == NULL) return 1; char *fileName = filenamemcopy(preferredName, ".dic");
char *fileName = searchFile(DICTIONARIES_SUBDIR, ".dic", preferredName); if (fileName == NULL) return PM3_EMALLOC;
if (fileName == NULL) return 1; char *path = searchFile(DICTIONARIES_SUBDIR, fileName);
if (path == NULL) {
PrintAndLogEx(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName);
free(fileName);
return PM3_EFILE;
}
free(fileName);
// t5577 == 4bytes // t5577 == 4bytes
// mifare == 6 bytes // mifare == 6 bytes
// iclass == 8 bytes // iclass == 8 bytes
@ -542,9 +547,9 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
size_t counter = 0; size_t counter = 0;
int retval = PM3_SUCCESS; int retval = PM3_SUCCESS;
FILE *f = fopen(fileName, "r"); FILE *f = fopen(path, "r");
if (!f) { if (!f) {
PrintAndLogEx(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", fileName); PrintAndLogEx(WARNING, "file not found or locked. '" _YELLOW_("%s")"'", path);
retval = PM3_EFILE; retval = PM3_EFILE;
goto out; goto out;
} }
@ -576,12 +581,12 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
counter += (keylen >> 1); counter += (keylen >> 1);
} }
fclose(f); fclose(f);
PrintAndLogEx(SUCCESS, "loaded " _GREEN_("%2d") "keys from dictionary file " _YELLOW_("%s"), *keycnt, fileName); PrintAndLogEx(SUCCESS, "loaded " _GREEN_("%2d") "keys from dictionary file " _YELLOW_("%s"), *keycnt, path);
if (datalen) if (datalen)
*datalen = counter; *datalen = counter;
out: out:
free(fileName); free(path);
return retval; return retval;
} }
@ -662,19 +667,18 @@ int searchAndList(const char *pm3dir, const char *ext) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
char *searchFile(const char *pm3dir, const char *suffix, const char *preferredName) { char *searchFile(const char *pm3dir, const char *searchname) {
char *filename = filenamemcopy(preferredName, suffix);
if (filename == NULL) return NULL;
// explicit absolute (/) or relative path (./) => try only to match it directly // explicit absolute (/) or relative path (./) => try only to match it directly
char *filename = malloc(strlen(searchname) + 1);
if (filename == NULL) return NULL;
strcpy(filename, searchname);
if (((strlen(filename) > 1) && (filename[0] == '/')) || if (((strlen(filename) > 1) && (filename[0] == '/')) ||
((strlen(filename) > 2) && (filename[0] == '.') && (filename[1] == '/'))) ((strlen(filename) > 2) && (filename[0] == '.') && (filename[1] == '/')))
{ {
if (fileExists(filename)) if (fileExists(filename))
return filename; return filename;
else else
free(filename); goto out;
return NULL;
} }
// else // else
@ -687,6 +691,8 @@ char *searchFile(const char *pm3dir, const char *suffix, const char *preferredNa
const char *exec_path = get_my_executable_directory(); const char *exec_path = get_my_executable_directory();
if (exec_path != NULL) { if (exec_path != NULL) {
char *path = malloc(strlen(exec_path) + strlen(pm3dir) + strlen(filename) + 1); char *path = malloc(strlen(exec_path) + strlen(pm3dir) + strlen(filename) + 1);
if (path == NULL)
goto out;
strcpy(path, exec_path); strcpy(path, exec_path);
strcat(path, pm3dir); strcat(path, pm3dir);
strcat(path, filename); strcat(path, filename);
@ -701,6 +707,8 @@ char *searchFile(const char *pm3dir, const char *suffix, const char *preferredNa
char *user_path = getenv("HOME"); char *user_path = getenv("HOME");
if (user_path != NULL) { if (user_path != NULL) {
char *path = malloc(strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(pm3dir) + strlen(filename) + 1); char *path = malloc(strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(pm3dir) + strlen(filename) + 1);
if (path == NULL)
goto out;
strcpy(path, user_path); strcpy(path, user_path);
strcat(path, PM3_USER_DIRECTORY); strcat(path, PM3_USER_DIRECTORY);
strcat(path, pm3dir); strcat(path, pm3dir);
@ -715,6 +723,8 @@ char *searchFile(const char *pm3dir, const char *suffix, const char *preferredNa
// try pm3 dirs in pm3 installation dir (install mode) // try pm3 dirs in pm3 installation dir (install mode)
{ {
char *path = malloc(strlen(PM3_SHARE_PATH) + strlen(pm3dir) + strlen(filename) + 1); char *path = malloc(strlen(PM3_SHARE_PATH) + strlen(pm3dir) + strlen(filename) + 1);
if (path == NULL)
goto out;
strcpy(path, PM3_SHARE_PATH); strcpy(path, PM3_SHARE_PATH);
strcat(path, pm3dir); strcat(path, pm3dir);
strcat(path, filename); strcat(path, filename);
@ -725,6 +735,7 @@ char *searchFile(const char *pm3dir, const char *suffix, const char *preferredNa
free(path); free(path);
} }
} }
out:
free(filename); free(filename);
return NULL; return NULL;
} }

3
client/fileutils.h
View file

@ -160,7 +160,8 @@ int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, u
*/ */
int convertOldMfuDump(uint8_t **dump, size_t *dumplen); int convertOldMfuDump(uint8_t **dump, size_t *dumplen);
char *filenamemcopy(const char *preferredName, const char *suffix);
int searchAndList(const char *pm3dir, const char *ext); int searchAndList(const char *pm3dir, const char *ext);
char *searchFile(const char *pm3dir, const char *suffix, const char *preferredName); char *searchFile(const char *pm3dir, const char *searchname);
#endif // FILEUTILS_H #endif // FILEUTILS_H