X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=752bc8ee2cd3f483f5994abf0e5f750a24331ea6;hp=3960347f36bc77bcc10d30a86f8d307569f1611d;hb=60ab7a63dc7c2b52bf21887f365a58588a08f708;hpb=90b9b84797a7a0ccfe5c4d505e2f6c75811258b9 diff --git a/misc.c b/misc.c index 3960347..752bc8e 100644 --- a/misc.c +++ b/misc.c @@ -640,14 +640,14 @@ bool MAPLIN(FILE *fp) * and is not changed thereafter unless the routines on this page choose * to do so. */ - if (prompt) - fputs("> ", stdout); do { if (!editline) { + if (prompt) + fputs("> ", stdout); IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); eof = (feof(fp)); } else { - char *cp = linenoise(prompt ? "> ": ""); + char *cp = linenoise("> "); eof = (cp == NULL); if (!eof) { strncpy(rawbuf, cp, sizeof(rawbuf)-1); @@ -663,10 +663,17 @@ bool MAPLIN(FILE *fp) fclose(logfp); return false; } else { + FILE *efp = NULL; if (logfp && fp == stdin) - IGNORE(fputs(rawbuf, logfp)); + efp = logfp; else if (!isatty(0)) - IGNORE(fputs(rawbuf, stdout)); + efp = stdout; + if (efp != NULL) + { + if (prompt) + fputs("> ", efp); + IGNORE(fputs(rawbuf, efp)); + } strcpy(INLINE+1, rawbuf); LNLENG=0; for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) {