X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/cd6d67151dfb691ea6f5ce3eef3562ab93a8847b..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/refile.c

diff --git a/uip/refile.c b/uip/refile.c
index ce56c51e..bed5cba6 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -1,6 +1,4 @@
-
-/*
- * refile.c -- move or link message(s) from a source folder
+/* refile.c -- move or link message(s) from a source folder
  *          -- into one or more destination folders
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
@@ -10,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \
@@ -312,7 +312,7 @@ opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 
 
 /*
- * Set the Previous-Sequence and then sychronize the
+ * Set the Previous-Sequence and then synchronize the
  * sequence file, for each destination folder.
  */
 
@@ -384,7 +384,7 @@ m_file (struct msgs *mp, char *msgfile, int oldmsgnum,
 	 * therefore won't be assigned to be the current message.
 	 */
 	if ((msgnum = folder_addmsg (&fp->f_mp, msgfile,
-				     mp == fp->f_mp ? 0 : 1,
+                                     mp != fp->f_mp,
 				     0, preserve, nfolders == 1 && refile,
 				     maildir)) == -1)
 	    return 1;
@@ -411,7 +411,7 @@ copy_seqs (struct msgs *oldmp, int oldmsgnum, struct msgs *newmp, int newmsgnum)
 	    assert ((int) seqnum == seq_getnum (oldmp, *seq));
 	    if (in_sequence (oldmp, seqnum, oldmsgnum)) {
 		seq_addmsg (newmp, *seq, newmsgnum,
-			    is_seq_private (oldmp, seqnum) ? 0 : 1, 0);
+                            !is_seq_private (oldmp, seqnum), 0);
 	    }
 	}
     }