man: Use `.B' instead of `.BR' when only one argument.

[nmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 83e64a5b174e6eeecdda8393989396f4f1263e19..e588799e1b64f598ad46ea2d7fccbfb20592e8fc 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -5,11 +5,36 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mime.h>
+#include "h/mh.h"
+#include "whatnowproc.h"
+#include "annosbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_switch_multiword.h"
+#include "sbr/concat.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/showfile.h"
+#include "sbr/smatch.h"
+#include "sbr/refile.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.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/error.h"
+#include "h/mime.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
+#include "replsbr.h"
 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \
@@ -92,15 +117,10 @@ static struct swit aqrl[] = {
     { NULL, 0, 0 }
 };
 
-short ccto = -1;               /* global for replsbr */
-short cccc = -1;
-short ccme = -1;
-short querysw = 0;
-
 static short outputlinelen = OUTPUTLINELEN;
-static short groupreply = 0;           /* Is this a group reply?        */
+static bool groupreply;                        /* Is this a group reply?        */
 
-static int mime = 0;                   /* include original as MIME part */
+static bool mime;                      /* include original as MIME part */
 static char *form   = NULL;            /* form (components) file        */
 static char *filter = NULL;            /* message filter file           */
 static char *fcc    = NULL;            /* folders to add to Fcc: header */
@@ -117,9 +137,11 @@ int
 main (int argc, char **argv)
 {
     int        i, isdf = 0;
-    int anot = 0, inplace = 1;
-    int nedit = 0, nwhat = 0;
-    int atfile = 0;
+    bool anot = false;
+    bool inplace = true;
+    bool nedit = false;
+    bool nwhat = false;
+    bool atfile = false;
     int fmtproc = -1;
     char *cp, *cwd, *dp, *maildir, *file = NULL;
     char *folder = NULL, *msg = NULL, *dfolder = NULL;
@@ -131,8 +153,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     struct stat st;
     FILE *in;
-
-    int buildsw = 0;
+    bool buildsw = false;
 
     if (nmh_init(argv[0], true, true)) { return 1; }
 
@@ -158,17 +179,17 @@ main (int argc, char **argv)
                    done (0);
 
                case GROUPSW:
-                   groupreply++;
+                   groupreply = true;
                    continue;
                case NGROUPSW:
-                   groupreply = 0;
+                   groupreply = false;
                    continue;
 
                case ANNOSW: 
-                   anot++;
+                   anot = true;
                    continue;
                case NANNOSW: 
-                   anot = 0;
+                   anot = false;
                    continue;
 
                case CCSW: 
@@ -185,10 +206,10 @@ main (int argc, char **argv)
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
                        die("missing argument to %s", argp[-2]);
-                   nedit = 0;
+                   nedit = false;
                    continue;
                case NEDITSW:
-                   nedit++;
+                   nedit = true;
                    continue;
                    
                case CONVERTARGSW: {
@@ -222,13 +243,13 @@ main (int argc, char **argv)
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                        die("missing argument to %s", argp[-2]);
-                   nwhat = 0;
+                   nwhat = false;
                    continue;
                case BILDSW: 
-                   buildsw++;
+                   buildsw = true;
                    /* FALLTHRU */
                case NWHATSW: 
-                   nwhat++;
+                   nwhat = true;
                    continue;
 
                case FCCSW: 
@@ -254,7 +275,7 @@ main (int argc, char **argv)
                    if (!(cp = *argp++) || *cp == '-')
                        die("missing argument to %s", argp[-2]);
                    filter = mh_xstrdup(etcpath(cp));
-                   mime = 0;
+                   mime = false;
                    continue;
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
@@ -263,25 +284,25 @@ main (int argc, char **argv)
 
                case FRMTSW: 
                    filter = mh_xstrdup(etcpath(mhlreply));
-                   mime = 0;
+                   mime = false;
                    continue;
                case NFRMTSW: 
                    filter = NULL;
                    continue;
 
                case INPLSW: 
-                   inplace++;
+                   inplace = true;
                    continue;
                case NINPLSW: 
-                   inplace = 0;
+                   inplace = false;
                    continue;
 
                case MIMESW:
-                   mime++;
+                   mime = true;
                    filter = NULL;
                    continue;
                case NMIMESW:
-                   mime = 0;
+                   mime = false;
                    continue;
 
                case QURYSW: 
@@ -318,10 +339,10 @@ main (int argc, char **argv)
                    continue;
 
                case ATFILESW:
-                   atfile++;
+                   atfile = true;
                    continue;
                case NOATFILESW:
-                   atfile = 0;
+                   atfile = false;
                    continue;
 
                case FMTPROCSW:
@@ -397,7 +418,7 @@ try_it_again:
        /*
         * We are replying to a file.
         */
-       anot = 0;       /* we don't want to annotate a file */
+       anot = false;   /* we don't want to annotate a file */
     } else {
        /*
         * We are replying to a message.
@@ -475,7 +496,7 @@ try_it_again:
     return 1;
 }
 
-void
+static void
 docc (char *cp, int ccflag)
 {
     switch (smatch (cp, ccswitches)) {
@@ -511,9 +532,10 @@ docc (char *cp, int ccflag)
  * The ARGS pseudoheader is optional, but we always add it when
  * -convertargs is used.
  */
-void
+static void
 add_convert_header (const char *convert_type, char *convert_arg,
-                    char *filename, char *drft) {
+                    char *filename, char *drft)
+{
     char *field_name;
 
     field_name = concat (MHBUILD_FILE_PSEUDOHEADER, convert_type, NULL);