diff options
| author | Sam Varshavchik | 2022-01-17 21:07:13 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2022-01-17 21:07:13 -0500 |
| commit | f67b3067a0fee0b7e768f6bd9e12649cacc1f0d2 (patch) | |
| tree | d37e02ae1acfbb6779a7c21e97a32411ff3cb191 /sqwebmail | |
| parent | 17cd2a82b61c728106ca385fee1f858b671f321e (diff) | |
| download | courier-libs-f67b3067a0fee0b7e768f6bd9e12649cacc1f0d2.tar.bz2 | |
Clean up maildir_getnew.
Diffstat (limited to 'sqwebmail')
| -rw-r--r-- | sqwebmail/ChangeLog | 4 | ||||
| -rw-r--r-- | sqwebmail/maildir.c | 25 |
2 files changed, 5 insertions, 24 deletions
diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index 4cf2868..9a01ba5 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -1,5 +1,9 @@ 2022-01-17 Sam Varshavchik <mrsam@courier-mta.com> + * Remove unused parameters to maildir_getnew. + + * maildir.c (maildir_checknew): use maildir_getnew. + * Fix minor memory leaks. 6.0.9 diff --git a/sqwebmail/maildir.c b/sqwebmail/maildir.c index e19cbcb..71fa511 100644 --- a/sqwebmail/maildir.c +++ b/sqwebmail/maildir.c @@ -1122,30 +1122,7 @@ static void maildir_checknew(const char *folder, const char *dir) /* Move everything from new to cur */ - dirbuf=alloc_filename(dir, "new", ""); - - for (dirp=opendir(dirbuf); dirp && (dire=readdir(dirp)) != 0; ) - { - char *oldname, *newname; - char *p; - - if (dire->d_name[0] == '.') continue; - - oldname=alloc_filename(dirbuf, dire->d_name, ""); - - newname=malloc(strlen(oldname)+4); - if (!newname) enomem(); - - strcat(strcat(strcpy(newname, dir), "/cur/"), dire->d_name); - p=strrchr(newname, '/'); - if ((p=strchr(p, ':')) != NULL) *p=0; /* Someone screwed up */ - strcat(newname, ":2,"); - rename(oldname, newname); - free(oldname); - free(newname); - } - if (dirp) closedir(dirp); - free(dirbuf); + maildir_getnew(dir, 0); /* Look for any messages mark as deleted. When we delete a message ** we link it into the Trash folder, and mark the original with a T, |