lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index d54696be92488b4f9d1bbe9b3848defda38912dc..40ec9b806451feb55949738fbb41eb98a38f0e5e 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -6,22 +6,13 @@
  */
 
 #include <h/nmh.h>
  */
 
 #include <h/nmh.h>

-#include <h/utils.h>
-

 #include <h/mh.h>
 #include <h/mh.h>

+#include <h/utils.h>

 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>

-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
-
-#ifdef NTOHLSWAP
-# include <netinet/in.h>
-#else
-# undef ntohl
-# define ntohl(n) (n)
-#endif
-
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 /*
 #include <fcntl.h>
 
 /*


@@ -133,7 +124,7 @@ mbx_chk_mmdf (int fd)
     ssize_t count;
     char ldelim[BUFSIZ];
 
     ssize_t count;
     char ldelim[BUFSIZ];
 

-    count = strlen (mmdlm1);
+    count = LEN(MMDF_DELIM);

 
     if (lseek (fd, -count, SEEK_END) == (off_t) NOTOK)
        return NOTOK;
 
     if (lseek (fd, -count, SEEK_END) == (off_t) NOTOK)
        return NOTOK;


@@ -142,9 +133,9 @@ mbx_chk_mmdf (int fd)
 
     ldelim[count] = 0;
 
 
     ldelim[count] = 0;
 

-    if (strcmp (ldelim, mmdlm1)
+    if (strcmp (ldelim, MMDF_DELIM)

            && write (fd, "\n", 1) != 1
            && write (fd, "\n", 1) != 1

-           && write (fd, mmdlm1, count) != count)
+           && write (fd, MMDF_DELIM, count) != count)

        return NOTOK;
 
     return OK;
        return NOTOK;
 
     return OK;


@@ -168,8 +159,8 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
     switch (mbx_style) {
        case MMDF_FORMAT: 
        default: 
     switch (mbx_style) {
        case MMDF_FORMAT: 
        default: 

-           j = strlen (mmdlm1);
-           if (write (md, mmdlm1, j) != j)
+           j = LEN(MMDF_DELIM);
+           if (write (md, MMDF_DELIM, j) != j)

                return NOTOK;
 
            if (text) {
                return NOTOK;
 
            if (text) {


@@ -184,16 +175,16 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
            while ((i = read (fd, buffer, sizeof buffer - 1)) > 0) {
                 buffer[i] = '\0';   /* Terminate for stringdex(). */
 
            while ((i = read (fd, buffer, sizeof buffer - 1)) > 0) {
                 buffer[i] = '\0';   /* Terminate for stringdex(). */
 

-               for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
+               for ( ; (j = stringdex (MMDF_DELIM, buffer)) >= 0; buffer[j]++)

                    continue;
                    continue;

-               for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
+               for ( ; (j = stringdex (MMDF_DELIM, buffer)) >= 0; buffer[j]++)

                    continue;
                if (write (md, buffer, i) != i)
                    return NOTOK;
            }
 
                    continue;
                if (write (md, buffer, i) != i)
                    return NOTOK;
            }
 

-           j = strlen (mmdlm1);
-           if (write (md, mmdlm1, j) != j)
+           j = LEN(MMDF_DELIM);
+           if (write (md, MMDF_DELIM, j) != j)

                return NOTOK;
 
            return (i != NOTOK ? OK : NOTOK);
                return NOTOK;
 
            return (i != NOTOK ? OK : NOTOK);