#endif
#include "fetchmail.h"
+#include "i18n.h"
/*
* Machinery for handling UID lists live here. This is mainly to support
if (lstat(idfile, &statbuf) < 0) {
if (errno == ENOTDIR)
{
- report(stderr, "lstat: %s: %s\n", idfile, strerror(errno));
+ report(stderr, GT_("lstat: %s: %s\n"), idfile, strerror(errno));
exit(PS_IOERR);
}
}
*/
if ((id = strchr(user, ' ')) != NULL )
{
+
+ /*
+ * this is one other trick. The userhost part
+ * may contain ' ' in the user part, at least in
+ * the lotus notes case.
+ * So we start looking for the '@' after which the
+ * host will follow with the ' ' seperator finaly id.
+ */
+ delimp1 = strchr(user, '@');
+ id = strchr(delimp1,' ');
for (delimp1 = id; delimp1 >= user; delimp1--)
if ((*delimp1 != ' ') && (*delimp1 != '\t'))
break;
}
for (ctl = hostlist; ctl; ctl = ctl->next) {
- if (ctl->server.truename &&
- strcasecmp(host, ctl->server.truename) == 0
+ if (strcasecmp(host, ctl->server.queryname) == 0
&& strcasecmp(user, ctl->remotename) == 0) {
save_str(&ctl->oldsaved, id, UID_SEEN);
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;
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, GT_("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, GT_(" <empty>"));
report_complete(stdout, "\n");
uidlcount++;
}
if (uidlcount)
{
- report_build(stdout, "Scratch list of UIDs:");
+ report_build(stdout, GT_("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, GT_(" <empty>"));
report_complete(stdout, "\n");
}
}
return(0);
}
+struct idlist *copy_str_list(struct idlist *idl)
+/* copy the given UID list */
+{
+ struct idlist *newnode ;
+
+ if (idl == (struct idlist *)NULL)
+ return(NULL);
+ else
+ {
+ newnode = (struct idlist *)xmalloc(sizeof(struct idlist));
+ memcpy(newnode, idl, sizeof(struct idlist));
+ newnode->next = copy_str_list(idl->next);
+ return(newnode);
+ }
+}
+
void append_str_list(struct idlist **idl, struct idlist **nidl)
/* append nidl to idl (does not copy *) */
{
idl->val.status.mark = UID_EXPUNGED;
}
-void uid_end_query(struct query *ctl)
+void uid_swap_lists(struct query *ctl)
/* finish a query */
{
- /* old state of mailbox is now irrelevant */
- free_str_list(&ctl->oldsaved);
- free_str_list(&scratchlist);
- ctl->oldsaved = ctl->newsaved;
- ctl->newsaved = (struct idlist *) NULL;
-
/* debugging code */
if (ctl->server.uidl && outlevel >= O_DEBUG)
{
struct idlist *idp;
- report_build(stdout, "New UID list from %s:", ctl->server.pollname);
- for (idp = ctl->oldsaved; idp; idp = idp->next)
+ report_build(stdout, GT_("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, GT_(" <empty>"));
report_complete(stdout, "\n");
}
+
+ /*
+ * 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, GT_("swapping UID lists\n"));
+ free_str_list(&ctl->oldsaved);
+ ctl->oldsaved = ctl->newsaved;
+ ctl->newsaved = (struct idlist *) NULL;
+ }
+ else if (outlevel >= O_DEBUG)
+ report(stdout, GT_("not swapping UID lists, no UIDs seen this query\n"));
}
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, GT_("Deleting fetchids file.\n"));
unlink(idfile);
}
else
{
if (outlevel >= O_DEBUG)
- report(stdout, "Writing fetchids file.\n");
+ report(stdout, GT_("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)
if (idp->val.status.mark == UID_SEEN
|| idp->val.status.mark == UID_DELETED)
fprintf(tmpfp, "%s@%s %s\n",
- ctl->remotename, ctl->server.truename, idp->id);
+ ctl->remotename, ctl->server.queryname, idp->id);
}
for (idp = scratchlist; idp; idp = idp->next)
fputs(idp->id, tmpfp);
projects / ~andy / fetchmail / blobdiff