Fix file descriptor leak in ruserpass()

[nmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 77322d4d60b251b513d6b83cf395dad7b784414a..630de11181615b892b8c2d8bd7584455ed79ccc9 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -5,12 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/nmh.h>
-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/dropsbr.h>
-#include <h/mts.h>
-#include <h/tws.h>
+#include "h/nmh.h"
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "sbr/strindex.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/dropsbr.h"
+#include "h/mts.h"
+#include "h/tws.h"
 #include "sbr/lock_file.h"
 #include "sbr/m_mktemp.h"
 #include <fcntl.h>
@@ -187,7 +190,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
            if (write (md, MMDF_DELIM, j) != j)
                return NOTOK;
 
-           return i != NOTOK ? OK : NOTOK;
+            return i == NOTOK ? NOTOK : OK;
 
        case MBOX_FORMAT:
            if ((j = dup (fd)) == NOTOK)
@@ -244,7 +247,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                         * If there is already a "From " line,
                         * then leave it alone.  Else we add one.
                         */
-                       char tmpbuffer[sizeof buffer];
+                       char tmpbuffer[sizeof buffer-7];
                        char *tp, *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));