#include "xdgmime/xdgmime.h"
#include "libcitadel.h"
+#include "libcitadellocal.h"
void extract_key(char *target, char *source, char *key)
{
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 *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PreMultiPartCallBack)
(char *cbname,
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PostMultiPartCallBack)
(char *cbname,
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void *userdata,
int dont_decode
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);
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PreMultiPartCallBack)
(char *cbname,
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PostMultiPartCallBack)
(char *cbname,
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void *userdata,
int dont_decode
size_t content_length;
char *encoding;
char *disposition;
+ char *id;
char *name = NULL;
char *content_type_name;
char *content_disposition_name;
disposition = malloc(SIZ);
memset(disposition, 0, SIZ);
+ id = malloc(SIZ);
+ memset(id, 0, SIZ);
+
/* If the caller didn't supply an endpointer, generate one by measure */
if (content_end == NULL) {
content_end = &content_start[strlen(content_start)];
extract_key(content_disposition_name, disposition, "name");
extract_key(filename, disposition, "filename");
}
+ if (!strncasecmp(header, "Content-ID:", 11)) {
+ strcpy(id, &header[11]);
+ striplt(id);
+ stripallbut(id, '<', '>');
+ }
if (!strncasecmp(header, "Content-length: ", 15)) {
char clbuf[10];
safestrncpy(clbuf, &header[15], sizeof clbuf);
if (PreMultiPartCallBack != NULL) {
PreMultiPartCallBack("", "", partnum, "",
NULL, content_type, charset,
- 0, encoding, userdata);
+ 0, encoding, id, userdata);
}
/* Figure out where the boundaries are */
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);
}
free(content_disposition_name);
free(filename);
free(disposition);
+ free(id);
}
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PreMultiPartCallBack)
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void (*PostMultiPartCallBack)
char *cbcharset,
size_t cblength,
char *cbencoding,
+ char *cbid,
void *cbuserdata),
void *userdata,
};
-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], ".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