X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=864574b50fa5fd7beb7335a031c09b08ce0c8bd2;hb=150eda989f39dde2dd6112b46c50558cd9bfd5fd;hp=7475d5e157e1603e0a2f39b6741a8e68db15bc75;hpb=dee387b53ab0d42922f857b60d6f980c9e79d16f;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 7475d5e..864574b 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -3,6 +3,10 @@
  * inc.c -- incorporate messages from a maildrop into a folder
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #ifdef MAILGROUP
@@ -130,8 +134,6 @@ static struct swit switches[] = {
     { NULL, 0 }
 };
 
-extern int errno;
-
 /*
  * flags for the mail source
  */
@@ -241,6 +243,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st, s1;
     FILE *aud = NULL;
+    char	b[MAXPATHLEN + 1];
+    char	*maildir_copy;		/* copy of mail directory because the static gets overwritten */
 
 #ifdef POP
     int nmsgs, nbytes, p = 0;
@@ -530,6 +534,11 @@ main (int argc, char **argv)
 	}
 	if (stat (newmail, &s1) == NOTOK || s1.st_size == 0)
 	    adios (NULL, "no mail to incorporate");
+
+	if ((cp = strdup(newmail)) == (char *)0)
+	    adios (maildir, "error allocating memory to copy newmail");
+
+	newmail = cp;
     }
 
 #ifdef POP
@@ -544,6 +553,9 @@ main (int argc, char **argv)
 	folder = getfolder (0);
     maildir = m_maildir (folder);
 
+    if ((maildir_copy = strdup(maildir)) == (char *)0)
+        adios (maildir, "error allocating memory to copy maildir");
+
     if (stat (maildir, &st) == NOTOK) {
 	if (errno != ENOENT)
 	    adios (maildir, "error on folder");
@@ -798,7 +810,6 @@ go_to_it:
 	    /* link message into folder */
 	    newmsg = folder_addmsg(mp, tmpfilenam);
 #endif
-
 	    /* create scanline for new message */
 	    switch (i = scan (in, msgnum + 1, msgnum + 1, nfs, width,
 			      msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
@@ -822,6 +833,13 @@ go_to_it:
 
 	    case SCNMSG:
 	    case SCNENC:
+		/*
+		 *  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
@@ -833,6 +851,9 @@ go_to_it:
 
 		msgnum++;
 		mp->hghmsg++;
+		mp->nummsg++;
+		if (mp->lowmsg == 0) mp->lowmsg = 1;
+
 		clear_msg_flags (mp, msgnum);
 		set_exists (mp, msgnum);
 		set_unseen (mp, msgnum);