X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/00d760f7506c2d5c32ab5abf9f11b3066999f08a..b3d4a4452c332fc3550db3fbdf9e02027b41e985:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index cc00e0ce..ca03877a 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -5,16 +5,18 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/fmt_compile.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/fmt_compile.h"
+#include "h/signals.h"
 #include <setjmp.h>
 #include <fcntl.h>
-#include <h/mime.h>
-#include <h/tws.h>
-#include <h/utils.h>
-#include <h/mts.h>
+#include "h/mime.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "h/mts.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -22,7 +24,7 @@
 #include <time.h>
 
 #ifdef OAUTH_SUPPORT
-#include <h/oauth.h>
+#include "h/oauth.h"
 #endif
 #include "h/done.h"
 #include "sbr/m_maildir.h"
@@ -34,12 +36,12 @@ static int setup_oauth_params(char *[], int *, const char *, const char **);
 #endif /* OAUTH_SUPPORT */
 
 int debugsw = 0;		/* global */
-int forwsw  = 1;
+bool forwsw = true;
 int inplace = 1;
-int pushsw  = 0;
+bool pushsw;
 int splitsw = -1;
-int unique  = 0;
-int verbsw  = 0;
+bool unique;
+bool verbsw;
 
 char *altmsg   = NULL;		/*  .. */
 char *annotext = NULL;
@@ -738,9 +740,9 @@ oops:
 }
 
 
-static
-void
-handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
+static void
+handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc)
+{
     const char *addr, *host;
     const char *message;
 
@@ -783,7 +785,8 @@ handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
  */
 static int
 setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
-		   const char **message) {
+		   const char **message)
+{
     const char *saslmech = NULL, *user = NULL;
     mh_oauth_service_info svc;
     char errbuf[256];
@@ -846,9 +849,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 /*
  * Extract user and domain from From: header line in draft.
  */
-static
-int
-get_from_header_info(const char *filename, const char **addr, const char **host, const char **message) {
+static int
+get_from_header_info(const char *filename, const char **addr, const char **host, const char **message)
+{
     struct stat st;
     FILE *in;
 
@@ -900,13 +903,13 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
  * Get formatted information from header of a message.
  * Adapted from process_single_file() in uip/fmttest.c.
  */
-static
-const char *
-get_message_header_info(FILE *in, char *format) {
+static const char *
+get_message_header_info(FILE *in, char *format)
+{
     int dat[5];
     struct format *fmt;
     struct stat st;
-    int parsing_header;
+    bool parsing_header;
     m_getfld_state_t gstate;
     charstring_t buffer = charstring_create(0);
     char *retval;
@@ -922,7 +925,7 @@ get_message_header_info(FILE *in, char *format) {
      * Read in the message and process the header.
      */
     rewind (in);
-    parsing_header = 1;
+    parsing_header = true;
     gstate = m_getfld_state_init(in);
     do {
         char name[NAMESZ], rbuf[NMH_BUFSIZ];
@@ -949,7 +952,7 @@ get_message_header_info(FILE *in, char *format) {
             break;
         }
         default:
-            parsing_header = 0;
+            parsing_header = false;
         }
     } while (parsing_header);
     m_getfld_state_destroy(&gstate);
@@ -978,9 +981,9 @@ get_message_header_info(FILE *in, char *format) {
  * If no -server passed in from profile or commandline, could use smtp.<svc>.com for gmail,
  * but that might not generalize for other svcs.
  */
-static
-void
-merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) {
+static void
+merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
+{
     char *addr_entry = concat("sendfrom-", addr, NULL);
     char *profile_entry = context_find(addr_entry);