X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_addmsg.c;h=f90cedfbae04504f4817e228a528a383dd7e0b6e;hp=16f4cc523219299b49ce63540c420cb0c00093d8;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 16f4cc5..f90cedf 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -20,10 +20,11 @@
 
 int
 folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
-               int unseen, int preserve)
+               int unseen, int preserve, int deleting, char *from_dir)
 {
     int infd, outfd, linkerr, first_time, msgnum;
     char *nmsg, newmsg[BUFSIZ];
+    char oldmsg[BUFSIZ];
     struct msgs *mp;
     struct stat st1, st2;
 
@@ -132,9 +133,21 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 	snprintf (newmsg, sizeof(newmsg), "%s/%s", mp->foldpath, nmsg);
 
 	/*
-	 * Now try to link message into folder
+	 * Now try to link message into folder.
+	 * Then run the external hook on the message if one was specified in the context.
+	 * Run the refile hook if we're moving the message from one place to another.
+	 * We have to construct the from path name for this because it's not there.
+	 * Run the add hook if the message is getting copied or linked somewhere else.
 	 */
 	if (link (msgfile, newmsg) != -1) {
+
+	    if (deleting) {
+		(void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", from_dir, msgfile);
+		(void)ext_hook("ref-hook", oldmsg, newmsg);
+	    }
+	    else
+		(void)ext_hook("add-hook", newmsg, (char *)0);
+
 	    return msgnum;
 	} else {
 	    linkerr = errno;
@@ -167,11 +180,11 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 	     */
 	    if (linkerr == EXDEV) {
 		if (stat (newmsg, &st1) == 0) {
-		    advise (NULL, "message %s:%s already exists", newmsg);
+		    advise (NULL, "message %s:%s already exists", mp->foldpath, newmsg);
 		    return -1;
 		} else {
 		    if ((infd = open (msgfile, O_RDONLY)) == -1) {
-			advise (msgfile, "unable to open message %s");
+			advise (msgfile, "unable to open message %s", msgfile);
 			return -1;
 		    }
 		    fstat (infd, &st1);
@@ -183,6 +196,14 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 		    cpydata (infd, outfd, msgfile, newmsg);
 		    close (infd);
 		    close (outfd);
+
+		    if (deleting) {
+			(void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", from_dir, msgfile);
+			(void)ext_hook("ref-hook", oldmsg, newmsg);
+		    }
+		    else
+		        (void)ext_hook("add-hook", newmsg, (char *)0);
+
 		    return msgnum;
 		}
 	    }