* More license declarations

[citadel.git] / citadel / modules / pop3client / serv_pop3client.c

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 7afe545337e69683ce5c729c0533cd321324b0ec..c7576146d70241effcb7757f571388cde1798d2e 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -3,6 +3,21 @@
  *
  * Consolidate mail from remote POP3 accounts.
  *
+ * Copyright (c) 2007-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
@@ -69,26 +84,26 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
        struct cdbdata *cdbut;
        struct UseTable ut;
 
-       lprintf(CTDL_DEBUG, "POP3: %s %s %s <password>\n", roomname, pop3host, pop3user);
-       lprintf(CTDL_NOTICE, "Connecting to <%s>\n", pop3host);
+       CtdlLogPrintf(CTDL_DEBUG, "POP3: %s %s %s <password>\n", roomname, pop3host, pop3user);
+       CtdlLogPrintf(CTDL_NOTICE, "Connecting to <%s>\n", pop3host);
        
        if (CtdlThreadCheckStop())
                return;
                
        sock = sock_connect(pop3host, "110", "tcp");
        if (sock < 0) {
-               lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
+               CtdlLogPrintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
                return;
        }
        
        if (CtdlThreadCheckStop())
                goto bail;
 
-       lprintf(CTDL_DEBUG, "Connected!\n");
+       CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
 
        /* Read the server greeting */
        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-       lprintf(CTDL_DEBUG, ">%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
        if (CtdlThreadCheckStop())
@@ -100,10 +115,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
         * actually barfs on LF-terminated newlines.
         */
        snprintf(buf, sizeof buf, "USER %s\r", pop3user);
-       lprintf(CTDL_DEBUG, "<%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
        if (sock_puts(sock, buf) <0) goto bail;
        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-       lprintf(CTDL_DEBUG, ">%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
        if (CtdlThreadCheckStop())
@@ -111,10 +126,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
 
        /* Password */
        snprintf(buf, sizeof buf, "PASS %s\r", pop3pass);
-       lprintf(CTDL_DEBUG, "<PASS <password>\n");
+       CtdlLogPrintf(CTDL_DEBUG, "<PASS <password>\n");
        if (sock_puts(sock, buf) <0) goto bail;
        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-       lprintf(CTDL_DEBUG, ">%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
        if (CtdlThreadCheckStop())
@@ -122,10 +137,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
 
        /* Get the list of messages */
        snprintf(buf, sizeof buf, "LIST\r");
-       lprintf(CTDL_DEBUG, "<%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
        if (sock_puts(sock, buf) <0) goto bail;
        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-       lprintf(CTDL_DEBUG, ">%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
        if (strncasecmp(buf, "+OK", 3)) goto bail;
 
        if (CtdlThreadCheckStop())
@@ -136,7 +151,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                        goto bail;
 
                if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-               lprintf(CTDL_DEBUG, ">%s\n", buf);
+               CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
                msg_to_fetch = atoi(buf);
                if (msg_to_fetch > 0) {
                        if (alloc_msgs == 0) {
@@ -156,10 +171,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
 
                /* Find out the UIDL of the message, to determine whether we've already downloaded it */
                snprintf(buf, sizeof buf, "UIDL %d\r", msglist[i]);
-               lprintf(CTDL_DEBUG, "<%s\n", buf);
+               CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
                if (sock_puts(sock, buf) <0) goto bail;
                if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-               lprintf(CTDL_DEBUG, ">%s\n", buf);
+               CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
                if (strncasecmp(buf, "+OK", 3)) goto bail;
                extract_token(this_uidl, buf, 2, ' ', sizeof this_uidl);
 
@@ -171,7 +186,7 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                cdbut = cdb_fetch(CDB_USETABLE, utmsgid, strlen(utmsgid));
                if (cdbut != NULL) {
                        /* message has already been seen */
-                       lprintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
+                       CtdlLogPrintf(CTDL_DEBUG, "%s has already been seen\n", utmsgid);
                        cdb_free(cdbut);
 
                        /* rewrite the record anyway, to update the timestamp */
@@ -182,10 +197,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                else {
                        /* Message has not been seen. Tell the server to fetch the message... */
                        snprintf(buf, sizeof buf, "RETR %d\r", msglist[i]);
-                       lprintf(CTDL_DEBUG, "<%s\n", buf);
+                       CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
                        if (sock_puts(sock, buf) <0) goto bail;
                        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-                       lprintf(CTDL_DEBUG, ">%s\n", buf);
+                       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
                        if (strncasecmp(buf, "+OK", 3)) goto bail;
        
                        if (CtdlThreadCheckStop())
@@ -195,21 +210,21 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
                        body = CtdlReadMessageBody(".", config.c_maxmsglen, NULL, 1, sock);
                        if (body == NULL) goto bail;
        
-                       lprintf(CTDL_DEBUG, "Converting message...\n");
+                       CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n");
                        msg = convert_internet_message(body);
                        body = NULL;    /* yes, this should be dereferenced, NOT freed */
        
                        /* Do Something With It (tm) */
-                       msgnum = CtdlSubmitMsg(msg, NULL, roomname);
+                       msgnum = CtdlSubmitMsg(msg, NULL, roomname, 0);
                        if (msgnum > 0L) {
                                /* Message has been committed to the store */
        
                                if (!keep) {
                                        snprintf(buf, sizeof buf, "DELE %d\r", msglist[i]);
-                                       lprintf(CTDL_DEBUG, "<%s\n", buf);
+                                       CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
                                        if (sock_puts(sock, buf) <0) goto bail;
                                        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-                                       lprintf(CTDL_DEBUG, ">%s\n", buf); /* errors here are non-fatal */
+                                       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf); /* errors here are non-fatal */
                                }
 
                                /* write the uidl to the use table so we don't fetch this message again */
@@ -224,10 +239,10 @@ void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3
 
        /* Log out */
        snprintf(buf, sizeof buf, "QUIT\r");
-       lprintf(CTDL_DEBUG, "<%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
        if (sock_puts(sock, buf) <0) goto bail;
        if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
-       lprintf(CTDL_DEBUG, ">%s\n", buf);
+       CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
 bail:  sock_close(sock);
        if (msglist) free(msglist);
 }
@@ -307,7 +322,7 @@ void pop3client_scan(void) {
        if (doing_pop3client) return;
        doing_pop3client = 1;
 
-       lprintf(CTDL_DEBUG, "pop3client started\n");
+       CtdlLogPrintf(CTDL_DEBUG, "pop3client started\n");
        ForEachRoom(pop3client_scan_room, NULL);
 
        while (palist != NULL && !CtdlThreadCheckStop()) {
@@ -320,7 +335,7 @@ void pop3client_scan(void) {
                free(pptr);
        }
 
-       lprintf(CTDL_DEBUG, "pop3client ended\n");
+       CtdlLogPrintf(CTDL_DEBUG, "pop3client ended\n");
        last_run = time(NULL);
        doing_pop3client = 0;
 }