Ready to ship another release.

svn path=/trunk/; revision=3385

diff --git a/Makefile.in b/Makefile.in
index 3fe8693e0c0febe701e625a494bca67aeb9352dc..a5042ff4069a4fc9566d3f55861c43635fa8a656 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 5.8.9
+VERSION = 5.8.10
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@

diff --git a/NEWS b/NEWS
index 908937cc7b4e77f71b002cd8264d23eb40e570a8..e719a2df9b56cbca0dd1ffe0ced86db2b38758ce 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+fetchmail-5.8.10 (Mon Jun 25 17:04:08 EDT 2001), 20922 lines:
+
+* More fixes for the new message-marking code from Thomas Moestl.
+* Fixes for ODMR code from Matt Armstrong.
+
+There are 355 people on fetchmail-friends and  on fetchmail-announce.
+
 fetchmail-5.8.9 (Sun Jun 24 20:30:49 EDT 2001), 20922 lines:
 
 * HMH's snprintf/strncat cleanup patch.

diff --git a/driver.c b/driver.c
index 3e8dc3bc4fc2017242c92f30f6651f16611d167e..43772458d45fdf1c3dc2ca452b5a6a7cf8e188ee 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -606,7 +606,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
            struct idlist       *sdp;
 
            for (sdp = ctl->newsaved; sdp; sdp = sdp->next)
-               if ((sdp->val.status.num == num) && (msgcodes[num-1] > 0))
+               if ((sdp->val.status.num == num) && (msgcodes[num-1] >= 0))
                {
                    sdp->val.status.mark = UID_SEEN;
                    save_str(&ctl->oldsaved, sdp->id,UID_SEEN);
@@ -621,7 +621,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
        }
        else if (ctl->server.base_protocol->delete
                 && !suppress_delete
-                && ((msgcodes[num-1] > 0) ? !ctl->keep : ctl->flush))
+                && ((msgcodes[num-1] >= 0) ? !ctl->keep : ctl->flush))
        {
            (*deletions)++;
            if (outlevel > O_SILENT) 
@@ -1174,7 +1174,7 @@ is restored."));
                    xalloca(msgsizes, int *, sizeof(int) * count);
                    xalloca(msgcodes, int *, sizeof(int) * count);
                    for (i = 0; i < count; i++)
-                       msgcodes[num - 1] = MSGLEN_UNKNOWN;
+                       msgcodes[i] = MSGLEN_UNKNOWN;
 
                    /* 
                     * We need the size of each message before it's

diff --git a/rcfile_y.y b/rcfile_y.y
index dbb1ad38175ebe046b9ba1ab83d91f41f86c074c..e034d566142137f3c0808cdb81a0e3ecaa4fc471 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -286,8 +286,8 @@ smtp_list   : STRING                {save_str(&current.smtphunt, $1,TRUE);}
                | smtp_list STRING      {save_str(&current.smtphunt, $2,TRUE);}
                ;
 
-domain_list    : STRING                {save_str(&current.domainlist, $1,TRUE);}
-               | domain_list STRING    {save_str(&current.domainlist, $2,TRUE);}
+fetch_list     : STRING                {save_str(&current.domainlist, $1,TRUE);}
+               | fetch_list STRING     {save_str(&current.domainlist, $2,TRUE);}
                ;
 
 num_list       : NUMBER
@@ -313,7 +313,7 @@ user_option : TO localnames HERE
                | PASSWORD STRING       {current.password    = xstrdup($2);}
                | FOLDER folder_list
                | SMTPHOST smtp_list
-               | FETCHDOMAINS domain_list
+               | FETCHDOMAINS fetch_list
                | SMTPADDRESS STRING    {current.smtpaddress = xstrdup($2);}
                | SMTPNAME STRING       {current.smtpname = xstrdup($2);}
                | SPAMRESPONSE num_list