*
* This is the MIME parser for Citadel. Sometimes it actually works.
*
- * Copyright (c) 1998-2001 by Art Cancro
+ * Copyright (c) 1998-2002 by Art Cancro
* This code is distributed under the terms of the GNU General Public License.
*
*/
#include "citadel.h"
#include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "tools.h"
/*
* Convert "quoted-printable" to binary. Returns number of bytes decoded.
*/
-int decode_quoted_printable(char *decoded, char *encoded, int sourcelen) {
+int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
char buf[SIZ];
int buf_length = 0;
int soft_line_break = 0;
* will never be larger than the encoded data. This is a safe
* assumption with base64, uuencode, and quoted-printable.
*/
- decoded = mallok(length+2048);
+ decoded = malloc(length+2048);
if (decoded == NULL) {
return;
}
if (!strcasecmp(encoding, "base64")) {
- bytes_decoded = decode_base64(decoded, part_start, length);
+ bytes_decoded = CtdlDecodeBase64(decoded, part_start, length);
}
else if (!strcasecmp(encoding, "quoted-printable")) {
- bytes_decoded = decode_quoted_printable(decoded,
+ bytes_decoded = CtdlDecodeQuotedPrintable(decoded,
part_start, length);
}
content_type, bytes_decoded, "binary", userdata);
}
- phree(decoded);
+ free(decoded);
}
/*
char *boundary;
char *startary;
char *endary;
+ char *next_boundary;
char *content_type;
size_t content_length;
char *encoding;
char *disposition;
- char *name;
+ char *name = NULL;
+ char *content_type_name;
+ char *content_disposition_name;
char *filename;
int is_multipart;
int part_seq = 0;
ptr = content_start;
content_length = 0;
- boundary = mallok(SIZ);
+ boundary = malloc(SIZ);
memset(boundary, 0, SIZ);
- startary = mallok(SIZ);
+ startary = malloc(SIZ);
memset(startary, 0, SIZ);
- endary = mallok(SIZ);
+ endary = malloc(SIZ);
memset(endary, 0, SIZ);
- header = mallok(SIZ);
+ header = malloc(SIZ);
memset(header, 0, SIZ);
- content_type = mallok(SIZ);
+ content_type = malloc(SIZ);
memset(content_type, 0, SIZ);
- encoding = mallok(SIZ);
+ encoding = malloc(SIZ);
memset(encoding, 0, SIZ);
- name = mallok(SIZ);
- memset(name, 0, SIZ);
+ content_type_name = malloc(SIZ);
+ memset(content_type_name, 0, SIZ);
- filename = mallok(SIZ);
+ content_disposition_name = malloc(SIZ);
+ memset(content_disposition_name, 0, SIZ);
+
+ filename = malloc(SIZ);
memset(filename, 0, SIZ);
- disposition = mallok(SIZ);
+ disposition = malloc(SIZ);
memset(disposition, 0, SIZ);
/* If the caller didn't supply an endpointer, generate one by measure */
if (!isspace(buf[0])) {
if (!strncasecmp(header, "Content-type: ", 14)) {
strcpy(content_type, &header[14]);
- extract_key(name, content_type, "name");
+ extract_key(content_type_name, content_type, "name");
/* Deal with weird headers */
if (strchr(content_type, ' '))
*(strchr(content_type, ' ')) = '\0';
}
if (!strncasecmp(header, "Content-Disposition: ", 21)) {
strcpy(disposition, &header[21]);
+ extract_key(content_disposition_name, disposition, "name");
extract_key(filename, disposition, "filename");
}
if (!strncasecmp(header, "Content-length: ", 16)) {
/* Figure out where the boundaries are */
snprintf(startary, SIZ, "--%s", boundary);
snprintf(endary, SIZ, "--%s--", boundary);
+
+ part_start = NULL;
do {
- if ( (!strncasecmp(ptr, startary, strlen(startary)))
- || (!strncasecmp(ptr, endary, strlen(endary))) ) {
- if (part_start != NULL) {
- if (strlen(partnum) > 0) {
- snprintf(nested_partnum,
- sizeof nested_partnum,
- "%s.%d", partnum,
- ++part_seq);
- }
- else {
- snprintf(nested_partnum,
- sizeof nested_partnum,
- "%d", ++part_seq);
- }
- the_mime_parser(nested_partnum,
- part_start, part_end,
- CallBack,
- PreMultiPartCallBack,
- PostMultiPartCallBack,
- userdata,
- dont_decode);
+ next_boundary = bmstrstr(ptr, startary, strncmp);
+ if ( (part_start != NULL) && (next_boundary != NULL) ) {
+ part_end = next_boundary;
+ --part_end;
+
+ if (strlen(partnum) > 0) {
+ snprintf(nested_partnum,
+ sizeof nested_partnum,
+ "%s.%d", partnum,
+ ++part_seq);
+ }
+ else {
+ snprintf(nested_partnum,
+ sizeof nested_partnum,
+ "%d", ++part_seq);
+ }
+ the_mime_parser(nested_partnum,
+ part_start, part_end,
+ CallBack,
+ PreMultiPartCallBack,
+ PostMultiPartCallBack,
+ userdata,
+ dont_decode);
+ }
+
+ if (next_boundary != NULL) {
+ /* If we pass out of scope, don't attempt to read
+ * past the end boundary. */
+ if (!strcmp(next_boundary, endary)) {
+ ptr = content_end;
+ }
+ else {
+ /* Set up for the next part. */
+ part_start = strstr(next_boundary, "\n");
+ ++part_start;
+ ptr = part_start;
}
- ptr = memreadline(ptr, buf, SIZ);
- part_start = ptr;
}
else {
- part_end = ptr;
- ++ptr;
+ /* Invalid end of multipart. Bail out! */
+ ptr = content_end;
}
- } while ( (strcasecmp(ptr, endary)) && (ptr <= content_end) );
+ } while ( (ptr < content_end) && (next_boundary != NULL) );
+
if (PostMultiPartCallBack != NULL) {
PostMultiPartCallBack("", "", partnum, "", NULL,
content_type, 0, encoding, userdata);
++length;
}
part_end = content_end;
+ /* fix an off-by-one error */
+ --part_end;
+ --length;
/* Truncate if the header told us to */
if ( (content_length > 0) && (length > content_length) ) {
length = content_length;
}
+
+ /* Sometimes the "name" field is tacked on to Content-type,
+ * and sometimes it's tacked on to Content-disposition. Use
+ * whichever one we have.
+ */
+ if (strlen(content_disposition_name) > strlen(content_type_name)) {
+ name = content_disposition_name;
+ }
+ else {
+ name = content_type_name;
+ }
mime_decode(partnum,
part_start, length,
}
end_parser: /* free the buffers! end the oppression!! */
- phree(boundary);
- phree(startary);
- phree(endary);
- phree(header);
- phree(content_type);
- phree(encoding);
- phree(name);
- phree(filename);
- phree(disposition);
+ free(boundary);
+ free(startary);
+ free(endary);
+ free(header);
+ free(content_type);
+ free(encoding);
+ free(content_type_name);
+ free(content_disposition_name);
+ free(filename);
+ free(disposition);
}
projects / citadel.git / blobdiff