X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fe4026749648d3f5693adce7ae7a218968a9beb5..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/whatnowproc.c

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 600dd5b7..f61f5b7f 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -5,7 +5,10 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/context_save.h"
+#include "sbr/error.h"
+#include "h/done.h"
 
 
 /*
@@ -22,7 +25,8 @@ int
 what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
           struct msgs *mp, char *text, int inplace, char *cwd, int atfile)
 {
-    int found, k, msgnum, vecp;
+    bool found;
+    int k, msgnum, vecp;
     int len, buflen;
     char *bp;
     char buffer[BUFSIZ], *vec[MAXARGS];
@@ -35,7 +39,7 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
     if (mp)
 	setenv("mhfolder", mp->foldpath, 1);
     else
-	unputenv ("mhfolder");
+	unsetenv("mhfolder");
     if (altmsg) {
 	if (mp == NULL || *altmsg == '/' || cwd == NULL)
 	    setenv("mhaltmsg", altmsg, 1);
@@ -44,14 +48,14 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 	    setenv("mhaltmsg", buffer, 1);
 	}
     } else {
-	unputenv ("mhaltmsg");
+	unsetenv("mhaltmsg");
     }
     if ((bp = getenv ("mhaltmsg")))/* XXX */
 	setenv("editalt", bp, 1);
     snprintf (buffer, sizeof(buffer), "%d", dist);
     setenv("mhdist", buffer, 1);
     if (nedit) {
-	unputenv ("mheditor");
+	unsetenv("mheditor");
     } else {
         if (!ed)
             ed = get_default_editor();
@@ -62,12 +66,12 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
     snprintf (buffer, sizeof(buffer), "%d", atfile);
     setenv("mhatfile", buffer, 1);
 
-    unputenv ("mhmessages");
-    unputenv ("mhannotate");
-    unputenv ("mhinplace");
+    unsetenv("mhmessages");
+    unsetenv("mhannotate");
+    unsetenv("mhinplace");
 
     if (text && mp && !is_readonly(mp)) {
-	found = 0;
+	found = false;
 	bp = buffer;
 	buflen = sizeof(buffer);
 	for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) {
@@ -85,7 +89,7 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 		    buflen -= len;
 		}
 		msgnum = k + 1;
-		found++;
+		found = true;
 	    }
 	}
 	if (found) {