X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstoresbr.c;h=6a0cf0497f7ac1aaa7e18d5347fd9b89a6a29c54;hp=0afcc995605905956f889928d9626b787fae8af4;hb=ffe93d6dc707aaf92529cefb38a1814956b48c9e;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 0afcc99..6a0cf04 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -13,7 +13,6 @@
 #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>
@@ -632,14 +631,15 @@ got_filename:
 		if (ct->c_folder) {
 			fprintf(stderr, " to folder %s as message %d\n",
 					ct->c_folder, msgnum);
-		} else if (!strcmp(ct->c_storage, "-")) {
+		} else if (strcmp(ct->c_storage, "-")==0) {
 			fprintf(stderr, " to stdout\n");
 		} else {
 			int cwdlen;
 
 			cwdlen = strlen(cwd);
 			fprintf(stderr, " as file %s\n",
-					strncmp(ct->c_storage, cwd, cwdlen) ||
+					strncmp(ct->c_storage, cwd,
+					cwdlen)!=0 ||
 					ct->c_storage[cwdlen] != '/' ?
 					ct->c_storage :
 					ct->c_storage + cwdlen + 1);
@@ -678,11 +678,11 @@ output_content_file(CT ct, int appending)
 			return NOTOK;
 		}
 
-		file = appending || !strcmp(ct->c_storage, "-") ?
+		file = appending || strcmp(ct->c_storage, "-")==0 ?
 				NULL : ct->c_storage;
 		if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
 			return NOTOK;
-		if (!strcmp(file, ct->c_storage)) {
+		if (strcmp(file, ct->c_storage)==0) {
 			(*ct->c_ceclosefnx) (ct);
 			return OK;
 		}
@@ -690,7 +690,7 @@ output_content_file(CT ct, int appending)
 		/*
 		** Send to standard output
 		*/
-		if (!strcmp(ct->c_storage, "-")) {
+		if (strcmp(ct->c_storage, "-")==0) {
 			int gd;
 
 			if ((gd = dup(fileno(stdout))) == NOTOK) {
@@ -763,7 +763,7 @@ losing:
 	last = ct->c_end;
 	fseek(ct->c_fp, pos, SEEK_SET);
 
-	if (!strcmp(ct->c_storage, "-")) {
+	if (strcmp(ct->c_storage, "-")==0) {
 		int gd;
 
 		if ((gd = dup(fileno(stdout))) == NOTOK) {
@@ -825,7 +825,7 @@ losing:
 				break;
 
 			default:
-				if (!uprf(buffer, XXX_FIELD_PRF) && !uprf(buffer, VRSN_FIELD) && !uprf(buffer, "Subject:") && !uprf(buffer, "Encrypted:") && !uprf(buffer, "Message-ID:")) {
+				if (!uprf(buffer, XXX_FIELD_PRF) && !uprf(buffer, VRSN_FIELD) && !uprf(buffer, "Subject:") && !uprf(buffer, "Message-ID:")) {
 					filterstate = -1;
 					buffer[0] = 0;
 					break;
@@ -1063,7 +1063,6 @@ copy_some_headers(FILE *out, CT ct)
 		if (!uprf(hp->name, XXX_FIELD_PRF) &&
 				mh_strcasecmp(hp->name, VRSN_FIELD) &&
 				mh_strcasecmp(hp->name, "Subject") &&
-				mh_strcasecmp(hp->name, "Encrypted") &&
 				mh_strcasecmp(hp->name, "Message-ID"))
 			fprintf(out, "%s:%s", hp->name, hp->value);
 		hp = hp->next;  /* next header field */