Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 46c854b..2411399 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp @@ -1,3 +1,3 @@ - +#include <stdlib.h> #include "pop3wrapper.h" #include "mailtypes.h" @@ -44,17 +44,21 @@ RecBody POP3wrapper::parseBody( const char *message ) { int err = MAILIMF_NO_ERROR; - size_t curTok; - mailimf_message *result; + /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ + size_t curTok = 0; + mailimf_message *result = 0; RecBody body; err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); - if ( err != MAILIMF_NO_ERROR ) return body; + if ( err != MAILIMF_NO_ERROR ) { + if (result) mailimf_message_free(result); + return body; + } if ( result && result->msg_body && result->msg_body->bd_text ) { qDebug( "POP3: bodytext found" ); - // TODO: why does this line segfault???? gdb says segfault in strlen(), maybe a bug in libetpan. + // when curTok isn't set to 0 this line will fault! 'cause upper line faults! body.setBodytext( QString( result->msg_body->bd_text ) ); } - + if (result) mailimf_message_free(result); return body; } @@ -63,7 +67,8 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) { int err = MAILPOP3_NO_ERROR; - char *header; - size_t length; - carray *messages; + char * header = 0; + /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ + size_t length = 0; + carray * messages = 0; login(); @@ -71,10 +76,12 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) mailpop3_list( m_pop3, &messages ); - for ( int i = carray_count( messages ); i > 0; i-- ) { - mailpop3_msg_info *info = (mailpop3_msg_info *) carray_get( messages, i - 1 ); - + //for ( int i = carray_count( messages ); i > 0; i-- ) { + for (unsigned int i = 0; i < carray_count(messages);++i) { + mailpop3_msg_info *info; + int r = mailpop3_get_msg_info(m_pop3,i+1,&info); err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); if ( err != MAILPOP3_NO_ERROR ) { qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); + free(header); logout(); return; @@ -84,6 +91,6 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) mail->setWrapper(this); target.append( mail ); + free(header); } - logout(); } @@ -92,8 +99,10 @@ RecMail *POP3wrapper::parseHeader( const char *header ) { int err = MAILIMF_NO_ERROR; - size_t curTok; + size_t curTok = 0; RecMail *mail = new RecMail(); mailimf_fields *fields; - + mailimf_references * refs; + mailimf_keywords*keys; + err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) { @@ -118,9 +127,25 @@ RecMail *POP3wrapper::parseHeader( const char *header ) mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); break; + case MAILIMF_FIELD_MESSAGE_ID: + mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); + break; + case MAILIMF_FIELD_REFERENCES: + refs = field->fld_data.fld_references; + if (refs && refs->mid_list && clist_count(refs->mid_list)) { + char * text = (char*)refs->mid_list->first->data; + mail->setReplyto(QString(text)); + } + break; + case MAILIMF_FIELD_KEYWORDS: + keys = field->fld_data.fld_keywords; + for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) { + qDebug("Keyword: %s",(char*)cur->data); + } + break; default: break; } } - + if (fields) mailimf_fields_free(fields); return mail; } |