[fetchmail-devel] patch review: 2003-05-22-6.2.2-hirsch-keeptopuidl.diff and 2003-05-24-6.2.2-andree-keeptopuidl.diff

[Matthias A. <ma...@dt...>]

Greetings,

here are some thoughts on 

2003-05-22-6.2.2-hirsch-keeptopuidl.diff
2003-05-24-6.2.2-andree-keeptopuidl.diff

Jakob Hirsch observed that the --keep option defeats the use of TOP. His
patch no longer applies to the SVN version, here's an updated version of
his patch:

Index: pop3.c
===================================================================
--- pop3.c	(revision 3925)
+++ pop3.c	(working copy)
@@ -589,7 +589,7 @@
     sleep(3); /* to be _really_ safe, probably need sleep(5)! */
 
     /* we're peek-capable if use of TOP is enabled */
-    peek_capable = !(ctl->fetchall || ctl->keep);
+    peek_capable = !(ctl->fetchall || (ctl->keep && !ctl->server.uidl));
 
     /* we're approved */
     return(PS_SUCCESS);
@@ -1102,7 +1102,7 @@
      * The line count passed (99999999) is the maximum value CompuServe will
      * accept; it's much lower than the natural value 2147483646 (the maximum
      * twos-complement signed 32-bit integer minus 1) */
-    if (ctl->keep || ctl->fetchall)
+    if (!peek_capable)
 	gen_send(sock, "RETR %d", number);
     else
 	gen_send(sock, "TOP %d 99999999", number);


-- 
Matthias Andree

NOTE YOU WILL NOT RECEIVE MY MAIL IF YOU'RE USING SPF!
Encrypted mail welcome: my GnuPG key ID is 0x052E7D95 (PGP/MIME preferred)