* 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>
static inline unsigned int _decode_hex(const char *Source)
{
- int ret = '?';
+ unsigned int ret = '?';
unsigned char LO_NIBBLE;
unsigned char HI_NIBBLE;
}
else
{
- ch = 0;
ch = _decode_hex(&encoded[pos]);
pos += 2;
decoded[decoded_length++] = ch;
/* 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)) {
*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) {
/* 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;
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 {