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

SCP: Avoid redundant HELP SET output for single unit DEVICEs

Browse source
This commit is contained in:
Mark Pizzolato 2021-04-12 03:50:52 -07:00
parent dea084a908
commit e1d60d1035
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scp.c
View file

@ -3269,8 +3269,12 @@ for (unit=0; unit < dptr->numunits; unit++)
--enabled_units; --enabled_units;
else else
found_unit = unit; found_unit = unit;
if (enabled_units == 1) if (enabled_units == 1) {
snprintf (unit_spec, sizeof (unit_spec), "%s%u", sim_dname (dptr), found_unit); if (found_unit == 0)
snprintf (unit_spec, sizeof (unit_spec), "%s", sim_dname (dptr));
else
snprintf (unit_spec, sizeof (unit_spec), "%s%u", sim_dname (dptr), found_unit);
}
else else
snprintf (unit_spec, sizeof (unit_spec), "%sn", sim_dname (dptr)); snprintf (unit_spec, sizeof (unit_spec), "%sn", sim_dname (dptr));
if (dptr->modifiers) { if (dptr->modifiers) {
@ -3351,6 +3355,8 @@ if ((dptr->modifiers) && (dptr->units)) { /* handle unit specific modifiers */
continue; /* skip device only modifiers */ continue; /* skip device only modifiers */
if ((!mptr->valid) && MODMASK(mptr,MTAB_XTD)) if ((!mptr->valid) && MODMASK(mptr,MTAB_XTD))
continue; /* skip show only modifiers */ continue; /* skip show only modifiers */
if ((enabled_units == 1) && (found_unit == 0))
continue;
if (mptr->mstring) { if (mptr->mstring) {
fprint_header (st, &found, header); fprint_header (st, &found, header);
sprintf (buf, "set %s %s%s", unit_spec, mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : (MODMASK(mptr,MTAB_VALR) ? "=val" : (MODMASK(mptr,MTAB_VALO) ? "{=val}": ""))); sprintf (buf, "set %s %s%s", unit_spec, mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : (MODMASK(mptr,MTAB_VALR) ? "=val" : (MODMASK(mptr,MTAB_VALO) ? "{=val}": "")));