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

[nmh] / uip / rcvstore.c

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 61702c4807bbaa21f074eb2edded1b94ea9490e7..58dba169001cea3e4044c7282eba059d446df9e8 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -5,13 +5,33 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setunseen.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/cpydata.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/folder_addmsg.h"
+#include "sbr/context_save.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_add.h"
+#include "sbr/error.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/signals.h>
-#include <h/mts.h>
-#include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "h/signals.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/makedir.h"

 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \
 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \


@@ -45,8 +65,10 @@ static void unlink_done(int) NORETURN;
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int publicsw = -1, zerosw = 0;
-    int create = 1, unseensw = 1;
+    int publicsw = -1;
+    bool zerosw = false;
+    bool create = true;
+    bool unseensw = true;

     int fd, msgnum;
     size_t seqp = 0;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     int fd, msgnum;
     size_t seqp = 0;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];


@@ -55,9 +77,9 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
     struct msgs *mp;
     struct stat st;
 

-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
 

-    done=unlink_done;
+    set_done(unlink_done);

 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);


@@ -71,7 +93,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [switches]",


@@ -84,17 +106,17 @@ main (int argc, char **argv)
 
            case SEQSW: 
                if (!(cp = *argp++) || *cp == '-')
 
            case SEQSW: 
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument name to %s", argp[-2]);
+                   die("missing argument name to %s", argp[-2]);

 
                svector_push_back (seqs, cp);
                seqp++;
                continue;
 
            case UNSEENSW:
 
                svector_push_back (seqs, cp);
                seqp++;
                continue;
 
            case UNSEENSW:

-               unseensw = 1;
+               unseensw = true;

                continue;
            case NUNSEENSW:
                continue;
            case NUNSEENSW:

-               unseensw = 0;
+               unseensw = false;

                continue;
 
            case PUBSW: 
                continue;
 
            case PUBSW: 


@@ -105,27 +127,26 @@ main (int argc, char **argv)
                continue;
 
            case ZEROSW: 
                continue;
 
            case ZEROSW: 

-               zerosw++;
+               zerosw = true;

                continue;
            case NZEROSW: 
                continue;
            case NZEROSW: 

-               zerosw = 0;
+               zerosw = false;

                continue;
 
            case CRETSW: 
                continue;
 
            case CRETSW: 

-               create++;
+               create = true;

                continue;
            case NCRETSW: 
                continue;
            case NCRETSW: 

-               create = 0;
+               create = false;

                continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else {
        } else {

-           adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+           die("usage: %s [+folder] [switches]", invo_name);

        }
     }
 
        }
     }
 


@@ -142,9 +163,9 @@ main (int argc, char **argv)
        if (errno != ENOENT)
            adios (maildir, "error on folder");
        if (!create)
        if (errno != ENOENT)
            adios (maildir, "error on folder");
        if (!create)

-           adios (NULL, "folder %s doesn't exist", maildir);
+           die("folder %s doesn't exist", maildir);

        if (!makedir (maildir))
        if (!makedir (maildir))

-           adios (NULL, "unable to create folder %s", maildir);
+           die("unable to create folder %s", maildir);

     }
 
     if (chdir (maildir) == NOTOK)
     }
 
     if (chdir (maildir) == NOTOK)


@@ -159,7 +180,7 @@ main (int argc, char **argv)
     /* create a temporary file */
     tmpfilenam = m_mktemp (invo_name, &fd, NULL);
     if (tmpfilenam == NULL) {
     /* create a temporary file */
     tmpfilenam = m_mktemp (invo_name, &fd, NULL);
     if (tmpfilenam == NULL) {

-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file in %s", get_temp_dir());

     }
     chmod (tmpfilenam, m_gmprot());
 
     }
     chmod (tmpfilenam, m_gmprot());
 


@@ -184,7 +205,7 @@ main (int argc, char **argv)
      * read folder and create message structure
      */
     if (!(mp = folder_read (folder, 1)))
      * read folder and create message structure
      */
     if (!(mp = folder_read (folder, 1)))

-       adios (NULL, "unable to read folder %s", folder);
+       die("unable to read folder %s", folder);

 
     /*
      * Link message into folder, and possibly add
 
     /*
      * Link message into folder, and possibly add