X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=e1cd5b6b29d0603f82c275c8c036fe2025f39613;hp=913dbb7522fbf280c5f19936d3249acfa206c675;hb=dc35ba82dbe9ba8cb27e623949dcd4b91930d3c5;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372 diff --git a/attach.c b/attach.c index 913dbb7..e1cd5b6 100644 --- a/attach.c +++ b/attach.c @@ -12,23 +12,26 @@ # include "config.h" #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" #include "mutt_crypt.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" #include "lib/debug.h" #include @@ -63,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) @@ -96,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)); @@ -111,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))) { @@ -144,12 +147,12 @@ int mutt_compose_attachment (BODY * a) b->parameter = NULL; } if (b->description) { - mem_free (&a->description); + p_delete(&a->description); a->description = b->description; b->description = NULL; } if (b->form_name) { - mem_free (&a->form_name); + p_delete(&a->form_name); a->form_name = b->form_name; b->form_name = NULL; } @@ -219,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)); @@ -232,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))) { @@ -278,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) { @@ -296,8 +299,8 @@ static int is_mmnoask (const char *buf) } } else { - lng = str_len (p); - if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0) + lng = m_strlen(p); + if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0) return (1); } @@ -314,14 +317,16 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) int i; for (; t; t = t->next) { - i = str_len (t->data) - 1; + i = m_strlen(t->data) - 1; if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' && 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" : @@ -335,9 +340,9 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) debug_print (1, ("\"%s\" -> %s\n", b->filename, type)); } if (tmp.subtype) - mem_free (&tmp.subtype); + p_delete(&tmp.subtype); if (tmp.xtype) - mem_free (&tmp.xtype); + p_delete(&tmp.xtype); } } } @@ -351,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; @@ -365,7 +370,7 @@ int mutt_is_autoview (BODY * b, const char *type) } for (; t; t = t->next) { - i = str_len (t->data) - 1; + i = m_strlen(t->data) - 1; if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' && ascii_strncasecmp (type, t->data, i) == 0) || ascii_strcasecmp (type, t->data) == 0) @@ -423,10 +428,10 @@ 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 = str_dup (a->filename); + fname = m_strdup(a->filename); mutt_sanitize_filename (fname, 1); } else @@ -434,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; } @@ -448,11 +453,11 @@ 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 */ - mem_free (&fname); + p_delete(&fname); if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1) goto return_error; } @@ -465,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 @@ -553,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); @@ -565,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 @@ -615,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")); @@ -753,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); @@ -807,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) @@ -908,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; @@ -919,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);