Better error recovery in UIDL code.

[~andy/fetchmail] / uid.c

diff --git a/uid.c b/uid.c
index 453274b795cfcced565fbcb68737efcfc7b9f3bd..b6f0a8af18fb3370149ea6cc0fde001dd51d67c8 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -19,6 +19,7 @@
 #endif
 
 #include "fetchmail.h"
+#include "i18n.h"
 
 /*
  * Machinery for handling UID lists live here.  This is mainly to support
@@ -93,7 +94,7 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile)
    if (lstat(idfile, &statbuf) < 0) {
      if (errno == ENOTDIR) 
     {
-      report(stderr, "lstat: %s: %s\n", idfile, strerror(errno));
+      report(stderr, _("lstat: %s: %s\n"), idfile, strerror(errno));
       exit(PS_IOERR);
     }
    }
@@ -169,8 +170,12 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile)
                            break;
                        }
                    }
-                   /* if it's not in a host we're querying,
-                   ** save it anyway */
+                   /* 
+                    * If it's not in a host we're querying,
+                    * save it anyway.  Otherwise we'd lose UIDL
+                    * information any time we queried an explicit
+                    * subset of hosts.
+                    */
                    if (ctl == (struct query *)NULL) {
                                /* restore string */
                        *delimp1 = saveddelim1;
@@ -194,22 +199,23 @@ void initialize_saved_lists(struct query *hostlist, const char *idfile)
        for (ctl = hostlist; ctl; ctl = ctl->next)
            if (ctl->server.uidl)
            {
-               report_build(stdout, "Old UID list from %s:",ctl->server.pollname);
+               report_build(stdout, _("Old UID list from %s:"), 
+                            ctl->server.pollname);
                for (idp = ctl->oldsaved; idp; idp = idp->next)
                    report_build(stdout, " %s", idp->id);
                if (!idp)
-                   report_build(stdout, " <empty>");
+                   report_build(stdout, _(" <empty>"));
                report_complete(stdout, "\n");
                uidlcount++;
            }
 
        if (uidlcount)
        {
-           report_build(stdout, "Scratch list of UIDs:");
+           report_build(stdout, _("Scratch list of UIDs:"));
            for (idp = scratchlist; idp; idp = idp->next)
                report_build(stdout, " %s", idp->id);
            if (!idp)
-               report_build(stdout, " <empty>");
+               report_build(stdout, _(" <empty>"));
            report_complete(stdout, "\n");
        }
     }
@@ -394,6 +400,7 @@ struct idlist *copy_str_list(struct idlist *idl)
     else
     {
        newnode = (struct idlist *)xmalloc(sizeof(struct idlist));
+       memcpy(newnode, idl, sizeof(struct idlist));
        newnode->next = copy_str_list(idl->next);
        return(newnode);
     }
@@ -423,7 +430,7 @@ void expunge_uids(struct query *ctl)
            idl->val.status.mark = UID_EXPUNGED;
 }
 
-void uid_end_query(struct query *ctl) 
+void uid_swap_lists(struct query *ctl) 
 /* finish a query */
 {
     /* debugging code */
@@ -431,11 +438,11 @@ void uid_end_query(struct query *ctl)
     {
        struct idlist *idp;
 
-       report_build(stdout, "New UID list from %s:", ctl->server.pollname);
+       report_build(stdout, _("New UID list from %s:"), ctl->server.pollname);
        for (idp = ctl->newsaved; idp; idp = idp->next)
            report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
        if (!idp)
-           report_build(stdout, " <empty>");
+           report_build(stdout, _(" <empty>"));
        report_complete(stdout, "\n");
     }
 
@@ -443,19 +450,29 @@ void uid_end_query(struct query *ctl)
      * Don't swap UID lists unless we've actually seen UIDLs.
      * This is necessary in order to keep UIDL information
      * from being heedlessly deleted later on.
+     *
+     * Older versions of fetchmail did
+     *
+     *     free_str_list(&scratchlist);
+     *
+     * after swap.  This was wrong; we need to preserve the UIDL information
+     * from unqueried hosts.  Unfortunately, not doing this means that
+     * under some circumstances UIDLs can end up being stored forever --
+     * specifically, if a user description is removed from .fetchmailrc
+     * with UIDLs from that account in .fetchids, there is no way for
+     * them to ever get garbage-collected.
      */
     if (ctl->newsaved)
     {
        /* old state of mailbox may now be irrelevant */
        if (outlevel >= O_DEBUG)
-           report(stdout, "swapping UID lists\n");
+           report(stdout, _("swapping UID lists\n"));
        free_str_list(&ctl->oldsaved);
-       free_str_list(&scratchlist);
        ctl->oldsaved = ctl->newsaved;
        ctl->newsaved = (struct idlist *) NULL;
     }
     else if (outlevel >= O_DEBUG)
-       report(stdout, "not swapping UID lists, no UIDs seen this query\n");
+       report(stdout, _("not swapping UID lists, no UIDs seen this query\n"));
 }
 
 void write_saved_lists(struct query *hostlist, const char *idfile)
@@ -469,21 +486,23 @@ void write_saved_lists(struct query *hostlist, const char *idfile)
     /* if all lists are empty, nuke the file */
     idcount = 0;
     for (ctl = hostlist; ctl; ctl = ctl->next) {
-       if (ctl->oldsaved)
-           idcount++;
+        for (idp = ctl->oldsaved; idp; idp = idp->next)
+            if (idp->val.status.mark == UID_SEEN
+                               || idp->val.status.mark == UID_DELETED)
+                idcount++;
     }
 
     /* either nuke the file or write updated last-seen IDs */
     if (!idcount && !scratchlist)
     {
        if (outlevel >= O_DEBUG)
-           report(stdout, "Deleting fetchids file.\n");
+           report(stdout, _("Deleting fetchids file.\n"));
        unlink(idfile);
     }
     else
     {
        if (outlevel >= O_DEBUG)
-           report(stdout, "Writing fetchids file.\n");
+           report(stdout, _("Writing fetchids file.\n"));
        if ((tmpfp = fopen(idfile, "w")) != (FILE *)NULL) {
            for (ctl = hostlist; ctl; ctl = ctl->next) {
                for (idp = ctl->oldsaved; idp; idp = idp->next)