X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuild.c;h=020512d77111f421ece58af480b2dde5e8eef759;hb=c43afcbaf482a3e7227ca839633c0f7488944895;hp=a47022ee4260f92fc2b950ca657496087013c063;hpb=25c0bc3f1c034964421f8007e5802c647c5dc908;p=mmh

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index a47022e..020512d 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -2,8 +2,6 @@
 /*
  * mhbuild.c -- expand/translate MIME composition files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -22,59 +20,58 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define	CHECKSW                 0
     { "check", 0 },
 #define	NCHECKSW                1
     { "nocheck", 0 },
-#define	EBCDICSW                2
+#define	DIRECTIVES              2
+    { "directives", 0 },
+#define	NDIRECTIVES             3
+    { "nodirectives", 0 },
+#define	EBCDICSW                4
     { "ebcdicsafe", 0 },
-#define	NEBCDICSW               3
+#define	NEBCDICSW               5
     { "noebcdicsafe", 0 },
-#define	HEADSW                  4
+#define	HEADSW                  6
     { "headers", 0 },
-#define	NHEADSW                 5
+#define	NHEADSW                 7
     { "noheaders", 0 },
-#define	LISTSW                  6
+#define	LISTSW                  8
     { "list", 0 },
-#define	NLISTSW                 7
+#define	NLISTSW                 9
     { "nolist", 0 },
-#define	SIZESW                  8
+#define	SIZESW                 10
     { "realsize", 0 },
-#define	NSIZESW                 9
+#define	NSIZESW                11
     { "norealsize", 0 },
-#define	RFC934SW               10
+#define	RFC934SW               12
     { "rfc934mode", 0 },
-#define	NRFC934SW              11
+#define	NRFC934SW              13
     { "norfc934mode", 0 },
-#define	VERBSW                 12
+#define	VERBSW                 14
     { "verbose", 0 },
-#define	NVERBSW                13
+#define	NVERBSW                15
     { "noverbose", 0 },
-#define	RCACHESW               14
+#define	RCACHESW               16
     { "rcache policy", 0 },
-#define	WCACHESW               15
+#define	WCACHESW               17
     { "wcache policy", 0 },
-#define	CONTENTIDSW            16
+#define	CONTENTIDSW            18
     { "contentid", 0 },
-#define	NCONTENTIDSW           17
+#define	NCONTENTIDSW           19
     { "nocontentid", 0 },
-#define VERSIONSW              18
+#define VERSIONSW              20
     { "version", 0 },
-#define	HELPSW                 19
+#define	HELPSW                 21
     { "help", 0 },
-#define	DEBUGSW                20
+#define	DEBUGSW                22
     { "debug", -5 },
     { NULL, 0 }
 };
 
 
 /* mhbuildsbr.c */
-extern int checksw;
 extern char *tmp;	/* directory to place temp files */
 
 /* mhcachesbr.c */
@@ -103,15 +100,13 @@ static int unlink_outfile = 0;
 static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */
-CT build_mime (char *);
+CT build_mime (char *, int);
 int output_message (CT, char *);
+int output_message_fp (CT, FILE *, char*);
 
 /* mhlistsbr.c */
 int list_all_messages (CT *, int, int, int, int);
 
-/* mhmisc.c */
-void set_endian (void);
-
 /* mhfree.c */
 void free_content (CT);
 
@@ -119,13 +114,14 @@ void free_content (CT);
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1;
+    int sizesw = 1, headsw = 1, directives = 1;
     int *icachesw;
     char *cp, buf[BUFSIZ];
     char buffer[BUFSIZ], *compfile = NULL;
     char **argp, **arguments;
     CT ct, cts[2];
-    FILE *fp;
+    FILE *fp = NULL;
+    FILE *fp_out = NULL;
 
     done=unlink_done;
 
@@ -206,6 +202,13 @@ main (int argc, char **argv)
 		headsw = 0;
 		continue;
 
+	    case DIRECTIVES:
+		directives = 1;
+		continue;
+	    case NDIRECTIVES:
+		directives = 0;
+		continue;
+
 	    case LISTSW:
 		listsw++;
 		continue;
@@ -306,27 +309,25 @@ main (int argc, char **argv)
      * Process the composition file from standard input.
      */
     if (compfile[0] == '-' && compfile[1] == '\0') {
-
 	/* copy standard input to temporary file */
-	strncpy (infile, m_scratch ("", invo_name), sizeof(infile));
-	if ((fp = fopen (infile, "w")) == NULL)
-	    adios (infile, "unable to open");
+	strncpy (infile, m_mktemp(invo_name, NULL, &fp), sizeof(infile));
 	while (fgets (buffer, BUFSIZ, stdin))
 	    fputs (buffer, fp);
 	fclose (fp);
 	unlink_infile = 1;
 
 	/* build the content structures for MIME message */
-	ct = build_mime (infile);
+	ct = build_mime (infile, directives);
 	cts[0] = ct;
 	cts[1] = NULL;
 
 	/* output MIME message to this temporary file */
-	strncpy (outfile, m_scratch ("", invo_name), sizeof(outfile));
+	strncpy (outfile, m_mktemp(invo_name, NULL, &fp_out), sizeof(outfile));
 	unlink_outfile = 1;
 
 	/* output the message */
-	output_message (ct, outfile);
+	output_message_fp (ct, fp_out, outfile);
+        fclose(fp_out);
 
 	/* output the temp file to standard output */
 	if ((fp = fopen (outfile, "r")) == NULL)
@@ -350,16 +351,18 @@ main (int argc, char **argv)
      */
 
     /* build the content structures for MIME message */
-    ct = build_mime (compfile);
+    ct = build_mime (compfile, directives);
     cts[0] = ct;
     cts[1] = NULL;
 
     /* output MIME message to this temporary file */
-    strncpy (outfile, m_scratch (compfile, invo_name), sizeof(outfile));
+    strncpy(outfile, m_mktemp2(compfile, invo_name, NULL, &fp_out),
+            sizeof(outfile));
     unlink_outfile = 1;
 
     /* output the message */
-    output_message (ct, outfile);
+    output_message_fp (ct, fp_out, outfile);
+    fclose(fp_out);
 
     /*
      * List the message info
@@ -369,12 +372,13 @@ main (int argc, char **argv)
 
     /* Rename composition draft */
     snprintf (buffer, sizeof(buffer), "%s.orig", m_backup (compfile));
-    if (rename (compfile, buffer) == NOTOK)
-	adios (compfile, "unable to rename %s to", buffer);
+    if (rename (compfile, buffer) == NOTOK) {
+	adios (compfile, "unable to rename comp draft %s to", buffer);
+    }
 
     /* Rename output file to take its place */
     if (rename (outfile, compfile) == NOTOK) {
-	advise (outfile, "unable to rename %s to", compfile);
+	advise (outfile, "unable to rename output %s to", compfile);
 	rename (buffer, compfile);
 	done (1);
     }