/*
- * $Id$
- *
* This is the MIME parser for Citadel.
*
- * Copyright (c) 1998-2007 by the citadel.org development team.
+ * Copyright (c) 1998-2010 by the citadel.org development team.
* This code is distributed under the GNU General Public License v3.
*
*/
#include "xdgmime/xdgmime.h"
#include "libcitadel.h"
+#include "libcitadellocal.h"
-void extract_key(char *target, char *source, char *key)
+void extract_key(char *target, char *source, long sourcelen, char *key, long keylen, char KeyEnd)
{
- char *ptr;
- char looking_for[256];
+ char *sptr, *ptr = NULL;
int double_quotes = 0;
+ long RealKeyLen = keylen;
- snprintf(looking_for, sizeof looking_for, "%s=", key);
+ sptr = source;
- ptr = bmstrcasestr(source, looking_for);
+ while (sptr != NULL)
+ {
+ ptr = bmstrcasestr_len(sptr, sourcelen - (sptr - source),
+ key, keylen);
+ if(ptr != NULL)
+ {
+ while (isspace(*(ptr + RealKeyLen)))
+ RealKeyLen ++;
+ if (*(ptr + RealKeyLen) == KeyEnd)
+ {
+ sptr = NULL;
+ RealKeyLen ++;
+ }
+ else
+ {
+ sptr = ptr + RealKeyLen + 1;
+ }
+ }
+ else
+ sptr = ptr;
+ }
if (ptr == NULL) {
- strcpy(target, "");
+ *target = '\0';
return;
}
- strcpy(target, (ptr + strlen(looking_for)));
+ strcpy(target, (ptr + RealKeyLen));
- for (ptr=target; (*ptr != 0); ++ptr) {
+ for (ptr=target; (*ptr != 0); ptr++) {
/* A semicolon means we've hit the end of the key, unless we're inside double quotes */
if ( (double_quotes != 1) && (*ptr == ';')) {
}
}
}
+ *ptr = '\0';
}
}
+static inline unsigned int _decode_hex(char *Source)
+{
+ int ret = 0;
+ if ((*Source >= '0') && (*Source <= '9')) {
+ ret += (*Source - '0');
+ }
+ else if ((*Source >= 'A') && (*Source <= 'F')) {
+ ret += (*Source - 'A' + 10);
+ }
+ else if ((*Source >= 'a') && (*Source <= 'f')) {
+ ret += (*Source - 'a' + 10);
+ }
+ else {
+ return '?';
+ }
+
+ ret = ret << 4;
+
+ if ((*(Source + 1) >= '0') && (*(Source + 1) <= '9')) {
+ ret |= (*(Source + 1) - '0');
+ }
+ else if ((*(Source + 1) >= 'A') && (*(Source + 1) <= 'F')) {
+ ret |= (*(Source + 1) - 'A' + 10);
+ }
+ else if ((*(Source + 1) >= 'a') && (*(Source + 1) <= 'f')) {
+ ret |= (*(Source + 1) - 'a' + 10);
+ }
+ else {
+ return '?';
+ }
+ return ret;
+}
+
+unsigned int decode_hex(char *Source) {return _decode_hex(Source);}
/*
* Convert "quoted-printable" to binary. Returns number of bytes decoded.
else if (encoded[pos] == '=')
{
ch = 0;
- sscanf(&encoded[pos+1], "%02x", &ch);
+ ch = _decode_hex(&encoded[pos+1]);
pos += 3;
decoded[decoded_length++] = ch;
}
char *part_start, size_t length,
char *content_type, char *charset, char *encoding,
char *disposition,
+ char *id,
char *name, char *filename,
- void (*CallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void (*PreMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void (*PostMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void *userdata,
- int dont_decode
-)
+ MimeParserCallBackType CallBack,
+ MimeParserCallBackType PreMultiPartCallBack,
+ MimeParserCallBackType PostMultiPartCallBack,
+ void *userdata,
+ int dont_decode)
{
char *decoded;
if (CallBack != NULL) {
CallBack(name, filename, fixed_partnum(partnum),
disposition, part_start,
- content_type, charset, length, encoding, userdata);
+ content_type, charset, length, encoding, id, userdata);
}
return;
}
if (bytes_decoded > 0) if (CallBack != NULL) {
CallBack(name, filename, fixed_partnum(partnum),
disposition, decoded,
- content_type, charset, bytes_decoded, "binary", userdata);
+ content_type, charset, bytes_decoded, "binary", id, userdata);
}
free(decoded);
*/
void the_mime_parser(char *partnum,
char *content_start, char *content_end,
- void (*CallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void (*PreMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void (*PostMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
- void *userdata,
- int dont_decode
-)
+ MimeParserCallBackType CallBack,
+ MimeParserCallBackType PreMultiPartCallBack,
+ MimeParserCallBackType PostMultiPartCallBack,
+ void *userdata,
+ int dont_decode)
{
char *ptr;
char *next_boundary;
char *content_type;
char *charset;
+ size_t content_type_len;
size_t content_length;
char *encoding;
char *disposition;
+ size_t disposition_len;
+ char *id;
char *name = NULL;
char *content_type_name;
char *content_disposition_name;
ptr = content_start;
content_length = 0;
- boundary = malloc(SIZ);
- memset(boundary, 0, SIZ);
+ boundary = malloc(SIZ * 12);
+ *boundary = '\0';
- startary = malloc(SIZ);
- memset(startary, 0, SIZ);
+ startary = boundary + SIZ * 1;
+ *startary = '\0';
- endary = malloc(SIZ);
- memset(endary, 0, SIZ);
+ endary = boundary + SIZ * 2;
+ *endary = '\0';
- header = malloc(SIZ);
- memset(header, 0, SIZ);
+ header = boundary + SIZ * 3;
+ *header = '\0';
- content_type = malloc(SIZ);
- memset(content_type, 0, SIZ);
+ content_type = boundary + SIZ * 4;
+ *content_type = '\0';
- charset = malloc(SIZ);
- memset(charset, 0, SIZ);
+ charset = boundary + SIZ * 5;
+ *charset = '\0';
- encoding = malloc(SIZ);
- memset(encoding, 0, SIZ);
+ encoding = boundary + SIZ * 6;
+ *encoding = '\0';
- content_type_name = malloc(SIZ);
- memset(content_type_name, 0, SIZ);
+ content_type_name = boundary + SIZ * 7;
+ *content_type_name = '\0';
- content_disposition_name = malloc(SIZ);
- memset(content_disposition_name, 0, SIZ);
+ content_disposition_name = boundary + SIZ * 8;
+ *content_disposition_name = '\0';
- filename = malloc(SIZ);
- memset(filename, 0, SIZ);
+ filename = boundary + SIZ * 9;
+ *filename = '\0';
- disposition = malloc(SIZ);
- memset(disposition, 0, SIZ);
+ disposition = boundary + SIZ * 10;
+ *disposition = '\0';
+
+ id = boundary + SIZ * 11;
+ *id = '\0';
/* If the caller didn't supply an endpointer, generate one by measure */
if (content_end == NULL) {
if (!isspace(buf[0])) {
if (!strncasecmp(header, "Content-type:", 13)) {
- strcpy(content_type, &header[13]);
- striplt(content_type);
- extract_key(content_type_name, content_type, "name");
- extract_key(charset, content_type, "charset");
- extract_key(boundary, header, "boundary");
+ memcpy (content_type, &header[13], headerlen - 12);
+ content_type_len = striplt (content_type);
+
+ extract_key(content_type_name, content_type, content_type_len, HKEY("name"), '=');
+ extract_key(charset, content_type, content_type_len, HKEY("charset"), '=');
+ extract_key(boundary, header, headerlen, HKEY("boundary"), '=');
+
/* Deal with weird headers */
if (strchr(content_type, ' '))
*(strchr(content_type, ' ')) = '\0';
if (strchr(content_type, ';'))
*(strchr(content_type, ';')) = '\0';
}
- if (!strncasecmp(header, "Content-Disposition:", 20)) {
- strcpy(disposition, &header[20]);
- striplt(disposition);
- extract_key(content_disposition_name, disposition, "name");
- extract_key(filename, disposition, "filename");
+ else if (!strncasecmp(header, "Content-Disposition:", 20)) {
+ memcpy (disposition, &header[20], headerlen - 19);
+ disposition_len = striplt(disposition);
+ extract_key(content_disposition_name, disposition, disposition_len, HKEY("name"), '=');
+ extract_key(filename, disposition, disposition_len, HKEY("filename"), '=');
+ }
+ else if (!strncasecmp(header, "Content-ID:", 11)) {
+ strcpy(id, &header[11]);
+ striplt(id);
+ stripallbut(id, '<', '>');
}
- if (!strncasecmp(header, "Content-length: ", 15)) {
+ else if (!strncasecmp(header, "Content-length: ", 15)) {
char clbuf[10];
safestrncpy(clbuf, &header[15], sizeof clbuf);
striplt(clbuf);
content_length = (size_t) atol(clbuf);
}
- if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
+ else if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
strcpy(encoding, &header[26]);
striplt(encoding);
}
if (PreMultiPartCallBack != NULL) {
PreMultiPartCallBack("", "", partnum, "",
NULL, content_type, charset,
- 0, encoding, userdata);
+ 0, encoding, id, userdata);
}
/* Figure out where the boundaries are */
- snprintf(startary, SIZ, "--%s", boundary);
+ startary_len = snprintf(startary, SIZ, "--%s", boundary);
snprintf(endary, SIZ, "--%s--", boundary);
- startary_len = strlen(startary);
part_start = NULL;
do {
if (PostMultiPartCallBack != NULL) {
PostMultiPartCallBack("", "", partnum, "", NULL,
- content_type, charset, 0, encoding, userdata);
+ content_type, charset, 0, encoding, id, userdata);
}
goto end_parser;
}
}
part_end = content_end;
- /******
- * I thought there was an off-by-one error here, but there isn't.
- * This probably means that there's an off-by-one error somewhere
- * else ... or maybe only in certain messages?
- --part_end;
- --length;
- ******/
-
- /* Truncate if the header told us to */
- if ( (content_length > 0) && (length > content_length) ) {
- length = content_length;
- }
+
+ /* The following code will truncate the MIME part to the size
+ * specified by the Content-length: header. We have commented it
+ * out because these headers have a tendency to be wrong.
+ *
+ * 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
*/
mime_decode(partnum,
part_start, length,
- content_type, charset, encoding, disposition,
+ content_type, charset, encoding, disposition, id,
name, filename,
CallBack, NULL, NULL,
userdata, dont_decode
if (PreMultiPartCallBack != NULL) {
PreMultiPartCallBack("", "", partnum, "",
NULL, content_type, charset,
- 0, encoding, userdata);
+ 0, encoding, id, userdata);
}
if (CallBack != NULL) {
if (strlen(partnum) > 0) {
}
if (PostMultiPartCallBack != NULL) {
PostMultiPartCallBack("", "", partnum, "", NULL,
- content_type, charset, 0, encoding, userdata);
+ content_type, charset, 0, encoding, id, userdata);
}
end_parser: /* free the buffers! end the oppression!! */
free(boundary);
- free(startary);
- free(endary);
- free(header);
- free(content_type);
- free(charset);
- free(encoding);
- free(content_type_name);
- free(content_disposition_name);
- free(filename);
- free(disposition);
}
* considered to have ended when the parser encounters a 0x00 byte.
*/
void mime_parser(char *content_start,
- char *content_end,
-
- void (*CallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
-
- void (*PreMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
-
- void (*PostMultiPartCallBack)
- (char *cbname,
- char *cbfilename,
- char *cbpartnum,
- char *cbdisp,
- void *cbcontent,
- char *cbtype,
- char *cbcharset,
- size_t cblength,
- char *cbencoding,
- void *cbuserdata),
-
- void *userdata,
- int dont_decode
-)
+ char *content_end,
+ MimeParserCallBackType CallBack,
+ MimeParserCallBackType PreMultiPartCallBack,
+ MimeParserCallBackType PostMultiPartCallBack,
+ void *userdata,
+ int dont_decode)
{
the_mime_parser("", content_start, content_end,
};
-const char *GuessMimeType(char *data, size_t dlen)
+const char *GuessMimeType(const char *data, size_t dlen)
{
int MimeIndex = 0;
const char* GuessMimeByFilename(const char *what, size_t len)
{
/* we know some hardcoded on our own, try them... */
- if (!strncasecmp(&what[len - 4], ".gif", 4))
+ if ((len > 3) && !strncasecmp(&what[len - 4], ".gif", 4))
return "image/gif";
- else if (!strncasecmp(&what[len - 3], ".js", 3))
+ else if ((len > 2) && !strncasecmp(&what[len - 3], ".js", 3))
return "text/javascript";
- else if (!strncasecmp(&what[len - 4], ".txt", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".txt", 4))
return "text/plain";
- else if (!strncasecmp(&what[len - 4], ".css", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".css", 4))
return "text/css";
- else if (!strncasecmp(&what[len - 4], ".jpg", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".htc", 4))
+ return "text/x-component";
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".jpg", 4))
return "image/jpeg";
- else if (!strncasecmp(&what[len - 4], ".png", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".png", 4))
return "image/png";
- else if (!strncasecmp(&what[len - 4], ".ico", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".ico", 4))
return "image/x-icon";
- else if (!strncasecmp(&what[len - 5], ".html", 5))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".vcf", 4))
+ return "text/x-vcard";
+ else if ((len > 4) && !strncasecmp(&what[len - 5], ".html", 5))
return "text/html";
- else if (!strncasecmp(&what[len - 4], ".htm", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".htm", 4))
return "text/html";
- else if (!strncasecmp(&what[len - 4], ".wml", 4))
+ else if ((len > 3) && !strncasecmp(&what[len - 4], ".wml", 4))
return "text/vnd.wap.wml";
- else if (!strncasecmp(&what[len - 5], ".wmls", 5))
+ else if ((len > 4) && !strncasecmp(&what[len - 5], ".wmls", 5))
return "text/vnd.wap.wmlscript";
- else if (!strncasecmp(&what[len - 5], ".wmlc", 5))
+ else if ((len > 4) && !strncasecmp(&what[len - 5], ".wmlc", 5))
return "application/vnd.wap.wmlc";
- else if (!strncasecmp(&what[len - 6], ".wmlsc", 6))
+ else if ((len > 5) && !strncasecmp(&what[len - 6], ".wmlsc", 6))
return "application/vnd.wap.wmlscriptc";
- else if (!strncasecmp(&what[len - 5], ".wbmp", 5))
+ else if ((len > 4) && !strncasecmp(&what[len - 5], ".wbmp", 5))
return "image/vnd.wap.wbmp";
else
/* and let xdgmime do the fallback. */
IconName *Icon = (IconName*) IconNamePtr;
free(Icon->FlatName);
free(Icon->FileName);
+ free(Icon);
}
+/*
static const char *PrintFlat(void *IconNamePtr)
{
IconName *Icon = (IconName*) IconNamePtr;
IconName *Icon = (IconName*) IconNamePtr;
return Icon->FileName;
}
+*/
+
#define GENSTR "x-generic"
#define IGNORE_PREFIX_1 "gnome-mime"
int LoadIconDir(const char *DirName)
IconName *Icon;
filedir = opendir (DirName);
- IconHash = NewHash();
+ IconHash = NewHash(1, NULL);
if (filedir == NULL) {
return 0;
}
Put(IconHash, Icon->FlatName, d_without_ext, Icon, DeleteIcon);
// PrintHash(IconHash, PrintFlat, PrintFile);
}
+ closedir(filedir);
return 1;
}
const char *GetIconFilename(char *MimeType, size_t len)
{
+ void *vIcon;
IconName *Icon;
if(IconHash == NULL)
return NULL;
- GetHash(IconHash, MimeType, len, (void**)&Icon);
+ GetHash(IconHash, MimeType, len, &vIcon), Icon = (IconName*) vIcon;
/* didn't find the exact mimetype? try major only. */
if (Icon == NULL) {
char * pMinor;
pMinor = strchr(MimeType, '/');
if (pMinor != NULL) {
*pMinor = '\0';
- GetHash(IconHash, MimeType, pMinor - MimeType, (void**)&Icon);
+ GetHash(IconHash, MimeType, pMinor - MimeType, &vIcon),
+ Icon = (IconName*) vIcon;
}
}
if (Icon == NULL) {
return Icon->FileName;
}
-void ShutDownLibCitadel(void)
+void ShutDownLibCitadelMime(void)
{
DeleteHash(&IconHash);
}
projects / citadel.git / blobdiff