* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
-
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "keymap.h"
-#include "rfc1524.h"
#include "pager.h"
#include "copy.h"
-#include "mx.h"
#include <lib-crypt/crypt.h>
int mutt_get_tmp_attachment (BODY * a)
{
char type[STRING];
char tempfile[_POSIX_PATH_MAX];
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
FILE *fpin = NULL, *fpout = NULL;
struct stat st;
rfc1524_expand_filename (entry->nametemplate, a->filename,
tempfile, sizeof (tempfile));
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
if (stat (a->filename, &st) == -1)
return -1;
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
short unlink_newfile = 0;
int rc = 0;
m_strcpy(command, sizeof(command), entry->composecommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (newfile))) {
- debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
if (r != -1 && entry->composetypecommand) {
BODY *b;
FILE *fp, *tfp;
- char tempfile[_POSIX_PATH_MAX];
if ((fp = safe_fopen (a->filename, "r")) == NULL) {
mutt_perror (_("Failure to open file to parse headers."));
b = mutt_read_mime_header (fp, 0);
if (b) {
+ char tempfile[_POSIX_PATH_MAX];
+
if (b->parameter) {
- parameter_delete(&a->parameter);
+ parameter_list_wipe(&a->parameter);
a->parameter = b->parameter;
b->parameter = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
fseeko (fp, b->offset, 0);
- mutt_mktemp (tempfile);
- if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
+ tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!tfp) {
mutt_perror (_("Failure to open file to strip headers."));
-
goto bailout;
}
mutt_copy_stream (fp, tfp);
goto bailout;
}
- mutt_free_body (&b);
+ body_list_wipe(&b);
}
}
}
}
}
else {
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
type);
return 1;
if (unlink_newfile)
unlink (newfile);
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return rc;
}
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
short unlink_newfile = 0;
int rc = 0;
m_strcpy(command, sizeof(command), entry->editcommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (newfile))) {
- debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
- if (safe_symlink (a->filename, newfile) == -1) {
+ if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
goto bailout;
mutt_edit_file (NONULL (Editor), a->filename);
}
else {
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
mutt_error (_("No mailcap edit entry for %s"), type);
return 0;
}
if (unlink_newfile)
unlink (newfile);
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return rc;
}
void mutt_check_lookup_list (BODY * b, char *type, int len)
{
- LIST *t = MimeLookupList;
+ string_list_t *t = MimeLookupList;
int i;
for (; t; t = t->next) {
n == TYPEMULTIPART ? "multipart" :
n == TYPETEXT ? "text" :
n == TYPEVIDEO ? "video" : "other", tmp.subtype);
- debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
p_delete(&tmp.subtype);
int mutt_is_autoview (BODY * b, const char *type)
{
- LIST *t = AutoViewList;
+ string_list_t *t = AutoViewList;
char _type[SHORT_STRING];
int i;
mutt_check_lookup_list (b, _type, sizeof (_type));
type = _type;
- if (mutt_needs_mailcap (b)) {
+ if (rfc1524_mailcap_isneeded(b)) {
if (option (OPTIMPLICITAUTOVIEW))
return 1;
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||
- (flag == M_REGULAR && mutt_needs_mailcap (a)));
+ (flag == M_REGULAR && rfc1524_mailcap_isneeded(a)));
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
if (use_mailcap) {
- entry = rfc1524_new_entry ();
+ entry = rfc1524_entry_new();
if (!rfc1524_mailcap_lookup (a, type, entry, 0)) {
if (flag == M_REGULAR) {
/* fallback to view as text */
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
mutt_error _("No matching mailcap entry found. Viewing as text.");
flag = M_AS_TEXT;
/* recv case */
m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
- }
- else
+ } else {
mutt_mktemp (pagerfile);
+ }
}
if (use_mailcap) {
return_error:
if (entry)
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
if (fp && tempfile[0])
mutt_unlink (tempfile);
else if (unlink_tempfile)
rfc1524_entry *entry;
int piped = FALSE;
- debug_print (2, ("Using mailcap...\n"));
-
- entry = rfc1524_new_entry ();
+ entry = rfc1524_entry_new();
rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
if (rfc1524_expand_filename (entry->nametemplate, a->filename,
newfile, sizeof (newfile))) {
if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES) {
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return 0;
}
m_strcpy(newfile, sizeof(newfile), a->filename);
if (piped) {
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return (0);
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
mutt_perror (_("Can't create filter"));
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
safe_fclose (&ifp);
return 0;
}
else if (unlink_newfile)
unlink (newfile);
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return (1);
}
mutt_mktemp (newfile);
if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
- debug_print (2, ("successfully decoded %s type attachment to %s\n",
- type, newfile));
-
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
goto bail0;
}
- debug_print (2, ("successfully opened %s read-only\n", newfile));
-
mutt_endwin (NULL);
if ((thepid =
mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {
goto bail0;
}
- debug_print (2, ("Filter created.\n"));
-
mutt_copy_stream (ifp, fpout);
safe_fclose (&fpout);
projects / apps / madmutt.git / blobdiff