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

Rework flasher exit on error

Browse source
This commit is contained in:
Philippe Teuwen 2019-07-19 13:15:32 +02:00
commit 33f2cb0981
1 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
client/flasher.c
View file

@ -81,6 +81,7 @@ int main(int argc, char **argv) {
int can_write_bl = 0; int can_write_bl = 0;
int num_files = 0; int num_files = 0;
int res; int res;
int ret = 0;
flash_file_t files[MAX_FILES]; flash_file_t files[MAX_FILES];
char * filenames[MAX_FILES]; char * filenames[MAX_FILES];
bool info = false; bool info = false;
@ -127,8 +128,10 @@ int main(int argc, char **argv) {
uint32_t chipid = 0; uint32_t chipid = 0;
res = flash_start_flashing(can_write_bl, serial_port_name, &chipid); res = flash_start_flashing(can_write_bl, serial_port_name, &chipid);
if (res < 0) if (res < 0) {
return -1; ret = -1;
goto finish;
}
int mem_avail = chipid_to_mem_avail(chipid); int mem_avail = chipid_to_mem_avail(chipid);
if (mem_avail != 0) { if (mem_avail != 0) {
@ -140,12 +143,15 @@ int main(int argc, char **argv) {
mem_avail = 256; //we default to a low value mem_avail = 256; //we default to a low value
} }
if (! info) { if (info)
goto finish;
for (int i = 0 ; i < num_files; ++i){ for (int i = 0 ; i < num_files; ++i){
res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail*ONE_KB); res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail*ONE_KB);
if (res < 0) if (res < 0) {
return -1; ret = -1;
goto finish;
}
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
} }
@ -153,19 +159,25 @@ int main(int argc, char **argv) {
for (int i = 0; i < num_files; i++) { for (int i = 0; i < num_files; i++) {
res = flash_write(&files[i]); res = flash_write(&files[i]);
if (res < 0) if (res < 0) {
return -1; ret = -1;
goto finish;
}
flash_free(&files[i]); flash_free(&files[i]);
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "\n");
} }
}
finish:
res = flash_stop_flashing(); res = flash_stop_flashing();
if (res < 0) if (res < 0)
return -1; ret = -1;
CloseProxmark(); CloseProxmark();
if (ret==0)
PrintAndLogEx(SUCCESS, _BLUE_("All done.")); PrintAndLogEx(SUCCESS, _BLUE_("All done."));
PrintAndLogEx(SUCCESS, "\nHave a nice day!"); else
return 0; PrintAndLogEx(ERR, "Aborted on error.");
PrintAndLogEx(NORMAL, "\nHave a nice day!");
return ret;
} }