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

clean up

Browse source
This commit is contained in:
mwalker33 2020-04-17 19:50:12 +10:00 • committed by Philippe Teuwen
commit b593d2c319
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/src/preferences.c
View file

@ -69,24 +69,14 @@ int preferences_load(void) {
// default save path // default save path
if (get_my_user_directory() != NULL) { if (get_my_user_directory() != NULL) { // should return path to .proxmark3 folder
if (session.default_savepath != NULL) session.default_savepath = (char *)realloc(session.default_savepath, strlen(get_my_user_directory()) + 1); //, sizeof(uint8_t));
free(session.default_savepath);
session.default_savepath = (char *)calloc(strlen(get_my_user_directory()) + 1, sizeof(uint8_t));
strcpy(session.default_savepath, get_my_user_directory()); strcpy(session.default_savepath, get_my_user_directory());
//if (session.file_savepath == NULL) {
} else { } else {
session.default_savepath = (char *)calloc(2, sizeof(uint8_t)); session.default_savepath = (char *)realloc(session.default_savepath,2); // 2, sizeof(uint8_t));
strcpy(session.default_savepath, "."); strcpy(session.default_savepath, ".");
} }
/*
if (get_my_user_directory ()!= NULL) {
strncpy (session.file_savepath,get_my_user_directory(),sizeof(session.file_savepath)-1);
} else {
strncpy (session.file_savepath,".",sizeof(session.file_savepath)-1);
}
*/
// loadFileJson wants these, so pass in place holder values, though not used // loadFileJson wants these, so pass in place holder values, though not used
// in settings load; // in settings load;
uint8_t dummyData = 0x00; uint8_t dummyData = 0x00;
@ -112,7 +102,6 @@ int preferences_save(void) {
fnLen = strlen(prefGetFilename()) + 5; // .bak\0 fnLen = strlen(prefGetFilename()) + 5; // .bak\0
backupFilename = (char *)calloc(fnLen, sizeof(uint8_t)); backupFilename = (char *)calloc(fnLen, sizeof(uint8_t));
// snprintf (backupFilename,sizeof(backupFilename)-1,"%s.bak",prefGetFilename());
snprintf(backupFilename, fnLen, "%s.bak", prefGetFilename()); snprintf(backupFilename, fnLen, "%s.bak", prefGetFilename());
if (fileExists(backupFilename)) { if (fileExists(backupFilename)) {