sidebar: don't overwrite the status if status_on_top is enabled (Closes: 494735)

[software/mutt-debian.git] / editmsg.c

diff --git a/editmsg.c b/editmsg.c
index e6c603f52fe844c9e43779ac83a3b86058395bcf..153b1397a9cfd471b9cab9d6b985f68731be3815 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
+ * Copyright (C) 1999-2002 Thomas Roessler <roessler@does-not-exist.org>

  * 
  *     This program is free software; you can redistribute it
  *     and/or modify it under the terms of the GNU General Public
  * 
  *     This program is free software; you can redistribute it
  *     and/or modify it under the terms of the GNU General Public


@@ -64,7 +64,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
   struct stat sb;
   time_t mtime = 0;
   
   struct stat sb;
   time_t mtime = 0;
   

-  mutt_mktemp (tmp);
+  mutt_mktemp (tmp, sizeof (tmp));

 
   omagic = DefaultMagic;
   DefaultMagic = M_MBOX;
 
   omagic = DefaultMagic;
   DefaultMagic = M_MBOX;


@@ -191,7 +191,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
   mx_close_mailbox (&tmpctx, NULL);
   
   bail:
   mx_close_mailbox (&tmpctx, NULL);
   
   bail:

-  if (fp) fclose (fp);
+  if (fp) safe_fclose (&fp);

 
   if (rc >= 0)
     unlink (tmp);
 
   if (rc >= 0)
     unlink (tmp);