fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 9ba67f9f6eb541b5ae1589750f110c58f824e251..0906e837113827fa5159c4d85ac2d81a92b65640 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -31,14 +31,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -89,7 +99,7 @@ void pop3_greeting(void) {
        POP3->msgs = NULL;
        POP3->num_msgs = 0;
 
-       cprintf("+OK Welcome to the Citadel/UX POP3 server %s\r\n",
+       cprintf("+OK Citadel/UX POP3 server %s\r\n",
                CC->cs_nonce, config.c_fqdn);
 }
 
@@ -98,7 +108,7 @@ void pop3_greeting(void) {
  * Specify user name (implements POP3 "USER" command)
  */
 void pop3_user(char *argbuf) {
-       char username[256];
+       char username[SIZ];
 
        if (CC->logged_in) {
                cprintf("-ERR You are already logged in.\r\n");
@@ -163,7 +173,8 @@ int pop3_grab_mailbox(void) {
         CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
        POP3->lastseen = (-1);
        if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
-               if ((POP3->msgs[POP3->num_msgs-1].msgnum) <= vbuf.v_lastseen) {
+               if (is_msg_in_mset(vbuf.v_seen,
+                  (POP3->msgs[POP3->num_msgs-1].msgnum) )) {
                        POP3->lastseen = i;
                }
        }
@@ -189,7 +200,7 @@ void pop3_login(void)
 
 void pop3_apop(char *argbuf)
 {
-   char username[256];
+   char username[SIZ];
    char userdigest[MD5_HEXSTRING_SIZE];
    char realdigest[MD5_HEXSTRING_SIZE];
    char *sptr;
@@ -202,7 +213,7 @@ void pop3_apop(char *argbuf)
    
    if ((sptr = strchr(argbuf, ' ')) == NULL)
    {
-       cprintf("Invalid APOP line.\r\n");
+       cprintf("-ERR Invalid APOP line.\r\n");
        return;
    }
    
@@ -232,11 +243,12 @@ void pop3_apop(char *argbuf)
    make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
+       do_login();
        pop3_login();
    }
    else
    {
-       cprintf("-ERR That is NOT the password!  Go away!\r\n");
+       cprintf("-ERR That is NOT the password.\r\n");
    }
 }
 
@@ -245,7 +257,7 @@ void pop3_apop(char *argbuf)
  * Authorize with password (implements POP3 "PASS" command)
  */
 void pop3_pass(char *argbuf) {
-       char password[256];
+       char password[SIZ];
 
        strcpy(password, argbuf);
        striplt(password);
@@ -255,7 +267,7 @@ void pop3_pass(char *argbuf) {
                pop3_login();
        }
        else {
-               cprintf("-ERR That is NOT the password!  Go away!\r\n");
+               cprintf("-ERR That is NOT the password.\r\n");
        }
 }
 
@@ -282,7 +294,7 @@ void pop3_list(char *argbuf) {
                        return;
                }
                else {
-                       cprintf("+OK %d %d\n",
+                       cprintf("+OK %d %d\r\n",
                                which_one,
                                POP3->msgs[which_one-1].rfc822_length
                                );
@@ -320,7 +332,7 @@ void pop3_stat(char *argbuf) {
                }
        }
 
-       cprintf("+OK %d %d\n", total_msgs, total_octets);
+       cprintf("+OK %d %d\r\n", total_msgs, total_octets);
 }
 
 
@@ -344,7 +356,7 @@ void pop3_retr(char *argbuf) {
                return;
        }
 
-       cprintf("+OK Whoop, there it is:\r\n");
+       cprintf("+OK Message %d:\r\n", which_one);
        bytes_remaining = POP3->msgs[which_one -1].rfc822_length;
        rewind(POP3->msgs[which_one - 1].temp);
        while (bytes_remaining-- > 0) {
@@ -381,7 +393,7 @@ void pop3_top(char *argbuf) {
                return;
        }
 
-       cprintf("+OK Whoop, there it is:\r\n");
+       cprintf("+OK Message %d:\r\n", which_one);
        rewind(POP3->msgs[which_one - 1].temp);
        while (ptr = fgets(buf, sizeof buf, POP3->msgs[which_one - 1].temp),
              ( (ptr!=NULL) && (done == 0))) {
@@ -416,7 +428,7 @@ void pop3_dele(char *argbuf) {
 
        /* Flag the message as deleted.  Will expunge during QUIT command. */
        POP3->msgs[which_one - 1].deleted = 1;
-       cprintf("+OK Message %d disappears in a cloud of orange smoke.\r\n",
+       cprintf("+OK Message %d deleted.\r\n",
                which_one);
 }
 
@@ -440,7 +452,8 @@ void pop3_update(void) {
                lgetuser(&CC->usersupp, CC->curr_user);
 
                CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-               vbuf.v_lastseen = POP3->msgs[POP3->num_msgs-1].msgnum;
+               sprintf(vbuf.v_seen, "*:%ld",
+                       POP3->msgs[POP3->num_msgs-1].msgnum);
                CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
                lputuser(&CC->usersupp);
@@ -460,7 +473,7 @@ void pop3_rset(char *argbuf) {
                        POP3->msgs[i].deleted = 0;
                }
        }
-       cprintf("+OK all that has come to pass, has now gone away.\r\n");
+       cprintf("+OK Reset completed.\r\n");
 }
 
 
@@ -496,7 +509,7 @@ void pop3_uidl(char *argbuf) {
                        return;
                }
                else {
-                       cprintf("+OK %d %ld\n",
+                       cprintf("+OK %d %ld\r\n",
                                which_one,
                                POP3->msgs[which_one-1].msgnum
                                );
@@ -525,7 +538,7 @@ void pop3_uidl(char *argbuf) {
  * Main command loop for POP3 sessions.
  */
 void pop3_command_loop(void) {
-       char cmdbuf[256];
+       char cmdbuf[SIZ];
 
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
@@ -538,7 +551,7 @@ void pop3_command_loop(void) {
        while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
        if (!strncasecmp(cmdbuf, "NOOP", 4)) {
-               cprintf("+OK This command successfully did nothing.\r\n");
+               cprintf("+OK No operation.\r\n");
        }
 
        else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
@@ -598,7 +611,7 @@ void pop3_command_loop(void) {
        }
 
        else {
-               cprintf("500 I'm afraid I can't do that, Dave.\r\n");
+               cprintf("-ERR I'm afraid I can't do that.\r\n");
        }
 
 }
@@ -608,7 +621,6 @@ void pop3_command_loop(void) {
 char *Dynamic_Module_Init(void)
 {
        SYM_POP3 = CtdlGetDynamicSymbol();
-       printf("Registering POP3 port %d\n", config.c_pop3_port);
        CtdlRegisterServiceHook(config.c_pop3_port,
                                NULL,
                                pop3_greeting,