[bug #4302] errno is not always an extern int

[mmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 906ea4a..c184dc1 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -4,6 +4,10 @@
  *          -- into one or more destination folders
  *
  * $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.
  */
 
 #include <h/mh.h>
@@ -43,12 +47,10 @@ static struct swit switches[] = {
 #define VERSIONSW       11
     { "version", 0 },
 #define        HELPSW          12
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
-extern int errno;
-
 static char maildir[BUFSIZ];
 
 struct st_fold {
@@ -62,7 +64,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
@@ -209,7 +211,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)
@@ -243,11 +245,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);
        }
@@ -265,9 +272,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);
@@ -383,13 +394,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)) == -1)
            return 1;
     }
     return 0;