X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffolder_addmsg.c;h=f90cedfbae04504f4817e228a528a383dd7e0b6e;hb=3bf07d227725f798f654ac09f015f35d27ab83cb;hp=b3bc8914b74678d9c64e8a5648dbfeef8ce2fe56;hpb=a259594cc41e41bfbb90562d3977b8194d1446f5;p=mmh

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index b3bc891..f90cedf 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -20,12 +20,11 @@
 
 int
 folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
-               int unseen, int preserve, int deleting)
+               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 *op;
     struct msgs *mp;
     struct stat st1, st2;
 
@@ -138,14 +137,12 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 	 * 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 lined somewhere else.
+	 * Run the add hook if the message is getting copied or linked somewhere else.
 	 */
 	if (link (msgfile, newmsg) != -1) {
 
 	    if (deleting) {
-		op = folder_read(getfolder(1));
-		(void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", op->foldpath, msgfile);
-		folder_free(op);
+		(void)snprintf(oldmsg, sizeof (oldmsg), "%s/%s", from_dir, msgfile);
 		(void)ext_hook("ref-hook", oldmsg, newmsg);
 	    }
 	    else
@@ -183,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);
@@ -200,8 +197,10 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
 		    close (infd);
 		    close (outfd);
 
-		    if (deleting)
-		        (void)ext_hook("ref-hook", newmsg, msgfile);
+		    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);