X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=e50253af5f5ebffba89ba603974a02cb4345ae83;hp=9e1ed2077a168919e9be26cad3c865318c313d4d;hb=389877bae1fe1a9f7259b8979f6a930744d90fab;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/uip/refile.c b/uip/refile.c
index 9e1ed20..e50253a 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,6 +11,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <fcntl.h>
 #include <errno.h>
 
@@ -51,8 +52,6 @@ static struct swit switches[] = {
     { NULL, 0 }
 };
 
-extern int errno;
-
 static char maildir[BUFSIZ];
 
 struct st_fold {
@@ -66,7 +65,7 @@ struct st_fold {
 static void opnfolds (struct st_fold *, int);
 static void clsfolds (struct st_fold *, int);
 static void remove_files (int, char **);
-static int m_file (char *, struct st_fold *, int, int);
+static int m_file (char *, struct st_fold *, int, int, int);
 
 
 int
@@ -99,8 +98,7 @@ main (int argc, char **argv)
      */
     nummsgs = 0;
     maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-	adios (NULL, "unable to allocate storage");
+    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
 
     /*
      * Parse arguments
@@ -187,9 +185,8 @@ main (int argc, char **argv)
 	     */
 	    if (nummsgs >= maxmsgs) {
 		maxmsgs += MAXMSGS;
-		if (!(msgs = (char **) realloc (msgs,
-						(size_t) (maxmsgs * sizeof(*msgs)))))
-		    adios (NULL, "unable to reallocate msgs storage");
+		msgs = (char **) mh_xrealloc (msgs,
+		    (size_t) (maxmsgs * sizeof(*msgs)));
 	    }
 	    msgs[nummsgs++] = cp;
 	}
@@ -213,7 +210,7 @@ main (int argc, char **argv)
 	    adios (NULL, "use -file or some messages, not both");
 	opnfolds (folders, foldp);
 	for (i = 0; i < filep; i++)
-	    if (m_file (files[i], folders, foldp, preserve))
+	    if (m_file (files[i], folders, foldp, preserve, 0))
 		done (1);
 	/* If -nolink, then "remove" files */
 	if (!linkf)
@@ -247,11 +244,16 @@ main (int argc, char **argv)
     /* create folder structures for each destination folder */
     opnfolds (folders, foldp);
 
-    /* Link all the selected messages into destination folders */
+    /* Link all the selected messages into destination folders.
+     *
+     * This causes the add hook to be run for messages that are
+     * linked into another folder.  The refile hook is run for
+     * messages that are moved to another folder.
+     */
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	if (is_selected (mp, msgnum)) {
 	    cp = getcpy (m_name (msgnum));
-	    if (m_file (cp, folders, foldp, preserve))
+	    if (m_file (cp, folders, foldp, preserve, !linkf))
 		done (1);
 	    free (cp);
 	}
@@ -269,9 +271,13 @@ main (int argc, char **argv)
 	fflush (stdout);
     }
 
-    /* If -nolink, then "remove" messages from source folder */
+    /* If -nolink, then "remove" messages from source folder.
+     *
+     * Note that folder_delmsgs does not call the delete hook
+     * because the message has already been handled above.
+     */
     if (!linkf) {
-	folder_delmsgs (mp, unlink_msgs);
+	folder_delmsgs (mp, unlink_msgs, 1);
     }
 
     clsfolds (folders, foldp);
@@ -387,13 +393,13 @@ remove_files (int filep, char **files)
  */
 
 static int
-m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve)
+m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve, int refile)
 {
     int msgnum;
     struct st_fold *fp, *ep;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-	if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve)) == -1)
+	if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve, nfolders == 1 && refile, maildir)) == -1)
 	    return 1;
     }
     return 0;