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

[nmh] / uip / mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index d18d8885fa069d9a2e0d30ee7a1be37ef4e1ab6e..4a3166f3f819b5c3401aa841768d1f8a28a359c8 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhoutsbr.c -- routines to output MIME messages
+/* mhoutsbr.c -- routines to output MIME messages
  *            -- given a Content structure
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
@@ -16,13 +14,10 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include "mhoutsbr.h"
+#include "sbr/base64.h"
 
 
-/*
- * prototypes
- */
-int output_message_fp (CT, FILE *, char *);
-
 /*
  * static prototypes
  */
@@ -175,13 +170,13 @@ output_content (CT ct, FILE *out)
                putc ('\n', out);
                result = write8Bit (ct, out);
            } else {
-               advise (NULL, "can't handle binary transfer encoding in content");
+               inform("can't handle binary transfer encoding in content");
                result = NOTOK;
            }
            break;
 
        default:
-           advise (NULL, "unknown transfer encoding in content");
+           inform("unknown transfer encoding in content");
            result = NOTOK;
            break;
        }
@@ -348,7 +343,7 @@ writeQuoted (CT ct, FILE *out)
         * doesn't falsely match an mbox delimiter.
         */
        cp = bufp;
-       if (gotlen >= 5 && HasPrefix(cp, "From ")) {
+       if (gotlen >= 5 && has_prefix(cp, "From ")) {
            fprintf (out, "=%02X", 'F');
            cp++;
            n += 3;