Cleanup MIME header handling in mhbuild

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index d67153fe2bd3f225a9b4a788be86734cca58a700..452dc735058228f87961d95b0aff56ae11e40d25 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -5,12 +5,15 @@
  * 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
 
-#include <h/mts.h>
+#include "h/mts.h"
 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -51,7 +54,7 @@ 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
@@ -354,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.
-       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, '@');
@@ -394,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.
-       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")))