[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. cbe5256a53c1c5a724264c14d96c4ade664a577a

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  cbe5256a53c1c5a724264c14d96c4ade664a577a (commit)
      from  a01a41d031c796b526329a4170eb23f0ac93b949 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=cbe5256a53c1c5a724264c14d96c4ade664a577a


commit cbe5256a53c1c5a724264c14d96c4ade664a577a
Author: David Malone <address@hidden>
Date:   Wed Dec 7 10:19:40 2011 -0500

    Add support to inc for incorporting email from Maildir dropboxes.
    
    Add missing #include for <sys/socket.h> to bring in definitions of 
PF_UNSPEC.
    
    Signed-off-by: Ken Hornstein <address@hidden>

diff --git a/man/inc.man b/man/inc.man
index 540b378..44153a5 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -47,6 +47,14 @@ incorporates mail from the user's incoming mail drop into
 an
 .B nmh
 folder.
+If the mail drop is a file, it can be in
+.B mbox
+or
+.B MMDF
+format.
+If the mail drop is a directory it will considered to be a
+.B Maildir
+format mail drop.
 .PP
 You may specify which folder to use with
 .IR +folder .
diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c
index a10509c..94287b5 100644
--- a/mts/smtp/hosts.c
+++ b/mts/smtp/hosts.c
@@ -16,6 +16,7 @@
 
 #include <h/mh.h>
 #include <h/mts.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 static struct host {
diff --git a/sbr/mts.c b/sbr/mts.c
index cd2a3d8..15f182c 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <h/mts.h>
 #include <pwd.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
diff --git a/uip/inc.c b/uip/inc.c
index 8f99b7b..1bc0766 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -112,22 +112,29 @@ static struct swit switches[] = {
 #define INC_POP   1
 
 static int inc_type;
+static struct Maildir_entry {
+       char *filename;
+       time_t mtime;
+} *Maildir = NULL;
+static int num_maildir_entries = 0;
 static int snoop = 0;
 
 #ifdef POP
 extern char response[];
 
-static char *packfile = NULL;
 static int size;
 static long pos;
-static long start;
-static long stop;
 
 static int mbx_style = MMDF_FORMAT;
 static int pd = NOTOK;
-static FILE *pf = NULL;
 #endif /* POP */
 
+static long start;
+static long stop;
+
+static char *packfile = NULL;
+static FILE *pf = NULL;
+
 /* This is an attempt to simplify things by putting all the
  * privilege ops into macros.
  * *GROUPPRIVS() is related to handling the setgid MAIL property,
@@ -192,6 +199,17 @@ static int pop_pack(char *);
 static int map_count(void);
 #endif
 
+int
+maildir_srt(const void *va, const void *vb)
+{
+    const struct Maildir_entry *a = va, *b = vb;
+    if (a->mtime > b->mtime)
+      return 1;
+    else if (a->mtime < b->mtime)
+      return -1;
+    else
+      return 0;
+}
 
 int
 main (int argc, char **argv)
@@ -476,6 +494,55 @@ main (int argc, char **argv)
        }
        if (stat (newmail, &s1) == NOTOK || s1.st_size == 0)
            adios (NULL, "no mail to incorporate");
+       if (s1.st_mode & S_IFDIR) {
+           DIR *md;
+           struct dirent *de;
+           struct stat ms;
+           int i;
+           i = 0;
+           cp = concat (newmail, "/new", NULL);
+           if ((md = opendir(cp)) == NULL)
+               adios (NULL, "unable to open %s", cp);
+           while ((de = readdir (md)) != NULL) {
+               if (de->d_name[0] == '.')
+                   continue;
+               if (i >= num_maildir_entries) {
+                   if ((Maildir = realloc(Maildir, sizeof(*Maildir) * 
(2*i+16))) == NULL)
+                       adios(NULL, "not enough memory for %d messages", 
2*i+16);
+                   num_maildir_entries = 2*i+16;
+               }
+               Maildir[i].filename = concat (cp, "/", de->d_name, NULL);
+               if (stat(Maildir[i].filename, &ms) != 0)
+                  adios (Maildir[i].filename, "couldn't get delivery time");
+               Maildir[i].mtime = ms.st_mtime;
+               i++;
+           }
+           free (cp);
+           closedir (md);
+           cp = concat (newmail, "/cur", NULL);
+           if ((md = opendir(cp)) == NULL)
+               adios (NULL, "unable to open %s", cp);
+           while ((de = readdir (md)) != NULL) {
+               if (de->d_name[0] == '.')
+                   continue;
+               if (i >= num_maildir_entries) {
+                   if ((Maildir = realloc(Maildir, sizeof(*Maildir) * 
(2*i+16))) == NULL)
+                       adios(NULL, "not enough memory for %d messages", 
2*i+16);
+                   num_maildir_entries = 2*i+16;
+               }
+               Maildir[i].filename = concat (cp, "/", de->d_name, NULL);
+               if (stat(Maildir[i].filename, &ms) != 0)
+                  adios (Maildir[i].filename, "couldn't get delivery time");
+               Maildir[i].mtime = ms.st_mtime;
+               i++;
+           }
+           free (cp);
+           closedir (md);
+           if (i == 0)
+               adios (NULL, "no mail to incorporate");
+           num_maildir_entries = i;
+           qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
+       }
 
        if ((cp = strdup(newmail)) == (char *)0)
            adios (NULL, "error allocating memory to copy newmail");
@@ -519,7 +586,7 @@ main (int argc, char **argv)
 go_to_it:
 #endif /* POP */
 
-    if (inc_type == INC_FILE) {
+    if (inc_type == INC_FILE && Maildir == NULL) {
        if (access (newmail, W_OK) != NOTOK) {
            locked++;
            if (trnflag) {
@@ -725,7 +792,7 @@ go_to_it:
     /*
      * Get the mail from file (usually mail spool)
      */
-    if (inc_type == INC_FILE) {
+    if (inc_type == INC_FILE && Maildir == NULL) {
        m_unknown (in);         /* the MAGIC invocation... */
        hghnum = msgnum = mp->hghmsg;
        for (;;) {
@@ -808,6 +875,110 @@ go_to_it:
             */
            break;
        }
+    } else { /* Maildir inbox to process */
+       char *sp;
+       FILE *sf;
+       int i;
+
+       hghnum = msgnum = mp->hghmsg;
+       for (i = 0; i < num_maildir_entries; i++) {
+           msgnum++;
+           /*
+            * Check if we need to allocate more space for message status.
+            * If so, then add space for an additional 100 messages.
+            */
+           if (msgnum >= mp->hghoff
+               && !(mp = folder_realloc (mp, mp->lowoff, mp->hghoff + 100))) {
+               advise (NULL, "unable to allocate folder storage");
+               incerr = NOTOK;
+               break;
+           }
+
+           sp = Maildir[i].filename;
+           cp = getcpy (m_name (msgnum));
+           pf = NULL;
+           if (!trnflag || link(sp, cp) == -1) {
+               static char buf[65536];
+               size_t nrd;
+
+               if ((sf = fopen (sp, "r")) == NULL)
+                   adios (sp, "unable to read for copy");
+               if ((pf = fopen (cp, "w+")) == NULL)
+                   adios (cp, "unable to write for copy");
+               while ((nrd = fread(buf, 1, sizeof(buf), sf)) > 0)
+                   if (fwrite(buf, 1, nrd, pf) != nrd)
+                       break;
+               if (ferror(sf) || fflush(pf) || ferror(pf)) {
+                       int e = errno;
+                       fclose(pf); fclose(sf); unlink(cp);
+                       errno = e;
+                       adios(cp, "copy error %s -> %s", sp, cp);
+               }
+               fclose (sf);
+               sf = NULL;
+           } 
+           if (pf == NULL && (pf = fopen (cp, "r")) == NULL)
+               adios (cp, "not available");
+           chmod (cp, m_gmprot ());
+
+           fseek (pf, 0L, SEEK_SET);
+           switch (incerr = scan (pf, msgnum, 0, nfs, width,
+                             msgnum == mp->hghmsg + 1 && chgflag,
+                             1, NULL, stop - start, noisy)) {
+           case SCNEOF: 
+               printf ("%*d  empty\n", DMAXFOLDER, msgnum);
+               break;
+
+           case SCNFAT:
+               trnflag = 0;
+               noisy++;
+               /* advise (cp, "unable to read"); already advised */
+               /* fall thru */
+
+           case SCNERR:
+           case SCNNUM: 
+               break;
+
+           case SCNMSG: 
+           case SCNENC:
+           default: 
+               /*
+                *  Run the external program hook on the message.
+                */
+
+               (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 
1);
+               (void)ext_hook("add-hook", b, (char *)0);
+
+               if (aud)
+                   fputs (scanl, aud);
+# ifdef MHE
+               if (mhe)
+                   fputs (scanl, mhe);
+# endif /* MHE */
+               if (noisy)
+                   fflush (stdout);
+               if (!packfile) {
+                   clear_msg_flags (mp, msgnum);
+                   set_exists (mp, msgnum);
+                   set_unseen (mp, msgnum);
+                   mp->msgflags |= SEQMOD;
+               }
+               break;
+           }
+           if (ferror(pf) || fclose (pf)) {
+               int e = errno;
+               unlink (cp);
+               errno = e;
+               adios (cp, "write error on");
+           }
+           pf = NULL;
+           free (cp);
+
+           if (trnflag && unlink (sp) == NOTOK)
+               adios (sp, "couldn't unlink");
+           free (sp); /* Free Maildir[i]->filename */
+       }
+       free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }
 
     if (incerr < 0) {          /* error */
@@ -840,7 +1011,7 @@ go_to_it:
     /*
      * truncate file we are incorporating from
      */
-    if (inc_type == INC_FILE) {
+    if (inc_type == INC_FILE && Maildir == NULL) {
        if (trnflag) {
            if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime)
                advise (NULL, "new messages have arrived!\007");
@@ -874,7 +1045,7 @@ go_to_it:
     /*
      * unlock the mail spool
      */
-    if (inc_type == INC_FILE) {
+    if (inc_type == INC_FILE && Maildir == NULL) {
        if (locked) {
            GETGROUPPRIVS();        /* Be sure we can unlock mail file */
            (void) lkfclose (in, newmail); in = NULL;

-----------------------------------------------------------------------

Summary of changes:
 man/inc.man      |    8 ++
 mts/smtp/hosts.c |    1 +
 sbr/mts.c        |    1 +
 uip/inc.c        |  187 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 189 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System