X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dc4d0c4bf247cfc88e1f3f9463fa2264d3d226b5..366cc6fc4c7bf1eed47cc9b52d0ef809b2e90174:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 5a841b0a..be3b414f 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -5,16 +5,36 @@
  * 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/fmt_new.h"
+#include "sendsbr.h"
+#include "distsbr.h"
+#include "annosbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/concat.h"
+#include "sbr/cpydgst.h"
+#include "sbr/trimcpy.h"
+#include "sbr/uprf.h"
+#include "sbr/getcpy.h"
+#include "sbr/m_convert.h"
+#include "sbr/m_backup.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 <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 +42,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"
@@ -240,12 +260,8 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 		     * of each message/partial in the collection.
 		     */
 		    if (!strcasecmp (name, "Subject")) {
-			size_t sublen;
-
 			strncpy (subject, buffer, BUFSIZ);
-			sublen = strlen (subject);
-			if (sublen > 0 && subject[sublen - 1] == '\n')
-			    subject[sublen - 1] = '\0';
+                        trim_suffix_c(subject, '\n');
 		    }
 
 		    dp = add (concat (name, ":", buffer, NULL), dp);
@@ -738,8 +754,7 @@ oops:
 }
 
 
-static
-void
+static void
 handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc)
 {
     const char *addr, *host;
@@ -848,8 +863,7 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 /*
  * Extract user and domain from From: header line in draft.
  */
-static
-int
+static int
 get_from_header_info(const char *filename, const char **addr, const char **host, const char **message)
 {
     struct stat st;
@@ -903,8 +917,7 @@ 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 *
+static const char *
 get_message_header_info(FILE *in, char *format)
 {
     int dat[5];
@@ -982,8 +995,7 @@ 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
+static void
 merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
 {
     char *addr_entry = concat("sendfrom-", addr, NULL);