2005-09-30 [colin] 1.9.14cvs62
[claws.git] / src / pop.c
index 045a8a8dc87fc3cdaaf1a44ee11b4f6e413d95db..a72f037edc1813129b80440aa3c7381503818d69 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -22,6 +22,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "pop.h"
 #include "md5.h"
 #include "prefs_account.h"
 #include "utils.h"
 #include "recv.h"
-
+#include "partial_download.h"
 #include "log.h"
 #include "hooks.h"
 
@@ -91,9 +91,6 @@ static gint pop3_session_recv_data_finished   (Session        *session,
                                                 guchar         *data,
                                                 guint           len);
 
-static gchar *pop3_get_filename_for_partial_mail(Pop3Session   *session, 
-                                                gchar          *muidl);
-
 static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
 {
        session->state = POP3_GREETING;
@@ -150,14 +147,14 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
        session->state = POP3_GETAUTH_APOP;
 
        if ((start = strchr(session->greeting, '<')) == NULL) {
-               log_warning(_("Required APOP timestamp not found "
+               log_error(_("Required APOP timestamp not found "
                            "in greeting\n"));
                session->error_val = PS_PROTOCOL;
                return -1;
        }
 
        if ((end = strchr(start, '>')) == NULL || end == start + 1) {
-               log_warning(_("Timestamp syntax error in greeting\n"));
+               log_error(_("Timestamp syntax error in greeting\n"));
                session->error_val = PS_PROTOCOL;
                return -1;
        }
@@ -183,7 +180,7 @@ static gint pop3_getrange_stat_send(Pop3Session *session)
 static gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
 {
        if (sscanf(msg, "%d %d", &session->count, &session->total_bytes) != 2) {
-               log_warning(_("POP3 protocol error\n"));
+               log_error(_("POP3 protocol error\n"));
                session->error_val = PS_PROTOCOL;
                return -1;
        } else {
@@ -254,10 +251,11 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                p = newline + 1;
                if (p < lastp && *p == '\n') p++;
 
-               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2)
-                       return -1;
-               if (num <= 0 || num > session->count)
-                       return -1;
+               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2 ||
+                   num <= 0 || num > session->count) {
+                       log_warning(_("invalid UIDL response: %s\n"), buf);
+                       continue;
+               }
 
                session->msg[num].uidl = g_strdup(id);
 
@@ -268,10 +266,13 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
                partial_recv = (gint)g_hash_table_lookup(
                                        session->partial_recv_table, id);
 
-               if (!session->ac_prefs->getall && recv_time != RECV_TIME_NONE) {
-                       session->msg[num].received = (partial_recv != 2);
+               if ((!session->ac_prefs->getall && recv_time != RECV_TIME_NONE)
+               || partial_recv != POP3_TOTALLY_RECEIVED) {
+                       session->msg[num].received = 
+                               (partial_recv != POP3_MUST_COMPLETE_RECV);
                        session->msg[num].partial_recv = partial_recv;
-
+                       if (partial_recv == POP3_MUST_COMPLETE_RECV)
+                               session->new_msg_exist = TRUE;
                }
                if (!session->new_msg_exist &&
                    (session->ac_prefs->getall || recv_time == RECV_TIME_NONE ||
@@ -339,13 +340,18 @@ static gint pop3_retr_recv(Pop3Session *session, const gchar *data, guint len)
        gint drop_ok;
        MailReceiveData mail_receive_data;
 
-       mail_receive_data.session = session;
-       mail_receive_data.data = g_strndup(data, len);
+       /* NOTE: we allocate a slightly larger buffer with a zero terminator
+        * because some plugins may think that it has a C string. */ 
+       mail_receive_data.session  = session;
+       mail_receive_data.data     = g_new0(gchar, len + 1);
+       mail_receive_data.data_len = len;
+       memcpy(mail_receive_data.data, data, len); 
+       
        hooks_invoke(MAIL_RECEIVE_HOOKLIST, &mail_receive_data);
 
        file = get_tmp_file();
-       if (pop3_write_msg_to_file(file, mail_receive_data.data,
-               strlen(mail_receive_data.data), NULL) < 0) {
+       if (pop3_write_msg_to_file(file, mail_receive_data.data, 
+                                  mail_receive_data.data_len, NULL) < 0) {
                g_free(file);
                g_free(mail_receive_data.data);
                session->error_val = PS_IOERR;
@@ -353,22 +359,22 @@ static gint pop3_retr_recv(Pop3Session *session, const gchar *data, guint len)
        }
        g_free(mail_receive_data.data);
 
-       if (session->msg[session->cur_msg].partial_recv == 2) {
-               gchar *old_file = pop3_get_filename_for_partial_mail(
-                               session, session->msg[session->cur_msg].uidl);
-               if (old_file != NULL) {
-                       move_file(file, old_file, TRUE);
-                       g_free(file);
-                       file = old_file;
+       if (session->msg[session->cur_msg].partial_recv 
+           == POP3_MUST_COMPLETE_RECV) {
+               gchar *old_file = partial_get_filename(
+                               session->ac_prefs->recv_server,
+                               session->ac_prefs->userid,
+                               session->msg[session->cur_msg].uidl);
+               
+               if (old_file) {
+                       partial_delete_old(old_file);
+                       g_free(old_file);
                }
-               /* drop_ok: 0: success 1: don't receive -1: error */
-               drop_ok = session->drop_message(
-                               session, file, old_file != NULL);
-       } else {
-               /* drop_ok: 0: success 1: don't receive -1: error */
-               drop_ok = session->drop_message(
-                               session, file, FALSE);
-       }
+       } 
+
+       /* drop_ok: 0: success 1: don't receive -1: error */
+       drop_ok = session->drop_message(session, file);
+
        g_free(file);
        if (drop_ok < 0) {
                session->error_val = PS_IOERR;
@@ -380,7 +386,7 @@ static gint pop3_retr_recv(Pop3Session *session, const gchar *data, guint len)
        session->cur_total_num++;
 
        session->msg[session->cur_msg].received = TRUE;
-       session->msg[session->cur_msg].partial_recv = FALSE;
+       session->msg[session->cur_msg].partial_recv = POP3_TOTALLY_RECEIVED;
 
        session->msg[session->cur_msg].recv_time =
                drop_ok == 1 ? RECV_TIME_KEEP : session->current_time;
@@ -403,11 +409,17 @@ static gint pop3_top_recv(Pop3Session *session, const gchar *data, guint len)
        MailReceiveData mail_receive_data;
        gchar *partial_notice = NULL;
        
-       mail_receive_data.session = session;
-       mail_receive_data.data = g_strndup(data, len);
+       /* NOTE: we allocate a slightly larger buffer with a zero terminator
+        * because some plugins may think that it has a C string. */ 
+       mail_receive_data.session  = session;
+       mail_receive_data.data     = g_new0(gchar, len + 1);
+       mail_receive_data.data_len = len;
+       memcpy(mail_receive_data.data, data, len);
+       
        hooks_invoke(MAIL_RECEIVE_HOOKLIST, &mail_receive_data);
 
-       partial_notice = g_strdup_printf("SC-Partially-Retrieved: %s\n"
+       partial_notice = g_strdup_printf("SC-Marked-For-Download: 0\n"
+                                        "SC-Partially-Retrieved: %s\n"
                                         "SC-Account-Server: %s\n"
                                         "SC-Account-Login: %s\n"
                                         "SC-Message-Size: %d",
@@ -417,7 +429,8 @@ static gint pop3_top_recv(Pop3Session *session, const gchar *data, guint len)
                                         session->msg[session->cur_msg].size);
        file = get_tmp_file();
        if (pop3_write_msg_to_file(file, mail_receive_data.data,
-               strlen(mail_receive_data.data), partial_notice) < 0) {
+                                  mail_receive_data.data_len,  
+                                  partial_notice) < 0) {
                g_free(file);
                g_free(mail_receive_data.data);
                session->error_val = PS_IOERR;
@@ -428,7 +441,7 @@ static gint pop3_top_recv(Pop3Session *session, const gchar *data, guint len)
        g_free(partial_notice);
 
        /* drop_ok: 0: success 1: don't receive -1: error */
-       drop_ok = session->drop_message(session, file, FALSE);
+       drop_ok = session->drop_message(session, file);
        g_free(file);
        if (drop_ok < 0) {
                session->error_val = PS_IOERR;
@@ -440,7 +453,7 @@ static gint pop3_top_recv(Pop3Session *session, const gchar *data, guint len)
        session->cur_total_num++;
 
        session->msg[session->cur_msg].received = TRUE;
-       session->msg[session->cur_msg].partial_recv = TRUE;
+       session->msg[session->cur_msg].partial_recv = POP3_PARTIALLY_RECEIVED;
        session->msg[session->cur_msg].recv_time =
                drop_ok == 1 ? RECV_TIME_KEEP : session->current_time;
 
@@ -476,7 +489,7 @@ static void pop3_gen_send(Pop3Session *session, const gchar *format, ...)
        g_vsnprintf(buf, sizeof(buf) - 2, format, args);
        va_end(args);
 
-       if (!strncasecmp(buf, "PASS ", 5))
+       if (!g_ascii_strncasecmp(buf, "PASS ", 5))
                log_print("POP3> PASS ********\n");
        else
                log_print("POP3> %s\n", buf);
@@ -551,20 +564,25 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
        time_t recv_time;
        time_t now;
        gint partial_recv;
+       gchar *sanitized_uid = g_strdup(ac_prefs->userid);
+       
+       subst_for_filename(sanitized_uid);
        
        table = g_hash_table_new(g_str_hash, g_str_equal);
        partial_recv_table = g_hash_table_new(g_str_hash, g_str_equal);
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl", G_DIR_SEPARATOR_S, ac_prefs->recv_server,
-                          "-", ac_prefs->userid, NULL);
-       if ((fp = fopen(path, "rb")) == NULL) {
+                          "-", sanitized_uid, NULL);
+                          
+       g_free(sanitized_uid);
+       if ((fp = g_fopen(path, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                g_free(path);
                path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                   "uidl-", ac_prefs->recv_server,
                                   "-", ac_prefs->userid, NULL);
-               if ((fp = fopen(path, "rb")) == NULL) {
+               if ((fp = g_fopen(path, "rb")) == NULL) {
                        if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
                        g_free(path);
                        session->uidl_table = table;
@@ -580,23 +598,29 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
                gchar tmp[POPBUFSIZE];
                strretchomp(buf);
                recv_time = RECV_TIME_NONE;
-               partial_recv = 0;
+               partial_recv = POP3_TOTALLY_RECEIVED;
                
-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 2) {
-                       if (sscanf(buf, "%s", uidl) != 1)
-                               continue;
-                       else {
-                               recv_time = now;
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time, tmp) < 3) {
+                       if (sscanf(buf, "%s\t%ld", uidl, (long int *) &recv_time) != 2) {
+                               if (sscanf(buf, "%s", uidl) != 1)
+                                       continue;
+                               else {
+                                       recv_time = now;
+                                       strcpy(tmp, "0");
+                               }
+                       } else {
+                               strcpy(tmp, "0");
                        }
                }
+
                if (recv_time == RECV_TIME_NONE)
                        recv_time = RECV_TIME_RECEIVED;
                g_hash_table_insert(table, g_strdup(uidl),
                                    GINT_TO_POINTER(recv_time));
                if (strlen(tmp) == 1)
-                       partial_recv = atoi(tmp);
+                       partial_recv = atoi(tmp); /* totally received ?*/
                else
-                       partial_recv = 2;
+                       partial_recv = POP3_MUST_COMPLETE_RECV;
 
                g_hash_table_insert(partial_recv_table, g_strdup(uidl),
                                    GINT_TO_POINTER(partial_recv));
@@ -609,174 +633,27 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
        return;
 }
 
-static gchar *pop3_get_filename_for_partial_mail(Pop3Session *session, 
-                                                gchar *muidl)
-{
-       gchar *path;
-       gchar *result = NULL;
-       FILE *fp;
-       gchar buf[POPBUFSIZE];
-       gchar uidl[POPBUFSIZE];
-       time_t recv_time;
-       time_t now;
-       gint partial_recv;
-       
-       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                          "uidl", G_DIR_SEPARATOR_S, 
-                          session->ac_prefs->recv_server,
-                          "-", session->ac_prefs->userid, NULL);
-       if ((fp = fopen(path, "rb")) == NULL) {
-               if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
-               g_free(path);
-               path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                  "uidl-", session->ac_prefs->recv_server,
-                                  "-", session->ac_prefs->userid, NULL);
-               if ((fp = fopen(path, "rb")) == NULL) {
-                       if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
-                       g_free(path);
-                       return result;
-               }
-       }
-       g_free(path);
-
-       now = time(NULL);
-
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               gchar tmp[POPBUFSIZE];
-               strretchomp(buf);
-               recv_time = RECV_TIME_NONE;
-               partial_recv = 0;
-               
-               if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 2) {
-                       if (sscanf(buf, "%s", uidl) != 1)
-                               continue;
-                       else {
-                               recv_time = now;
-                       }
-               }
-               if (!strcmp(muidl, uidl)) {
-                       result = strdup(tmp);
-                       break;
-               }
-       }
-
-       fclose(fp);
-       
-       return result;
-}
-
-int pop3_mark_for_download(const gchar *server, const gchar *login, 
-                          const gchar *muidl, const gchar *filename)
-{
-       gchar *path;
-       gchar *pathnew;
-       FILE *fp;
-       FILE *fpnew;
-       gchar buf[POPBUFSIZE];
-       gchar uidl[POPBUFSIZE];
-       time_t recv_time;
-       time_t now;
-       int len;
-       gchar partial_recv[POPBUFSIZE];
-       
-
-       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                          "uidl", G_DIR_SEPARATOR_S, server,
-                          "-", login, NULL);
-       if ((fp = fopen(path, "rb")) == NULL) {
-               perror("fopen1");
-               if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
-               g_free(path);
-               path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                                  "uidl-", server,
-                                  "-", login, NULL);
-               if ((fp = fopen(path, "rb")) == NULL) {
-                       if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
-                       g_free(path);
-               }
-               return -1;
-       }
-
-       pathnew = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                          "uidl", G_DIR_SEPARATOR_S, server,
-                          "-", login, ".new", NULL);
-       if ((fpnew = fopen(pathnew, "wb")) == NULL) {
-               perror("fopen2");
-               fclose(fp);
-               g_free(pathnew);
-               return -1;      
-       }
-       
-       now = time(NULL);
-
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               strretchomp(buf);
-               recv_time = RECV_TIME_NONE;
-               sprintf(partial_recv,"0");
-               
-               if (sscanf(buf, "%s\t%ld\t%s", 
-                          uidl, &recv_time, &partial_recv) < 2) {
-                       if (sscanf(buf, "%s", uidl) != 1)
-                               continue;
-                       else {
-                               recv_time = now;
-                       }
-               }
-               if (strcmp(muidl, uidl)) {
-                       fprintf(fpnew, "%s\t%ld\t%s\n", 
-                               uidl, recv_time, partial_recv);
-               } else {
-                       fprintf(fpnew, "%s\t%ld\t%s\n", 
-                               uidl, recv_time, filename);
-               }
-       }
-       fclose(fpnew);
-       fclose(fp);
-
-       move_file(pathnew, path, TRUE);
-
-       g_free(path);
-       g_free(pathnew);
-       
-       if ((fp = fopen(filename,"rb")) == NULL) {
-               perror("fopen3");
-               return -1;
-       }
-       pathnew = g_strdup_printf("%s.new", filename);
-       if ((fpnew = fopen(pathnew, "wb")) == NULL) {
-               perror("fopen4");
-               fclose(fp);
-               g_free(pathnew);
-               return -1;
-       }
-       
-       fprintf(fpnew, "SC-Marked-For-Download: 1\n");
-       while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
-               fprintf(fpnew, "%s", buf);
-       }
-       fclose(fpnew);
-       fclose(fp);
-       unlink(filename);
-       rename(pathnew, filename);
-       
-       g_free(pathnew);
-       return 0;
-}
-
 gint pop3_write_uidl_list(Pop3Session *session)
 {
        gchar *path;
        FILE *fp;
        Pop3MsgInfo *msg;
        gint n;
+       gchar *sanitized_uid = g_strdup(session->ac_prefs->userid);
+       
+       subst_for_filename(sanitized_uid);
+       
 
        if (!session->uidl_is_valid) return 0;
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                           "uidl", G_DIR_SEPARATOR_S,
                           session->ac_prefs->recv_server,
-                          "-", session->ac_prefs->userid, NULL);
-       if ((fp = fopen(path, "wb")) == NULL) {
+                          "-", sanitized_uid, NULL);
+       
+       g_free(sanitized_uid);
+
+       if ((fp = g_fopen(path, "wb")) == NULL) {
                FILE_OP_ERROR(path, "fopen");
                g_free(path);
                return -1;
@@ -784,10 +661,10 @@ gint pop3_write_uidl_list(Pop3Session *session)
 
        for (n = 1; n <= session->count; n++) {
                msg = &session->msg[n];
-               if (msg->uidl && msg->received && !msg->deleted) {
+               if (msg->uidl && msg->received &&
+                   (!msg->deleted || session->state != POP3_DONE))
                        fprintf(fp, "%s\t%ld\t%d\n", 
-                               msg->uidl, msg->recv_time, msg->partial_recv);
-               }
+                               msg->uidl, (long int) msg->recv_time, msg->partial_recv);
        }
 
        if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
@@ -804,7 +681,7 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
 
        g_return_val_if_fail(file != NULL, -1);
 
-       if ((fp = fopen(file, "wb")) == NULL) {
+       if ((fp = g_fopen(file, "wb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
@@ -813,7 +690,7 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
                FILE_OP_ERROR(file, "chmod");
 
        if (prefix != NULL) {
-               fprintf(fp, prefix);
+               fprintf(fp, "%s", prefix);
                fprintf(fp, "\n");
        }
        
@@ -821,13 +698,14 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
         * ^data              ^prev            ^cur             data+len-1^ */
 
        prev = data;
-       while ((cur = memchr(prev, '\r', len - (prev - data))) != NULL) {
-               if ((cur > prev && fwrite(prev, cur - prev, 1, fp) < 1) ||
+       while ((cur = (gchar *)my_memmem(prev, len - (prev - data), "\r\n", 2))
+              != NULL) {
+               if ((cur > prev && fwrite(prev, 1, cur - prev, fp) < 1) ||
                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR(file, "fwrite");
                        g_warning("can't write to file: %s\n", file);
                        fclose(fp);
-                       unlink(file);
+                       g_unlink(file);
                        return -1;
                }
 
@@ -849,11 +727,11 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
        }
 
        if (prev - data < len &&
-           fwrite(prev, len - (prev - data), 1, fp) < 1) {
+           fwrite(prev, 1, len - (prev - data), fp) < 1) {
                FILE_OP_ERROR(file, "fwrite");
                g_warning("can't write to file: %s\n", file);
                fclose(fp);
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
        if (data[len - 1] != '\r' && data[len - 1] != '\n') {
@@ -861,14 +739,14 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
                        FILE_OP_ERROR(file, "fputc");
                        g_warning("can't write to file: %s\n", file);
                        fclose(fp);
-                       unlink(file);
+                       g_unlink(file);
                        return -1;
                }
        }
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(file, "fclose");
-               unlink(file);
+               g_unlink(file);
                return -1;
        }
 
@@ -893,35 +771,27 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
                if (ac->rmmail &&
                    msg->recv_time != RECV_TIME_NONE &&
                    msg->recv_time != RECV_TIME_KEEP &&
+                   msg->partial_recv == POP3_TOTALLY_RECEIVED &&
                    session->current_time - msg->recv_time >=
                    ac->msg_leave_time * 24 * 60 * 60) {
-                       if (msg->partial_recv == 0) {
-                               log_message
-                                       (_("POP3: Deleting expired message "
-                                          "%d\n"), session->cur_msg);
-                               pop3_delete_send(session);
-                               return POP3_DELETE;
-                       } else if (session->current_time - msg->recv_time >=
-                                  5 * 24 * 60 * 60) {
-                               log_message
-                                       (_("POP3: Deleting too big expired "
-                                          "message %d\n"), session->cur_msg);
-                               pop3_delete_send(session);
-                               return POP3_DELETE;
-                       }
+                       log_message
+                               (_("POP3: Deleting expired message "
+                                  "%d\n"), session->cur_msg);
+                       pop3_delete_send(session);
+                       return POP3_DELETE;
                }
 
                if (size_limit_over) {
-                       log_message
-                               (_("POP3: Skipping message %d (%d bytes)\n"),
-                                  session->cur_msg, size);
-
-                       if (!msg->received && msg->partial_recv != 2) {
+                       if (!msg->received && msg->partial_recv != 
+                           POP3_MUST_COMPLETE_RECV) {
                                pop3_top_send(session, ac->size_limit);
                                return POP3_TOP;
-                       } else if (msg->partial_recv == 2) {
+                       } else if (msg->partial_recv == POP3_MUST_COMPLETE_RECV)
                                break;
-                       }
+
+                       log_message
+                               (_("POP3: Skipping message %d (%d bytes)\n"),
+                                  session->cur_msg, size);
                }
                
                if (size == 0 || msg->received || size_limit_over) {
@@ -952,23 +822,23 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                    strstr(msg + 4, "Lock") ||
                    strstr(msg + 4, "LOCK") ||
                    strstr(msg + 4, "wait")) {
-                       log_warning(_("mailbox is locked\n"));
+                       log_error(_("mailbox is locked\n"));
                        ok = PS_LOCKBUSY;
                } else if (strcasestr(msg + 4, "timeout")) {
-                       log_warning(_("session timeout\n"));
+                       log_error(_("Session timeout\n"));
                        ok = PS_ERROR;
                } else {
                        switch (session->state) {
 #if USE_OPENSSL
                        case POP3_STLS:
-                               log_warning(_("can't start TLS session\n"));
+                               log_error(_("can't start TLS session\n"));
                                ok = PS_ERROR;
                                break;
 #endif
                        case POP3_GETAUTH_USER:
                        case POP3_GETAUTH_PASS:
                        case POP3_GETAUTH_APOP:
-                               log_warning(_("error occurred on authentication\n"));
+                               log_error(_("error occurred on authentication\n"));
                                ok = PS_AUTHFAIL;
                                break;
                        case POP3_GETRANGE_LAST:
@@ -979,7 +849,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                                break;
                                
                        default:
-                               log_warning(_("error occurred on POP3 session\n"));
+                               log_error(_("error occurred on POP3 session\n"));
                                ok = PS_ERROR;
                        }
                }
@@ -998,7 +868,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
 {
        Pop3Session *pop3_session = POP3_SESSION(session);
        Pop3ErrorValue val = PS_SUCCESS;
-       const guchar *body;
+       const gchar *body;
 
        body = msg;
        if (pop3_session->state != POP3_GETRANGE_UIDL_RECV &&
@@ -1013,9 +883,9 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
 
                if (*body == '+' || *body == '-')
                        body++;
-               while (isalpha(*body))
+               while (g_ascii_isalpha(*body))
                        body++;
-               while (isspace(*body))
+               while (g_ascii_isspace(*body))
                        body++;
        }
 
@@ -1028,7 +898,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
                        pop3_stls_send(pop3_session);
                else
 #endif
-               if (pop3_session->ac_prefs->protocol == A_APOP)
+               if (pop3_session->ac_prefs->use_apop_auth)
                        pop3_getauth_apop_send(pop3_session);
                else
                        pop3_getauth_user_send(pop3_session);
@@ -1037,7 +907,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
        case POP3_STLS:
                if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
                        return -1;
-               if (pop3_session->ac_prefs->protocol == A_APOP)
+               if (pop3_session->ac_prefs->use_apop_auth)
                        pop3_getauth_apop_send(pop3_session);
                else
                        pop3_getauth_user_send(pop3_session);
@@ -1107,6 +977,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
                }
                break;
        case POP3_LOGOUT:
+               pop3_session->state = POP3_DONE;
                session_disconnect(session);
                break;
        case POP3_ERROR: