- Fixed bcc to work with sendmail/pipe [Bug 55700].

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 6d088d872943b31649492abcc4e2b4af2b276c6d..69210f81ed0437515fad73dc2a12ff0d17f7f864 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,14 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/fmt_new.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_save.h"

 #include "sbr/showfile.h"
 #include "sbr/smatch.h"
 #include "sbr/refile.h"
 #include "sbr/showfile.h"
 #include "sbr/smatch.h"
 #include "sbr/refile.h"


@@ -159,7 +167,7 @@ main (int argc, char **argv)
                    use = NOUSE;
                    continue;
 
                    use = NOUSE;
                    continue;
 

-               case FILESW:    /* compatibility */
+               case FILESW:    /* compatibility */

                    if (file)
                        die("only one file at a time!");
                    if (!(file = *argp++) || *file == '-')
                    if (file)
                        die("only one file at a time!");
                    if (!(file = *argp++) || *file == '-')


@@ -292,7 +300,7 @@ main (int argc, char **argv)
     } else {
        struct comp *cptr;
 
     } else {
        struct comp *cptr;
 

-       if (! form)
+       if (! form)

            form = components;
 
         cp = new_fs(form, NULL, NULL);
            form = components;
 
         cp = new_fs(form, NULL, NULL);


@@ -306,33 +314,33 @@ main (int argc, char **argv)
        if (from) {
            cptr = fmt_findcomp("from");
            if (cptr)
        if (from) {
            cptr = fmt_findcomp("from");
            if (cptr)

-               cptr->c_text = from;
+               cptr->c_text = from;

        }
        if (to) {
            cptr = fmt_findcomp("to");
            if (cptr)
        }
        if (to) {
            cptr = fmt_findcomp("to");
            if (cptr)

-               cptr->c_text = to;
+               cptr->c_text = to;

        }
        if (cc) {
            cptr = fmt_findcomp("cc");
            if (cptr)
        }
        if (cc) {
            cptr = fmt_findcomp("cc");
            if (cptr)

-               cptr->c_text = cc;
+               cptr->c_text = cc;

        }
        if (fcc) {
            cptr = fmt_findcomp("fcc");
            if (cptr)
        }
        if (fcc) {
            cptr = fmt_findcomp("fcc");
            if (cptr)

-               cptr->c_text = fcc;
+               cptr->c_text = fcc;

        }
        if (subject) {
            cptr = fmt_findcomp("subject");
            if (cptr)
        }
        if (subject) {
            cptr = fmt_findcomp("subject");
            if (cptr)

-               cptr->c_text = subject;
+               cptr->c_text = subject;

        }
     }
 
 try_it_again:
     strncpy (drft, build ? m_maildir ("draft")
        }
     }
 
 try_it_again:
     strncpy (drft, build ? m_maildir ("draft")

-                       : m_draft (dfolder, file, use, &isdf), sizeof(drft));
+                       : m_draft (dfolder, file, use, &isdf), sizeof(drft));

 
     /*
      * Check if we have an existing draft
 
     /*
      * Check if we have an existing draft