From: Brendan Cully <brendan@kublai.com>
Date: Sat, 31 Mar 2007 21:10:35 +0000 (-0700)
Subject: Always set up data pointer in mh_read_dir, not just when allocating context
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0391ba27979cb29963224bcb6660ef8258e9a2b;p=neomutt

Always set up data pointer in mh_read_dir, not just when allocating context
---

diff --git a/ChangeLog b/ChangeLog
index f7f7645e3..d2a844016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2007-03-30 19:51 -0700  Brendan Cully  <brendan@kublai.com>  (4828ffd619f6)
+2007-03-30 21:26 -0700  Daniel Burrows  <dburrows@debian.org>  (d5ab883ef90a)
+
+	* hcache.c: Fix handling of DB4 hcache open failure. (closes: #2714)
+
+2007-03-30 20:18 -0700  Brendan Cully  <brendan@kublai.com>  (dc54ae48d8c1)
+
+	* mh.c: Set mode of new mh/maildir messages to match parent
+	directory.
 
 	* mh.c, mutt.h: Move mtime_cur from CONTEXT to mh_data
 
diff --git a/mh.c b/mh.c
index bd4228459..55ae0abce 100644
--- a/mh.c
+++ b/mh.c
@@ -209,7 +209,7 @@ static inline mode_t mh_umask (CONTEXT* ctx)
     return 077;
   }
 
-  return 0777 & ~(st.st_mode);
+  return 0777 & ~st.st_mode;
 }
 
 int mh_buffy (const char *path)
@@ -1069,9 +1069,9 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
   if (!ctx->data)
   {
     ctx->data = safe_calloc(sizeof (struct mh_data), 1);
-    data = mh_data (ctx);
     ctx->mx_close = mh_close_mailbox;
   }
+  data = mh_data (ctx);
 
   maildir_update_mtime (ctx);