folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed disk creation logic to avoid writing a zero sector to the first and last sector of a newly created disk if the disk's contents were copied from another disk. This solves the last details in issue #35

Browse source
This commit is contained in:
Mark Pizzolato 2013-04-07 12:43:54 -07:00
parent 471ea3efce
commit 8acb3b29e3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sim_disk.c
View file

@ -821,7 +821,7 @@ FILE *(*open_function)(const char *filename, const char *mode) = sim_fopen;
FILE *(*create_function)(const char *filename, t_offset desiredsize) = NULL; FILE *(*create_function)(const char *filename, t_offset desiredsize) = NULL;
t_offset (*size_function)(FILE *file); t_offset (*size_function)(FILE *file);
t_stat (*storage_function)(FILE *file, uint32 *sector_size, uint32 *removable) = NULL; t_stat (*storage_function)(FILE *file, uint32 *sector_size, uint32 *removable) = NULL;
t_bool created = FALSE; t_bool created = FALSE, copied = FALSE;
t_bool auto_format = FALSE; t_bool auto_format = FALSE;
t_offset capac; t_offset capac;
@ -978,6 +978,7 @@ if (sim_switches & SWMASK ('C')) { /* create vhd disk & cop
sim_disk_detach (uptr); sim_disk_detach (uptr);
if (r == SCPE_OK) { if (r == SCPE_OK) {
created = TRUE; created = TRUE;
copied = TRUE;
strcpy (cptr, gbuf); strcpy (cptr, gbuf);
sim_disk_set_fmt (uptr, 0, "VHD", NULL); sim_disk_set_fmt (uptr, 0, "VHD", NULL);
sim_switches = saved_sim_switches; sim_switches = saved_sim_switches;
@ -1098,7 +1099,7 @@ uptr->pos = 0;
if (storage_function) if (storage_function)
storage_function (uptr->fileref, &ctx->storage_sector_size, &ctx->removable); storage_function (uptr->fileref, &ctx->storage_sector_size, &ctx->removable);
if (created) { if ((created) && (!copied)) {
t_stat r = SCPE_OK; t_stat r = SCPE_OK;
uint8 *secbuf = calloc (1, ctx->sector_size); /* alloc temp sector buf */ uint8 *secbuf = calloc (1, ctx->sector_size); /* alloc temp sector buf */