* use modern functions for downloads.

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 2fda2d6961a00e9a05de2e01c0ffb818a078c50f..9b16e2a94b4d0a8a1f0a7ff6d32f4c38b45c1e72 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -85,7 +85,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        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")) 
                {
@@ -155,7 +155,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                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 */
                        }
@@ -354,7 +354,7 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 
        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;
@@ -362,7 +362,7 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 
        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);
@@ -1541,44 +1541,47 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 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);
 }
 
 
@@ -1614,23 +1617,24 @@ char *load_mimepart(long msgnum, char *partnum)
  */
 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);
 }