projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
safe_fclose -> m_fclose, and is now inlined.
[apps/madmutt.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
d276022
..
e0dfe2e
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-8,24
+8,9
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <lib-lib/lib-lib.h>
#include <utime.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-
#include <lib-mime/mime.h>
#include <lib-sys/exit.h>
#include <lib-mime/mime.h>
#include <lib-sys/exit.h>
@@
-34,13
+19,13
@@
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "copy.h"
#include "mutt.h"
#include "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "copy.h"
-#include "mx.h"
#include "pager.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#include "pager.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
@@
-50,10
+35,6
@@
#include <imap/imap.h>
#include <imap/imap.h>
-#ifdef BUFFY_SIZE
-#include "buffy.h"
-#endif
-
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
@@
-74,11
+55,10
@@
int mutt_display_message (HEADER * cur)
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
mutt_parse_mime_message (Context, cur);
mutt_message_hook (Context, cur, M_MESSAGEHOOK);
-
mutt_mktemp (tempfile
);
- if (
(fpout = safe_fopen (tempfile, "w")) == NULL
) {
+
fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
mutt_error _("Could not create temporary file!");
mutt_error _("Could not create temporary file!");
-
- return (0);
+ return 0;
}
if (DisplayFilter && *DisplayFilter) {
}
if (DisplayFilter && *DisplayFilter) {
@@
-89,7
+69,7
@@
int mutt_display_message (HEADER * cur)
-1, fileno (fpfilterout), -1);
if (filterpid < 0) {
mutt_error (_("Cannot create display filter"));
-1, fileno (fpfilterout), -1);
if (filterpid < 0) {
mutt_error (_("Cannot create display filter"));
-
safe_fclose
(&fpfilterout);
+
m_fclose
(&fpfilterout);
unlink (tempfile);
return 0;
}
unlink (tempfile);
return 0;
}
@@
-148,11
+128,11
@@
int mutt_display_message (HEADER * cur)
mx_close_message (&msg);
}
mx_close_message (&msg);
}
- if ((
safe_fclose
(&fpout) != 0 && errno != EPIPE) || res == -1) {
+ if ((
m_fclose
(&fpout) != 0 && errno != EPIPE) || res == -1) {
mutt_error (_("Could not copy message"));
if (fpfilterout != NULL) {
mutt_wait_filter (filterpid);
mutt_error (_("Could not copy message"));
if (fpfilterout != NULL) {
mutt_wait_filter (filterpid);
-
safe_fclose
(&fpfilterout);
+
m_fclose
(&fpfilterout);
}
#if 0
/* this is maybe just plain wrong but it makes the pager display
}
#if 0
/* this is maybe just plain wrong but it makes the pager display
@@
-169,7
+149,7
@@
int mutt_display_message (HEADER * cur)
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
mutt_any_key_to_continue (NULL);
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
mutt_any_key_to_continue (NULL);
-
safe_fclose
(&fpfilterout); /* XXX - check result? */
+
m_fclose
(&fpfilterout); /* XXX - check result? */
/* update crypto information for this message */
/* update crypto information for this message */
@@
-240,7
+220,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
char prompt[SHORT_STRING];
char buf[HUGE_STRING] = { 0 };
address_t *adr = NULL;
char prompt[SHORT_STRING];
char buf[HUGE_STRING] = { 0 };
address_t *adr = NULL;
- c
onst c
har *err = NULL;
+ char *err = NULL;
int rc;
if (h)
int rc;
if (h)
@@
-409,7
+389,7
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
/* add the message separator */
if (sep)
fputs (sep, fpout);
/* add the message separator */
if (sep)
fputs (sep, fpout);
-
safe_fclose
(&fpout);
+
m_fclose
(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
@@
-432,7
+412,7
@@
static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
fputs (sep, fpout);
}
}
fputs (sep, fpout);
}
}
-
safe_fclose
(&fpout);
+
m_fclose
(&fpout);
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
if (mutt_wait_filter (thepid) != 0)
rc = 1;
}
@@
-674,12
+654,7
@@
int mutt_save_message (HEADER * h, int delete,
char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX];
CONTEXT ctx;
struct stat st;
char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX];
CONTEXT ctx;
struct stat st;
-
-#ifdef BUFFY_SIZE
- BUFFY *tmp = NULL;
-#else
struct utimbuf ut;
struct utimbuf ut;
-#endif
*redraw = 0;
*redraw = 0;
@@
-793,20
+768,14
@@
int mutt_save_message (HEADER * h, int delete,
mx_close_mailbox (&ctx, NULL);
if (need_buffy_cleanup) {
mx_close_mailbox (&ctx, NULL);
if (need_buffy_cleanup) {
-#ifdef BUFFY_SIZE
- tmp = buffy_find_mailbox (buf);
- if (tmp && tmp->new <= 0)
- buffy_update_mailbox (tmp);
-#else
/* fix up the times so buffy won't get confused */
if (st.st_mtime > st.st_atime) {
ut.actime = st.st_atime;
ut.modtime = time (NULL);
utime (buf, &ut);
/* fix up the times so buffy won't get confused */
if (st.st_mtime > st.st_atime) {
ut.actime = st.st_atime;
ut.modtime = time (NULL);
utime (buf, &ut);
- }
- else
+ } else {
utime (buf, NULL);
utime (buf, NULL);
-#endif
+ }
}
mutt_clear_error ();
}
mutt_clear_error ();
@@
-893,7
+862,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
b->force_charset |= charset_changed ? 1 : 0;
if (!is_multipart(b) && b->parts)
b->force_charset |= charset_changed ? 1 : 0;
if (!is_multipart(b) && b->parts)
-
mutt_free_body
(&b->parts);
+
body_list_wipe
(&b->parts);
if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
b->hdr->content = NULL;
header_delete(&b->hdr);
if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
b->hdr->content = NULL;
header_delete(&b->hdr);