lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 05a533e2752c2dc941b3cb5ca5a6de70aba1def2..bed5cba6558fc3955d13768a251ea32fe7c8b42a 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,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 \
@@ -382,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;
@@ -409,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);
            }
        }
     }