X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=118edfa5591f5796c54b87eea88a15da3035e64a;hp=3f6a9ac4d7f248835c5061cd28e0189019e64c13;hb=71c287c8c863d235517bf19ddf1834a833a324ce;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83 diff --git a/attach.c b/attach.c index 3f6a9ac..118edfa 100644 --- a/attach.c +++ b/attach.c @@ -8,46 +8,27 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include +#include +#include #include +#include +#include +#include #include "mutt.h" #include "handler.h" #include "recvattach.h" -#include "mutt_menu.h" -#include "mutt_curses.h" #include "keymap.h" -#include "rfc1524.h" #include "pager.h" #include "copy.h" -#include "mx.h" #include -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include -#include - 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; @@ -59,7 +40,7 @@ int mutt_get_tmp_attachment (BODY * a) 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; @@ -90,7 +71,7 @@ int mutt_compose_attachment (BODY * a) 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; @@ -104,7 +85,6 @@ int mutt_compose_attachment (BODY * a) 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) @@ -142,7 +122,7 @@ int mutt_compose_attachment (BODY * a) b = mutt_read_mime_header (fp, 0); if (b) { if (b->parameter) { - mutt_free_parameter (&a->parameter); + parameter_list_wipe(&a->parameter); a->parameter = b->parameter; b->parameter = NULL; } @@ -176,14 +156,14 @@ int mutt_compose_attachment (BODY * a) 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; @@ -196,7 +176,7 @@ bailout: if (unlink_newfile) unlink (newfile); - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); return rc; } @@ -214,7 +194,7 @@ int mutt_edit_attachment (BODY * a) 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; @@ -225,8 +205,7 @@ int mutt_edit_attachment (BODY * a) 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; @@ -257,7 +236,7 @@ int mutt_edit_attachment (BODY * a) 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; } @@ -269,7 +248,7 @@ bailout: if (unlink_newfile) unlink (newfile); - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); return rc; } @@ -313,7 +292,7 @@ static int is_mmnoask (const char *buf) 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) { @@ -337,7 +316,6 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) 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); @@ -349,7 +327,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) int mutt_is_autoview (BODY * b, const char *type) { - LIST *t = AutoViewList; + string_list_t *t = AutoViewList; char _type[SHORT_STRING]; int i; @@ -361,7 +339,7 @@ int mutt_is_autoview (BODY * b, const char *type) 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; @@ -403,15 +381,15 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, !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; @@ -590,7 +568,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, return_error: if (entry) - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); if (fp && tempfile[0]) mutt_unlink (tempfile); else if (unlink_tempfile) @@ -865,7 +843,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, m->length = 0; m->encoding = saved_encoding; if (saved_parts) { - mutt_free_header (&m->hdr); + header_delete(&m->hdr); m->parts = saved_parts; m->hdr = saved_hdr; } @@ -897,9 +875,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) 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))) { @@ -907,7 +883,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) 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); @@ -931,14 +907,14 @@ int mutt_print_attachment (FILE * fp, BODY * a) 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; } @@ -958,7 +934,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) else if (unlink_newfile) unlink (newfile); - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); return (1); } @@ -977,16 +953,11 @@ int mutt_print_attachment (FILE * fp, BODY * a) 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) { @@ -995,8 +966,6 @@ int mutt_print_attachment (FILE * fp, BODY * a) goto bail0; } - debug_print (2, ("Filter created.\n")); - mutt_copy_stream (ifp, fpout); safe_fclose (&fpout);