Diffstat (limited to 'noncore/net/mail/libmailwrapper/pop3wrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 55 |
1 files changed, 40 insertions, 15 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 @@ | |||
1 | 1 | #include <stdlib.h> | |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
@@ -44,17 +44,21 @@ RecBody POP3wrapper::parseBody( const char *message ) | |||
44 | { | 44 | { |
45 | int err = MAILIMF_NO_ERROR; | 45 | int err = MAILIMF_NO_ERROR; |
46 | size_t curTok; | 46 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
47 | mailimf_message *result; | 47 | size_t curTok = 0; |
48 | mailimf_message *result = 0; | ||
48 | RecBody body; | 49 | RecBody body; |
49 | 50 | ||
50 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); | 51 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); |
51 | if ( err != MAILIMF_NO_ERROR ) return body; | 52 | if ( err != MAILIMF_NO_ERROR ) { |
53 | if (result) mailimf_message_free(result); | ||
54 | return body; | ||
55 | } | ||
52 | 56 | ||
53 | if ( result && result->msg_body && result->msg_body->bd_text ) { | 57 | if ( result && result->msg_body && result->msg_body->bd_text ) { |
54 | qDebug( "POP3: bodytext found" ); | 58 | qDebug( "POP3: bodytext found" ); |
55 | // TODO: why does this line segfault???? gdb says segfault in strlen(), maybe a bug in libetpan. | 59 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! |
56 | body.setBodytext( QString( result->msg_body->bd_text ) ); | 60 | body.setBodytext( QString( result->msg_body->bd_text ) ); |
57 | } | 61 | } |
58 | 62 | if (result) mailimf_message_free(result); | |
59 | return body; | 63 | return body; |
60 | } | 64 | } |
@@ -63,7 +67,8 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | |||
63 | { | 67 | { |
64 | int err = MAILPOP3_NO_ERROR; | 68 | int err = MAILPOP3_NO_ERROR; |
65 | char *header; | 69 | char * header = 0; |
66 | size_t length; | 70 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
67 | carray *messages; | 71 | size_t length = 0; |
72 | carray * messages = 0; | ||
68 | 73 | ||
69 | login(); | 74 | login(); |
@@ -71,10 +76,12 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | |||
71 | mailpop3_list( m_pop3, &messages ); | 76 | mailpop3_list( m_pop3, &messages ); |
72 | 77 | ||
73 | for ( int i = carray_count( messages ); i > 0; i-- ) { | 78 | //for ( int i = carray_count( messages ); i > 0; i-- ) { |
74 | mailpop3_msg_info *info = (mailpop3_msg_info *) carray_get( messages, i - 1 ); | 79 | for (unsigned int i = 0; i < carray_count(messages);++i) { |
75 | 80 | mailpop3_msg_info *info; | |
81 | int r = mailpop3_get_msg_info(m_pop3,i+1,&info); | ||
76 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); | 82 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); |
77 | if ( err != MAILPOP3_NO_ERROR ) { | 83 | if ( err != MAILPOP3_NO_ERROR ) { |
78 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); | 84 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); |
85 | free(header); | ||
79 | logout(); | 86 | logout(); |
80 | return; | 87 | return; |
@@ -84,6 +91,6 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | |||
84 | mail->setWrapper(this); | 91 | mail->setWrapper(this); |
85 | target.append( mail ); | 92 | target.append( mail ); |
93 | free(header); | ||
86 | } | 94 | } |
87 | |||
88 | logout(); | 95 | logout(); |
89 | } | 96 | } |
@@ -92,7 +99,9 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
92 | { | 99 | { |
93 | int err = MAILIMF_NO_ERROR; | 100 | int err = MAILIMF_NO_ERROR; |
94 | size_t curTok; | 101 | size_t curTok = 0; |
95 | RecMail *mail = new RecMail(); | 102 | RecMail *mail = new RecMail(); |
96 | mailimf_fields *fields; | 103 | mailimf_fields *fields; |
104 | mailimf_references * refs; | ||
105 | mailimf_keywords*keys; | ||
97 | 106 | ||
98 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); | 107 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); |
@@ -118,9 +127,25 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
118 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); | 127 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); |
119 | break; | 128 | break; |
129 | case MAILIMF_FIELD_MESSAGE_ID: | ||
130 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); | ||
131 | break; | ||
132 | case MAILIMF_FIELD_REFERENCES: | ||
133 | refs = field->fld_data.fld_references; | ||
134 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | ||
135 | char * text = (char*)refs->mid_list->first->data; | ||
136 | mail->setReplyto(QString(text)); | ||
137 | } | ||
138 | break; | ||
139 | case MAILIMF_FIELD_KEYWORDS: | ||
140 | keys = field->fld_data.fld_keywords; | ||
141 | for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) { | ||
142 | qDebug("Keyword: %s",(char*)cur->data); | ||
143 | } | ||
144 | break; | ||
120 | default: | 145 | default: |
121 | break; | 146 | break; |
122 | } | 147 | } |
123 | } | 148 | } |
124 | 149 | if (fields) mailimf_fields_free(fields); | |
125 | return mail; | 150 | return mail; |
126 | } | 151 | } |