X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/87e0228a43ba73eac409f2f0d7f75f3b6148adfc..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index ea45a628..0f2b9eb3 100644
--- 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
@@ -8,21 +6,18 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/utils.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-
+#include "h/utils.h"
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "mhoutsbr.h"
+#include "sbr/base64.h"
 
-/*
- * prototypes
- */
-int output_message (CT, char *);
-int output_message_fp (CT, FILE *, char *);
 
 /*
  * static prototypes
@@ -54,23 +49,6 @@ output_message_fp (CT ct, FILE *fp, char *file)
     return OK;
 }
 
-int
-output_message (CT ct, char *file)
-{
-    FILE *fp;
-    int status;
-
-    if (! strcmp (file, "-")) {
-	fp = stdout;
-    } else if ((fp = fopen (file, "w")) == NULL) {
-	advise (file, "unable to open for writing");
-	return NOTOK;
-    }
-    status = output_message_fp(ct, fp, file);
-    if (strcmp (file, "-")) fclose(fp);
-    return status;
-}
-
 
 /*
  * Output a Content structure to a file.
@@ -193,13 +171,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;
 	}
@@ -366,7 +344,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;