* 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.
*
#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;
static struct mail_s *global_mail;
static int global_mail_use = 0;
-void update_mail_count(struct local_mail_s *mail)
+static void update_mail_count(struct local_mail_s *mail)
{
struct stat st;
{
float n1;
char mbox[256], dst[256];
+ struct local_mail_s *locmail;
if (!arg) {
n1 = 9.5;
}
variable_substitute(mbox, dst, sizeof(dst));
- obj->data.local_mail.mbox = strndup(dst, text_buffer_size);
- obj->data.local_mail.interval = n1;
+
+ 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) \
{ \
- update_mail_count(&obj->data.local_mail); \
- snprintf(p, p_max_size, "%d", obj->data.local_mail.x##mail_count); \
+ 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(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)
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");
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);
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;
}
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);
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");
timed_thread_lock(mail->p_timed_thread);
if (mail->messages != messages) {
force_check = 1;
- mail->messages = messages;
}
timed_thread_unlock(mail->p_timed_thread);
}
projects / monky / blobdiff