turn charset into a lua package as well.

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

diff --git a/lib-mx/mbox.c b/lib-mx/mbox.c
index 8e75038..60caf04 100644 (file)
--- a/lib-mx/mbox.c
+++ b/lib-mx/mbox.c
@@ -546,7 +546,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
     return (-1);
 
   /* Create a temporary file to write the new version of the mailbox in. */
     return (-1);
 
   /* Create a temporary file to write the new version of the mailbox in. */

-  fp = m_tempfile(tempfile, _POSIX_PATH_MAX, NONULL(Tempdir), NULL);
+  fp = m_tempfile(tempfile, _POSIX_PATH_MAX, NONULL(MCore.tmpdir), NULL);

   if (fp == NULL) {
     mutt_error _("Could not create temporary file!");
     mutt_sleep (5);
   if (fp == NULL) {
     mutt_error _("Could not create temporary file!");
     mutt_sleep (5);


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


@@ -718,7 +718,7 @@ static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
     char savefile[_POSIX_PATH_MAX];
 
     snprintf(savefile, sizeof (savefile), "%s/mutt.%s-%u",
     char savefile[_POSIX_PATH_MAX];
 
     snprintf(savefile, sizeof (savefile), "%s/mutt.%s-%u",

-             NONULL(Tempdir), NONULL(Username), (unsigned int)getpid());
+             NONULL(MCore.tmpdir), NONULL(MCore.username), (unsigned int)getpid());

     rename (tempfile, savefile);
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);
     rename (tempfile, savefile);
     mutt_unblock_signals ();
     mx_fastclose_mailbox (ctx);


@@ -838,9 +838,9 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
 
   /* simulate a close */
   if (ctx->id_hash)
 
   /* simulate a close */
   if (ctx->id_hash)

-    hash_destroy (&ctx->id_hash, NULL);
+    hash_delete (&ctx->id_hash, NULL);

   if (ctx->subj_hash)
   if (ctx->subj_hash)

-    hash_destroy (&ctx->subj_hash, NULL);
+    hash_delete (&ctx->subj_hash, NULL);

   mutt_clear_threads (ctx);
   p_delete(&ctx->v2r);
   if (ctx->readonly) {
   mutt_clear_threads (ctx);
   p_delete(&ctx->v2r);
   if (ctx->readonly) {