github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-27 01:00:07 +00:00
Code Releases Activity

SCP: Make ATTACH messages report the UNIT name

Browse Source 
As discussed in #1034
This commit is contained in:
Mark Pizzolato
2021-04-16 11:28:43 -07:00
parent 4471e0525d
commit 7276dc1f8d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scp.c
View File

@@ -7738,7 +7738,7 @@ if ((sim_switches & SWMASK ('R')) || /* read only? */
if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */
if (!(uptr->flags & UNIT_RO))
sim_messagef (SCPE_OK, "%s: unit is read only\n", sim_dname (dptr));
sim_messagef (SCPE_OK, "%s: unit is read only\n", sim_uname (uptr));
uptr->flags = uptr->flags | UNIT_RO; /* set rd only */
}
else {
@@ -7746,7 +7746,7 @@ else {
uptr->fileref = sim_fopen (cptr, "wb+"); /* open new file */
if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */
sim_messagef (SCPE_OK, "%s: creating new file: %s\n", sim_dname (dptr), cptr);
sim_messagef (SCPE_OK, "%s: creating new file: %s\n", sim_uname (uptr), cptr);
}
else { /* normal */
uptr->fileref = sim_fopen (cptr, "rb+"); /* open r/w */
@@ -7762,7 +7762,7 @@ else {
if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */
uptr->flags = uptr->flags | UNIT_RO; /* set rd only */
sim_messagef (SCPE_OK, "%s: unit is read only\n", sim_dname (dptr));
sim_messagef (SCPE_OK, "%s: unit is read only\n", sim_uname (uptr));
}
else { /* doesn't exist */
if (sim_switches & SWMASK ('E')) /* must exist? */
@@ -7770,7 +7770,7 @@ else {
uptr->fileref = sim_fopen (cptr, "wb+");/* open new file */
if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */
sim_messagef (SCPE_OK, "%s: creating new file\n", sim_dname (dptr));
sim_messagef (SCPE_OK, "%s: creating new file\n", sim_uname (uptr));
}
} /* end if null */
else
@@ -7783,7 +7783,7 @@ if (uptr->flags & UNIT_BUFABLE) { /* buffer? */
uptr->filebuf = calloc (cap, SZ_D (dptr)); /* allocate */
if (uptr->filebuf == NULL) /* no buffer? */
return attach_err (uptr, SCPE_MEM); /* error */
sim_messagef (SCPE_OK, "%s: buffering file in memory\n", sim_dname (dptr));
sim_messagef (SCPE_OK, "%s: buffering file in memory\n", sim_uname (uptr));
uptr->hwmark = (uint32)sim_fread (uptr->filebuf, /* read file */
SZ_D (dptr), cap, uptr->fileref);
uptr->flags = uptr->flags | UNIT_BUF; /* set buffered */
@@ -9151,6 +9151,9 @@ for (gptr = gbuf, reason = SCPE_OK;
strlcpy (gbuf, ap, sizeof (gbuf));
gptr = gbuf;
}
/* Special handling of EXAMINE to cover the case of ALL (detected in
get_range) so that all of memory isn't output at once without any
ability to interrupt that output */
tptr = get_range (sim_dfdev, gptr, &low, &high, sim_dfdev->aradix,
(((sim_dfunit->capac == 0) || (flag == EX_E))? 0:
sim_dfunit->capac - sim_dfdev->aincr), 0);