X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=c311ba226ce0004ae1ab06b5b9b63a53702a43a0;hp=8eeb71b6ea96fde233f5db3befe19de9bb676999;hb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1;hpb=c6b9d35ed9361e4defab9762a7480d5126405ae9 diff --git a/attach.c b/attach.c index 8eeb71b..c311ba2 100644 --- a/attach.c +++ b/attach.c @@ -18,6 +18,8 @@ #include #include +#include + #include "mutt.h" #include "handler.h" #include "recvattach.h" @@ -25,7 +27,6 @@ #include "mutt_curses.h" #include "keymap.h" #include "rfc1524.h" -#include "mime.h" #include "pager.h" #include "copy.h" #include "mx.h" @@ -65,7 +66,7 @@ int mutt_get_tmp_attachment (BODY * a) if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) { /* __FOPEN_CHECKED__ */ mutt_copy_stream (fpin, fpout); - str_replace (&a->filename, tempfile); + m_strreplace(&a->filename, tempfile); a->unlink = 1; if (a->stamp >= st.st_mtime) @@ -98,9 +99,9 @@ int mutt_compose_attachment (BODY * a) if (entry->composecommand || entry->composetypecommand) { if (entry->composetypecommand) - strfcpy (command, entry->composetypecommand, sizeof (command)); + m_strcpy(command, sizeof(command), entry->composetypecommand); else - strfcpy (command, entry->composecommand, sizeof (command)); + 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)); @@ -113,7 +114,7 @@ int mutt_compose_attachment (BODY * a) unlink_newfile = 1; } else - strfcpy (newfile, a->filename, sizeof (newfile)); + m_strcpy(newfile, sizeof(newfile), a->filename); if (rfc1524_expand_command (a, newfile, type, command, sizeof (command))) { @@ -221,7 +222,7 @@ int mutt_edit_attachment (BODY * a) if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT)) { if (entry->editcommand) { - strfcpy (command, entry->editcommand, sizeof (command)); + 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)); @@ -234,7 +235,7 @@ int mutt_edit_attachment (BODY * a) unlink_newfile = 1; } else - strfcpy (newfile, a->filename, sizeof (newfile)); + m_strcpy(newfile, sizeof(newfile), a->filename); if (rfc1524_expand_command (a, newfile, type, command, sizeof (command))) { @@ -283,7 +284,7 @@ static int is_mmnoask (const char *buf) if (m_strcmp(p, "1") == 0) return (1); - strfcpy (tmp, p, sizeof (tmp)); + m_strcpy(tmp, sizeof(tmp), p); p = tmp; while ((p = strtok (p, ",")) != NULL) { @@ -299,7 +300,7 @@ static int is_mmnoask (const char *buf) } else { lng = m_strlen(p); - if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0) + if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0) return (1); } @@ -321,9 +322,11 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) ascii_strncasecmp (type, t->data, i) == 0) || ascii_strcasecmp (type, t->data) == 0) { - BODY tmp = { 0 }; + BODY tmp; int n; + p_clear(&tmp, 1); + if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) { snprintf (type, len, "%s/%s", n == TYPEAUDIO ? "audio" : @@ -396,7 +399,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, int unlink_tempfile = 0; is_message = mutt_is_message_type (a->type, a->subtype); - if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) && + if (is_message && a->hdr && (a->hdr->security & ENCRYPT) && !crypt_valid_passphrase (a->hdr->security)) return (rc); use_mailcap = (flag == M_MAILCAP || @@ -425,7 +428,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, goto return_error; } - strfcpy (command, entry->command, sizeof (command)); + m_strcpy(command, sizeof(command), entry->command); if (fp) { fname = m_strdup(a->filename); @@ -441,7 +444,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (safe_symlink (a->filename, tempfile) == -1) { if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) == M_YES) - strfcpy (tempfile, a->filename, sizeof (tempfile)); + m_strcpy(tempfile, sizeof(tempfile), a->filename); else goto return_error; } @@ -450,7 +453,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, } } else if (fp == NULL) /* send case */ - strfcpy (tempfile, a->filename, sizeof (tempfile)); + m_strcpy(tempfile, sizeof(tempfile), a->filename); if (fp) { /* recv case: we need to save the attachment to a file */ @@ -467,7 +470,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (use_pager) { if (fp && !use_mailcap && a->filename) { /* recv case */ - strfcpy (pagerfile, a->filename, sizeof (pagerfile)); + m_strcpy(pagerfile, sizeof(pagerfile), a->filename); mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile)); } else @@ -555,7 +558,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, } if (a->description) - strfcpy (descrip, a->description, sizeof (descrip)); + m_strcpy(descrip, sizeof(descrip), a->description); else if (a->filename) snprintf (descrip, sizeof (descrip), "---Attachment: %s : %s", a->filename, type); @@ -907,7 +910,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) rfc1524_free_entry (&entry); return 0; } - strfcpy (newfile, a->filename, sizeof (newfile)); + m_strcpy(newfile, sizeof(newfile), a->filename); } else unlink_newfile = 1; @@ -918,9 +921,9 @@ int mutt_print_attachment (FILE * fp, BODY * a) if (fp) mutt_save_attachment (fp, a, newfile, 0, NULL); - strfcpy (command, entry->printcommand, sizeof (command)); - piped = - rfc1524_expand_command (a, newfile, type, command, sizeof (command)); + m_strcpy(command, sizeof(command), entry->printcommand); + piped = rfc1524_expand_command(a, newfile, type, command, + sizeof(command)); mutt_endwin (NULL);