X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=63eae5a6c4fad9cde356079dc6ee51cc50770f64;hp=0ad54d1ead48eda4e8bcd86d35f69dc3ef3227ad;hb=f404a0ca916be07049af51a3022baaaaab94def6;hpb=f07b807db70d3ac5d0a8086819cfbb4f7ff25f07

diff --git a/imap/imap.c b/imap/imap.c
index 0ad54d1..63eae5a 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -20,6 +20,10 @@
 
 /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"
@@ -430,7 +434,7 @@ int imap_open_connection (IMAP_DATA* idata)
 	  {
 	    mutt_error (_("Could not negotiate TLS connection"));
 	    mutt_sleep (1);
-	    goto bail;
+	    goto err_close_conn;
 	  }
 	  else
 	  {
@@ -460,6 +464,7 @@ int imap_open_connection (IMAP_DATA* idata)
 
  err_close_conn:
   mutt_socket_close (idata->conn);
+  idata->state = IMAP_DISCONNECTED;
  bail:
   FREE (&idata->capstr);
   return -1;
@@ -793,12 +798,14 @@ void imap_logout (IMAP_DATA* idata)
   imap_cmd_start (idata, "LOGOUT");
   while (imap_cmd_step (idata) == IMAP_CMD_CONTINUE)
     ;
+  FREE(& idata->cmd.buf);
+  FREE(& idata);
 }
 
+/*
 int imap_close_connection (CONTEXT *ctx)
 {
   dprint (1, (debugfile, "imap_close_connection(): closing connection\n"));
-  /* if the server didn't shut down on us, close the connection gracefully */
   if (CTX_DATA->status != IMAP_BYE)
   {
     mutt_message _("Closing connection to IMAP server...");
@@ -810,6 +817,7 @@ int imap_close_connection (CONTEXT *ctx)
   CTX_DATA->conn->data = NULL;
   return 0;
 }
+*/
 
 /* imap_set_flag: append str to flags if we currently have permission
  *   according to aclbit */
@@ -818,7 +826,7 @@ static void imap_set_flag (IMAP_DATA* idata, int aclbit, int flag,
 {
   if (mutt_bit_isset (idata->rights, aclbit))
     if (flag)
-      strncat (flags, str, flsize);
+      safe_strcat (flags, flsize, str);
 }
 
 /* imap_make_msg_set: make an IMAP4rev1 UID message set out of a set of
@@ -1485,20 +1493,19 @@ int imap_complete(char* dest, size_t dlen, char* path) {
   return -1;
 }
 
-/* reconnect and verify indexes if connection was lost */
+/* reconnect if connection was lost */
 int imap_reconnect(CONTEXT* ctx) {
   IMAP_DATA* imap_data = (IMAP_DATA *)ctx->data;
 
-  if (imap_data->status == IMAP_CONNECTED)
-    return -1;
-  if (imap_data->status == IMAP_BYE)
-    return 0;
-
-  mutt_socket_close(imap_data->conn);
+  if (imap_data) {
+    if (imap_data->status == IMAP_CONNECTED)
+      return -1;
+  }
 
   if (query_quadoption(OPT_IMAPRECONNECT,_("Connection lost. Reconnect to IMAP server?")) != M_YES)
     return -1;
 
-  return imap_open_mailbox(ctx);
+  mx_open_mailbox(ctx->path,0,ctx);
+  return 0;
 }