infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 20:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks.

Browse Source
This commit is contained in:
Mechiel Lukkien 2025-03-01 11:19:02 +01:00
parent ea64936a67
commit 9ce552368b
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
imapserver/server.go
View File

@ -3921,17 +3921,17 @@ func (c *conn) cmdUIDExpunge(tag, cmd string, p *parser) {
} }
// Permanently delete messages for the currently selected/active mailbox. If uidset // Permanently delete messages for the currently selected/active mailbox. If uidset
// is not nil, only those UIDs are removed. // is not nil, only those UIDs are expunged.
// State: Selected // State: Selected
func (c *conn) cmdxExpunge(tag, cmd string, uidSet *numSet) { func (c *conn) cmdxExpunge(tag, cmd string, uidSet *numSet) {
// Command: ../rfc/9051:3687 ../rfc/3501:2695 // Command: ../rfc/9051:3687 ../rfc/3501:2695
removed, highestModSeq := c.xexpunge(uidSet, false) expunged, highestModSeq := c.xexpunge(uidSet, false)
// Response syntax: ../rfc/9051:6742 ../rfc/3501:4864 // Response syntax: ../rfc/9051:6742 ../rfc/3501:4864
var vanishedUIDs numSet var vanishedUIDs numSet
qresync := c.enabled[capQresync] qresync := c.enabled[capQresync]
for _, m := range removed { for _, m := range expunged {
seq := c.xsequence(m.UID) seq := c.xsequence(m.UID)
c.sequenceRemove(seq, m.UID) c.sequenceRemove(seq, m.UID)
if qresync { if qresync {
@ -4053,16 +4053,11 @@ func (c *conn) cmdxCopy(isUID bool, tag, cmd string, p *parser) {
// Files that were created during the copy. Remove them if the operation fails. // Files that were created during the copy. Remove them if the operation fails.
var createdIDs []int64 var createdIDs []int64
defer func() { defer func() {
x := recover()
if x == nil {
return
}
for _, id := range createdIDs { for _, id := range createdIDs {
p := c.account.MessagePath(id) p := c.account.MessagePath(id)
err := os.Remove(p) err := os.Remove(p)
c.xsanity(err, "cleaning up created file") c.xsanity(err, "cleaning up created file")
} }
panic(x)
}() }()
var mbDst store.Mailbox var mbDst store.Mailbox
@ -4214,6 +4209,8 @@ func (c *conn) cmdxCopy(isUID bool, tag, cmd string, p *parser) {
xcheckf(err, "train copied messages") xcheckf(err, "train copied messages")
}) })
createdIDs = nil
// Broadcast changes to other connections. // Broadcast changes to other connections.
if len(newUIDs) > 0 { if len(newUIDs) > 0 {
changes := make([]store.Change, 0, len(newUIDs)+2) changes := make([]store.Change, 0, len(newUIDs)+2)
@ -4228,9 +4225,6 @@ func (c *conn) cmdxCopy(isUID bool, tag, cmd string, p *parser) {
} }
}) })
// All good, prevent defer above from cleaning up copied files.
createdIDs = nil
// ../rfc/9051:6881 ../rfc/4315:183 // ../rfc/9051:6881 ../rfc/4315:183
c.writeresultf("%s OK [COPYUID %d %s %s] copied", tag, mbDst.UIDValidity, compactUIDSet(origUIDs).String(), compactUIDSet(newUIDs).String()) c.writeresultf("%s OK [COPYUID %d %s %s] copied", tag, mbDst.UIDValidity, compactUIDSet(origUIDs).String(), compactUIDSet(newUIDs).String())
} }