From 8eb69231ba08c5e3f275d925c617ceec17d18175 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 18 Apr 2017 11:26:49 -0400 Subject: [PATCH] imap_output_copyuid_response() now accepts an IMAP session context passed up the stack instead of grabbing it from the thread context. --- citadel/modules/imap/imap_misc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c index b966f87b4..e7940d1cb 100644 --- a/citadel/modules/imap/imap_misc.c +++ b/citadel/modules/imap/imap_misc.c @@ -159,9 +159,10 @@ int imap_do_copy(const char *destination_folder) { * messages in our source room. Since the Citadel system uses UID's that * are both globally unique and persistent across a room-to-room copy, we * can get this done quite easily. + * + * FIXME this is outputing WRONG !!! See https://tools.ietf.org/html/rfc2359#section-4.3 */ -void imap_output_copyuid_response(void) { - citimap *Imap = IMAP; +void imap_output_copyuid_response(citimap *Imap) { int i; int num_output = 0; @@ -205,7 +206,7 @@ void imap_copy(int num_parms, ConstStr *Params) { ret = imap_do_copy(Params[3].Key); if (!ret) { IAPrintf("%s OK ", Params[0].Key); - imap_output_copyuid_response(); + imap_output_copyuid_response(IMAP); IAPuts("COPY completed\r\n"); } else { @@ -233,7 +234,7 @@ void imap_uidcopy(int num_parms, ConstStr *Params) { if (imap_do_copy(Params[4].Key) == 0) { IAPrintf("%s OK ", Params[0].Key); - imap_output_copyuid_response(); + imap_output_copyuid_response(IMAP); IAPuts("UID COPY completed\r\n"); } else { -- 2.30.2