tools/blkup: add shortcut for zero blocks

This commit is contained in:
Virgil Dupras 2020-12-17 20:19:12 -05:00
parent da72d7bbe1
commit efa2556c82

View File

@ -3,6 +3,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdbool.h>
#include "common.h" #include "common.h"
@ -30,29 +31,43 @@ int main(int argc, char **argv)
char s[0x40]; char s[0x40];
char buf[1024] = {0}; char buf[1024] = {0};
sendcmdp(fd, ": _ 1024 0 DO KEY DUP .x I BLK( + C! LOOP ;"); sendcmdp(fd, ": _ 1024 0 DO KEY DUP .x I BLK( + C! LOOP ;");
sendcmdp(fd, ": Z BLK( 1024 0 FILL ;");
int returncode = 0; int returncode = 0;
while (fread(buf, 1, 1024, fp)) { while (fread(buf, 1, 1024, fp)) {
sendcmd(fd, "_"); bool allzero = true;
for (int i=0; i<1024; i++) { for (int i=0; i<1024; i++) {
putchar('.'); if (buf[i] != 0) {
fflush(stdout); allzero = false;
write(fd, &buf[i], 1); break;
usleep(1000); // let it breathe
mread(fd, s, 2); // read hex pair
s[2] = 0; // null terminate
unsigned char c = strtol(s, NULL, 16);
if (c != buf[i]) {
// mismatch!
fprintf(stderr, "Mismatch at bno %d (%d) %d != %d.\n", blkno, i, buf[i], c);
// we don't exit now because we need to "consume" our whole program.
returncode = 1;
} }
usleep(1000); // let it breathe
} }
readprompt(fd); if (allzero) {
if (returncode) break; sendcmdp(fd, "Z");
memset(buf, 0, 1024); putchar('Z');
fflush(stdout);
} else {
sendcmd(fd, "_");
for (int i=0; i<1024; i++) {
putchar('.');
fflush(stdout);
write(fd, &buf[i], 1);
usleep(1000); // let it breathe
mread(fd, s, 2); // read hex pair
s[2] = 0; // null terminate
unsigned char c = strtol(s, NULL, 16);
if (c != buf[i]) {
// mismatch!
fprintf(stderr, "Mismatch at bno %d (%d) %d != %d.\n", blkno, i, buf[i], c);
// we don't exit now because we need to "consume" our whole program.
returncode = 1;
}
usleep(1000); // let it breathe
}
readprompt(fd);
if (returncode) break;
memset(buf, 0, 1024);
}
sprintf(s, "%d BLK> ! BLK!", blkno); sprintf(s, "%d BLK> ! BLK!", blkno);
sendcmdp(fd, s); sendcmdp(fd, s);
blkno++; blkno++;