[commit] master: after [TRYCREATE], just resend the same command instead of cloning it

[Oswald Buddenhagen]

commit e12c4f563eed973d64ee2eedb1f24322c0fa5828
Author: Oswald Buddenhagen <o...@kde.org>
Date:   Sat Nov 20 10:17:41 2010 +0100

    after [TRYCREATE], just resend the same command instead of cloning it

 src/drv_imap.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/drv_imap.c b/src/drv_imap.c
index 456ac5a..a5c71ae 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -509,7 +509,8 @@ v_submit_imap_cmd( imap_store_t *ctx, struct imap_cmd *cmd,
        if (!cmd)
                cmd = new_imap_cmd();
        cmd->tag = ++ctx->nexttag;
-       nfvasprintf( &cmd->cmd, fmt, ap );
+       if (fmt)
+               nfvasprintf( &cmd->cmd, fmt, ap );
        if (!cmd->param.data) {
                buffmt = "%d %s\r\n";
                litplus = 0;
@@ -996,7 +997,7 @@ parse_list_rsp( imap_store_t *ctx, char *cmd )
 static int
 get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
 {
-       struct imap_cmd *cmdp, **pcmdp, *ncmdp;
+       struct imap_cmd *cmdp, **pcmdp;
        char *cmd, *arg, *arg1, *p;
        int n, resp, resp2, tag;
 
@@ -1095,19 +1096,13 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd 
*tcmd )
                                                }
                                                /* not waiting here violates 
the spec, but a server that does not
                                                   grok this nonetheless 
violates it too. */
-                                               ncmdp = nfmalloc( 
sizeof(*ncmdp) );
-                                               memcpy( &ncmdp->param, 
&cmdp->param, sizeof(cmdp->param) );
-                                               ncmdp->param.create = 0;
-                                               if (!submit_imap_cmd( ctx, 
ncmdp, "%s", cmdp->cmd )) {
+                                               cmdp->param.create = 0;
+                                               if (!submit_imap_cmd( ctx, 
cmdp, 0 )) {
                                                        resp = RESP_BAD;
-                                                       goto normal;
+                                                       goto abnormal;
                                                }
-                                               free( cmdp->cmd );
-                                               free( cmdp );
                                                if (!tcmd)
                                                        return 0;       /* 
ignored */
-                                               if (cmdp == tcmd)
-                                                       tcmd = ncmdp;
                                                continue;
                                        }
                                        resp = RESP_NO;
@@ -1125,6 +1120,7 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
                        free( cmdp->param.data );
                        free( cmdp->cmd );
                        free( cmdp );
+                 abnormal:
                        if (!tcmd || tcmd == cmdp)
                                return resp;
                }

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel