sbr/utils.c: Delete unused upcase() function.

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 05a533e2752c2dc941b3cb5ca5a6de70aba1def2..8beae1b8d6c4a26b71924284be6794653e2424ae 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

+#include "../sbr/m_mktemp.h"

 #include <fcntl.h>
 
 #define REFILE_SWITCHES \
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \


@@ -382,7 +383,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,
         * 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;
                                     0, preserve, nfolders == 1 && refile,
                                     maildir)) == -1)
            return 1;


@@ -409,7 +410,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,
            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);

            }
        }
     }
            }
        }
     }