X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=752bc8ee2cd3f483f5994abf0e5f750a24331ea6;hp=d89b4058fbcfd003329b3a470b8fed765b7ba93e;hb=60ab7a63dc7c2b52bf21887f365a58588a08f708;hpb=a044f10411cac5c530a19a66b7252110d5d1ca0f

diff --git a/misc.c b/misc.c
index d89b405..752bc8e 100644
--- a/misc.c
+++ b/misc.c
@@ -21,6 +21,17 @@ void* xmalloc(size_t size)
   return(ptr);
 }
 
+char* xstrdup(const char* s)
+{
+  char* ptr = strdup(s);
+  if (ptr == NULL)
+    {
+      fprintf(stderr, "Out of memory!\n");
+      exit(EXIT_FAILURE);
+    }
+  return(ptr);
+}
+
 void packed_to_token(long packed, char token[6])
 {
   // Unpack and map back to ASCII.
@@ -60,8 +71,7 @@ void newspeak(char* msg)
     printf("\n");
 
   // Create a copy of our string, so we can edit it.
-  char* copy = (char*) xmalloc(strlen(msg) + 1);
-  strncpy(copy, msg, strlen(msg) + 1);
+  char* copy = xstrdup(msg);
 
   // Staging area for stringified parameters.
   char parameters[5][100]; // FIXME: to be replaced with dynamic allocation
@@ -128,7 +138,7 @@ void newspeak(char* msg)
 
   // Render the final string.
   char rendered[2000]; // FIXME: to be replaced with dynamic allocation
-  sprintf((char *)&rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); // FIXME: to be replaced with vsprintf()
+  sprintf(rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); // FIXME: to be replaced with vsprintf()
 
   // Print the message.
   printf("%s\n", rendered);
@@ -630,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);
@@ -653,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++) {