X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffolder_delmsgs.c;h=c1416a6fb8557ea1ea5b094be18af962703b56ad;hb=a8a488a128a8124503d01da632c7290f6abc0752;hp=3d2e5497a68b45381965b3dbe66b7d524bef6666;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 3d2e549..c1416a6 100644
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -2,8 +2,6 @@
 /*
  * folder_delmsgs.c -- "remove" SELECTED messages from 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.
@@ -22,11 +20,12 @@
  */
 
 int
-folder_delmsgs (struct msgs *mp, int unlink_msgs)
+folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 {
     pid_t pid;
     int msgnum, vecp, retval = 0;
     char buf[100], *dp, **vec;
+    char	msgpath[BUFSIZ];
 
     /*
      * If "rmmproc" is defined, exec it to remove messages.
@@ -41,9 +40,6 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs)
 	/* Mark that the sequence information has changed */
 	mp->msgflags |= SEQMOD;
 
-	if (mp->numsel > MAXARGS - 2)
-	    adios (NULL, "more than %d messages for %s exec", MAXARGS - 2,
-		   rmmproc);
 	vec = (char **) calloc ((size_t) (mp->numsel + 2), sizeof(*vec));
 	if (vec == NULL)
 	    adios (NULL, "unable to allocate exec vector");
@@ -83,6 +79,19 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs)
 	    unset_selected (mp, msgnum);
 	    mp->numsel--;
 
+	    /*
+	     *	Run the external hook on the message if one was specified in the context.
+	     *	All we have is the message number; we have changed to the directory
+	     *	containing the message.  So, we need to extract that directory to form
+	     *	the complete path.  Note that the caller knows the directory, but has
+	     *	no way of passing that to us.
+	     */
+
+	    if (!nohook) {
+		    (void)snprintf(msgpath, sizeof (msgpath), "%s/%d", mp->foldpath, msgnum);
+		    (void)ext_hook("del-hook", msgpath, (char *)0);
+		}
+
 	    dp = m_name (msgnum);
 
 	    if (unlink_msgs) {