Cleanup MIME header handling in mhbuild

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 65059201d417ae0fea8040f94ae59cc2e331bf12..452dc735058228f87961d95b0aff56ae11e40d25 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -5,12 +5,15 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>   /* for snprintf() */
-#include <h/utils.h>
+#include "h/mh.h"
+#include "escape_addresses.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/utils.h"

 
 #define nmhetcdir(file) NMHETCDIR#file
 
 
 #define nmhetcdir(file) NMHETCDIR#file
 

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

 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>


@@ -46,14 +49,12 @@ char *mmdflfil = "";
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 
 char *uucpldir = "/usr/spool/mail";
 char *uucplfil = "";
 

-char *mmdlm1 = "\001\001\001\001\n";
-

 char *spoollocking = DEFAULT_LOCKING;
 
 /* Cache the username, fullname, and mailbox of the user */
 static char username[BUFSIZ];
 static char fullname[BUFSIZ];
 char *spoollocking = DEFAULT_LOCKING;
 
 /* Cache the username, fullname, and mailbox of the user */
 static char username[BUFSIZ];
 static char fullname[BUFSIZ];

-static char localmbox[BUFSIZ];
+static char localmbox[2*BUFSIZ+3];

 
 /*
  * MTS specific variables
 
 /*
  * MTS specific variables


@@ -107,7 +108,8 @@ static struct bind binds[] = {
 
 /* Convert name of mts method to integer value and store it. */
 void
 
 /* Convert name of mts method to integer value and store it. */
 void

-save_mts_method (const char *value) {
+save_mts_method (const char *value)
+{

     if (! strcasecmp (value, "smtp")) {
         mts_method = "smtp";
         sm_mts = MTS_SMTP;
     if (! strcasecmp (value, "smtp")) {
         mts_method = "smtp";
         sm_mts = MTS_SMTP;


@@ -119,7 +121,7 @@ save_mts_method (const char *value) {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {

-        adios (NULL, "unsupported mts selection \"%s\"", value);
+        die("unsupported mts selection \"%s\"", value);

     }
 }
 
     }
 }
 


@@ -237,7 +239,7 @@ LocalName (int flag)
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 
        gethostname (buf, sizeof(buffer0) - 1);
        /* now fully qualify our name */
 

-       memset(&hints, 0, sizeof(hints));
+        ZERO(&hints);

        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {
        hints.ai_flags = AI_CANONNAME;
        hints.ai_family = PF_UNSPEC;
        if (getaddrinfo(buf, NULL, &hints, &res) == 0) {


@@ -355,8 +357,8 @@ getuserinfo (void)
     /* If there's a Local-Mailbox profile component, try to extract
        the username from it.  But don't try very hard, this assumes
        the very simple User Name <user@name.com> form.
     /* If there's a Local-Mailbox profile component, try to extract
        the username from it.  But don't try very hard, this assumes
        the very simple User Name <user@name.com> form.

-       Note that post(8) and whom(1) use context_foil (), so they
-       won't see the profile component. */
+       Note that post(8) uses context_foil(), so it won't see the profile
+       component. */

     if ((np = context_find("Local-Mailbox")) != NULL) {
        char *left_angle_bracket = strchr (np, '<');
        char *at_sign = strchr (np, '@');
     if ((np = context_find("Local-Mailbox")) != NULL) {
        char *left_angle_bracket = strchr (np, '<');
        char *at_sign = strchr (np, '@');


@@ -395,8 +397,8 @@ getuserinfo (void)
     /* The $SIGNATURE environment variable overrides the GECOS field's idea of
        your real name. If SIGNATURE isn't set, use the Signature profile
        setting if it exists.
     /* The $SIGNATURE environment variable overrides the GECOS field's idea of
        your real name. If SIGNATURE isn't set, use the Signature profile
        setting if it exists.

-       Note that post(8) and whom(1) use context_foil (), so they
-       won't see the profile component. */
+       Note that post(8) uses context_foil(), so it won't see the profile
+       component. */

     if ((cp = getenv ("SIGNATURE")) && *cp)
        strncpy (fullname, cp, sizeof(fullname));
     else if ((cp = context_find("Signature")))
     if ((cp = getenv ("SIGNATURE")) && *cp)
        strncpy (fullname, cp, sizeof(fullname));
     else if ((cp = context_find("Signature")))