From 712f9c9e3a099fecf802d1d5cc8570a8efa4cf8e Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 24 Nov 2018 06:03:04 -0800 Subject: [PATCH] SCP: Provide detailed error message when rejecting invalid device DEGUG option --- scp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scp.c b/scp.c index 1288df96..4bf4f676 100644 --- a/scp.c +++ b/scp.c @@ -5336,6 +5336,7 @@ int32 flag = flags & 1; t_bool uflag = ((flags & 2) != 0); char gbuf[CBUFSIZE]; DEBTAB *dep; +t_stat r = SCPE_OK; if ((dptr->flags & DEV_DEBUG) == 0) return SCPE_NOFNC; @@ -5354,7 +5355,7 @@ if (cptr == NULL) { /* no arguments? */ return SCPE_OK; } if (dptr->debflags == NULL) /* must have table */ - return SCPE_ARG; + return sim_messagef (SCPE_ARG, "The %s device doesn't have DEBUG options.\n", dptr->name); while (*cptr) { cptr = get_glyph (cptr, gbuf, ';'); /* get debug flag */ for (dep = dptr->debflags; dep->name != NULL; dep++) { @@ -5373,9 +5374,9 @@ while (*cptr) { } } /* end for */ if (dep->mask == 0) /* no match? */ - return SCPE_ARG; + r = sim_messagef (SCPE_ARG, "Invalid DEBUG option '%s' for %s device\n", gbuf, dptr->name); } /* end while */ -return SCPE_OK; +return r; } /* Show command */