Fixed file descriptor leak in mhfixmsg when run on multiple input files.

[nmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index fe508ba90322e2d6443d42494fb0fda9cf6acca0..af8ecd4d00f4c40acb55bc721b5cde072f62db7b 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -5,11 +5,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/mf.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "snprintb.h"
+#include "strindex.h"
+#include "uprf.h"
+#include "getcpy.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/addrsbr.h"
+#include "h/mf.h"
+#include "h/mts.h"
+#include "h/utils.h"
 
 /* High level parsing of addresses:
 
@@ -220,17 +226,17 @@ mnfree (struct mailname *mp)
 char *
 auxformat (struct mailname *mp, int extras)
 {
-    static char addr[BUFSIZ];
+    static char addr[BUFSIZ-4];
     static char buffer[BUFSIZ];
 
        if (mp->m_nohost)
            strncpy (addr, FENDNULL(mp->m_mbox), sizeof(addr));
        else if (mp->m_type != UUCPHOST) {
            if (mp->m_host)
-               snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
+               snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
                          FENDNULL(mp->m_mbox), mp->m_host);
            else snprintf (addr, sizeof(addr), "%s%s", FENDNULL(mp->m_path),
-                          FENDNULL(mp->m_mbox));
+                          FENDNULL(mp->m_mbox));
        } else
            snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
@@ -287,7 +293,7 @@ ismymbox (struct mailname *np)
      */
     if (am == NULL) {
        mq.m_next = NULL;
-       mq.m_mbox = getusername ();
+       mq.m_mbox = getusername (0);
 
        if ((am = context_find ("local-mailbox"))) {
 
@@ -306,11 +312,11 @@ ismymbox (struct mailname *np)
            /* Sigh, it turns out that the address parser gets messed up
             * if you don't call getname() until it returns NULL. */
            while (getname(am) != NULL)
-               ;
+               ;
        }
 
        if ((am = context_find ("alternate-mailboxes")) == NULL)
-           am = getusername();
+           am = getusername(0);
        else {
            mp = mq.m_next ? mq.m_next : &mq;
            oops = false;