X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Fmime_parser.c;h=1fc037d43ffd77462434eb93f645001f4dbb251a;hb=8659bf61f03724755374145e6211be6bbfe74fda;hp=86905f1ee60fe54cd93cf624937f7de988e8ccef;hpb=b02af515656223215f51c8413157d14656d89008;p=citadel.git

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 86905f1ee..1fc037d43 100644
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -2,8 +2,20 @@
  * This is the MIME parser for Citadel.
  *
  * Copyright (c) 1998-2010 by the citadel.org development team.
- * This code is distributed under the GNU General Public License v3.
  *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <stdlib.h>
@@ -123,7 +135,7 @@ char *fixed_partnum(char *supplied_partnum) {
 
 static inline unsigned int _decode_hex(const char *Source)
 {
-	int ret = '?';
+	unsigned int ret = '?';
 	unsigned char LO_NIBBLE;
 	unsigned char HI_NIBBLE;
 
@@ -166,7 +178,6 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
 			}
 			else
 			{
-				ch = 0;
 				ch = _decode_hex(&encoded[pos]);
 				pos += 2;
 				decoded[decoded_length++] = ch;
@@ -205,13 +216,13 @@ void mime_decode(char *partnum,
 
 	/* Some encodings aren't really encodings */
 	if (!strcasecmp(encoding, "7bit"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 	if (!strcasecmp(encoding, "8bit"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 	if (!strcasecmp(encoding, "binary"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 	if (!strcasecmp(encoding, "ISO-8859-1"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 
 	/* If this part is not encoded, send as-is */
 	if ( (strlen(encoding) == 0) || (dont_decode)) {
@@ -293,11 +304,11 @@ int mime_decode_now (char *part_start,
 	*decoded = NULL;
 	/* Some encodings aren't really encodings */
 	if (!strcasecmp(encoding, "7bit"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 	if (!strcasecmp(encoding, "8bit"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 	if (!strcasecmp(encoding, "binary"))
-		strcpy(encoding, "");
+		*encoding = '\0';
 
 	/* If this part is not encoded, send as-is */
 	if (strlen(encoding) == 0) {
@@ -614,16 +625,14 @@ static void recurseable_mime_parser(char *partnum,
 		/* Figure out where the boundaries are */
 		m->b[startary].len = snprintf(m->b[startary].Key, SIZ, "--%s", m->b[boundary].Key);
 		SubMimeHeaders = InitInterestingMimes ();
-		if (*ptr == '\r')
-			ptr ++;
-		if (*ptr == '\n')
-			ptr ++;
+
+		while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
 		if (strncmp(ptr, m->b[startary].Key, m->b[startary].len) == 0)
 			ptr += m->b[startary].len;
-		if (*ptr == '\r')
-			ptr ++;
-		if (*ptr == '\n')
-			ptr ++;
+
+		while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
 		part_start = NULL;
 		do {
 			char *optr;
@@ -680,8 +689,8 @@ static void recurseable_mime_parser(char *partnum,
 			if (next_boundary != NULL) {
 				/* If we pass out of scope, don't attempt to
 				 * read past the end boundary. */
-				if ((*(next_boundary + m->b[startary].len + 1) == '-') && 
-				    (*(next_boundary + m->b[startary].len + 2) == '-') ){
+				if ((*(next_boundary + m->b[startary].len) == '-') && 
+				    (*(next_boundary + m->b[startary].len + 1) == '-') ){
 					ptr = content_end;
 				}
 				else {
@@ -1048,8 +1057,8 @@ int LoadIconDir(const char *DirName)
 	{
 		char *MinorPtr;
 		char *PStart;
-#ifdef _DIRENT_HAVE_D_NAMELEN
-		d_namelen = filedir_entry->d_namelen;
+#ifdef _DIRENT_HAVE_D_NAMLEN
+		d_namelen = filedir_entry->d_namlen;
 #else
 		d_namelen = strlen(filedir_entry->d_name);
 #endif