Bugfix

* libmailutils/base/amd.c: Add more debugging info. Always check the return from amd_pool_open and amd_check_message (which returns int now) and act accordingly.

Bugfix
* libmailutils/base/amd.c: Add more debugging info. Always check the return from amd_pool_open and amd_check_message (which returns int now) and act accordingly.
Sergey Poznyakoff
Commit d9044ffe ... d9044ffe99b447598e649b24f5ed49ccb110e15e authored 2011-01-19 13:11:56 +0200 by Sergey Poznyakoff
Showing 2 changed files with 95 additions and 50 deletions
imap4d/io.c
libmailutils/base/amd.c
--- a/imap4d/io.c
View file @d9044ff
+++ b/imap4d/io.c
View file @d9044ff
@@ -167,7 +167,7 @@ io_sendf (const char *format, ...)
 }
 /* Send NIL if empty string, change the quoted string to a literal if the
-   string contains: double quotes, CR, LF, and '/'.  CR, LF will be change
+   string contains: double quotes, CR, LF, and '/'.  CR, LF will be changed
   to spaces.  */
 int
 io_send_qstring (const char *buffer)
--- a/libmailutils/base/amd.c
View file @d9044ff
+++ b/libmailutils/base/amd.c
View file @d9044ff
@@ -1458,53 +1458,69 @@ amd_scan_message (struct _amd_message *mhm)
  /* Check if the message was modified after the last scan */
  status = mhm->amd->cur_msg_file_name (mhm, &msg_name);
  if (status)
-    return status;
+    {
+      mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+		("amd_scan_message: cur_msg_file_name=%s",
+		 mu_strerror (status)));      
+      return status;
+    }
  if (stat (msg_name, &st) == 0 && st.st_mtime == mhm->mtime)
    {
      /* Nothing to do */
      free (msg_name);
      return 0;
    }
-  free (msg_name);
  off = 0;
  status = mu_stream_seek (stream, 0, MU_SEEK_SET, NULL);
-  if (status == 0)
+  if (status)
-    while ((status = mu_stream_readline (stream, buf, sizeof (buf), &n)) == 0
+    mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
-	   && n != 0)
+	      ("amd_scan_message(%s): mu_stream_seek=%s",
-      {
+	       msg_name, mu_strerror (status)));      
-	if (in_header)
+  else
-	  {
+    {
-	    if (buf[0] == '\n')
+      while ((status = mu_stream_readline (stream, buf, sizeof (buf), &n)) == 0
-	      {
+	     && n != 0)
-		in_header = 0;
+	{
-		body_start = off + 1;
+	  if (in_header)
-	      }
+	    {
-	    if (buf[n - 1] == '\n')
+	      if (buf[0] == '\n')
-	      hlines++;
+		{
+		  in_header = 0;
-	    /* Process particular attributes */
+		  body_start = off + 1;
-	    if (mu_c_strncasecmp (buf, "status:", 7) == 0)
+		}
-	      {
+	      if (buf[n - 1] == '\n')
-		int deleted = mhm->attr_flags & MU_ATTRIBUTE_DELETED;
+		hlines++;
-		mu_string_to_flags (buf, &mhm->attr_flags);
-		mhm->attr_flags |= deleted;
+	      /* Process particular attributes */
-	      }
+	      if (mu_c_strncasecmp (buf, "status:", 7) == 0)
-	    else if (mu_c_strncasecmp (buf, "x-imapbase:", 11) == 0)
+		{
-	      {
+		  int deleted = mhm->attr_flags & MU_ATTRIBUTE_DELETED;
-		char *p;
+		  mu_string_to_flags (buf, &mhm->attr_flags);
-		mhm->amd->uidvalidity = strtoul (buf + 11, &p, 10);
+		  mhm->attr_flags |= deleted;
-		/* second number is next uid. Ignored */
+		}
-	      }
+	      else if (mu_c_strncasecmp (buf, "x-imapbase:", 11) == 0)
-	  }
+		{
-	else
+		  char *p;
-	  {
+		  mhm->amd->uidvalidity = strtoul (buf + 11, &p, 10);
-	    if (buf[n - 1] == '\n')
+		  /* second number is next uid. Ignored */
-	      blines++;
+		}
-	  }
+	    }
-	off += n;
+	  else
-      }
+	    {
+	      if (buf[n - 1] == '\n')
+		blines++;
+	    }
+	  off += n;
+	}
+      if (status)
+	mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+		  ("amd_scan_message(%s): %s",
+		   msg_name, mu_strerror (status)));     
+    }
+  free (msg_name);
  if (status == 0)
    {
@@ -1606,14 +1622,19 @@ amd_pool_open (struct _amd_message *mhm)
  struct _amd_data *amd = mhm->amd;
  if (amd_pool_lookup (mhm))
    return 0;
-  if (amd_pool_open_count(amd) == MAX_OPEN_STREAMS-1)
+  if (amd_pool_open_count (amd) == MAX_OPEN_STREAMS-1)
    {
      amd_message_stream_close (amd->msg_pool[amd->pool_first++]);
      amd->pool_first %= MAX_OPEN_STREAMS;
    }
  status = amd_message_stream_open (mhm);
  if (status)
-    return status;
+    {
+      mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+		("amd_pool_open: amd_message_stream_open=%s",
+		 mu_strerror (status)));
+      return status;
+    }
  amd->msg_pool[amd->pool_last++] = mhm;
  amd->pool_last %= MAX_OPEN_STREAMS;
  return 0;
@@ -1646,14 +1667,23 @@ amd_message_stream_open (struct _amd_message *mhm)
  status = amd->cur_msg_file_name (mhm, &filename);
  if (status)
-    return status;
+    {
+      mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+		("amd_message_stream_open: cur_msg_file_name=%s",
+		 mu_strerror (status)));
+      return status;
+    }
  /* The message should be at least readable */
  if (amd->mailbox->flags & (MU_STREAM_RDWR|MU_STREAM_WRITE|MU_STREAM_APPEND))
    flags |= MU_STREAM_RDWR;
  else 
    flags |= MU_STREAM_READ;
  status = mu_file_stream_create (&mhm->stream, filename, flags);
+  if (status)
+    mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+	      ("amd_message_stream_open: mu_file_stream_create(%s)=%s",
+	       filename, mu_strerror (status)));      
  free (filename);
@@ -1664,7 +1694,11 @@ amd_message_stream_open (struct _amd_message *mhm)
  mu_stream_set_buffer (mhm->stream, mu_buffer_full, 16384);
  status = amd_scan_message (mhm);
+  if (status)
+    mu_debug (MU_DEBCAT_MAILBOX, MU_DEBUG_ERROR,
+	      ("amd_message_stream_open: amd_scan_message=%s",
+	       mu_strerror (status)));
  return status;
 }
@@ -1679,11 +1713,12 @@ amd_message_stream_close (struct _amd_message *mhm)
    }
 }
-void
+int
 amd_check_message (struct _amd_message *mhm)
 {
  if (mhm->body_end == 0)
-    amd_pool_open (mhm);
+    return amd_pool_open (mhm);
+  return 0;
 }
 /* Reading functions */
@@ -1699,7 +1734,9 @@ amd_body_stream_read (mu_stream_t is, char *buffer, size_t buflen,
  int status = 0;
  mu_off_t ln;
-  amd_pool_open (mhm);
+  status = amd_pool_open (mhm);
+  if (status)
+    return status;
  if (buffer == NULL || buflen == 0)
    {
@@ -1748,7 +1785,9 @@ amd_body_stream_readdelim (mu_stream_t is, char *buffer, size_t buflen,
  struct _amd_message *mhm = mu_message_get_owner (msg);
  int status = 0;
-  amd_pool_open (mhm);
+  status = amd_pool_open (mhm);
+  if (status)
+    return status;
  if (buffer == NULL || buflen == 0)
    {
@@ -1825,11 +1864,14 @@ amd_body_stream_size (mu_stream_t stream, mu_off_t *psize)
 static int
 amd_body_size (mu_body_t body, size_t *psize)
 {
+  int status;
  mu_message_t msg = mu_body_get_owner (body);
  struct _amd_message *mhm = mu_message_get_owner (msg);
  if (mhm == NULL)
    return EINVAL;
-  amd_check_message (mhm);
+  status = amd_check_message (mhm);
+  if (status)
+    return status;
  if (psize)
    *psize = mhm->body_end - mhm->body_start;
  return 0;
@@ -1838,11 +1880,14 @@ amd_body_size (mu_body_t body, size_t *psize)
 static int
 amd_body_lines (mu_body_t body, size_t *plines)
 {
+  int status;
  mu_message_t msg = mu_body_get_owner (body);
  struct _amd_message *mhm = mu_message_get_owner (msg);
  if (mhm == NULL)
    return EINVAL;
-  amd_check_message (mhm);
+  status = amd_check_message (mhm);
+  if (status)
+    return status;
  if (plines)
    *plines = mhm->body_lines;
  return 0;