github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-05-04 15:05:39 +00:00
Code Releases Activity

DISK: Allow Control-C to cancel ZAP command

Browse Source
This commit is contained in:
Mark Pizzolato
2022-06-11 21:43:55 -07:00
parent 5448965f70
commit 0065f05336
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sim_disk.c
View File

@@ -6903,7 +6903,9 @@ if (info->flag) { /* zap type */
sector_data = (uint8 *)malloc (sector_size * sizeof (*sector_data)); sector_data = (uint8 *)malloc (sector_size * sizeof (*sector_data));
zero_sector = (uint8 *)calloc (sector_size, sizeof (*sector_data)); zero_sector = (uint8 *)calloc (sector_size, sizeof (*sector_data));
container_size -= sizeof (*f); container_size -= sizeof (*f);
while (container_size > highwater) { stop_cpu = FALSE;
while ((container_size > highwater) &&
(!stop_cpu)) {
if ((sim_fseeko (container, container_size - sector_size, SEEK_SET) != 0) || if ((sim_fseeko (container, container_size - sector_size, SEEK_SET) != 0) ||
(sector_size != sim_fread (sector_data, 1, sector_size, container)) || (sector_size != sim_fread (sector_data, 1, sector_size, container)) ||
(0 != memcmp (sector_data, zero_sector, sector_size))) (0 != memcmp (sector_data, zero_sector, sector_size)))
@@ -6913,14 +6915,21 @@ if (info->flag) { /* zap type */
sim_messagef (SCPE_OK, "Trimming trailing zero containing blocks at lbn: %u \r", (uint32)(container_size / sector_size)); sim_messagef (SCPE_OK, "Trimming trailing zero containing blocks at lbn: %u \r", (uint32)(container_size / sector_size));
container_size -= sector_size; container_size -= sector_size;
} }
if (sim_switches & SWMASK ('Z'))
sim_messagef (SCPE_OK, "Last zero containing block found at lbn: %u \n", (uint32)(container_size / sector_size));
free (sector_data); free (sector_data);
free (zero_sector); free (zero_sector);
(void)sim_set_fsize (container, (t_addr)container_size); if (!stop_cpu) {
fclose (container); if (sim_switches & SWMASK ('Z'))
sim_set_file_times (FullPath, statb.st_atime, statb.st_mtime); sim_messagef (SCPE_OK, "Last zero containing block found at lbn: %u \n", (uint32)(container_size / sector_size));
info->stat = sim_messagef (SCPE_OK, "Disk Type Removed from container '%s'\n", FullPath); (void)sim_set_fsize (container, (t_addr)container_size);
fclose (container);
sim_set_file_times (FullPath, statb.st_atime, statb.st_mtime);
info->stat = sim_messagef (SCPE_OK, "Disk Type Removed from container '%s'\n", FullPath);
}
else {
stop_cpu = FALSE;
fclose (container);
info->stat = sim_messagef (SCPE_ARG, "Canceled Disk Type Removal from container '%s'\n", FullPath);
}
return; return;
} }
} }