fmt_new.c: Move interface to own file.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 2141f32dc9732879829e9f7b063f63b46b945577..a41e7fe67557614c380d1e8ef86a6e727e590484 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -7,10 +7,33 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/crawl_folders.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/ssequal.h"
+#include "sbr/getcpy.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_pack.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_del.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "sbr/crawl_folders.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
@@ -47,12 +70,12 @@ DEFINE_SWITCH_ENUM(FOLDER);
 DEFINE_SWITCH_ARRAY(FOLDER, switches);
 #undef X
 
-static int fshort   = 0;       /* output only folder names                 */
+static bool fshort;            /* output only folder names                 */
 static int fcreat   = 0;       /* should we ask to create new folders?     */
-static int fpack    = 0;       /* are we packing the folder?               */
-static int fverb    = 0;       /* print actions taken while packing folder */
+static bool fpack;             /* are we packing the folder?               */
+static bool fverb;             /* print actions taken while packing folder */
 static int fheader  = 0;       /* should we output a header?               */
-static int frecurse = 0;       /* recurse through subfolders               */
+static bool frecurse;          /* recurse through subfolders               */
 static int ftotal   = 0;       /* should we output the totals?             */
 static bool all;               /* should we output all folders             */
 
@@ -96,9 +119,9 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
-static
-void
-nonexistent_folder (int status) {
+static void
+nonexistent_folder (int status)
+{
     NMH_UNUSED (status);
     die("folder %s does not exist", folder);
 }
@@ -159,10 +182,10 @@ main (int argc, char **argv)
                    continue;
 
                case FASTSW: 
-                   fshort++;
+                   fshort = true;
                    continue;
                case NFASTSW: 
-                   fshort = 0;
+                   fshort = false;
                    continue;
 
                case HDRSW: 
@@ -173,24 +196,24 @@ main (int argc, char **argv)
                    continue;
 
                case PACKSW: 
-                   fpack++;
+                   fpack = true;
                    continue;
                case NPACKSW: 
-                   fpack = 0;
+                   fpack = false;
                    continue;
 
                case VERBSW:
-                   fverb++;
+                   fverb = true;
                    continue;
                case NVERBSW:
-                   fverb = 0;
+                   fverb = false;
                    continue;
 
                case RECURSW: 
-                   frecurse++;
+                   frecurse = true;
                    continue;
                case NRECRSW: 
-                   frecurse = 0;
+                   frecurse = false;
                    continue;
 
                case TOTALSW: