X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=e1cd5b6b29d0603f82c275c8c036fe2025f39613;hp=6cbaa6bb1c220e07efcbab9c2ac91cc9a43bb267;hb=dc35ba82dbe9ba8cb27e623949dcd4b91930d3c5;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd diff --git a/attach.c b/attach.c index 6cbaa6b..e1cd5b6 100644 --- a/attach.c +++ b/attach.c @@ -13,18 +13,20 @@ #endif #include +#include #include +#include #include +#include + #include "mutt.h" -#include "ascii.h" #include "handler.h" #include "recvattach.h" #include "mutt_menu.h" #include "mutt_curses.h" #include "keymap.h" #include "rfc1524.h" -#include "mime.h" #include "pager.h" #include "copy.h" #include "mx.h" @@ -64,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) @@ -97,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)); @@ -112,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))) { @@ -220,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)); @@ -233,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))) { @@ -279,10 +281,10 @@ static int is_mmnoask (const char *buf) int lng; if ((p = getenv ("MM_NOASK")) != NULL && *p) { - if (str_cmp (p, "1") == 0) + 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) { @@ -298,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); } @@ -320,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" : @@ -352,7 +356,7 @@ int mutt_is_autoview (BODY * b, const char *type) if (!type) snprintf (_type, sizeof (_type), "%s/%s", TYPE (b), b->subtype); else - strncpy (_type, type, sizeof (_type)); + m_strcpy(_type, sizeof(_type), type); mutt_check_lookup_list (b, _type, sizeof (_type)); type = _type; @@ -424,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); @@ -435,12 +439,12 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (rfc1524_expand_filename (entry->nametemplate, fname, tempfile, sizeof (tempfile))) { - if (fp == NULL && str_cmp (tempfile, a->filename)) { + if (fp == NULL && m_strcmp(tempfile, a->filename)) { /* send case: the file is already there */ 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; } @@ -449,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 */ @@ -466,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 @@ -554,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); @@ -566,18 +570,18 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (use_pager) { pager_t info; + p_clear(&info, 1); - memset (&info, 0, sizeof (info)); - info.fp = fp; + info.fp = fp; info.bdy = a; info.ctx = Context; info.idx = idx; info.idxlen = idxlen; info.hdr = hdr; - rc = mutt_do_pager (descrip, pagerfile, - M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : - 0), &info); + rc = mutt_do_pager(descrip, pagerfile, + M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0), + &info); *pagerfile = '\0'; } else @@ -616,16 +620,13 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, if (fp) { /* recv case */ - STATE s; - - memset (&s, 0, sizeof (STATE)); + p_clear(&s, 1); if (outfile && *outfile) - thepid = - mutt_create_filter_fd (path, &s.fpout, NULL, NULL, -1, out, -1); + thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1); else - thepid = mutt_create_filter (path, &s.fpout, NULL, NULL); + thepid = mutt_create_filter(path, &s.fpout, NULL, NULL); if (thepid < 0) { mutt_perror (_("Can't create filter")); @@ -754,8 +755,8 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, /* In recv mode, extract from folder and decode */ STATE s; + p_clear(&s, 1); - memset (&s, 0, sizeof (s)); if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) { mutt_perror ("fopen"); return (-1); @@ -808,7 +809,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, BODY *saved_parts = NULL; HEADER *saved_hdr = NULL; - memset (&s, 0, sizeof (s)); + p_clear(&s, 1); s.flags = displaying; if (flags == M_SAVE_APPEND) @@ -909,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; @@ -920,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);