2004-12-02 [paul] 0.9.12cvs180

[claws.git] / src / pop.c

diff --git a/src/pop.c b/src/pop.c
index 560a815eb3819fabc2632d5510810ad7251563b0..b58adf54cd296649d96cab0c64259f9b8f0ed084 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -36,10 +36,6 @@
 #include "prefs_account.h"
 #include "utils.h"
 #include "recv.h"
-#include "folder.h"
-#include "procmsg.h"
-#include "procheader.h"
-#include "msgcache.h"
 #include "partial_download.h"
 #include "log.h"
 #include "hooks.h"
@@ -151,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;
        }
@@ -184,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 {
@@ -255,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);
 
@@ -269,7 +266,8 @@ 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) {
+               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;
@@ -479,7 +477,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_strncasecmp(buf, "PASS ", 5))
                log_print("POP3> PASS ********\n");
        else
                log_print("POP3> %s\n", buf);
@@ -585,13 +583,19 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
                recv_time = RECV_TIME_NONE;
                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, &recv_time, tmp) < 3) {
+                       if (sscanf(buf, "%s\t%ld", uidl, &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),
@@ -662,7 +666,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");
        }
        
@@ -670,7 +674,8 @@ 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) {
+       while ((cur = (gchar *)my_memmem(prev, len - (prev - data), "\r\n", 2))
+              != NULL) {
                if ((cur > prev && fwrite(prev, cur - prev, 1, fp) < 1) ||
                    fputc('\n', fp) == EOF) {
                        FILE_OP_ERROR(file, "fwrite");
@@ -793,23 +798,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:
@@ -820,7 +825,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;
                        }
                }
@@ -869,7 +874,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);
@@ -878,7 +883,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);