lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable UTF-8 on servers with RFC6855 support

Browse Source 
note that this is a somewhat sloppy implementation, as it simply
assumes that the local system uses UTF-8 - that seems reasonable
nowadays.
This commit is contained in:
Oswald Buddenhagen 2022-05-23 12:04:57 +02:00
parent 9169ee8fd8
commit efab63fb8e
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -19,6 +19,8 @@ Made the Channel side to expire with MaxMessages configurable.
MaxMessages and MaxSize can be used together now. MaxMessages and MaxSize can be used together now.
Added support for IMAP mailbox names with non-ASCII characters.
The unfiltered list of mailboxes in each Store can be printed now. The unfiltered list of mailboxes in each Store can be printed now.
A proper summary is now printed prior to exiting. A proper summary is now printed prior to exiting.

33
src/drv_imap.c
View File

@ -286,6 +286,8 @@ enum CAPABILITY {
LITERALMINUS, LITERALMINUS,
MOVE, MOVE,
NAMESPACE, NAMESPACE,
UTF8_ACCEPT,
UTF8_ONLY,
COMPRESS_DEFLATE COMPRESS_DEFLATE
}; };
@ -306,6 +308,8 @@ static const struct {
{ "LITERAL-", 8 }, { "LITERAL-", 8 },
{ "MOVE", 4 }, { "MOVE", 4 },
{ "NAMESPACE", 9 }, { "NAMESPACE", 9 },
{ "UTF8=ACCEPT", 11 },
{ "UTF8=ONLY", 9 },
{ "COMPRESS=DEFLATE", 16 }, { "COMPRESS=DEFLATE", 16 },
}; };
@ -2090,6 +2094,8 @@ static void imap_open_store_compress( imap_store_t * );
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
static void imap_open_store_compress_p2( imap_store_t *, imap_cmd_t *, int ); static void imap_open_store_compress_p2( imap_store_t *, imap_cmd_t *, int );
#endif #endif
static void imap_open_store_enable_utf8( imap_store_t * );
static void imap_open_store_enable_utf8_p2( imap_store_t *, imap_cmd_t *, int );
static void imap_open_store_namespace( imap_store_t * ); static void imap_open_store_namespace( imap_store_t * );
static void imap_open_store_namespace_p2( imap_store_t *, imap_cmd_t *, int ); static void imap_open_store_namespace_p2( imap_store_t *, imap_cmd_t *, int );
static void imap_open_store_namespace2( imap_store_t * ); static void imap_open_store_namespace2( imap_store_t * );
@ -2737,7 +2743,7 @@ imap_open_store_compress( imap_store_t *ctx )
return; return;
} }
#endif #endif
imap_open_store_namespace( ctx ); imap_open_store_enable_utf8( ctx );
} }
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
@ -2746,14 +2752,35 @@ imap_open_store_compress_p2( imap_store_t *ctx, imap_cmd_t *cmd ATTR_UNUSED, int
{ {
if (response == RESP_NO) { if (response == RESP_NO) {
/* We already reported an error, but it's not fatal to us. */ /* We already reported an error, but it's not fatal to us. */
imap_open_store_namespace( ctx ); imap_open_store_enable_utf8( ctx );
} else if (response == RESP_OK) { } else if (response == RESP_OK) {
socket_start_deflate( &ctx->conn ); socket_start_deflate( &ctx->conn );
imap_open_store_namespace( ctx ); imap_open_store_enable_utf8( ctx );
} }
} }
#endif #endif
static void
imap_open_store_enable_utf8( imap_store_t *ctx )
{
if (CAP(UTF8_ACCEPT) || CAP(UTF8_ONLY)) {
// We just assume that a server that announces UTF8= also supports ENABLE.
imap_exec( ctx, NULL, imap_open_store_enable_utf8_p2, "ENABLE UTF8=ACCEPT" );
} else {
imap_open_store_namespace( ctx );
}
}
static void
imap_open_store_enable_utf8_p2( imap_store_t *ctx, imap_cmd_t *cmd ATTR_UNUSED, int response )
{
if (response == RESP_NO) {
imap_open_store_bail( ctx, FAIL_FINAL );
} else if (response == RESP_OK) {
imap_open_store_namespace( ctx );
}
}
static void static void
imap_open_store_namespace( imap_store_t *ctx ) imap_open_store_namespace( imap_store_t *ctx )
{ {