X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=bf65480e08b6c76cb56a79a220eb1f779b6ffca5;hb=12fc1bc3b016c93fa00712de76a286c09dc1ee39;hp=d2f69bc6a1eb979917369b7ad63f7144520e38a9;hpb=4e38095f027a81c005a48a888d0f8937e98543a5;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d2f69bc..bf65480 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -13,17 +13,11 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-
 extern int debugsw;
 
 extern int endian;  /* mhmisc.c */
@@ -1702,7 +1696,7 @@ static int
 openBase64(CT ct, char **file)
 {
 	int bitno, cc, digested;
-	int fd, len, skip;
+	int fd, len, skip, own_ct_fp = 0;
 	unsigned long bits;
 	unsigned char value, *b, *b1, *b2, *b3;
 	unsigned char *cp, *ep;
@@ -1778,9 +1772,13 @@ openBase64(CT ct, char **file)
 	if ((len = ct->c_end - ct->c_begin) < 0)
 		adios(NULL, "internal error(1)");
 
-	if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
-		content_error(ct->c_file, ct, "unable to open for reading");
-		return NOTOK;
+	if (!ct->c_fp) {
+		if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
+			content_error(ct->c_file, ct,
+					"unable to open for reading");
+			return NOTOK;
+		}
+		own_ct_fp = 1;
 	}
 
 	if ((digested = ct->c_digested))
@@ -1886,10 +1884,18 @@ self_delimiting:
 
 ready_to_go:
 	*file = ce->ce_file;
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return fileno(ce->ce_fp);
 
 clean_up:
 	free_encoding(ct, 0);
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return NOTOK;
 }
 
@@ -1928,7 +1934,7 @@ InitQuoted(CT ct)
 static int
 openQuoted(CT ct, char **file)
 {
-	int cc, digested, len, quoted;
+	int cc, digested, len, quoted, own_ct_fp = 0;
 	unsigned char *cp, *ep;
 	char buffer[BUFSIZ];
 	unsigned char mask;
@@ -1993,18 +1999,16 @@ openQuoted(CT ct, char **file)
 		return NOTOK;
 	}
 
-	if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
-		content_error(ce->ce_file, ct,
-				"unable to fopen for reading/writing");
-		return NOTOK;
-	}
-
 	if ((len = ct->c_end - ct->c_begin) < 0)
 		adios(NULL, "internal error(2)");
 
-	if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
-		content_error(ct->c_file, ct, "unable to open for reading");
-		return NOTOK;
+	if (!ct->c_fp) {
+		if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
+			content_error(ct->c_file, ct,
+					"unable to open for reading");
+			return NOTOK;
+		}
+		own_ct_fp = 1;
 	}
 
 	if ((digested = ct->c_digested))
@@ -2139,10 +2143,18 @@ openQuoted(CT ct, char **file)
 
 ready_to_go:
 	*file = ce->ce_file;
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return fileno(ce->ce_fp);
 
 clean_up:
 	free_encoding(ct, 0);
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return NOTOK;
 }
 
@@ -2165,7 +2177,7 @@ Init7Bit(CT ct)
 int
 open7Bit(CT ct, char **file)
 {
-	int cc, fd, len;
+	int cc, fd, len, own_ct_fp = 0;
 	char buffer[BUFSIZ];
 	/* sbeck -- handle suffixes */
 	char *cp;
@@ -2282,9 +2294,13 @@ open7Bit(CT ct, char **file)
 	if ((len = ct->c_end - ct->c_begin) < 0)
 		adios(NULL, "internal error(3)");
 
-	if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
-		content_error(ct->c_file, ct, "unable to open for reading");
-		return NOTOK;
+	if (!ct->c_fp) {
+		if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
+			content_error(ct->c_file, ct,
+					"unable to open for reading");
+			return NOTOK;
+		}
+		own_ct_fp = 1;
 	}
 
 	lseek(fd = fileno(ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
@@ -2322,10 +2338,18 @@ open7Bit(CT ct, char **file)
 
 ready_to_go:
 	*file = ce->ce_file;
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return fileno(ce->ce_fp);
 
 clean_up:
 	free_encoding(ct, 0);
+	if (own_ct_fp) {
+		fclose(ct->c_fp);
+		ct->c_fp = NULL;
+	}
 	return NOTOK;
 }
 
@@ -2473,7 +2497,7 @@ openFTP(CT ct, char **file)
 	CE ce;
 	static char *username = NULL;
 	static char *password = NULL;
-	int child_id, i, vecp;
+	int child_id, vecp;
 	char *vec[9];
 
 	e  = ct->c_ctexbody;
@@ -2599,9 +2623,7 @@ openFTP(CT ct, char **file)
 
 	fflush(stdout);
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		adios("fork", "unable to");
 		/* NOTREACHED */
@@ -2675,7 +2697,7 @@ InitMail(CT ct)
 static int
 openMail(CT ct, char **file)
 {
-	int child_id, fd, i, vecp;
+	int child_id, fd, vecp;
 	int len, buflen;
 	char *bp, buffer[BUFSIZ], *vec[7];
 	struct exbody *e = ct->c_ctexbody;
@@ -2727,7 +2749,7 @@ openMail(CT ct, char **file)
 		return NOTOK;
 
 	vecp = 0;
-	vec[vecp++] = mhbasename(mailproc);
+	vec[vecp++] = "mhmail";
 	vec[vecp++] = e->eb_server;
 	vec[vecp++] = "-subject";
 	vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";
@@ -2735,17 +2757,15 @@ openMail(CT ct, char **file)
 	vec[vecp++] = e->eb_body;
 	vec[vecp] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		advise("fork", "unable to");
 		return NOTOK;
 
 	case OK:
-		execvp(mailproc, vec);
+		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
-		perror(mailproc);
+		perror(*vec);
 		_exit(-1);
 		/* NOTREACHED */