Commit ddf3a8574f65 is a fix to commit af586ebe59b7.

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index f9d3b54f1da4dc7704838bf65efb61a4159ce842..bbc1bae4369d3a3923684e9ddbdb0832e6c49c3d 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -6,9 +6,33 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/folder_delmsgs.h"
+#include "sbr/folder_addmsg.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_getnum.h"
+#include "sbr/seq_add.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 #include "sbr/m_mktemp.h"
 #include <fcntl.h>
@@ -58,8 +82,12 @@ static void copy_seqs (struct msgs *, int, struct msgs *, int);
 int
 main (int argc, char **argv)
 {
-    int linkf = 0, preserve = 0, retainseqs = 0, filep = 0;
-    int foldp = 0, isdf = 0, unlink_msgs = 0;
+    bool linkf = false;
+    bool preserve = false;
+    bool retainseqs = false;
+    int filep = 0;
+    int foldp = 0, isdf = 0;
+    bool unlink_msgs = false;
     int i, msgnum;
     char *cp, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
@@ -96,31 +124,31 @@ main (int argc, char **argv)
                done (0);
 
            case LINKSW:
-               linkf++;
+               linkf = true;
                continue;
            case NLINKSW:
-               linkf = 0;
+               linkf = false;
                continue;
 
            case PRESSW:
-               preserve++;
+               preserve = true;
                continue;
            case NPRESSW:
-               preserve = 0;
+               preserve = false;
                continue;
 
            case RETAINSEQSSW:
-               retainseqs = 1;
+               retainseqs = true;
                continue;
            case NRETAINSEQSSW:
-               retainseqs = 0;
+               retainseqs = false;
                continue;
 
            case UNLINKSW:
-               unlink_msgs++;
+               unlink_msgs = true;
                continue;
            case NUNLINKSW:
-               unlink_msgs = 0;
+               unlink_msgs = false;
                continue;
 
            case SRCSW:
@@ -345,7 +373,7 @@ remove_files (int filep, char **files)
 
     /* If rmmproc is defined, we use that */
     if (rmmproc) {
-       vec = argsplit(rmmproc, &program, &vecp);
+       vec = argsplit(rmmproc, &program, &vecp);
        files++;                /* Yes, we need to do this */
        for (i = 0; i < filep; i++)
                vec[vecp++] = files[i];