Fix IMAP IDLE with Google's IMAP service.
[monky] / src / mail.c
index d8a0099..ec1fbc9 100644 (file)
@@ -1,4 +1,7 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -7,7 +10,7 @@
  * 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 "config.h"
 #include "conky.h"
+#include "common.h"
+#include "logging.h"
+#include "mail.h"
 
+#include <errno.h>
+#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>
 #include <termios.h>
 
+/* MAX() is defined by a header included from conky.h
+ * maybe once this is not true anymore, so have an alternative
+ * waiting to drop in.
+ *
+ * #define MAX(a, b)  ((a > b) ? a : b)
+ */
+
 char *current_mail_spool;
 
 void update_mail_count(struct local_mail_s *mail)
@@ -53,11 +76,11 @@ void update_mail_count(struct local_mail_s *mail)
                mail->last_update = current_update_time;
        }
 
-       if (stat(mail->box, &st)) {
-               static int rep;
+       if (stat(mail->mbox, &st)) {
+               static int rep = 0;
 
                if (!rep) {
-                       ERR("can't stat %s: %s", mail->box, strerror(errno));
+                       NORM_ERR("can't stat %s: %s", mail->mbox, strerror(errno));
                        rep = 1;
                }
                return;
@@ -68,21 +91,27 @@ void update_mail_count(struct local_mail_s *mail)
                DIR *dir;
                char *dirname;
                struct dirent *dirent;
+               char *mailflags;
 
                mail->mail_count = mail->new_mail_count = 0;
-               dirname = (char *) malloc(sizeof(char) * (strlen(mail->box) + 5));
+               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->mbox) + 5));
                if (!dirname) {
-                       ERR("malloc");
+                       NORM_ERR("malloc");
                        return;
                }
-               strcpy(dirname, mail->box);
+               strcpy(dirname, mail->mbox);
                strcat(dirname, "/");
                /* checking the cur subdirectory */
                strcat(dirname, "cur");
 
                dir = opendir(dirname);
                if (!dir) {
-                       ERR("cannot open directory");
+                       NORM_ERR("cannot open directory");
                        free(dirname);
                        return;
                }
@@ -91,6 +120,41 @@ void update_mail_count(struct local_mail_s *mail)
                        /* . and .. are skipped */
                        if (dirent->d_name[0] != '.') {
                                mail->mail_count++;
+                               mailflags = (char *) malloc(sizeof(char) * strlen(strrchr(dirent->d_name, ',')));
+                               if (!mailflags) {
+                                       NORM_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);
                }
@@ -101,7 +165,7 @@ void update_mail_count(struct local_mail_s *mail)
 
                dir = opendir(dirname);
                if (!dir) {
-                       ERR("cannot open directory");
+                       NORM_ERR("cannot open directory");
                        free(dirname);
                        return;
                }
@@ -111,6 +175,7 @@ void update_mail_count(struct local_mail_s *mail)
                        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);
                }
@@ -132,7 +197,14 @@ void update_mail_count(struct local_mail_s *mail)
 
                mail->new_mail_count = mail->mail_count = 0;
 
-               fp = open_file(mail->box, &rep);
+               /* 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->mbox, &rep);
                if (!fp) {
                        return;
                }
@@ -141,6 +213,7 @@ void update_mail_count(struct local_mail_s *mail)
 
                while (!feof(fp)) {
                        char buf[128];
+                       int was_new = 0;
 
                        if (fgets(buf, 128, fp) == NULL) {
                                break;
@@ -150,28 +223,53 @@ void update_mail_count(struct local_mail_s *mail)
                                /* 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;
@@ -208,10 +306,11 @@ struct mail_s *parse_mail_args(char type, const char *arg)
        if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass)
                        != 3) {
                if (type == POP3_TYPE) {
-                       ERR("Scanning IMAP args failed");
+                       NORM_ERR("Scanning POP3 args failed");
                } else if (type == IMAP_TYPE) {
-                       ERR("Scanning POP3 args failed");
+                       NORM_ERR("Scanning IMAP args failed");
                }
+               return 0;
        }
        // see if password needs prompting
        if (mail->pass[0] == '*' && mail->pass[1] == '\0') {
@@ -283,24 +382,25 @@ struct mail_s *parse_mail_args(char type, const char *arg)
 
 int imap_command(int sockfd, const char *command, char *response, const char *verify)
 {
-       struct timeval timeout;
+       struct timeval fetchtimeout;
        fd_set fdset;
        int res, numbytes = 0;
        if (send(sockfd, command, strlen(command), 0) == -1) {
                perror("send");
                return -1;
        }
-       timeout.tv_sec = 60;    // 60 second timeout i guess
-       timeout.tv_usec = 0;
+       fetchtimeout.tv_sec = 60;       // 60 second timeout i guess
+       fetchtimeout.tv_usec = 0;
        FD_ZERO(&fdset);
        FD_SET(sockfd, &fdset);
-       res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
+       res = select(sockfd + 1, &fdset, NULL, NULL, &fetchtimeout);
        if (res > 0) {
                if ((numbytes = recv(sockfd, response, MAXDATASIZE - 1, 0)) == -1) {
                        perror("recv");
                        return -1;
                }
        }
+       DBGP2("imap_command()  command: %s", command);
        DBGP2("imap_command() received: %s", response);
        response[numbytes] = '\0';
        if (strstr(response, verify) == NULL) {
@@ -319,7 +419,7 @@ int imap_check_status(char *recvbuf, struct mail_s *mail)
        reply += 2;
        *strchr(reply, ')') = '\0';
        if (reply == NULL) {
-               ERR("Error parsing IMAP response: %s", recvbuf);
+               NORM_ERR("Error parsing IMAP response: %s", recvbuf);
                return -1;
        } else {
                timed_thread_lock(mail->p_timed_thread);
@@ -360,22 +460,22 @@ void *imap_thread(void *arg)
 
 #ifdef HAVE_GETHOSTBYNAME_R
        if (gethostbyname_r(mail->host, &he, hostbuff, sizeof(hostbuff), &he_res, &he_errno)) { // get the host info
-               ERR("IMAP gethostbyname_r: %s", hstrerror(h_errno));
-               exit(1);
+               NORM_ERR("IMAP gethostbyname_r: %s", hstrerror(h_errno));
+               exit(EXIT_FAILURE);
        }
 #else /* HAVE_GETHOSTBYNAME_R */
        if ((he_res = gethostbyname(mail->host)) == NULL) {     // get the host info
                herror("gethostbyname");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #endif /* HAVE_GETHOSTBYNAME_R */
        while (fail < mail->retries) {
-               struct timeval timeout;
+               struct timeval fetchtimeout;
                int res;
                fd_set fdset;
 
                if (fail > 0) {
-                       ERR("Trying IMAP connection again for %s@%s (try %u/%u)",
+                       NORM_ERR("Trying IMAP connection again for %s@%s (try %u/%u)",
                                        mail->user, mail->host, fail + 1, mail->retries);
                }
                do {
@@ -400,11 +500,11 @@ void *imap_thread(void *arg)
                                break;
                        }
 
-                       timeout.tv_sec = 60;    // 60 second timeout i guess
-                       timeout.tv_usec = 0;
+                       fetchtimeout.tv_sec = 60;       // 60 second timeout i guess
+                       fetchtimeout.tv_usec = 0;
                        FD_ZERO(&fdset);
                        FD_SET(sockfd, &fdset);
-                       res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
+                       res = select(sockfd + 1, &fdset, NULL, NULL, &fetchtimeout);
                        if (res > 0) {
                                if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
                                        perror("recv");
@@ -412,17 +512,26 @@ void *imap_thread(void *arg)
                                        break;
                                }
                        } else {
-                               ERR("IMAP connection failed: timeout");
+                               NORM_ERR("IMAP connection failed: timeout");
                                fail++;
                                break;
                        }
                        recvbuf[numbytes] = '\0';
                        DBGP2("imap_thread() received: %s", recvbuf);
                        if (strstr(recvbuf, "* OK") != recvbuf) {
-                               ERR("IMAP connection failed, probably not an IMAP server");
+                               NORM_ERR("IMAP connection failed, probably not an IMAP server");
                                fail++;
                                break;
                        }
+                       strncpy(sendbuf, "abc CAPABILITY\r\n", MAXDATASIZE);
+                       if (imap_command(sockfd, sendbuf, recvbuf, "abc OK")) {
+                               fail++;
+                               break;
+                       }
+                       if (strstr(recvbuf, " IDLE ") != NULL) {
+                               has_idle = 1;
+                       }
+
                        strncpy(sendbuf, "a1 login ", MAXDATASIZE);
                        strncat(sendbuf, mail->user, MAXDATASIZE - strlen(sendbuf) - 1);
                        strncat(sendbuf, " ", MAXDATASIZE - strlen(sendbuf) - 1);
@@ -432,9 +541,6 @@ void *imap_thread(void *arg)
                                fail++;
                                break;
                        }
-                       if (strstr(recvbuf, " IDLE ") != NULL) {
-                               has_idle = 1;
-                       }
 
                        strncpy(sendbuf, "a2 STATUS ", MAXDATASIZE);
                        strncat(sendbuf, mail->folder, MAXDATASIZE - strlen(sendbuf) - 1);
@@ -475,8 +581,9 @@ void *imap_thread(void *arg)
                                         * RFC 2177 says we have to re-idle every 29 minutes.
                                         * We'll do it every 20 minutes to be safe.
                                         */
-                                       timeout.tv_sec = 1200;
-                                       timeout.tv_usec = 0;
+                                       fetchtimeout.tv_sec = 1200;
+                                       fetchtimeout.tv_usec = 0;
+                                       DBGP2("idling...");
                                        FD_ZERO(&fdset);
                                        FD_SET(sockfd, &fdset);
                                        FD_SET(threadfd, &fdset);
@@ -494,6 +601,7 @@ void *imap_thread(void *arg)
                                                        break;
                                                }
                                        } else {
+                                               fail++;
                                                break;
                                        }
                                        recvbuf[numbytes] = '\0';
@@ -501,6 +609,7 @@ void *imap_thread(void *arg)
                                        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");
@@ -512,7 +621,10 @@ void *imap_thread(void *arg)
                                                        }
                                                        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);
                                                        }
                                                }
@@ -535,7 +647,7 @@ void *imap_thread(void *arg)
                                                 * 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 ")) || fetchtimeout.tv_sec == 0 || force_check) {
                                                        // re-check messages and unseen
                                                        if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
                                                                fail++;
@@ -567,12 +679,16 @@ void *imap_thread(void *arg)
                                                        // 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) {
@@ -580,11 +696,11 @@ void *imap_thread(void *arg)
                                        fail++;
                                        break;
                                }
-                               timeout.tv_sec = 60;    // 60 second timeout i guess
-                               timeout.tv_usec = 0;
+                               fetchtimeout.tv_sec = 60;       // 60 second timeout i guess
+                               fetchtimeout.tv_usec = 0;
                                FD_ZERO(&fdset);
                                FD_SET(sockfd, &fdset);
-                               res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
+                               res = select(sockfd + 1, &fdset, NULL, NULL, &fetchtimeout);
                                if (res > 0) {
                                        if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
                                                perror("recv a3");
@@ -595,7 +711,7 @@ void *imap_thread(void *arg)
                                recvbuf[numbytes] = '\0';
                                DBGP2("imap_thread() received: %s", recvbuf);
                                if (strstr(recvbuf, "a3 OK") == NULL) {
-                                       ERR("IMAP logout failed: %s", recvbuf);
+                                       NORM_ERR("IMAP logout failed: %s", recvbuf);
                                        fail++;
                                        break;
                                }
@@ -616,18 +732,18 @@ void *imap_thread(void *arg)
 
 int pop3_command(int sockfd, const char *command, char *response, const char *verify)
 {
-       struct timeval timeout;
+       struct timeval fetchtimeout;
        fd_set fdset;
        int res, numbytes = 0;
        if (send(sockfd, command, strlen(command), 0) == -1) {
                perror("send");
                return -1;
        }
-       timeout.tv_sec = 60;    // 60 second timeout i guess
-       timeout.tv_usec = 0;
+       fetchtimeout.tv_sec = 60;       // 60 second timeout i guess
+       fetchtimeout.tv_usec = 0;
        FD_ZERO(&fdset);
        FD_SET(sockfd, &fdset);
-       res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
+       res = select(sockfd + 1, &fdset, NULL, NULL, &fetchtimeout);
        if (res > 0) {
                if ((numbytes = recv(sockfd, response, MAXDATASIZE - 1, 0)) == -1) {
                        perror("recv");
@@ -659,22 +775,22 @@ void *pop3_thread(void *arg)
 
 #ifdef HAVE_GETHOSTBYNAME_R
        if (gethostbyname_r(mail->host, &he, hostbuff, sizeof(hostbuff), &he_res, &he_errno)) { // get the host info
-               ERR("POP3 gethostbyname_r: %s", hstrerror(h_errno));
-               exit(1);
+               NORM_ERR("POP3 gethostbyname_r: %s", hstrerror(h_errno));
+               exit(EXIT_FAILURE);
        }
 #else /* HAVE_GETHOSTBYNAME_R */
        if ((he_res = gethostbyname(mail->host)) == NULL) {     // get the host info
                herror("gethostbyname");
-               exit(1);
+               exit(EXIT_FAILURE);
        }
 #endif /* HAVE_GETHOSTBYNAME_R */
        while (fail < mail->retries) {
-               struct timeval timeout;
+               struct timeval fetchtimeout;
                int res;
                fd_set fdset;
 
                if (fail > 0) {
-                       ERR("Trying POP3 connection again for %s@%s (try %u/%u)",
+                       NORM_ERR("Trying POP3 connection again for %s@%s (try %u/%u)",
                                        mail->user, mail->host, fail + 1, mail->retries);
                }
                do {
@@ -699,11 +815,11 @@ void *pop3_thread(void *arg)
                                break;
                        }
 
-                       timeout.tv_sec = 60;    // 60 second timeout i guess
-                       timeout.tv_usec = 0;
+                       fetchtimeout.tv_sec = 60;       // 60 second timeout i guess
+                       fetchtimeout.tv_usec = 0;
                        FD_ZERO(&fdset);
                        FD_SET(sockfd, &fdset);
-                       res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
+                       res = select(sockfd + 1, &fdset, NULL, NULL, &fetchtimeout);
                        if (res > 0) {
                                if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
                                        perror("recv");
@@ -711,14 +827,14 @@ void *pop3_thread(void *arg)
                                        break;
                                }
                        } else {
-                               ERR("POP3 connection failed: timeout\n");
+                               NORM_ERR("POP3 connection failed: timeout\n");
                                fail++;
                                break;
                        }
                        DBGP2("pop3_thread received: %s", recvbuf);
                        recvbuf[numbytes] = '\0';
                        if (strstr(recvbuf, "+OK ") != recvbuf) {
-                               ERR("POP3 connection failed, probably not a POP3 server");
+                               NORM_ERR("POP3 connection failed, probably not a POP3 server");
                                fail++;
                                break;
                        }
@@ -734,7 +850,7 @@ void *pop3_thread(void *arg)
                        strncat(sendbuf, mail->pass, MAXDATASIZE - strlen(sendbuf) - 1);
                        strncat(sendbuf, "\r\n", MAXDATASIZE - strlen(sendbuf) - 1);
                        if (pop3_command(sockfd, sendbuf, recvbuf, "+OK ")) {
-                               ERR("POP3 server login failed: %s", recvbuf);
+                               NORM_ERR("POP3 server login failed: %s", recvbuf);
                                fail++;
                                break;
                        }
@@ -749,7 +865,7 @@ void *pop3_thread(void *arg)
                        // now we get the data
                        reply = recvbuf + 4;
                        if (reply == NULL) {
-                               ERR("Error parsing POP3 response: %s", recvbuf);
+                               NORM_ERR("Error parsing POP3 response: %s", recvbuf);
                                fail++;
                                break;
                        } else {
@@ -760,7 +876,7 @@ void *pop3_thread(void *arg)
                        
                        strncpy(sendbuf, "QUIT\r\n", MAXDATASIZE);
                        if (pop3_command(sockfd, sendbuf, recvbuf, "+OK")) {
-                               ERR("POP3 logout failed: %s", recvbuf);
+                               NORM_ERR("POP3 logout failed: %s", recvbuf);
                                fail++;
                                break;
                        }