Alright, things compile now, but don't link yet; need to write the

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 065777405ede3fcdbd125d6f6265a119a17d41a5..58b37c4ee670eb20560b5765325a292f401ddc8c 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -111,6 +110,7 @@ main (int argc, char **argv)
     FILE *fp = NULL;
     FILE *fp_out = NULL;
     int header_encoding = CE_UNKNOWN;
+    size_t n;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
@@ -334,13 +334,18 @@ main (int argc, char **argv)
                  get_temp_dir());
        }
 
-       /* copy standard input to temporary file */
+       /* save a copy of the name for later removal */
        strncpy (infile, cp, sizeof(infile));
-       while (fgets (buffer, BUFSIZ, stdin))
-           fputs (buffer, fp);
-       fclose (fp);
        unlink_infile = 1;
 
+       /* copy standard input to temporary file */
+       while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
+           if (fwrite(buffer, 1, n, fp) != n) {
+               adios (NULL, "error copying to temporary file");
+           }
+       }
+       fclose (fp);
+
        /* build the content structures for MIME message */
        ct = build_mime (infile, autobuild, dist, directives, header_encoding,
                         maxunencoded, verbosw);
@@ -354,17 +359,17 @@ main (int argc, char **argv)
            if (! (fp = fopen(infile, "r"))) {
                adios(NULL, "Unable to open %s for reading", infile);
            }
-           while (fgets(buffer, BUFSIZ, fp))
-               fputs(buffer, stdout);
+           while ((n = fread(buffer, 1, sizeof(buffer), fp)) > 0) {
+               if (fwrite(buffer, 1, n, stdout) != n) {
+                   adios(NULL, "error copying %s to stdout", infile);
+               }
+           }
        } else {
            /* output the message */
            output_message_fp (ct, stdout, NULL);
            free_content (ct);
        }
 
-       (void) m_unlink (infile);
-       unlink_infile = 0;
-
        done (0);
     }