fdcompare.c: Move interface to own file.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 8d6dd616765ce822f2e7f484eb8e421fc5ba1ddf..ab4f73ce7c27ccecefb744a1c4852404c9ff1564 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -5,16 +5,23 @@
  * complete copyright information.
  */
 
  * 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/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/pidstatus.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 <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>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -22,7 +29,7 @@
 #include <time.h>
 
 #ifdef OAUTH_SUPPORT
 #include <time.h>
 
 #ifdef OAUTH_SUPPORT

-#include <h/oauth.h>
+#include "h/oauth.h"

 #endif
 #include "h/done.h"
 #include "sbr/m_maildir.h"
 #endif
 #include "h/done.h"
 #include "sbr/m_maildir.h"


@@ -738,9 +745,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;
 
     const char *addr, *host;
     const char *message;
 


@@ -783,7 +790,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,
  */
 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];
     const char *saslmech = NULL, *user = NULL;
     mh_oauth_service_info svc;
     char errbuf[256];


@@ -846,9 +854,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 /*
  * Extract user and domain from From: header line in draft.
  */
 /*
  * 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;
 
     struct stat st;
     FILE *in;
 


@@ -900,9 +908,9 @@ 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.
  */
  * 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 dat[5];
     struct format *fmt;
     struct stat st;


@@ -978,9 +986,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.
  */
  * 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);
 
     char *addr_entry = concat("sendfrom-", addr, NULL);
     char *profile_entry = context_find(addr_entry);