inc/test-eom-align: Create test mboxes in less steps.

[nmh] / uip / whatnowproc.c

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index a0186f55b5c30f918d7fa1029286638745856218..2fa0ed85cd3b92f584f1578f6f21cbafeee35500 100644 (file)
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "h/done.h"
 
 
 /*
@@ -31,38 +32,40 @@ 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;
@@ -87,10 +90,10 @@ what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
            }
        }
        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);
        }
     }