| author | alwin <alwin> | 2003-12-25 02:10:29 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2003-12-25 02:10:29 (UTC) |
| commit | af6b80a3d184e8984575a2cf7741058302c1c30b (patch) (side-by-side diff) | |
| tree | f6f66284fd9f1fd3403b188c1a1afae58ec951dc | |
| parent | 52ccb19535d332f38dcd49f9d115192668c45357 (diff) | |
| download | opie-af6b80a3d184e8984575a2cf7741058302c1c30b.zip opie-af6b80a3d184e8984575a2cf7741058302c1c30b.tar.gz opie-af6b80a3d184e8984575a2cf7741058302c1c30b.tar.bz2 | |
fixed an address parsing bug
| -rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 39 | ||||
| -rw-r--r-- | noncore/net/mail/smtpwrapper.cpp | 39 |
2 files changed, 70 insertions, 8 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index 21992b4..285561c 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp @@ -82,5 +82,34 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) addresses = mailimf_address_list_new_empty(); - QStringList list = QStringList::split( ',', addr ); + bool literal_open = false; + unsigned int startpos = 0; + QStringList list; + QString s; + unsigned int i = 0; + for (; i < addr.length();++i) { + switch (addr[i]) { + case '\"': + literal_open = !literal_open; + break; + case ',': + if (!literal_open) { + s = addr.mid(startpos,i-startpos); + if (!s.isEmpty()) { + list.append(s); + qDebug("Appended %s",s.latin1()); + } + // !!!! this is a MUST BE! + startpos = ++i; + } + break; + default: + break; + } + } + s = addr.mid(startpos,i-startpos); + if (!s.isEmpty()) { + list.append(s); + qDebug("Appended %s",s.latin1()); + } QStringList::Iterator it; for ( it = list.begin(); it != list.end(); it++ ) { @@ -92,8 +121,7 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) free( str ); } else { - qDebug( "Parse success! :)" ); + qDebug( "Parse success! %s",(*it).latin1()); } } - return addresses; } @@ -626,5 +654,8 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou err = mailsmtp_send( session, from, rcpts, data, size ); - if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;} + if ( err != MAILSMTP_NO_ERROR ) { + qDebug("Error sending mail: %s",mailsmtpError(err).latin1()); + result = 0; goto free_con_session; + } qDebug( "Mail sent." ); diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp index 21992b4..285561c 100644 --- a/noncore/net/mail/smtpwrapper.cpp +++ b/noncore/net/mail/smtpwrapper.cpp @@ -82,5 +82,34 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) addresses = mailimf_address_list_new_empty(); - QStringList list = QStringList::split( ',', addr ); + bool literal_open = false; + unsigned int startpos = 0; + QStringList list; + QString s; + unsigned int i = 0; + for (; i < addr.length();++i) { + switch (addr[i]) { + case '\"': + literal_open = !literal_open; + break; + case ',': + if (!literal_open) { + s = addr.mid(startpos,i-startpos); + if (!s.isEmpty()) { + list.append(s); + qDebug("Appended %s",s.latin1()); + } + // !!!! this is a MUST BE! + startpos = ++i; + } + break; + default: + break; + } + } + s = addr.mid(startpos,i-startpos); + if (!s.isEmpty()) { + list.append(s); + qDebug("Appended %s",s.latin1()); + } QStringList::Iterator it; for ( it = list.begin(); it != list.end(); it++ ) { @@ -92,8 +121,7 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) free( str ); } else { - qDebug( "Parse success! :)" ); + qDebug( "Parse success! %s",(*it).latin1()); } } - return addresses; } @@ -626,5 +654,8 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou err = mailsmtp_send( session, from, rcpts, data, size ); - if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;} + if ( err != MAILSMTP_NO_ERROR ) { + qDebug("Error sending mail: %s",mailsmtpError(err).latin1()); + result = 0; goto free_con_session; + } qDebug( "Mail sent." ); |