Change a debug printf to DBGP.
[monky] / src / mail.c
index dbcdb1c..de41e65 100644 (file)
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -32,8 +32,8 @@
 #include "conky.h"
 #include "common.h"
 #include "logging.h"
-#include "mail.h"
 #include "text_object.h"
+#include "timed_thread.h"
 
 #include <errno.h>
 #include <stdio.h>
  * #define MAX(a, b)  ((a > b) ? a : b)
  */
 
+#define POP3_TYPE 1
+#define IMAP_TYPE 2
+
+#define MAXSIZE 1024
+
+struct mail_s {                        // for imap and pop3
+       unsigned long unseen;
+       unsigned long messages;
+       unsigned long used;
+       unsigned long quota;
+       unsigned long port;
+       unsigned int retries;
+       float interval;
+       double last_update;
+       char host[MAXSIZE];
+       char user[MAXSIZE];
+       char pass[MAXSIZE];
+       char command[MAXSIZE];
+       char folder[MAXSIZE];
+       timed_thread *p_timed_thread;
+       char secure;
+};
+
+struct local_mail_s {
+       char *mbox;
+       int mail_count;
+       int new_mail_count;
+       int seen_mail_count;
+       int unseen_mail_count;
+       int flagged_mail_count;
+       int unflagged_mail_count;
+       int forwarded_mail_count;
+       int unforwarded_mail_count;
+       int replied_mail_count;
+       int unreplied_mail_count;
+       int draft_mail_count;
+       int trashed_mail_count;
+       float interval;
+       time_t last_mtime;
+       double last_update;
+};
+
 char *current_mail_spool;
 
-void update_mail_count(struct local_mail_s *mail)
+static struct mail_s *global_mail;
+static int global_mail_use = 0;
+
+static void update_mail_count(struct local_mail_s *mail)
 {
        struct stat st;
 
@@ -294,6 +339,72 @@ void update_mail_count(struct local_mail_s *mail)
        }
 }
 
+void parse_local_mail_args(struct text_object *obj, const char *arg)
+{
+       float n1;
+       char mbox[256], dst[256];
+       struct local_mail_s *locmail;
+
+       if (!arg) {
+               n1 = 9.5;
+               /* Kapil: Changed from MAIL_FILE to
+                  current_mail_spool since the latter
+                  is a copy of the former if undefined
+                  but the latter should take precedence
+                  if defined */
+               strncpy(mbox, current_mail_spool, sizeof(mbox));
+       } else {
+               if (sscanf(arg, "%s %f", mbox, &n1) != 2) {
+                       n1 = 9.5;
+                       strncpy(mbox, arg, sizeof(mbox));
+               }
+       }
+
+       variable_substitute(mbox, dst, sizeof(dst));
+
+       locmail = malloc(sizeof(struct local_mail_s));
+       memset(locmail, 0, sizeof(struct local_mail_s));
+       locmail->mbox = strndup(dst, text_buffer_size);
+       locmail->interval = n1;
+       obj->data.opaque = locmail;
+}
+
+#define PRINT_MAILS_GENERATOR(x) \
+void print_##x##mails(struct text_object *obj, char *p, int p_max_size) \
+{ \
+       struct local_mail_s *locmail = obj->data.opaque; \
+       if (!locmail) \
+               return; \
+       update_mail_count(locmail); \
+       snprintf(p, p_max_size, "%d", locmail->x##mail_count); \
+}
+
+PRINT_MAILS_GENERATOR()
+PRINT_MAILS_GENERATOR(new_)
+PRINT_MAILS_GENERATOR(seen_)
+PRINT_MAILS_GENERATOR(unseen_)
+PRINT_MAILS_GENERATOR(flagged_)
+PRINT_MAILS_GENERATOR(unflagged_)
+PRINT_MAILS_GENERATOR(forwarded_)
+PRINT_MAILS_GENERATOR(unforwarded_)
+PRINT_MAILS_GENERATOR(replied_)
+PRINT_MAILS_GENERATOR(unreplied_)
+PRINT_MAILS_GENERATOR(draft_)
+PRINT_MAILS_GENERATOR(trashed_)
+
+void free_local_mails(struct text_object *obj)
+{
+       struct local_mail_s *locmail = obj->data.opaque;
+
+       if (!locmail)
+               return;
+
+       if (locmail->mbox)
+               free(locmail->mbox);
+       free(obj->data.opaque);
+       obj->data.opaque = 0;
+}
+
 #define MAXDATASIZE 1000
 
 struct mail_s *parse_mail_args(char type, const char *arg)
@@ -304,7 +415,8 @@ struct mail_s *parse_mail_args(char type, const char *arg)
        mail = malloc(sizeof(struct mail_s));
        memset(mail, 0, sizeof(struct mail_s));
 
-       if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass)
+#define lenstr "%1023s"
+       if (sscanf(arg, lenstr " " lenstr " " lenstr, mail->host, mail->user, mail->pass)
                        != 3) {
                if (type == POP3_TYPE) {
                        NORM_ERR("Scanning POP3 args failed");
@@ -322,7 +434,8 @@ struct mail_s *parse_mail_args(char type, const char *arg)
                term.c_lflag &= ~ECHO;
                tcsetattr(fp, TCSANOW, &term);
                printf("Enter mailbox password (%s@%s): ", mail->user, mail->host);
-               scanf("%128s", mail->pass);
+               scanf(lenstr, mail->pass);
+#undef lenstr
                printf("\n");
                term.c_lflag |= ECHO;
                tcsetattr(fp, TCSANOW, &term);
@@ -356,64 +469,105 @@ struct mail_s *parse_mail_args(char type, const char *arg)
        if (type == IMAP_TYPE) {
                tmp = strstr(arg, "-f ");
                if (tmp) {
-                       int len = 1024;
+                       int len = MAXSIZE - 1;
                        tmp += 3;
                        if (tmp[0] == '\'') {
-                               len = strstr(tmp + 1, "'") - tmp - 1;
-                               if (len > 1024) {
-                                       len = 1024;
+                               len = strstr(tmp + 1, "'") - tmp;
+                               if (len > MAXSIZE) {
+                                       len = MAXSIZE;
                                }
                        }
-                       strncpy(mail->folder, tmp + 1, len);
+                       strncpy(mail->folder, tmp + 1, len - 1);
                } else {
-                       strncpy(mail->folder, "INBOX", 128);    // default imap inbox
+                       strncpy(mail->folder, "INBOX", MAXSIZE - 1);    // default imap inbox
                }
        }
        tmp = strstr(arg, "-e ");
        if (tmp) {
-               int len = 1024;
+               int len = MAXSIZE - 1;
                tmp += 3;
 
                if (tmp[0] == '\'') {
-                       len = strstr(tmp + 1, "'") - tmp - 1;
-                       if (len > 1024) {
-                               len = 1024;
+                       len = strstr(tmp + 1, "'") - tmp;
+                       if (len > MAXSIZE) {
+                               len = MAXSIZE;
                        }
                }
-               strncpy(mail->command, tmp + 1, len);
+               strncpy(mail->command, tmp + 1, len - 1);
        } else {
                mail->command[0] = '\0';
        }
+       DBGP("mail args parsed: folder: '%s' command: '%s' user: '%s' host: '%s'\n",
+                       mail->folder, mail->command, mail->user, mail->host);
        mail->p_timed_thread = NULL;
        return mail;
 }
 
 void parse_imap_mail_args(struct text_object *obj, const char *arg)
 {
+       static int rep = 0;
+
        if (!arg) {
-               obj->char_b = 1;
+               if (!global_mail && !rep) {
+                       // something is wrong, warn once then stop
+                       NORM_ERR("There's a problem with your mail settings.  "
+                                       "Check that the global mail settings are properly defined"
+                                       " (line %li).", obj->line);
+                       rep = 1;
+                       return;
+               }
+               obj->data.opaque = global_mail;
+               global_mail_use++;
                return;
        }
        // proccss
-       obj->data.mail = parse_mail_args(IMAP_TYPE, arg);
-       obj->char_b = 0;
+       obj->data.opaque = parse_mail_args(IMAP_TYPE, arg);
 }
 
 void parse_pop3_mail_args(struct text_object *obj, const char *arg)
 {
+       static int rep = 0;
+
        if (!arg) {
-               obj->char_b = 1;
+               if (!global_mail && !rep) {
+                       // something is wrong, warn once then stop
+                       NORM_ERR("There's a problem with your mail settings.  "
+                                       "Check that the global mail settings are properly defined"
+                                       " (line %li).", obj->line);
+                       rep = 1;
+                       return;
+               }
+               obj->data.opaque = global_mail;
+               global_mail_use++;
                return;
        }
        // proccss
-       obj->data.mail = parse_mail_args(POP3_TYPE, arg);
-       obj->char_b = 0;
+       obj->data.opaque = parse_mail_args(POP3_TYPE, arg);
+}
+
+void parse_global_imap_mail_args(const char *value)
+{
+       global_mail = parse_mail_args(IMAP_TYPE, value);
+}
+
+void parse_global_pop3_mail_args(const char *value)
+{
+       global_mail = parse_mail_args(POP3_TYPE, value);
 }
 
 void free_mail_obj(struct text_object *obj)
 {
-       if (!obj->char_b) {
-               free(obj->data.mail);
+       if (!obj->data.opaque)
+               return;
+
+       if (obj->data.opaque == global_mail) {
+               if (--global_mail_use == 0) {
+                       free(global_mail);
+                       global_mail = 0;
+               }
+       } else {
+               free(obj->data.opaque);
+               obj->data.opaque = 0;
        }
 }
 
@@ -478,50 +632,22 @@ void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen, unsigned
        }
 }
 
-static inline struct mail_s *ensure_mail_thread(struct text_object *obj,
+static void ensure_mail_thread(struct mail_s *mail,
                void *thread(void *), const char *text)
 {
-       if (obj->char_b && info.mail) {
-               // this means we use info
-               if (!info.mail->p_timed_thread) {
-                       info.mail->p_timed_thread =
-                               timed_thread_create(thread,
-                                               (void *) info.mail, info.mail->interval * 1000000);
-                       if (!info.mail->p_timed_thread) {
-                               NORM_ERR("Error creating %s timed thread", text);
-                       }
-                       timed_thread_register(info.mail->p_timed_thread,
-                                       &info.mail->p_timed_thread);
-                       if (timed_thread_run(info.mail->p_timed_thread)) {
-                               NORM_ERR("Error running %s timed thread", text);
-                       }
-               }
-               return info.mail;
-       } else if (obj->data.mail) {
-               // this means we use obj
-               if (!obj->data.mail->p_timed_thread) {
-                       obj->data.mail->p_timed_thread =
-                               timed_thread_create(thread,
-                                               (void *) obj->data.mail,
-                                               obj->data.mail->interval * 1000000);
-                       if (!obj->data.mail->p_timed_thread) {
-                               NORM_ERR("Error creating %s timed thread", text);
-                       }
-                       timed_thread_register(obj->data.mail->p_timed_thread,
-                                       &obj->data.mail->p_timed_thread);
-                       if (timed_thread_run(obj->data.mail->p_timed_thread)) {
-                               NORM_ERR("Error running %s timed thread", text);
-                       }
-               }
-               return obj->data.mail;
-       } else if (!obj->a) {
-               // something is wrong, warn once then stop
-               NORM_ERR("There's a problem with your mail settings.  "
-                               "Check that the global mail settings are properly defined"
-                               " (line %li).", obj->line);
-               obj->a++;
+       if (mail->p_timed_thread)
+               return;
+
+       mail->p_timed_thread = timed_thread_create(thread,
+                               mail, mail->interval * 1000000);
+       if (!mail->p_timed_thread) {
+               NORM_ERR("Error creating %s timed thread", text);
+       }
+       timed_thread_register(mail->p_timed_thread,
+                       &mail->p_timed_thread);
+       if (timed_thread_run(mail->p_timed_thread)) {
+               NORM_ERR("Error running %s timed thread", text);
        }
-       return NULL;
 }
 
 static void *imap_thread(void *arg)
@@ -668,9 +794,9 @@ static void *imap_thread(void *arg)
                                while (1) {
                                        /*
                                         * RFC 2177 says we have to re-idle every 29 minutes.
-                                        * We'll do it every 20 minutes to be safe.
+                                        * We'll do it every 10 minutes to be safe.
                                         */
-                                       fetchtimeout.tv_sec = 1200;
+                                       fetchtimeout.tv_sec = 600;
                                        fetchtimeout.tv_usec = 0;
                                        DBGP2("idling...");
                                        FD_ZERO(&fdset);
@@ -689,14 +815,14 @@ static void *imap_thread(void *arg)
                                                        fail++;
                                                        break;
                                                }
-                                       } else {
+                                       } else if (fetchtimeout.tv_sec > 0) {
                                                fail++;
                                                break;
                                        }
                                        recvbuf[numbytes] = '\0';
                                        DBGP2("imap_thread() received: %s", recvbuf);
                                        if (strlen(recvbuf) > 2) {
-                                               unsigned long messages, recent;
+                                               unsigned long messages, recent = 0;
                                                char *buf = recvbuf;
                                                char force_check = 0;
                                                buf = strstr(buf, "EXISTS");
@@ -712,7 +838,6 @@ static void *imap_thread(void *arg)
                                                                timed_thread_lock(mail->p_timed_thread);
                                                                if (mail->messages != messages) {
                                                                        force_check = 1;
-                                                                       mail->messages = messages;
                                                                }
                                                                timed_thread_unlock(mail->p_timed_thread);
                                                        }
@@ -821,7 +946,12 @@ static void *imap_thread(void *arg)
 
 void print_imap_unseen(struct text_object *obj, char *p, int p_max_size)
 {
-       struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap");
+       struct mail_s *mail = obj->data.opaque;
+
+       if (!mail)
+               return;
+
+       ensure_mail_thread(mail, imap_thread, "imap");
 
        if (mail && mail->p_timed_thread) {
                timed_thread_lock(mail->p_timed_thread);
@@ -832,7 +962,12 @@ void print_imap_unseen(struct text_object *obj, char *p, int p_max_size)
 
 void print_imap_messages(struct text_object *obj, char *p, int p_max_size)
 {
-       struct mail_s *mail = ensure_mail_thread(obj, imap_thread, "imap");
+       struct mail_s *mail = obj->data.opaque;
+
+       if (!mail)
+               return;
+
+       ensure_mail_thread(mail, imap_thread, "imap");
 
        if (mail && mail->p_timed_thread) {
                timed_thread_lock(mail->p_timed_thread);
@@ -989,14 +1124,14 @@ static void *pop3_thread(void *arg)
                                sscanf(reply, "%lu %lu", &mail->unseen, &mail->used);
                                timed_thread_unlock(mail->p_timed_thread);
                        }
-                       
+
                        strncpy(sendbuf, "QUIT\r\n", MAXDATASIZE);
                        if (pop3_command(sockfd, sendbuf, recvbuf, "+OK")) {
                                NORM_ERR("POP3 logout failed: %s", recvbuf);
                                fail++;
                                break;
                        }
-                       
+
                        if (strlen(mail->command) > 1 && mail->unseen > old_unseen) {
                                // new mail goodie
                                if (system(mail->command) == -1) {
@@ -1021,7 +1156,12 @@ static void *pop3_thread(void *arg)
 
 void print_pop3_unseen(struct text_object *obj, char *p, int p_max_size)
 {
-       struct mail_s *mail = ensure_mail_thread(obj, pop3_thread, "pop3");
+       struct mail_s *mail = obj->data.opaque;
+
+       if (!mail)
+               return;
+
+       ensure_mail_thread(mail, pop3_thread, "pop3");
 
        if (mail && mail->p_timed_thread) {
                timed_thread_lock(mail->p_timed_thread);
@@ -1032,7 +1172,12 @@ void print_pop3_unseen(struct text_object *obj, char *p, int p_max_size)
 
 void print_pop3_used(struct text_object *obj, char *p, int p_max_size)
 {
-       struct mail_s *mail = ensure_mail_thread(obj, pop3_thread, "pop3");
+       struct mail_s *mail = obj->data.opaque;
+
+       if (!mail)
+               return;
+
+       ensure_mail_thread(mail, pop3_thread, "pop3");
 
        if (mail && mail->p_timed_thread) {
                timed_thread_lock(mail->p_timed_thread);