strcpy(charset, "UTF-8");
}
+ /* Remove wandering punctuation */
+ if ((ptr=strchr(charset, '\"'))) *ptr = 0;
+ striplt(charset);
}
}
if (ptr == NULL) {
StrBufAppendPrintf(Target, "<b>");
StrBufAppendPrintf(Target, _("realloc() error! couldn't get %d bytes: %s"),
- buffer_length + 1,
- strerror(errno));
+ buffer_length + 1,
+ strerror(errno));
StrBufAppendPrintf(Target, "</b><br /><br />\n");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
/** flush */
stripquotes(meta_http_equiv);
stripquotes(meta_content);
extract_charset_from_meta(charset,
- meta_http_equiv, meta_content);
+ meta_http_equiv, meta_content);
}
free(meta_content);
}
* the tag to be removed.
*/
if ( (!strncasecmp(ptr, "HTML", 4))
- ||(!strncasecmp(ptr, "HEAD", 4))
- ||(!strncasecmp(ptr, "/HEAD", 5))
- ||(!strncasecmp(ptr, "BODY", 4)) ) {
+ ||(!strncasecmp(ptr, "HEAD", 4))
+ ||(!strncasecmp(ptr, "/HEAD", 5))
+ ||(!strncasecmp(ptr, "BODY", 4)) ) {
char *pBody = NULL;
-
+
if (!strncasecmp(ptr, "BODY", 4)) {
pBody = ptr;
}
cid_start = src + 4;
cid_end = cid_start;
while ((*cid_end != '"') &&
- !isspace(*cid_end) &&
- (cid_end < ptr))
+ !isspace(*cid_end) &&
+ (cid_end < ptr))
cid_end ++;
/* copy tag and attributes up to src="cid: */
/* add in /webcit/mimepart/<msgno>/CID/
trailing / stops dumb URL filters getting excited */
StrBufAppendPrintf(BodyArea,
- "/webcit/mimepart/%d/",msgnum);
+ "/webcit/mimepart/%d/",msgnum);
StrBufAppendBufPlain(BodyArea, cid_start, cid_end - cid_start, 0);
if (ptr - cid_end > 0)
StrBufAppendBufPlain(BodyArea,
- cid_end + 1,
- ptr - cid_end, 0);
+ cid_end + 1,
+ ptr - cid_end, 0);
}
else
StrBufAppendBufPlain(BodyArea, pBody, ptr - pBody, 0);
* the tag to be removed.
*/
if ( (!strncasecmp(ptr, "/HTML", 5))
- ||(!strncasecmp(ptr, "/BODY", 5)) ) {
+ ||(!strncasecmp(ptr, "/BODY", 5)) ) {
--ptr;
msgend = ptr;
strcpy(ptr, "");
-
+
}
++ptr;
/** Convert foreign character sets to UTF-8 if necessary. */
#ifdef HAVE_ICONV
if ( (strcasecmp(charset, "us-ascii"))
- && (strcasecmp(charset, "UTF-8"))
- && (strcasecmp(charset, ""))
- ) {
+ && (strcasecmp(charset, "UTF-8"))
+ && (strcasecmp(charset, ""))
+ ) {
lprintf(9, "Converting %s to UTF-8\n", charset);
ctdl_iconv_open("UTF-8", charset, &ic);
if (ic == (iconv_t)(-1) ) {
lprintf(5, "%s:%d iconv_open() failed: %s\n",
- __FILE__, __LINE__, strerror(errno));
+ __FILE__, __LINE__, strerror(errno));
}
}
if (Source == NULL) {
msg = (char*)ChrPtr(Source); /* TODO: get rid of this. */
}
}
-
+
#endif
/**
if (!strncasecmp(ptr, "<a href=\"mailto:", 16)) {
content_length += 64;
StrBufAppendPrintf(converted_msg,
- "<a href=\"display_enter?force_room=_MAIL_&recp=");
+
"<a href=\"display_enter?force_room=_MAIL_&recp=");
ptr = &ptr[16];
++alevel;
++brak;
++alevel;
++brak;
if ( ((strchr(ptr, ':') < strchr(ptr, '/')))
- && ((strchr(ptr, '/') < strchr(ptr, '>')))
- ) {
+ && ((strchr(ptr, '/') < strchr(ptr, '>')))
+ ) {
/* open external links to new window */
StrBufAppendPrintf(converted_msg, new_window);
ptr = &ptr[8];
}
/** Fixup <img src="cid:... ...> to fetch the mime part */
else if (!strncasecmp(ptr, "<img ", 5)) {
- char* tag_end=strchr(ptr,'>');
- char* src=strstr(ptr, " src=\"cid:");
char *cid_start, *cid_end;
- ++brak;
+ char* tag_end=strchr(ptr,'>');
+ char* src;
+ /* FIXME - handle this situation (maybe someone opened an <img cid...
+ * and then ended the message)
+ */
+ if (!tag_end) {
+ lprintf(9, "tag_end is null and ptr is:\n");
+ lprintf(9, "%s\n", ptr);
+ lprintf(9, "Theoretical bytes remaining: %d\n", msgend - ptr);
+ }
- if (src &&
- (cid_start=strchr(src,':')) &&
- (cid_end=strchr(cid_start,'"')) &&
- (cid_end < tag_end)) {
+ src=strstr(ptr, " src=\"cid:");
+ ++brak;
+ if (src
+ && tag_end
+ && (cid_start=strchr(src,':'))
+ && (cid_end=strchr(cid_start,'"'))
+ && (cid_end < tag_end)
+ ) {
/* copy tag and attributes up to src="cid: */
StrBufAppendBufPlain(converted_msg, ptr, src - ptr, 0);
cid_start++;
/* add in /webcit/mimepart/<msgno>/CID/
- trailing / stops dumb URL filters getting excited */
+ trailing / stops dumb URL filters getting excited */
StrBufAppendPrintf(converted_msg,
- "src=\"/webcit/mimepart/%d/",msgnum);
+ " src=\"/webcit/mimepart/%d/",msgnum);
StrBufAppendBufPlain(converted_msg, cid_start, cid_end - cid_start, 0);
StrBufAppendBufPlain(converted_msg, "/\"", -1, 0);
-
+
ptr = cid_end+1;
}
StrBufAppendBufPlain(converted_msg, ptr, tag_end - ptr, 0);
char *ltreviewptr;
char *nbspreviewptr;
char linkedchar;
- int len = linklen;
+ int len;
len = linklen;
linkedchar = ptr[len];
ptr++;
}
- /**
- * We need to know when we're inside a tag,
- * so we don't turn things that look like URL's into
- * links, when they're already links - or image sources.
- */
- if (*(ptr-1) == '<') {
- ++brak;
- }
- if (*(ptr-1) == '>') {
- --brak;
- if ((scriptlevel == 0) && (script_start_pos >= 0)) {
- StrBufCutRight(converted_msg, StrLength(converted_msg) - script_start_pos);
- script_start_pos = (-1);
+
+ if ((ptr >= msg) && (ptr <= msgend)) {
+ /*
+ * We need to know when we're inside a tag,
+ * so we don't turn things that look like URL's into
+ * links, when they're already links - or image sources.
+ */
+ if ((ptr > msg) && (*(ptr-1) == '<')) {
+ ++brak;
+ }
+ if ((ptr > msg) && (*(ptr-1) == '>')) {
+ --brak;
+ if ((scriptlevel == 0) && (script_start_pos >= 0)) {
+ StrBufCutRight(converted_msg, StrLength(converted_msg) - script_start_pos);
+ script_start_pos = (-1);
+ }
}
+ if (!strncasecmp(ptr, "</A>", 3)) --alevel;
}
- if (!strncasecmp(ptr, "</A>", 3)) --alevel;
}
+
if (BodyArea != NULL) {
StrBufAppendBufPlain(converted_msg, HKEY("</td></tr></table>"), 0);
FreeStrBuf(&BodyArea);
projects / citadel.git / blobdiff