1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-10 04:31:44 +00:00

Handle errors in the main copy loop using a variable

This commit is contained in:
MCMrARM 2018-05-15 19:05:13 +02:00
parent 70fe38bd3a
commit 71725059cd

View file

@ -43,43 +43,42 @@ bool dumpPartitionRaw(FsDeviceOperator* fsOperator, u32 partition) {
const size_t bufs = 1024 * 1024;
char* buf = (char*) malloc(bufs);
bool success = true;
for (u64 off = 0; off < size; off += bufs) {
u64 n = bufs;
if (size - off < n)
n = size - off;
if (R_FAILED(result = fsStorageRead(&gameCardStorage, off, buf, n))) {
printf("fsStorageRead error\n");
free(buf);
fsStorageClose(&gameCardStorage);
return false;
printf("\nfsStorageRead error\n");
success = false;
break;
}
if (fwrite(buf, 1, n, outFile) != n) {
printf("fwrite error\n");
free(buf);
fsStorageClose(&gameCardStorage);
return false;
printf("\nfwrite error\n");
success = false;
break;
}
if (((off / bufs) % 10) == 0) {
hidScanInput();
u64 kDown = hidKeysDown(CONTROLLER_P1_AUTO);
if (kDown & KEY_B) {
printf("\nCancelled\n");
free(buf);
fsStorageClose(&gameCardStorage);
return false;
success = false;
break;
}
printf(C_CLEAR_LINE "\rDumping %i%% [%li / %li bytes]", (int) (off * 100 / size), off, size);
syncDisplay();
}
}
if (success) {
printf(C_CLEAR_LINE "\rDone!\n");
syncDisplay();
}
free(buf);
printf(C_CLEAR_LINE "\rDone!\n");
syncDisplay();
fclose(outFile);
fsStorageClose(&gameCardStorage);
return true;
return success;
}