projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework some things with sasl.
[apps/madmutt.git]
/
lib-mx
/
mbox.c
diff --git
a/lib-mx/mbox.c
b/lib-mx/mbox.c
index
26b5580
..
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(Te
mpdir), NULL);
+ fp = m_tempfile
(tempfile, _POSIX_PATH_MAX, NONULL(MCore.t
mpdir), 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,12
+605,11
@@
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;
}
-
}
/* save the new offset for this message. we add `offset' because the
}
/* save the new offset for this message. we add `offset' because the
@@
-622,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;
@@
-641,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;
@@
-649,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;
@@
-658,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) {
@@
-678,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);
}
@@
-710,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
*/
@@
-722,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(U
sername), (unsigned int)getpid());
+ NONULL(
MCore.tmpdir), NONULL(MCore.u
sername), (unsigned int)getpid());
rename (tempfile, savefile);
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
rename (tempfile, savefile);
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
@@
-764,7
+760,7
@@
static int mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused))
bail: /* Come here in case of disaster */
bail: /* Come here in case of disaster */
-
safe_fclose
(&fp);
+
m_fclose
(&fp);
/* restore offsets, as far as they are valid */
if (first >= 0 && oldOffset) {
/* restore offsets, as far as they are valid */
if (first >= 0 && oldOffset) {
@@
-842,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_de
stroy
(&ctx->id_hash, NULL);
+ hash_de
lete
(&ctx->id_hash, NULL);
if (ctx->subj_hash)
if (ctx->subj_hash)
- hash_de
stroy
(&ctx->subj_hash, NULL);
+ hash_de
lete
(&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) {
@@
-1010,7
+1006,7
@@
int mbox_is_magic (const char* path, struct stat* st) {
magic = M_MBOX;
else if (m_strcmp(MMDF_SEP, tmp) == 0)
magic = M_MMDF;
magic = M_MBOX;
else if (m_strcmp(MMDF_SEP, tmp) == 0)
magic = M_MMDF;
-
safe_fclose
(&f);
+
m_fclose
(&f);
/* need to restore the times here, the file was not really accessed,
* only the type was accessed. This is important, because detection
/* need to restore the times here, the file was not really accessed,
* only the type was accessed. This is important, because detection