Changeset 5427:50cc55e95be6

Timestamp:

2008-06-26 12:15:18 (5 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

fflush before fsync and close. Closes #2962 again.

Files:

• ChangeLog (modified) (1 diff)
• lib.c (modified) (1 diff)
• lib.h (modified) (1 diff)
• mh.c (modified) (2 diffs)

ChangeLog

@@ -1 @@
-2008-06-25 23:13 -0700  Brendan Cully  <brendan@kublai.com>  (d2134eced31b)
+2008-06-26 00:18 -0700  Brendan Cully  <brendan@kublai.com>  (5d46ad49d04a)
+
+        * mh.c: fsync maildir/mh messages on commit. Closes #2962.
+
+2008-06-25 23:40 -0700  Brendan Cully  <brendan@kublai.com>  (32374c911c6c)
+
+        * smime.c: Check S/MIME signing ID exists before attempting to use
+        it. Closes #3069. Also make (s)ign automatically ask for a key if
+        no default is defined.
 
         * init.h: Make $move default to no instead of ask-no. Closes #2945.

lib.c

@@ -210 +210 @@
 }
 
+int safe_fsync_close (FILE **f)
+{
+  int r = 0;
+
+  if (*f)
+  {
+    if (fflush (*f) || fsync (fileno (*f)))
+    {
+      r = -1;
+      fclose (*f);
+    }
+    else
+      r = fclose(*f);
+    *f = NULL;
+  }
+
+  return r;
+}
+
 char *safe_strdup (const char *s)
 {

lib.h

@@ -171 +171 @@
 int safe_symlink (const char *, const char *);
 int safe_fclose (FILE **);
+int safe_fsync_close (FILE **);
 
 size_t mutt_quote_filename (char *, size_t, const char *);

mh.c

@@ -1312 +1312 @@
   char *s;
 
-  if (msg->fp && fsync(fileno(msg->fp)) < 0)
-  {
-    mutt_perror("Could not flush message to disk");
+  if (safe_fsync_close (&msg->fp))
+  {
+    mutt_perror (_("Could not flush message to disk"));
     return -1;
   }
-  if (safe_fclose (&msg->fp) != 0)
-    return -1;
 
   /* extract the subdir */
@@ -1392 +1390 @@
   char tmp[16];
 
-  if (msg->fp && fsync(fileno(msg->fp)) < 0)
-  {
-    mutt_perror("Could not flush message to disk");
+  if (safe_fsync_close (&msg->fp))
+  {
+    mutt_perror (_("Could not flush message to disk"));
     return -1;
   }
-  if (safe_fclose (&msg->fp) != 0)
-    return -1;
 
   if ((dirp = opendir (ctx->path)) == NULL)