/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
session->state = POP3_GETAUTH_APOP;
if ((start = strchr(session->greeting, '<')) == NULL) {
- log_error(_("Required APOP timestamp not found "
+ log_error(LOG_PROTOCOL, _("Required APOP timestamp not found "
"in greeting\n"));
session->error_val = PS_PROTOCOL;
return -1;
}
if ((end = strchr(start, '>')) == NULL || end == start + 1) {
- log_error(_("Timestamp syntax error in greeting\n"));
+ log_error(LOG_PROTOCOL, _("Timestamp syntax error in greeting\n"));
session->error_val = PS_PROTOCOL;
return -1;
}
static gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
{
if (sscanf(msg, "%d %d", &session->count, &session->total_bytes) != 2) {
- log_error(_("POP3 protocol error\n"));
+ log_error(LOG_PROTOCOL, _("POP3 protocol error\n"));
session->error_val = PS_PROTOCOL;
return -1;
} else {
gint last;
if (sscanf(msg, "%d", &last) == 0) {
- log_warning(_("POP3 protocol error\n"));
+ log_warning(LOG_PROTOCOL, _("POP3 protocol error\n"));
session->error_val = PS_PROTOCOL;
return -1;
} else {
gchar id[IDLEN + 1];
gchar buf[POPBUFSIZE];
gint buf_len;
- gint num;
+ guint32 num;
time_t recv_time;
gint partial_recv;
const gchar *p = data;
if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2 ||
num <= 0 || num > session->count) {
- log_warning(_("invalid UIDL response: %s\n"), buf);
+ log_warning(LOG_PROTOCOL, _("invalid UIDL response: %s\n"), buf);
continue;
}
session->uidl_table, id);
session->msg[num].recv_time = recv_time;
+ if (recv_time != RECV_TIME_NONE) {
+ debug_print("num %d uidl %s: already got it\n", num, id);
+ } else {
+ debug_print("num %d uidl %s: unknown\n", num, id);
+ }
+
partial_recv = (gint)g_hash_table_lookup(
session->partial_recv_table, id);
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 ||
static gint pop3_retr_send(Pop3Session *session)
{
session->state = POP3_RETR;
+ debug_print("retrieving %d [%s]\n", session->cur_msg,
+ session->msg[session->cur_msg].uidl ?
+ session->msg[session->cur_msg].uidl:" ");
pop3_gen_send(session, "RETR %d", session->cur_msg);
return PS_SUCCESS;
}
va_end(args);
if (!g_ascii_strncasecmp(buf, "PASS ", 5))
- log_print("POP3> PASS ********\n");
+ log_print(LOG_PROTOCOL, "POP3> PASS ********\n");
else
- log_print("POP3> %s\n", buf);
+ log_print(LOG_PROTOCOL, "POP3> %s\n", buf);
session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf);
}
return;
}
+#define TRY(func) \
+if (!(func)) \
+{ \
+ g_warning("failed to write\n"); \
+ goto err_write; \
+} \
+
gint pop3_write_uidl_list(Pop3Session *session)
{
- gchar *path;
+ gchar *path, *tmp_path;
FILE *fp;
Pop3MsgInfo *msg;
gint n;
"uidl", G_DIR_SEPARATOR_S,
session->ac_prefs->recv_server,
"-", sanitized_uid, NULL);
-
+ tmp_path = g_strconcat(path, ".tmp", NULL);
+
g_free(sanitized_uid);
- if ((fp = g_fopen(path, "wb")) == NULL) {
- FILE_OP_ERROR(path, "fopen");
- g_free(path);
- return -1;
+ if ((fp = g_fopen(tmp_path, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp_path, "fopen");
+ goto err_write;
}
for (n = 1; n <= session->count; n++) {
msg = &session->msg[n];
if (msg->uidl && msg->received &&
(!msg->deleted || session->state != POP3_DONE))
- fprintf(fp, "%s\t%ld\t%d\n",
- msg->uidl, (long int) msg->recv_time, msg->partial_recv);
+ TRY(fprintf(fp, "%s\t%ld\t%d\n",
+ msg->uidl, (long int)
+ msg->recv_time,
+ msg->partial_recv)
+ > 0);
}
- if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
+ if (fclose(fp) == EOF) {
+ FILE_OP_ERROR(tmp_path, "fclose");
+ fp = NULL;
+ goto err_write;
+ }
+ fp = NULL;
+#ifdef G_OS_WIN32
+ g_unlink(path);
+#endif
+ if (g_rename(tmp_path, path) < 0) {
+ FILE_OP_ERROR(path, "rename");
+ goto err_write;
+ }
g_free(path);
-
+ g_free(tmp_path);
return 0;
+err_write:
+ if (fp)
+ fclose(fp);
+ g_free(path);
+ g_free(tmp_path);
+ return -1;
}
+#undef TRY
+
static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
guint len, const gchar *prefix)
{
msg->partial_recv == POP3_TOTALLY_RECEIVED &&
session->current_time - msg->recv_time >=
ac->msg_leave_time * 24 * 60 * 60) {
- log_message
- (_("POP3: Deleting expired message "
- "%d\n"), session->cur_msg);
+ log_message(LOG_PROTOCOL,
+ _("POP3: Deleting expired message %d [%s]\n"),
+ session->cur_msg, msg->uidl?msg->uidl:" ");
+ session->cur_total_bytes += size;
pop3_delete_send(session);
return POP3_DELETE;
}
} else if (msg->partial_recv == POP3_MUST_COMPLETE_RECV)
break;
- log_message
- (_("POP3: Skipping message %d (%d bytes)\n"),
- session->cur_msg, size);
+ log_message(LOG_PROTOCOL,
+ _("POP3: Skipping message %d [%s] (%d bytes)\n"),
+ session->cur_msg, msg->uidl?msg->uidl:" ", size);
}
if (size == 0 || msg->received || size_limit_over) {
{
Pop3ErrorValue ok;
- log_print("POP3< %s\n", msg);
+ log_print(LOG_PROTOCOL, "POP3< %s\n", msg);
if (!strncmp(msg, "+OK", 3))
ok = PS_SUCCESS;
strstr(msg + 4, "Lock") ||
strstr(msg + 4, "LOCK") ||
strstr(msg + 4, "wait")) {
- log_error(_("mailbox is locked\n"));
+ log_error(LOG_PROTOCOL, _("mailbox is locked\n"));
ok = PS_LOCKBUSY;
} else if (strcasestr(msg + 4, "timeout")) {
- log_error(_("Session timeout\n"));
+ log_error(LOG_PROTOCOL, _("Session timeout\n"));
ok = PS_ERROR;
} else {
switch (session->state) {
#if USE_OPENSSL
case POP3_STLS:
- log_error(_("can't start TLS session\n"));
+ log_error(LOG_PROTOCOL, _("couldn't start TLS session\n"));
ok = PS_ERROR;
break;
#endif
case POP3_GETAUTH_USER:
case POP3_GETAUTH_PASS:
case POP3_GETAUTH_APOP:
- log_error(_("error occurred on authentication\n"));
+ log_error(LOG_PROTOCOL, _("error occurred on authentication\n"));
ok = PS_AUTHFAIL;
break;
case POP3_GETRANGE_LAST:
case POP3_GETRANGE_UIDL:
case POP3_TOP:
- log_warning(_("command not supported\n"));
+ log_warning(LOG_PROTOCOL, _("command not supported\n"));
ok = PS_NOTSUPPORTED;
break;
default:
- log_error(_("error occurred on POP3 session\n"));
+ log_error(LOG_PROTOCOL, _("error occurred on POP3 session\n"));
ok = PS_ERROR;
}
}
}
break;
case POP3_TOP:
- log_warning(_("TOP command unsupported\n"));
+ log_warning(LOG_PROTOCOL, _("TOP command unsupported\n"));
if (pop3_session->cur_msg == pop3_session->count)
pop3_logout_send(pop3_session);
else {
projects / claws.git / blobdiff