Fixed mhical(1) exit status to reflect return status of icalparse().

[nmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 9df455f633516c794fcf781774bd2ecabe64f954..530e61cdc4528346a599f539b648cc16ac9347cb 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,13 @@
  */
 
 #include "h/mh.h"
+#include "whatnowproc.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_switch_multiword.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"
 #include "sbr/showfile.h"
 #include "sbr/smatch.h"
@@ -332,7 +339,7 @@ main (int argc, char **argv)
 try_it_again:
 
     strncpy (drft, buildsw ? m_maildir ("draft")
-                         : m_draft (dfolder, NULL, NOUSE, &isdf), sizeof(drft));
+                 : m_draft (dfolder, NULL, NOUSE, &isdf), sizeof(drft) - 1);
 
     /* Check if a draft already exists */
     if (!buildsw && stat (drft, &st) != NOTOK) {
@@ -434,8 +441,8 @@ try_it_again:
        if (!form)
            form = digestcomps;
     } else {
-       if (!form)
-           form = forwcomps;
+       if (!form)
+           form = forwcomps;
     }
 
     dat[0] = digest ? issue : msgnum;
@@ -446,7 +453,7 @@ try_it_again:
 
 
     in = build_form (form, digest, dat, from, to, cc, fcc, subject,
-                    file ? file : fwdmsg);
+                    file ? file : fwdmsg);
 
     if ((out = creat (drft, m_gmprot ())) == NOTOK)
        adios (drft, "unable to create");