X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnow.c;h=be046ac79f632fadc3dfb6838abab206988ed4c7;hb=refs%2Fheads%2Fmaster;hp=4b45a0c45ba27929e4c1107172b5e65252dd6ef2;hpb=2f2a1446c8ed6b3e466425561c0a09f9bf417b05;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 4b45a0c..41c8733 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -32,6 +32,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 /*
 ** Options at the "whatnow" prompt
 */
@@ -102,6 +104,8 @@ main(int argc, char **argv)
 	/* read user profile/context */
 	context_read();
 
+	advise(NULL, "whatnow is deprecated. Consider switching to whatnow2.");
+
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
@@ -153,7 +157,7 @@ main(int argc, char **argv)
 	}
 
 	if ((!drft && !(drft = getenv("mhdraft"))) || !*drft)
-		drft = getcpy(m_draft(seq_cur));
+		drft = mh_xstrdup(m_draft(seq_cur));
 
 	if ((cp = getenv("mhuse")) && *cp)
 		use = atoi(cp);
@@ -173,10 +177,7 @@ main(int argc, char **argv)
 	}
 
 	snprintf(prompt, sizeof(prompt), myprompt, invo_name);
-	for (;;) {
-		if (!(argp = getans(prompt, aleqs))) {
-			exit(EX_IOERR);
-		}
+	while ((argp = getans(prompt, aleqs))) {
 		switch (smatch(*argp, aleqs)) {
 		case DISPSW:
 			/* display the msg being replied to or distributed */
@@ -381,7 +382,8 @@ main(int argc, char **argv)
 			break;
 		}
 	}
-	/*NOTREACHED*/
+
+	exit(EX_IOERR);
 }
 
 
@@ -557,7 +559,7 @@ editfile(char **ed, char **arg, char *file)
 	}
 
 	/* remember which editor we used */
-	edsave = getcpy(*ed);
+	edsave = mh_xstrdup(*ed);
 
 	*ed = NULL;