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

SCP: Assure that files attached honor the unit Read-Only flag in addition to -R switches.

Browse source
This commit is contained in:
Mark Pizzolato 2016-01-12 09:52:14 -08:00
parent 622c594e59
commit 5a99bcf185
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scp.c
View file

@ -5183,8 +5183,10 @@ uptr->filename = (char *) calloc (CBUFSIZE, sizeof (char)); /* alloc name buf */
if (uptr->filename == NULL) if (uptr->filename == NULL)
return SCPE_MEM; return SCPE_MEM;
strncpy (uptr->filename, cptr, CBUFSIZE); /* save name */ strncpy (uptr->filename, cptr, CBUFSIZE); /* save name */
if (sim_switches & SWMASK ('R')) { /* read only? */ if ((sim_switches & SWMASK ('R')) || /* read only? */
if ((uptr->flags & UNIT_ROABLE) == 0) /* allowed? */ ((uptr->flags & UNIT_RO) != 0)) {
if (((uptr->flags & UNIT_ROABLE) == 0) && /* allowed? */
((uptr->flags & UNIT_RO) == 0))
return attach_err (uptr, SCPE_NORO); /* no, error */ return attach_err (uptr, SCPE_NORO); /* no, error */
uptr->fileref = sim_fopen (cptr, "rb"); /* open rd only */ uptr->fileref = sim_fopen (cptr, "rb"); /* open rd only */
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */

6
sim_disk.c
View file

@ -1076,8 +1076,10 @@ ctx->dbit = dbit; /* save debug bit */
sim_debug (ctx->dbit, ctx->dptr, "sim_disk_attach(unit=%d,filename='%s')\n", (int)(uptr-ctx->dptr->units), uptr->filename); sim_debug (ctx->dbit, ctx->dptr, "sim_disk_attach(unit=%d,filename='%s')\n", (int)(uptr-ctx->dptr->units), uptr->filename);
ctx->auto_format = auto_format; /* save that we auto selected format */ ctx->auto_format = auto_format; /* save that we auto selected format */
ctx->storage_sector_size = (uint32)sector_size; /* Default */ ctx->storage_sector_size = (uint32)sector_size; /* Default */
if (sim_switches & SWMASK ('R')) { /* read only? */ if ((sim_switches & SWMASK ('R')) || /* read only? */
if ((uptr->flags & UNIT_ROABLE) == 0) /* allowed? */ ((uptr->flags & UNIT_RO) != 0)) {
if (((uptr->flags & UNIT_ROABLE) == 0) && /* allowed? */
((uptr->flags & UNIT_RO) == 0))
return _err_return (uptr, SCPE_NORO); /* no, error */ return _err_return (uptr, SCPE_NORO); /* no, error */
uptr->fileref = open_function (cptr, "rb"); /* open rd only */ uptr->fileref = open_function (cptr, "rb"); /* open rd only */
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */