X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1ca8f21e0edfe448b71ac86de1b0cd987547a002..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 9ee6dab4..16cc7fcc 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -6,9 +6,24 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.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,10 +73,12 @@ static void copy_seqs (struct msgs *, int, struct msgs *, int);
 int
 main (int argc, char **argv)
 {
-    int linkf = 0, preserve = 0;
+    bool linkf = false;
+    bool preserve = false;
     bool retainseqs = false;
     int filep = 0;
-    int foldp = 0, isdf = 0, unlink_msgs = 0;
+    int foldp = 0, isdf = 0;
+    bool unlink_msgs = false;
     int i, msgnum;
     char *cp, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
@@ -98,17 +115,17 @@ 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:
@@ -119,10 +136,10 @@ main (int argc, char **argv)
 		continue;
 
 	    case UNLINKSW:
-		unlink_msgs++;
+		unlink_msgs = true;
 		continue;
 	    case NUNLINKSW:
-		unlink_msgs = 0;
+		unlink_msgs = false;
 		continue;
 
 	    case SRCSW: