Use better error msgs for tempfile

Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-mx/mbox.c b/lib-mx/mbox.c
index 8e75038..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;


@@ -659,7 +659,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
 
   if (m_fclose(&fp) != 0) {
     unlink (tempfile);
 
   if (m_fclose(&fp) != 0) {
     unlink (tempfile);

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

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


@@ -675,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);
   }

diff --git a/send.c b/send.c
index 6d14c69..d282321 100644 (file)
--- a/send.c
+++ b/send.c
@@ -994,7 +994,7 @@ static int send_message (HEADER * msg)
   }
 
   if (m_fclose(&tempfp) != 0) {
   }
 
   if (m_fclose(&tempfp) != 0) {

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

     unlink (tempfile);
     return (-1);
   }
     unlink (tempfile);
     return (-1);
   }