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

add get_my_user_directory() to centralize HOME processing

Browse source
This commit is contained in:
Philippe Teuwen 2019-09-12 20:13:01 +02:00
commit 46574ae0f5
5 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/proxmark3.c
View file

@ -315,6 +315,16 @@ static void set_my_executable_path(void) {
}
}
static char *my_user_directory = NULL;
const char *get_my_user_directory(void) {
return my_user_directory;
}
static void set_my_user_directory(void) {
my_user_directory = getenv("HOME");
}
static void show_help(bool showFullHelp, char *exec_name) {
PrintAndLogEx(NORMAL, "\nsyntax: %s [-h|-t|-m]", exec_name);
@ -486,6 +496,10 @@ int main(int argc, char *argv[]) {
int flash_num_files = 0;
char *flash_filenames[FLASH_MAX_FILES];
// set global variables soon enough to get the log path
set_my_executable_path();
set_my_user_directory();
for (int i = 1; i < argc; i++) {
if (argv[i][0] != '-') {
@ -685,9 +699,6 @@ int main(int argc, char *argv[]) {
if (speed == 0)
speed = USART_BAUD_RATE;
// set global variables
set_my_executable_path();
if (flash_mode) {
flash_pm3(port, flash_num_files, flash_filenames, flash_can_write_bl);
exit(EXIT_SUCCESS);