X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..ec173fd2c:/uip/whatnowproc.c?ds=sidebyside

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 6ed9fb7c..badd8daa 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -1,12 +1,19 @@
-/*
- * whatnowproc.c -- exec the "whatnowproc"
+/* whatnowproc.c -- exec the "whatnowproc"
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "whatnowsbr.h"
+#include "whatnowproc.h"
+#include "sbr/m_name.h"
+#include "sbr/r1bindex.h"
+#include "sbr/geteditor.h"
+#include "sbr/context_save.h"
+#include "sbr/error.h"
+#include "h/done.h"
 
 
 /*
@@ -23,7 +30,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];
@@ -32,41 +40,43 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
     vec[vecp++] = r1bindex (whatnowproc, '/');
     vec[vecp] = NULL;
 
-    m_putenv ("mhdraft", file);
+    setenv("mhdraft", file, 1);
     if (mp)
-	m_putenv ("mhfolder", mp->foldpath);
+	setenv("mhfolder", mp->foldpath, 1);
     else
-	unputenv ("mhfolder");
+	unsetenv("mhfolder");
     if (altmsg) {
 	if (mp == NULL || *altmsg == '/' || cwd == NULL)
-	    m_putenv ("mhaltmsg", altmsg);
+	    setenv("mhaltmsg", altmsg, 1);
 	else {
 	    snprintf (buffer, sizeof(buffer), "%s/%s", mp->foldpath, altmsg);
-	    m_putenv ("mhaltmsg", buffer);
+	    setenv("mhaltmsg", buffer, 1);
 	}
     } else {
-	unputenv ("mhaltmsg");
+	unsetenv("mhaltmsg");
     }
     if ((bp = getenv ("mhaltmsg")))/* XXX */
-	m_putenv ("editalt", bp);
+	setenv("editalt", bp, 1);
     snprintf (buffer, sizeof(buffer), "%d", dist);
-    m_putenv ("mhdist", buffer);
+    setenv("mhdist", buffer, 1);
     if (nedit) {
-	unputenv ("mheditor");
+	unsetenv("mheditor");
     } else {
-	m_putenv ("mheditor", ed ? ed : (ed = get_default_editor()));
+        if (!ed)
+            ed = get_default_editor();
+	setenv("mheditor", ed, 1);
     }
     snprintf (buffer, sizeof(buffer), "%d", use);
-    m_putenv ("mhuse", buffer);
+    setenv("mhuse", buffer, 1);
     snprintf (buffer, sizeof(buffer), "%d", atfile);
-    m_putenv ("mhatfile", buffer);
+    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++) {
@@ -84,14 +94,14 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 		    buflen -= len;
 		}
 		msgnum = k + 1;
-		found++;
+		found = true;
 	    }
 	}
 	if (found) {
-	    m_putenv ("mhmessages", buffer);
-	    m_putenv ("mhannotate", text);
+	    setenv("mhmessages", buffer, 1);
+	    setenv("mhannotate", text, 1);
 	    snprintf (buffer, sizeof(buffer), "%d", inplace);
-	    m_putenv ("mhinplace", buffer);
+	    setenv("mhinplace", buffer, 1);
 	}
     }