Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

fixed pop3 problem?

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@635 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2006-05-14 06:15:23 +00:00
parent 215876c14b
commit 560877d23e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conky.c
View File

@ -1169,7 +1169,7 @@ struct mail_s* parse_mail_args(char type, const char *arg) {
sscanf(tmp, "%lu", &mail->port); sscanf(tmp, "%lu", &mail->port);
} else { } else {
if (type == POP3) { if (type == POP3) {
mail->port = 143; // default pop3 port mail->port = 110; // default pop3 port
} else if (type == IMAP) { } else if (type == IMAP) {
mail->port = 143; // default imap port mail->port = 143; // default imap port
} }
@ -1258,13 +1258,13 @@ void *imap_thread(struct mail_s* mail)
continue; continue;
} }
} else { } else {
ERR("IMAP connection failed: timeout\n"); ERR("IMAP connection failed: timeout");
fail++; fail++;
continue; continue;
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "* OK") != recvbuf) { if (strstr(recvbuf, "* OK") != recvbuf) {
ERR("IMAP connection failed, probably not an IMAP server\n"); ERR("IMAP connection failed, probably not an IMAP server");
fail++; fail++;
continue; continue;
} }
@ -1296,7 +1296,7 @@ void *imap_thread(struct mail_s* mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "a1 OK") == NULL) { if (strstr(recvbuf, "a1 OK") == NULL) {
ERR("IMAP server login failed: %s\n", recvbuf); ERR("IMAP server login failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1326,7 +1326,7 @@ void *imap_thread(struct mail_s* mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "a2 OK") == NULL) { if (strstr(recvbuf, "a2 OK") == NULL) {
ERR("IMAP status failed: %s\n", recvbuf); ERR("IMAP status failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1367,7 +1367,7 @@ void *imap_thread(struct mail_s* mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "a3 OK") == NULL) { if (strstr(recvbuf, "a3 OK") == NULL) {
ERR("IMAP logout failed: %s\n", recvbuf); ERR("IMAP logout failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1463,7 +1463,7 @@ void *pop3_thread(struct mail_s *mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "+OK ") != recvbuf) { if (strstr(recvbuf, "+OK ") != recvbuf) {
ERR("POP3 connection failed, probably not a POP3 server\n"); ERR("POP3 connection failed, probably not a POP3 server");
fail++; fail++;
continue; continue;
} }
@ -1492,7 +1492,7 @@ void *pop3_thread(struct mail_s *mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "+OK ") == NULL) { if (strstr(recvbuf, "+OK ") == NULL) {
ERR("POP3 server login failed: %s\n", recvbuf); ERR("POP3 server login failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1521,7 +1521,7 @@ void *pop3_thread(struct mail_s *mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "+OK ") == NULL) { if (strstr(recvbuf, "+OK ") == NULL) {
ERR("POP3 server login failed: %s\n", recvbuf); ERR("POP3 server login failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1547,7 +1547,7 @@ void *pop3_thread(struct mail_s *mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "+OK ") == NULL) { if (strstr(recvbuf, "+OK ") == NULL) {
ERR("POP3 status failed: %s\n", recvbuf); ERR("POP3 status failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -1585,7 +1585,7 @@ void *pop3_thread(struct mail_s *mail)
} }
recvbuf[numbytes] = '\0'; recvbuf[numbytes] = '\0';
if (strstr(recvbuf, "+OK") == NULL) { if (strstr(recvbuf, "+OK") == NULL) {
ERR("POP3 logout failed: %s\n", recvbuf); ERR("POP3 logout failed: %s", recvbuf);
fail++; fail++;
continue; continue;
} }
@ -6114,7 +6114,7 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
} }
CONF("pop3") { CONF("pop3") {
if (value) { if (value) {
info.mail = parse_mail_args(IMAP, value); info.mail = parse_mail_args(POP3, value);
} else { } else {
CONF_ERR; CONF_ERR;
} }