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

Fixed HELP dev SET and HELP dev SHOW to properly process non-extended mtab entries and to avoid using the help string when mstring has example arguments/syntax

Browse source
This commit is contained in:
Mark Pizzolato 2013-02-02 05:59:30 -08:00
parent 8f170b0e40
commit 8b230f946b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scp.c
View file

@ -1104,8 +1104,8 @@ if (dptr->modifiers) {
if (!(mptr->mask & MTAB_VDV) && (mptr->mask & MTAB_VUN)) if (!(mptr->mask & MTAB_VDV) && (mptr->mask & MTAB_VUN))
continue; continue;
if (mptr->mstring) { if (mptr->mstring) {
sprintf (buf, "set %s %s%s", sim_dname (dptr), mptr->mstring, (mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": "")); sprintf (buf, "set %s %s%s", sim_dname (dptr), mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : ((mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": "")));
fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : ""); fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : ""));
} }
} }
} }
@ -1121,24 +1121,26 @@ if (dptr->flags & DEV_DEBUG) {
sprintf (buf, "set %s NODEBUG", sim_dname (dptr)); sprintf (buf, "set %s NODEBUG", sim_dname (dptr));
fprintf (st, "%-30s\tDisables debugging for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisables debugging for device %s\n", buf, sim_dname (dptr));
if (dptr->debflags) { if (dptr->debflags) {
fprintf (st, "To enable or disable detailed debugging on the %s device:\n", sim_dname (dptr)); strcpy (buf, "");
fprintf (st, "set %s DEBUG=", sim_dname (dptr)); fprintf (st, "set %s DEBUG=", sim_dname (dptr));
for (dep = dptr->debflags; dep->name != NULL; dep++) for (dep = dptr->debflags; dep->name != NULL; dep++)
fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name); fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name);
fprintf (st, "\n"); fprintf (st, "\n");
fprintf (st, "%-30s\tEnables detailed debugging for device %s\n", buf, sim_dname (dptr));
fprintf (st, "set %s NODEBUG=", sim_dname (dptr)); fprintf (st, "set %s NODEBUG=", sim_dname (dptr));
for (dep = dptr->debflags; dep->name != NULL; dep++) for (dep = dptr->debflags; dep->name != NULL; dep++)
fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name); fprintf (st, "%s%s", ((dep == dptr->debflags) ? "" : ";"), dep->name);
fprintf (st, "\n"); fprintf (st, "\n");
fprintf (st, "%-30s\tDisables detailed debugging for device %s\n", buf, sim_dname (dptr));
} }
} }
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if (!(mptr->mask & MTAB_VUN)) if ((!(mptr->mask & MTAB_VUN)) && (mptr->mask & MTAB_XTD))
continue; continue;
if (mptr->mstring) { if (mptr->mstring) {
sprintf (buf, "set %s%s %s%s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->mstring, (mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": "")); sprintf (buf, "set %s%s %s%s", sim_dname (dptr), (dptr->numunits > 1) ? "n" : "0", mptr->mstring, (strchr(mptr->mstring, '=')) ? "" : ((mptr->mask & MTAB_VALR) ? "=val" : ((mptr->mask & MTAB_VALO) ? "{=val}": "")));
fprintf (st, "%-30s\t%s\n", buf, mptr->help ? mptr->help : ""); fprintf (st, "%-30s\t%s\n", buf, (strchr(mptr->mstring, '=')) ? "" : (mptr->help ? mptr->help : ""));
} }
} }
} }
@ -1165,7 +1167,7 @@ if (dptr->flags & DEV_DEBUG) {
} }
if (dptr->modifiers) { if (dptr->modifiers) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if (!(mptr->mask & MTAB_VUN)) if ((!(mptr->mask & MTAB_VUN)) && (mptr->mask & MTAB_XTD))
continue; continue;
if ((!mptr->disp) || (!mptr->pstring)) if ((!mptr->disp) || (!mptr->pstring))
continue; continue;