Moved CPPFLAGS additions to AM_CPPFLAGS.

[nmh] / uip / mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index cb530e1eb2c1a822a7dd898317a06fe00ff76519..0f3e9c1dfaa2badc66bc05b3f11f6a719baef2d3 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -10,7 +10,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -83,9 +82,8 @@ output_content (CT ct, FILE *out)
     CI ci = &ct->c_ctinfo;
     char *boundary = "", *cp;
 
-    if ((cp = get_param(ci->ci_first_pm, "boundary, '-', 0)))
+    if ((cp = get_param(ci->ci_first_pm, "boundary", '-', 0)))
        boundary = cp;
-    }
 
     /*
      * Output all header fields for this content
@@ -166,7 +164,7 @@ output_content (CT ct, FILE *out)
               body, don't emit the newline that would appear between
               the headers and body.  In that case, the call to
               write8Bit() shouldn't be needed, but is harmless. */
-           if (ct->c_ctinfo.ci_first_pm != NULL  ||
+           if (ct->c_ctinfo.ci_first_pm != NULL  ||  ct->c_begin == 0  ||
                ct->c_begin != ct->c_end) {
                putc ('\n', out);
            }
@@ -232,7 +230,7 @@ output_headers (CT ct, FILE *out)
 static int
 writeExternalBody (CT ct, FILE *out)
 {
-    char *cp;
+    char *cp, *dp;
     struct exbody *e = (struct exbody *) ct->c_ctparams;
                
     putc ('\n', out);
@@ -244,7 +242,7 @@ writeExternalBody (CT ct, FILE *out)
            switch (*++cp) {
            case 'I':
                if (ct2->c_id) {
-                   char *dp = trimcpy (ct2->c_id);
+                   dp = trimcpy (ct2->c_id);
 
                    fputs (dp, out);
                    free (dp);
@@ -252,17 +250,22 @@ writeExternalBody (CT ct, FILE *out)
                continue;
 
            case 'N':
-               for (pm = ci2->ci_first_pm; pm; pm = pm->pm_next)
-                   if (!strcasecmp (pm->pm_name, "name")) {
-                       fprintf (out, "%s", pm->pm_value);
-                       break;
-                   }
+               dp = get_param(ci2->ci_first_pm, "name", '_', 0);
+               if (dp) {
+                   fputs (dp, out);
+                   free (dp);
+               }
                continue;
 
            case 'T':
                fprintf (out, "%s/%s", ci2->ci_type, ci2->ci_subtype);
-               for (pm = ci2->ci_first_pm; pm; pm = pm->pm_next)
-                   fprintf (out, "; %s=\"%s\"", pm->pm_name, pm->pm_value);
+               dp = output_params(strlen(ci2->ci_type) +
+                                  strlen(ci2->ci_subtype) + 1,
+                                  ci2->ci_first_pm, NULL, 0);
+               if (dp) {
+                   fputs (dp, out);
+                   free (dp);
+               }
                continue;
 
            case 'n':
@@ -313,7 +316,9 @@ write8Bit (CT ct, FILE *out)
     c = '\n';
     while ((inbytes = fread (buffer, 1, sizeof buffer, ce->ce_fp)) > 0) {
         c = buffer[inbytes - 1];
-        fwrite (buffer, 1, inbytes, out);
+        if (fwrite (buffer, 1, inbytes, out) < inbytes) {
+            advise ("write8Bit", "fwrite");
+        }
     }
     if (c != '\n')
        putc ('\n', out);
@@ -332,26 +337,35 @@ writeQuoted (CT ct, FILE *out)
 {
     int fd;
     char *cp, *file;
-    char c = '\0', buffer[BUFSIZ];
+    char c = '\0';
     CE ce = &ct->c_cefile;
     int n = 0;
+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;
 
     file = NULL;
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
        return NOTOK;
 
-    while (fgets (buffer, sizeof(buffer) - 1, ce->ce_fp)) {
+    while ((gotlen = getline(&bufp, &buflen, ce->ce_fp)) != -1) {
 
-       cp = buffer + strlen (buffer) - 1;
+       cp = bufp + gotlen - 1;
        if ((c = *cp) == '\n')
-           *cp = '\0';
-
-       if (strncmp (cp = buffer, "From ", sizeof("From ") - 1) == 0) {
-           fprintf (out, "=%02X", *cp++ & 0xff);
+           gotlen--;
+
+       /*
+        * if the line starts with "From ", encode the 'F' so it
+        * doesn't falsely match an mbox delimiter.
+        */
+       cp = bufp;
+       if (gotlen >= 5 && strncmp (cp, "From ", 5) == 0) {
+           fprintf (out, "=%02X", 'F');
+           cp++;
            n += 3;
        }
 
-       for (; *cp; cp++) {
+       for (; cp < bufp + gotlen; cp++) {
            if (n > CPERLIN - 3) {
                fputs ("=\n", out);
                n = 0;
@@ -380,7 +394,7 @@ three_print:
        }
 
        if (c == '\n') {
-           if (cp > buffer && (*--cp == ' ' || *cp == '\t'))
+           if (cp > bufp && (*--cp == ' ' || *cp == '\t'))
                fputs ("=\n", out);
 
            putc ('\n', out);
@@ -392,6 +406,7 @@ three_print:
        putc ('\n', out);
 
     (*ct->c_ceclosefnx) (ct);
+    free (bufp);
     return OK;
 }
 
@@ -411,7 +426,10 @@ writeBase64ct (CT ct, FILE *out)
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
        return NOTOK;
 
-    result = writeBase64aux (ce->ce_fp, out, (ct->c_type == CT_TEXT));
+    result = writeBase64aux (ce->ce_fp, out,
+                             ct->c_type == CT_TEXT  &&  ct->c_ctparams
+                             ?  ((struct text *) ct->c_ctparams)->lf_line_endings == 0
+                             :  0);
     (*ct->c_ceclosefnx) (ct);
     return result;
 }