X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=e83932c52f2d6387ed7e77bfcae212122a439661;hp=dc8e380bf38fbad4c7531de3b15ffdef48c2d485;hb=3113d18bf20013be27c9aabc8aafcab9a6a8643e;hpb=2433122c20baccb10b70b49c04c6b0497b5b3b60

diff --git a/uip/mhparse.c b/uip/mhparse.c
index dc8e380..e83932c 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -8,10 +8,8 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
-#include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
+#include <errno.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -137,7 +135,7 @@ pidcheck(int status)
 
 	fflush(stdout);
 	fflush(stderr);
-	done(1);
+	exit(1);
 	return 1;
 }
 
@@ -1536,7 +1534,7 @@ openBase64(CT ct, char **file)
 	cp = context_find(buffer);
 	if (cp == NULL || *cp == '\0') {
 		snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
-			  ci->ci_type);
+				ci->ci_type);
 		cp = context_find(buffer);
 	}
 	if (cp != NULL && *cp != '\0') {
@@ -1752,8 +1750,10 @@ openQuoted(CT ct, char **file)
 	}
 	if (cp != NULL && *cp != '\0') {
 		if (ce->ce_unlink) {
-			// Temporary file already exists, so we rename to
-			// version with extension.
+			/*
+			** Temporary file already exists, so we rename to
+			** version with extension.
+			*/
 			char *file_org = strdup(ce->ce_file);
 			ce->ce_file = add(cp, ce->ce_file);
 			if (rename(file_org, ce->ce_file)) {
@@ -1962,7 +1962,7 @@ open7Bit(CT ct, char **file)
 	cp = context_find(buffer);
 	if (cp == NULL || *cp == '\0') {
 		snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
-			ci->ci_type);
+				ci->ci_type);
 		cp = context_find(buffer);
 	}
 	if (cp != NULL && *cp != '\0') {