From 746e5ab88ca4afea18eb42d7a79d1ee677e6f5c0 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Mon, 5 May 2014 05:30:35 -0700
Subject: [PATCH] SCP: Fix reporting of console's buffering status.  Fix
 parsing of MUX settings which were simply interpreted by matching a single
 token. Reported by Mark Bensen.

---
 sim_console.c | 4 ++--
 sim_tmxr.c    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sim_console.c b/sim_console.c
index 28eaa7a1..d1bf515e 100644
--- a/sim_console.c
+++ b/sim_console.c
@@ -1289,10 +1289,10 @@ t_stat sim_show_cons_buff (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag,
 {
 if (cptr && (*cptr != 0))
     return SCPE_2MARG;
-if (!sim_con_tmxr.buffered)
+if (!sim_con_tmxr.ldsc->txbfd)
     fprintf (st, "Unbuffered\n");
 else
-    fprintf (st, "Buffer Size = %d\n", sim_con_tmxr.buffered);
+    fprintf (st, "Buffer Size = %d\n", sim_con_tmxr.ldsc->txbsz);
 return SCPE_OK;
 }
 
diff --git a/sim_tmxr.c b/sim_tmxr.c
index 40c784d8..0d0d7c8d 100644
--- a/sim_tmxr.c
+++ b/sim_tmxr.c
@@ -2069,8 +2069,10 @@ SERHANDLE serport;
 char *tptr = cptr;
 t_bool nolog, notelnet, listennotelnet, modem_control, loopback, datagram, packet;
 TMLN *lp;
-t_stat r = SCPE_ARG;
+t_stat r = SCPE_OK;
 
+if (*tptr == '\0')
+    return SCPE_ARG;
 for (i = 0; i < mp->lines; i++) {               /* initialize lines */
     lp = mp->ldsc + i;
     lp->mp = mp;                                /* set the back pointer */