26c26
< * $Id: prompt.c,v 1.4 1998/05/27 22:43:37 brian Exp $
---
> * $Id: prompt.c,v 1.5 1998/06/15 19:06:53 brian Exp $
158,165c158,163
< prompt_Printf(p, "The following commands are available:\r\n");
< prompt_Printf(p, " ~p\tEnter Packet mode\r\n");
< prompt_Printf(p, " ~-\tDecrease log level\r\n");
< prompt_Printf(p, " ~+\tIncrease log level\r\n");
< prompt_Printf(p, " ~t\tShow timers\r\n");
< prompt_Printf(p, " ~m\tShow memory map\r\n");
< prompt_Printf(p, " ~.\tTerminate program\r\n");
< prompt_Printf(p, " ~?\tThis help\r\n");
---
> prompt_Printf(p, "The following commands are available:\n");
> prompt_Printf(p, " ~p\tEnter Packet mode\n");
> prompt_Printf(p, " ~t\tShow timers\n");
> prompt_Printf(p, " ~m\tShow memory map\n");
> prompt_Printf(p, " ~.\tTerminate program\n");
> prompt_Printf(p, " ~?\tThis help\n");
253c251,264
< mbuf_Show(NULL);
---
> {
> struct cmdargs arg;
>
> arg.cmdtab = NULL;
> arg.cmd = NULL;
> arg.argc = 0;
> arg.argn = 0;
> arg.argv = NULL;
> arg.bundle = bundle;
> arg.cx = p->TermMode;
> arg.prompt = p;
>
> mbuf_Show(&arg);
> }
345a357
>
347,348c359
< vfprintf(p->Term, fmt, ap);
< fflush(p->Term);
---
> prompt_vPrintf(p, fmt, ap);
350d360
< p->nonewline = 1;
358c368,383
< vfprintf(p->Term, fmt, ap);
---
> char nfmt[LINE_LEN];
> const char *pfmt;
>
> if (p->TermMode) {
> /* Stuff '\r' in front of '\n' 'cos we're in raw mode */
> int len = strlen(fmt);
>
> if (len && len < sizeof nfmt - 1 && fmt[len-1] == '\n') {
> strcpy(nfmt, fmt);
> strcpy(nfmt + len - 1, "\r\n");
> pfmt = nfmt;
> } else
> pfmt = fmt;
> } else
> pfmt = fmt;
> vfprintf(p->Term, pfmt, ap);