Use m_temp instead of mutt_mktemp in compress code

[apps/madmutt.git] / lib-mx / mbox.c

diff --git a/lib-mx/mbox.c b/lib-mx/mbox.c
index d1b2746..81beb52 100644 (file)
--- a/lib-mx/mbox.c
+++ b/lib-mx/mbox.c
@@ -605,7 +605,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
 
       if (ctx->magic == M_MMDF) {
         if (fputs (MMDF_SEP, fp) == EOF) {
 
       if (ctx->magic == M_MMDF) {
         if (fputs (MMDF_SEP, fp) == EOF) {

-          mutt_perror (tempfile);
+          mutt_perror (_("Can't create temporary file"));

           mutt_sleep (5);
           unlink (tempfile);
           goto bail;
           mutt_sleep (5);
           unlink (tempfile);
           goto bail;


@@ -621,7 +621,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
       if (mutt_copy_message
           (fp, ctx, ctx->hdrs[i], M_CM_UPDATE,
            CH_FROM | CH_UPDATE | CH_UPDATE_LEN) == -1) {
       if (mutt_copy_message
           (fp, ctx, ctx->hdrs[i], M_CM_UPDATE,
            CH_FROM | CH_UPDATE | CH_UPDATE_LEN) == -1) {

-        mutt_perror (tempfile);
+        mutt_perror (_("Can't create temporary file"));

         mutt_sleep (5);
         unlink (tempfile);
         goto bail;
         mutt_sleep (5);
         unlink (tempfile);
         goto bail;


@@ -640,7 +640,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
       switch (ctx->magic) {
       case M_MMDF:
         if (fputs (MMDF_SEP, fp) == EOF) {
       switch (ctx->magic) {
       case M_MMDF:
         if (fputs (MMDF_SEP, fp) == EOF) {

-          mutt_perror (tempfile);
+          mutt_perror (_("Can't create temporary file"));

           mutt_sleep (5);
           unlink (tempfile);
           goto bail;
           mutt_sleep (5);
           unlink (tempfile);
           goto bail;


@@ -648,7 +648,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
         break;
       default:
         if (fputs ("\n", fp) == EOF) {
         break;
       default:
         if (fputs ("\n", fp) == EOF) {

-          mutt_perror (tempfile);
+          mutt_perror (_("Can't create temporary file"));

           mutt_sleep (5);
           unlink (tempfile);
           goto bail;
           mutt_sleep (5);
           unlink (tempfile);
           goto bail;


@@ -657,14 +657,12 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
     }
   }
 
     }
   }
 

-  if (fclose (fp) != 0) {
-    fp = NULL;
+  if (m_fclose(&fp) != 0) {

     unlink (tempfile);
     unlink (tempfile);

-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));

     mutt_sleep (5);
     goto bail;
   }
     mutt_sleep (5);
     goto bail;
   }

-  fp = NULL;

 
   /* Save the state of this folder. */
   if (stat (ctx->path, &statbuf) == -1) {
 
   /* Save the state of this folder. */
   if (stat (ctx->path, &statbuf) == -1) {


@@ -677,7 +675,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
   if ((fp = fopen (tempfile, "r")) == NULL) {
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);
   if ((fp = fopen (tempfile, "r")) == NULL) {
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);

-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));

     mutt_sleep (5);
     return (-1);
   }
     mutt_sleep (5);
     return (-1);
   }


@@ -709,11 +707,10 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
     }
   }
 
     }
   }
 

-  fclose (fp);
-  fp = NULL;
+  m_fclose(&fp);

   mbox_unlock_mailbox (ctx);
 
   mbox_unlock_mailbox (ctx);
 

-  if (fclose (ctx->fp) != 0 || i == -1) {
+  if (m_fclose(&ctx->fp) != 0 || i == -1) {

     /* error occured while writing the mailbox back, so keep the temp copy
      * around
      */
     /* error occured while writing the mailbox back, so keep the temp copy
      * around
      */