From 3d2272c69936e73e58ec9b02054014486a349913 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 17 Jul 2011 16:40:34 +0000
Subject: [PATCH] cleanup usage of `prompt()'

---
 ChangeLog                   | 6 ++++++
 src/frontend/arg.c          | 2 +-
 src/frontend/com_hardcopy.c | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0042d1f90..e997b8547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-17  Robert Larice
+ * src/frontend/arg.c ,
+ * src/frontend/com_hardcopy.c :
+   cleanup usage of `prompt()'
+     and get rid of an ancient hack
+
 2011-07-17  Robert Larice
  * src/frontend/com_fft.c ,
  * src/frontend/inpcom.c :
diff --git a/src/frontend/arg.c b/src/frontend/arg.c
index 5edae7382..7b67e1641 100644
--- a/src/frontend/arg.c
+++ b/src/frontend/arg.c
@@ -28,7 +28,7 @@ char *prompt(FILE *fp)
     size_t  n;
 
     if (!fgets(buf, sizeof(buf), fp))
-	return 0;
+	return NULL;
     n = strlen(buf) - 1;
     buf[n] = '\0';	/* fgets leaves the \n */
     p = TMALLOC(char, n + 1);
diff --git a/src/frontend/com_hardcopy.c b/src/frontend/com_hardcopy.c
index b2517e20e..454aebbea 100644
--- a/src/frontend/com_hardcopy.c
+++ b/src/frontend/com_hardcopy.c
@@ -27,7 +27,6 @@
 void
 com_hardcopy(wordlist *wl)
 {
-    char *buf2;
     char *fname;
     char buf[BSIZE_SP], device[BSIZE_SP];
     bool tempf = FALSE;
@@ -140,8 +139,10 @@ com_hardcopy(wordlist *wl)
     if (!foundit) {
 
         if (!wl) {
+            char *buf2;
             outmenuprompt("which variable ? ");
-            if ((buf2 = prompt(cp_in)) == (char *) -1)	/* XXXX Sick */
+            buf2 = prompt(cp_in);
+            if (!buf2)
                 return;
             wl = TMALLOC(struct wordlist, 1);
             wl->wl_word = buf2;