/*----------------------------------------------------------------------------*/
-
-/*
- * I wanna SEE that message!
- *
- * msgnum Message number to display
- * printable_view Nonzero to display a printable view
- * section Optional for encapsulated message/rfc822 submessage
- */
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum)
+int load_message(message_summary *Msg,
+ StrBuf *FoundCharset,
+ StrBuf **Error)
{
wcsession *WCC = WC;
StrBuf *Buf;
StrBuf *HdrToken;
- StrBuf *FoundCharset;
- HashPos *it;
- void *vMime;
- message_summary *Msg = NULL;
headereval *Hdr;
void *vHdr;
char buf[SIZ];
int Done = 0;
int state=0;
- long len;
- const char *Key;
- WCTemplputParams SubTP;
-
+
Buf = NewStrBuf();
- lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
- serv_printf("MSG4 %ld|%s", msgnum, ChrPtr(PartNum));
+ lprintf(1, "-------------------MSG4 %ld|%s--------------\n", Msg->msgnum, ChrPtr(Msg->PartNum));
+ serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
- StrBufAppendPrintf(Target, "<strong>");
- StrBufAppendPrintf(Target, _("ERROR:"));
- StrBufAppendPrintf(Target, "</strong> %s<br />\n", &buf[4]);
+ *Error = NewStrBuf();
+ StrBufAppendPrintf(*Error, "<strong>");
+ StrBufAppendPrintf(*Error, _("ERROR:"));
+ StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
FreeStrBuf(&Buf);
return 0;
}
/** begin everythingamundo table */
-
-
HdrToken = NewStrBuf();
- Msg = (message_summary *)malloc(sizeof(message_summary));
- memset(Msg, 0, sizeof(message_summary));
- Msg->msgnum = msgnum;
- Msg->PartNum = PartNum;
- Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
- memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
- Msg->MsgBody->msgnum = msgnum;
- FoundCharset = NewStrBuf();
- while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+ while ((StrBuf_ServGetlnBuffered(Buf)>=0) && !Done) {
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000"))
{
if (Hdr->Type == 1) {
state++;
}
- }
+ }/* TODO:
else LogError(Target,
__FUNCTION__,
"don't know how to handle message header[%s]\n",
ChrPtr(HdrToken));
+ */
break;
case 1:/* Message Mime Header */
if (StrLength(Buf) == 0) {
case 2: /* Message Body */
if (Msg->MsgBody->size_known > 0) {
- StrBuf_ServGetBLOB(Msg->MsgBody->Data, Msg->MsgBody->length);
+ StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
state ++;
/*/ todo: check next line, if not 000, append following lines */
}
/* now we put the body mimepart we read above into the mimelist */
Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
- /* strip the bare contenttype, so we ommit charset etc. */
- StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
- StrBufTrim(Buf);
- /* look up the renderer, that will convert this mimeitem into the htmlized form */
- if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
- (vHdr != NULL)) {
- RenderMimeFuncStruct *Render;
- Render = (RenderMimeFuncStruct*)vHdr;
- Render->f(Msg->MsgBody, NULL, FoundCharset);
- }
-
- if (StrLength(Msg->reply_references)> 0) {
- /* Trim down excessively long lists of thread references. We eliminate the
- * second one in the list so that the thread root remains intact.
- */
- int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
- int rrlen = StrLength(Msg->reply_references);
- if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
- StrBufRemove_token(Msg->reply_references, 1, '|');
- }
- }
-
/* Generate a reply-to address */
if (StrLength(Msg->Rfca) > 0) {
if (Msg->reply_to == NULL)
StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
}
}
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&HdrToken);
+ return 1;
+}
+
+
+
+/*
+ * I wanna SEE that message!
+ *
+ * msgnum Message number to display
+ * printable_view Nonzero to display a printable view
+ * section Optional for encapsulated message/rfc822 submessage
+ */
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum)
+{
+ StrBuf *Buf;
+ StrBuf *FoundCharset;
+ HashPos *it;
+ void *vMime;
+ message_summary *Msg = NULL;
+ void *vHdr;
+ long len;
+ const char *Key;
+ WCTemplputParams SubTP;
+ StrBuf *Error = NULL;
+
+ Buf = NewStrBuf();
+ FoundCharset = NewStrBuf();
+ Msg = (message_summary *)malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+ Msg->msgnum = msgnum;
+ Msg->PartNum = PartNum;
+ Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+ memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+ Msg->MsgBody->msgnum = msgnum;
+
+ if (!load_message(Msg, FoundCharset, &Error)) {
+ StrBufAppendBuf(Target, Error, 0);
+ FreeStrBuf(&Error);
+ }
+
+ /* strip the bare contenttype, so we ommit charset etc. */
+ StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
+ StrBufTrim(Buf);
+ /* look up the renderer, that will convert this mimeitem into the htmlized form */
+ if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
+ (vHdr != NULL)) {
+ RenderMimeFuncStruct *Render;
+ Render = (RenderMimeFuncStruct*)vHdr;
+ Render->f(Msg->MsgBody, NULL, FoundCharset);
+ }
+
+ if (StrLength(Msg->reply_references)> 0) {
+ /* Trim down excessively long lists of thread references. We eliminate the
+ * second one in the list so that the thread root remains intact.
+ */
+ int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
+ int rrlen = StrLength(Msg->reply_references);
+ if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+ StrBufRemove_token(Msg->reply_references, 1, '|');
+ }
+ }
/* now check if we need to translate some mimeparts, and remove the duplicate */
it = GetNewHashPos(Msg->AllAttach, 0);
DestroyMessageSummary(Msg);
FreeStrBuf(&FoundCharset);
- FreeStrBuf(&HdrToken);
FreeStrBuf(&Buf);
return 1;
}
+
+
+
/*
* Unadorned HTML output of an individual message, suitable
* for placing in a hidden iframe, for printing, or whatever
msgnum = StrTol(WCC->UrlFragment2);
if (StrLength(Tmpl) > 0)
- read_message(WCC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
+ read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL);
else
- read_message(WCC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
+ read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL);
}
begin_burst();
- read_message(WC->WBuf, HKEY("view_message_print"), msgnum, 1, NULL);
+ read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL);
wDumpContent(0);
}
output_headers(1, 0, 0, 0, 0, 1);
begin_burst();
do_template("msgcontrols", NULL);
- read_message(WC->WBuf, HKEY("view_message"), msgnum,1, NULL);
+ read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL);
wDumpContent(0);
}
serv_printf("MSG0 %ld|1", MsgNum); /* ask for headers only */
- StrBuf_ServGetln(Buf);
+ StrBuf_ServGetlnBuffered(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
FreeStrBuf(&Buf);
return NULL;
Msg = (message_summary*)malloc(sizeof(message_summary));
memset(Msg, 0, sizeof(message_summary));
- while (len = StrBuf_ServGetln(Buf),
+ while (len = StrBuf_ServGetlnBuffered(Buf),
((len != 3) ||
strcmp(ChrPtr(Buf), "000")== 0)){
buf = ChrPtr(Buf);
* servcmd: the citadel command to send to the citserver
* with_headers: also include some of the headers with the message numbers (more expensive)
*/
-int load_msg_ptrs(char *servcmd, int with_headers)
+int load_msg_ptrs(const char *servcmd, int with_headers)
{
StrBuf* FoundCharset = NULL;
wcsession *WCC = WC;
long len;
int n;
int skipit;
+ const char *Ptr;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
Buf = NewStrBuf();
serv_puts(servcmd);
- StrBuf_ServGetln(Buf);
+ StrBuf_ServGetlnBuffered(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
FreeStrBuf(&Buf);
return (nummsgs);
}
Buf2 = NewStrBuf();
- while (len = StrBuf_ServGetln(Buf),
+ while (len = StrBuf_ServGetlnBuffered(Buf),
((len != 3) ||
strcmp(ChrPtr(Buf), "000")!= 0))
{
if (nummsgs < maxload) {
skipit = 0;
+ Ptr = NULL;
Msg = (message_summary*)malloc(sizeof(message_summary));
memset(Msg, 0, sizeof(message_summary));
- Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
- Msg->date = StrBufExtract_long(Buf, 1, '|');
+ Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
+ Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
/*
* as citserver probably gives us messages in forward date sorting
* nummsgs should be the same order as the message date.
}
if (!skipit) {
Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_token(Buf2, Buf, 2, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if (StrLength(Buf2) != 0) {
/** Handle senders with RFC2047 encoding */
StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
}
/** Nodename */
- StrBufExtract_token(Buf2, Buf, 3, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if ((StrLength(Buf2) !=0 ) &&
( ((WCC->room_flags & QR_NETWORK)
|| ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
/** Not used:
StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
*/
-
+ StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_token(Buf2, Buf, 5, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if (StrLength(Buf2) == 0)
StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
else {
int sortit = 0;
int defaultsortorder = 0;
WCTemplputParams SubTP;
+ char *ab_name;
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
case VIEW_CALBRIEF:
case VIEW_CALENDAR:
load_seen = 1;
- strcpy(cmd, "MSGS ALL|||1");
+ strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
parse_calendar_view_request(&calv);
break;
display_note(Msg, Msg->is_new);
break;
case VIEW_ADDRESSBOOK:
- fetch_ab_name(Msg, buf);
+ ab_name = NULL;
+ fetch_ab_name(Msg, &ab_name);
++num_ab;
addrbook = realloc(addrbook,
(sizeof(addrbookent) * num_ab) );
- safestrncpy(addrbook[num_ab-1].ab_name, buf,
+ safestrncpy(addrbook[num_ab-1].ab_name, ab_name,
sizeof(addrbook[num_ab-1].ab_name));
addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
+ free(ab_name);
break;
case VIEW_BBS: /* Tag the mails we want to show in bbview... */
default:
/** if we do a split bbview in the future, begin messages div here */
for (a=0; a<num_displayed; ++a) {
- read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
+ read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], NULL);
}
/** if we do a split bbview in the future, end messages div here */
break;
case VIEW_ADDRESSBOOK:
if (is_singlecard)
- read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), 0, NULL);
+ read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL);
else
do_addrbook_view(addrbook, num_ab); /** Render the address book */
break;
{
const StrBuf *ref = sbstr("references");
references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
- lprintf(9, "Converting: %s\n", ChrPtr(references));
+ if (*ChrPtr(references) == '|') { /* remove leading '|' if present */
+ StrBufCutLeft(references, 1);
+ }
StrBufReplaceChars(references, '|', '!');
- lprintf(9, "Converted: %s\n", ChrPtr(references));
}
if (havebstr("subject")) {
const StrBuf *Subj;
else {
content_type = NewStrBufDup(part->ContentType);
}
- output_headers(0, 0, 0, 0, 0, 0);
StrBufAppendBuf(WC->WBuf, part->Data, 0);
http_transmit_thing(ChrPtr(content_type), 0);
} else {
void mimepart(int force_download)
{
wcsession *WCC = WC;
-
- char buf[256];
+ StrBuf *Buf;
off_t bytes;
- char content_type[256];
- const char *ContentType = &content_type[0];
+ StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+ const char *CT;
+ Buf = NewStrBuf();
serv_printf("OPNA %s|%s", ChrPtr(WCC->UrlFragment2), ChrPtr(WCC->UrlFragment3));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- bytes = extract_long(&buf[4], 0);
- if (force_download) {
- strcpy(content_type, "application/octet-stream");
- }
- else {
- extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+ if (!force_download) {
+ StrBufExtract_token(ContentType, Buf, 3, '|');
}
- read_server_binary(WCC->WBuf, bytes);
+ read_server_binary(WCC->WBuf, bytes, Buf);
serv_puts("CLOS");
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetlnBuffered(Buf);
+ CT = ChrPtr(ContentType);
if (!force_download) {
- if (!strcasecmp(ContentType, "application/octet-stream")) {
- ContentType = GuessMimeByFilename(SKEY(WCC->UrlFragment4));
+ if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+ CT = GuessMimeByFilename(SKEY(WCC->UrlFragment4));
}
- if (!strcasecmp(ContentType, "application/octet-stream")) {
- ContentType = GuessMimeType(SKEY(WCC->WBuf));
+ if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+ CT = GuessMimeType(SKEY(WCC->WBuf));
}
}
- output_headers(0, 0, 0, 0, 0, 0);
- http_transmit_thing(ContentType, 0);
+ http_transmit_thing(CT, 0);
} else {
- hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+ StrBufCutLeft(Buf, 4);
+ hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+ wprintf(_("An error occurred while retrieving this part: %s\n"),
+ ChrPtr(Buf));
end_burst();
}
+ FreeStrBuf(&ContentType);
+ FreeStrBuf(&Buf);
}
/*
* Read any MIME part of a message, from the server, into memory.
*/
-char *load_mimepart(long msgnum, char *partnum)
+StrBuf *load_mimepart(long msgnum, char *partnum)
{
- char buf[SIZ];
off_t bytes;
- char content_type[SIZ];
- char *content;
+ StrBuf *Buf;
+ Buf = NewStrBuf();
serv_printf("DLAT %ld|%s", msgnum, partnum);
- serv_getln(buf, sizeof buf);
- if (buf[0] == '6') {
- bytes = extract_long(&buf[4], 0);
- extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
-
- content = malloc(bytes + 2);
- serv_read(content, bytes);
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
- content[bytes] = 0; /* null terminate for good measure */
- return(content);
+ StrBuf_ServGetBLOBBuffered(Buf, bytes);
+ return(Buf);
}
else {
+ FreeStrBuf(&Buf);
return(NULL);
}
}
*/
void MimeLoadData(wc_mime_attachment *Mime)
{
- char buf[SIZ];
+ StrBuf *Buf;
off_t bytes;
/* TODO: is there a chance the contenttype is different to the one we know? */
serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '6') {
- bytes = extract_long(&buf[4], 0);
-
+ Buf = NewStrBuf();
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
+
if (Mime->Data == NULL)
Mime->Data = NewStrBufPlain(NULL, bytes);
- StrBuf_ServGetBLOB(Mime->Data, bytes);
-
+ StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
}
else {
FlushStrBuf(Mime->Data);
/* TODO XImportant message */
}
+ FreeStrBuf(&Buf);
}