Created
September 16, 2012 11:45
-
-
Save philwo/3732097 to your computer and use it in GitHub Desktop.
Patches for isync
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur isync-1.0.5~/src/drv_imap.c isync-1.0.5/src/drv_imap.c | |
--- isync-1.0.5~/src/drv_imap.c 2012-09-16 20:46:17.000000000 +0900 | |
+++ isync-1.0.5/src/drv_imap.c 2012-09-16 20:48:16.000000000 +0900 | |
@@ -22,6 +22,13 @@ | |
* despite that library's more restrictive license. | |
*/ | |
+#include <config.h> | |
+#if HAVE_LIBSSL | |
+# include <openssl/ssl.h> | |
+# include <openssl/err.h> | |
+# include <openssl/hmac.h> | |
+#endif | |
+ | |
#include "isync.h" | |
#include <assert.h> | |
@@ -44,11 +51,6 @@ | |
#include <netinet/tcp.h> | |
#include <arpa/inet.h> | |
#include <netdb.h> | |
-#if HAVE_LIBSSL | |
-# include <openssl/ssl.h> | |
-# include <openssl/err.h> | |
-# include <openssl/hmac.h> | |
-#endif | |
typedef struct imap_server_conf { | |
struct imap_server_conf *next; | |
@@ -1690,7 +1692,7 @@ | |
int ret; | |
imap->boxes = 0; | |
- if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s%%\"", ctx->prefix )) != DRV_OK) | |
+ if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s*\"", ctx->prefix )) != DRV_OK) | |
return ret; | |
*retb = imap->boxes; | |
return DRV_OK; | |
diff -ur isync-1.0.5~/src/drv_maildir.c isync-1.0.5/src/drv_maildir.c | |
--- isync-1.0.5~/src/drv_maildir.c 2012-09-16 20:46:17.000000000 +0900 | |
+++ isync-1.0.5/src/drv_maildir.c 2012-09-16 20:50:12.000000000 +0900 | |
@@ -24,6 +24,7 @@ | |
#include "isync.h" | |
+#include <assert.h> | |
#include <limits.h> | |
#include <stdlib.h> | |
#include <string.h> | |
@@ -46,6 +47,56 @@ | |
#include <db.h> | |
#endif /* USE_DB */ | |
+static void encode_maildir_box(const char* in, char* out, size_t size) | |
+{ | |
+ const char* p; | |
+ char c; | |
+ size_t out_chars; | |
+ | |
+ for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) { | |
+ assert(out_chars < size); | |
+ if (c == '/') { | |
+ assert(out_chars < size - 1); | |
+ *(out++) = '~'; | |
+ *out = '-'; | |
+ ++out_chars; | |
+ } | |
+ else if (c == '~') { | |
+ assert(out_chars < size - 1); | |
+ *(out++) = '~'; | |
+ *out = '~'; | |
+ ++out_chars; | |
+ } | |
+ else { | |
+ *out = c; | |
+ } | |
+ } | |
+ assert(out_chars < size); | |
+ *out = 0; | |
+} | |
+ | |
+static void decode_maildir_box(const char* in, char* out, size_t size) | |
+{ | |
+ const char* p; | |
+ char c; | |
+ size_t out_chars; | |
+ | |
+ for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) { | |
+ assert(out_chars < size); | |
+ if (c == '~') { | |
+ assert(out_chars < size - 1); | |
+ c = *(++p); | |
+ *out = (c == '-' ? '/' : '~'); | |
+ ++out_chars; | |
+ } | |
+ else { | |
+ *out = c; | |
+ } | |
+ } | |
+ assert(out_chars < size); | |
+ *out = 0; | |
+} | |
+ | |
typedef struct maildir_store_conf { | |
store_conf_t gen; | |
char *inbox; | |
@@ -164,14 +215,16 @@ | |
const char *inbox = ((maildir_store_conf_t *)gctx->conf)->inbox; | |
int bl; | |
struct stat st; | |
- char buf[PATH_MAX]; | |
+ char buf[PATH_MAX], box[PATH_MAX]; | |
if (*de->d_name == '.') | |
continue; | |
bl = nfsnprintf( buf, sizeof(buf), "%s%s/cur", gctx->conf->path, de->d_name ); | |
if (stat( buf, &st ) || !S_ISDIR(st.st_mode)) | |
continue; | |
- add_string_list( retb, !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : de->d_name ); | |
+ | |
+ decode_maildir_box(de->d_name, box, PATH_MAX); | |
+ add_string_list( retb, !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : box ); | |
} | |
closedir (dir); | |
@@ -717,8 +770,11 @@ | |
#endif /* USE_DB */ | |
if (!strcmp( gctx->name, "INBOX" )) | |
gctx->path = nfstrdup( ((maildir_store_conf_t *)gctx->conf)->inbox ); | |
- else | |
- nfasprintf( &gctx->path, "%s%s", gctx->conf->path, gctx->name ); | |
+ else { | |
+ char box[_POSIX_PATH_MAX]; | |
+ encode_maildir_box(gctx->name, box, _POSIX_PATH_MAX); | |
+ nfasprintf( &gctx->path, "%s%s", gctx->conf->path, box ); | |
+ } | |
if (opts & OPEN_SETFLAGS) | |
opts |= OPEN_OLD; | |
if (opts & OPEN_EXPUNGE) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment