X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1ca8f21e0edfe448b71ac86de1b0cd987547a002..42db3a2c36e26e0106b1e480407e32d3c8c09bef:/uip/whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 50001f17..e1729df7 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -37,12 +37,39 @@
  *				by attachment number.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "whatnowsbr.h"
+#include "sendsbr.h"
+#include "annosbr.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_switch_multiword_via_readline.h"
+#include "sbr/concat.h"
+#include "sbr/showfile.h"
+#include "sbr/smatch.h"
+#include "sbr/r1bindex.h"
+#include "sbr/refile.h"
+#include "sbr/closefds.h"
+#include "sbr/copyip.h"
+#include "sbr/getcpy.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_backup.h"
+#include "sbr/geteditor.h"
+#include "sbr/context_save.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/push.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/mime.h>
-#include <h/utils.h>
+#include "h/mime.h"
+#include "h/utils.h"
 #ifdef OAUTH_SUPPORT
-# include <h/oauth.h>
+#include "h/oauth.h"
 #endif
 #include "h/done.h"
 #include "sbr/m_maildir.h"
@@ -120,7 +147,9 @@ static int copyf (char *, char *);
 int
 WhatNow (int argc, char **argv)
 {
-    int isdf = 0, nedit = 0, use = 0, atfile = 1;
+    int isdf = 0;
+    bool nedit = false;
+    int use = 0, atfile = 1;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;
     char buf[BUFSIZ];
@@ -186,10 +215,10 @@ WhatNow (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 PRMPTSW:
@@ -216,7 +245,7 @@ WhatNow (int argc, char **argv)
 
     if (ed == NULL && ((ed = getenv ("mheditor")) == NULL || *ed == 0)) {
 	ed = NULL;
-	nedit++;
+	nedit = true;
     }
 
     /* start editing the draft, unless -noedit was given */
@@ -634,7 +663,7 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
  * EDIT
  */
 
-static int  reedit = 0;		/* have we been here before?     */
+static bool reedit;    		/* have we been here before?     */
 static char *edsave = NULL;	/* the editor we used previously */
 
 
@@ -739,7 +768,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		break;
 	    }
 
-	    reedit++;
+	    reedit = true;
 	    if (altmsg
 		    && mp
 		    && !is_readonly(mp)
@@ -956,12 +985,12 @@ DEFINE_SWITCH_ARRAY(SEND, sendswitches);
 
 
 extern int debugsw;		/* from sendsbr.c */
-extern int forwsw;
+extern bool forwsw;
 extern int inplace;
-extern int pushsw;
+extern bool pushsw;
 extern int splitsw;
-extern int unique;
-extern int verbsw;
+extern bool unique;
+extern bool verbsw;
 
 extern char *altmsg;		/*  .. */
 extern char *annotext;
@@ -976,7 +1005,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
     char **arguments, *savearg[MAXARGS], **vec;
     const char *user = NULL, *saslmech = NULL;
     char *auth_svc = NULL;
-    int snoop = 0;
     struct stat st;
 
     /*
@@ -1013,9 +1041,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
     argp = arguments;
 
     debugsw = 0;
-    forwsw = 1;
+    forwsw = true;
     inplace = 1;
-    unique = 0;
+    unique = false;
 
     altmsg = NULL;
     annotext = NULL;
@@ -1079,24 +1107,24 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		    continue;
 
 		case UNIQSW:
-		    unique++;
+		    unique = true;
 		    continue;
 		case NUNIQSW:
-		    unique = 0;
+		    unique = false;
 		    continue;
 		case FORWSW:
-		    forwsw++;
+		    forwsw = true;
 		    continue;
 		case NFORWSW:
-		    forwsw = 0;
+		    forwsw = false;
 		    continue;
 
 		case VERBSW:
-		    verbsw++;
+		    verbsw = true;
 		    vec[vecp++] = --cp;
 		    continue;
 		case NVERBSW:
-		    verbsw = 0;
+		    verbsw = false;
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -1125,7 +1153,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
 		    continue;
 
 		case SNOOPSW:
-                    snoop++;
 		    vec[vecp++] = --cp;
 		    continue;