* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <limits.h>
+#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <sys/param.h>
#include <dirent.h>
#include <errno.h>
}
if (stat(mail->box, &st)) {
- static int rep;
+ static int rep = 0;
if (!rep) {
ERR("can't stat %s: %s", mail->box, strerror(errno));
DIR *dir;
char *dirname;
struct dirent *dirent;
+ char *mailflags;
mail->mail_count = mail->new_mail_count = 0;
+ mail->seen_mail_count = mail->unseen_mail_count = 0;
+ mail->flagged_mail_count = mail->unflagged_mail_count = 0;
+ mail->forwarded_mail_count = mail->unforwarded_mail_count = 0;
+ mail->replied_mail_count = mail->unreplied_mail_count = 0;
+ mail->draft_mail_count = mail->trashed_mail_count = 0;
dirname = (char *) malloc(sizeof(char) * (strlen(mail->box) + 5));
if (!dirname) {
ERR("malloc");
/* . and .. are skipped */
if (dirent->d_name[0] != '.') {
mail->mail_count++;
+ mailflags = (char *) malloc(sizeof(char) * strlen(strrchr(dirent->d_name, ',')));
+ if (!mailflags) {
+ ERR("malloc");
+ free(dirname);
+ return;
+ }
+ strcpy(mailflags, strrchr(dirent->d_name, ','));
+ if (!strchr(mailflags, 'T')) { /* The message is not in the trash */
+ if (strchr(mailflags, 'S')) { /*The message has been seen */
+ mail->seen_mail_count++;
+ } else {
+ mail->unseen_mail_count++;
+ }
+ if (strchr(mailflags, 'F')) { /*The message was flagged */
+ mail->flagged_mail_count++;
+ } else {
+ mail->unflagged_mail_count++;
+ }
+ if (strchr(mailflags, 'P')) { /*The message was forwarded */
+ mail->forwarded_mail_count++;
+ } else {
+ mail->unforwarded_mail_count++;
+ }
+ if (strchr(mailflags, 'R')) { /*The message was replied */
+ mail->replied_mail_count++;
+ } else {
+ mail->unreplied_mail_count++;
+ }
+ if (strchr(mailflags, 'D')) { /*The message is a draft */
+ mail->draft_mail_count++;
+ }
+ } else {
+ mail->trashed_mail_count++;
+ }
+ free(mailflags);
}
dirent = readdir(dir);
}
if (dirent->d_name[0] != '.') {
mail->new_mail_count++;
mail->mail_count++;
+ mail->unseen_mail_count++; /* new messages cannot have been seen */
}
dirent = readdir(dir);
}
mail->new_mail_count = mail->mail_count = 0;
+ /* these flags are not supported for mbox */
+ mail->seen_mail_count = mail->unseen_mail_count = -1;
+ mail->flagged_mail_count = mail->unflagged_mail_count = -1;
+ mail->forwarded_mail_count = mail->unforwarded_mail_count = -1;
+ mail->replied_mail_count = mail->unreplied_mail_count = -1;
+ mail->draft_mail_count = mail->trashed_mail_count = -1;
+
fp = open_file(mail->box, &rep);
if (!fp) {
return;
while (!feof(fp)) {
char buf[128];
+ int was_new = 0;
if (fgets(buf, 128, fp) == NULL) {
break;
/* ignore MAILER-DAEMON */
if (strncmp(buf + 5, "MAILER-DAEMON ", 14) != 0) {
mail->mail_count++;
+ was_new = 0;
- if (reading_status) {
+ if (reading_status == 1) {
mail->new_mail_count++;
} else {
reading_status = 1;
}
}
} else {
- if (reading_status
+ if (reading_status == 1
&& strncmp(buf, "X-Mozilla-Status:", 17) == 0) {
+ int xms = strtol(buf + 17, NULL, 16);
+ /* check that mail isn't marked for deletion */
+ if (xms & 0x0008) {
+ mail->trashed_mail_count++;
+ reading_status = 0;
+ /* Don't check whether the trashed email is unread */
+ continue;
+ }
/* check that mail isn't already read */
- if (strchr(buf + 21, '0')) {
+ if (!(xms & 0x0001)) {
mail->new_mail_count++;
+ was_new = 1;
}
- reading_status = 0;
+ /* check for an additional X-Status header */
+ reading_status = 2;
continue;
}
- if (reading_status && strncmp(buf, "Status:", 7) == 0) {
+ if (reading_status == 1 && strncmp(buf, "Status:", 7) == 0) {
/* check that mail isn't already read */
if (strchr(buf + 7, 'R') == NULL) {
mail->new_mail_count++;
+ was_new = 1;
+ }
+
+ reading_status = 2;
+ continue;
+ }
+ if (reading_status >= 1 && strncmp(buf, "X-Status:", 9) == 0) {
+ /* check that mail isn't marked for deletion */
+ if (strchr(buf + 9, 'D') != NULL) {
+ mail->trashed_mail_count++;
+ /* If the mail was previously detected as new,
+ subtract it from the new mail count */
+ if (was_new)
+ mail->new_mail_count--;
}
reading_status = 0;
if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass)
!= 3) {
if (type == POP3_TYPE) {
- ERR("Scanning IMAP args failed");
- } else if (type == IMAP_TYPE) {
ERR("Scanning POP3 args failed");
+ } else if (type == IMAP_TYPE) {
+ ERR("Scanning IMAP args failed");
}
+ return 0;
}
// see if password needs prompting
if (mail->pass[0] == '*' && mail->pass[1] == '\0') {
return -1;
}
}
+ DBGP2("imap_command() command: %s", command);
DBGP2("imap_command() received: %s", response);
response[numbytes] = '\0';
if (strstr(response, verify) == NULL) {
*/
timeout.tv_sec = 1200;
timeout.tv_usec = 0;
+ DBGP2("idling...");
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
FD_SET(threadfd, &fdset);
break;
}
} else {
+ fail++;
break;
}
recvbuf[numbytes] = '\0';
if (strlen(recvbuf) > 2) {
unsigned long messages, recent;
char *buf = recvbuf;
+ char force_check = 0;
buf = strstr(buf, "EXISTS");
while (buf && strlen(buf) > 1 && strstr(buf + 1, "EXISTS")) {
buf = strstr(buf + 1, "EXISTS");
}
if (sscanf(buf, "* %lu EXISTS\r\n", &messages) == 1) {
timed_thread_lock(mail->p_timed_thread);
- mail->messages = messages;
+ if (mail->messages != messages) {
+ force_check = 1;
+ mail->messages = messages;
+ }
timed_thread_unlock(mail->p_timed_thread);
}
}
* something other than 0, or we had a timeout
*/
buf = recvbuf;
- if (recent > 0 || (buf && strstr(buf, " FETCH ")) || timeout.tv_sec == 0) {
+ if (recent > 0 || (buf && strstr(buf, " FETCH ")) || timeout.tv_sec == 0 || force_check) {
// re-check messages and unseen
if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
fail++;
// need to re-connect
break;
}
+ } else {
+ fail++;
+ break;
}
imap_unseen_command(mail, old_unseen, old_messages);
fail = 0;
old_unseen = mail->unseen;
old_messages = mail->messages;
}
+ if (fail) break;
} else {
strncpy(sendbuf, "a3 logout\r\n", MAXDATASIZE);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
projects / monky / blobdiff