X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=5480710bfb873ff386112972b685bb4577302d84;hp=b14ee86748a0ed13ba2d3baa4339af8cc9877483;hb=9aae63e2d1cce39bb0928362416a8d17b953ca5e;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3 diff --git a/attach.c b/attach.c index b14ee86..5480710 100644 --- a/attach.c +++ b/attach.c @@ -12,7 +12,14 @@ # include "config.h" #endif +#include +#include +#include +#include + #include "mutt.h" +#include "handler.h" +#include "recvattach.h" #include "mutt_menu.h" #include "mutt_curses.h" #include "keymap.h" @@ -23,9 +30,7 @@ #include "mx.h" #include "mutt_crypt.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" +#include "lib/debug.h" #include #include @@ -66,7 +71,7 @@ int mutt_get_tmp_attachment (BODY * a) mutt_stamp_attachment (a); } else - mutt_perror (fpin ? tempfile : a->filename); + mutt_perror(fpin ? tempfile : a->filename); if (fpin) fclose (fpin); @@ -97,8 +102,7 @@ int mutt_compose_attachment (BODY * a) strfcpy (command, entry->composecommand, sizeof (command)); if (rfc1524_expand_filename (entry->nametemplate, a->filename, newfile, sizeof (newfile))) { - dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n", - a->filename, 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) @@ -128,7 +132,7 @@ int mutt_compose_attachment (BODY * a) char tempfile[_POSIX_PATH_MAX]; if ((fp = safe_fopen (a->filename, "r")) == NULL) { - mutt_perror _("Failure to open file to parse headers."); + mutt_perror (_("Failure to open file to parse headers.")); goto bailout; } @@ -141,22 +145,22 @@ int mutt_compose_attachment (BODY * a) b->parameter = NULL; } if (b->description) { - FREE (&a->description); + p_delete(&a->description); a->description = b->description; b->description = NULL; } if (b->form_name) { - FREE (&a->form_name); + p_delete(&a->form_name); a->form_name = b->form_name; b->form_name = NULL; } /* Remove headers by copying out data to another file, then * copying the file back */ - fseek (fp, b->offset, 0); + fseeko (fp, b->offset, 0); mutt_mktemp (tempfile); if ((tfp = safe_fopen (tempfile, "w")) == NULL) { - mutt_perror _("Failure to open file to strip headers."); + mutt_perror (_("Failure to open file to strip headers.")); goto bailout; } @@ -165,7 +169,7 @@ int mutt_compose_attachment (BODY * a) fclose (tfp); mutt_unlink (a->filename); if (mutt_rename_file (tempfile, a->filename) != 0) { - mutt_perror _("Failure to rename file."); + mutt_perror (_("Failure to rename file.")); goto bailout; } @@ -219,8 +223,7 @@ int mutt_edit_attachment (BODY * a) strfcpy (command, entry->editcommand, sizeof (command)); if (rfc1524_expand_filename (entry->nametemplate, a->filename, newfile, sizeof (newfile))) { - dprint (1, (debugfile, "oldfile: %s\t newfile: %s\n", - a->filename, 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) @@ -236,17 +239,20 @@ int mutt_edit_attachment (BODY * a) command, sizeof (command))) { /* For now, editing requires a file, no piping */ mutt_error _("Mailcap Edit entry requires %%s"); + goto bailout; } else { mutt_endwin (NULL); - if (mutt_system (command) == -1) + if (mutt_system (command) == -1) { mutt_error (_("Error running \"%s\"!"), command); + goto bailout; + } } } } else if (a->type == TYPETEXT) { /* On text, default to editor */ - mutt_edit_file (NONULL (Editor), newfile); + mutt_edit_file (NONULL (Editor), a->filename); } else { rfc1524_free_entry (&entry); @@ -273,7 +279,7 @@ static int is_mmnoask (const char *buf) int lng; if ((p = getenv ("MM_NOASK")) != NULL && *p) { - if (safe_strcmp (p, "1") == 0) + if (str_cmp (p, "1") == 0) return (1); strfcpy (tmp, p, sizeof (tmp)); @@ -291,8 +297,8 @@ static int is_mmnoask (const char *buf) } } else { - lng = safe_strlen (p); - if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0) + lng = m_strlen(p); + if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0) return (1); } @@ -309,7 +315,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) int i; for (; t; t = t->next) { - i = safe_strlen (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) { @@ -327,13 +333,12 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) n == TYPEMULTIPART ? "multipart" : n == TYPETEXT ? "text" : n == TYPEVIDEO ? "video" : "other", tmp.subtype); - dprint (1, (debugfile, "mutt_check_lookup_list: \"%s\" -> %s\n", - b->filename, type)); + debug_print (1, ("\"%s\" -> %s\n", b->filename, type)); } if (tmp.subtype) - FREE (&tmp.subtype); + p_delete(&tmp.subtype); if (tmp.xtype) - FREE (&tmp.xtype); + p_delete(&tmp.xtype); } } } @@ -361,7 +366,7 @@ int mutt_is_autoview (BODY * b, const char *type) } for (; t; t = t->next) { - i = safe_strlen (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) @@ -422,7 +427,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, strfcpy (command, entry->command, sizeof (command)); if (fp) { - fname = safe_strdup (a->filename); + fname = m_strdup(a->filename); mutt_sanitize_filename (fname, 1); } else @@ -430,7 +435,7 @@ 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 && safe_strcmp (tempfile, a->filename)) { + if (fp == NULL && str_cmp (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) @@ -448,7 +453,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (fp) { /* recv case: we need to save the attachment to a file */ - FREE (&fname); + p_delete(&fname); if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1) goto return_error; } @@ -462,7 +467,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (fp && !use_mailcap && a->filename) { /* recv case */ strfcpy (pagerfile, a->filename, sizeof (pagerfile)); - mutt_adv_mktemp (pagerfile, sizeof (pagerfile)); + mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile)); } else mutt_mktemp (pagerfile); @@ -561,18 +566,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 @@ -611,19 +616,16 @@ 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"); + mutt_perror (_("Can't create filter")); goto bail; } @@ -652,7 +654,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, thepid = mutt_create_filter (path, &ofp, NULL, NULL); if (thepid < 0) { - mutt_perror _("Can't create filter"); + mutt_perror (_("Can't create filter")); safe_fclose (&ifp); goto bail; @@ -720,7 +722,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, hn->msgno = hdr->msgno; /* required for MH/maildir */ hn->read = 1; - fseek (fp, m->offset, 0); + fseeko (fp, m->offset, 0); if (fgets (buf, sizeof (buf), fp) == NULL) return -1; if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL) @@ -749,13 +751,13 @@ 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); } - fseek ((s.fpin = fp), m->offset, 0); + fseeko ((s.fpin = fp), m->offset, 0); mutt_decode_attachment (m, &s); if (fclose (s.fpout) != 0) { @@ -803,7 +805,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) @@ -891,7 +893,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) rfc1524_entry *entry; int piped = FALSE; - dprint (2, (debugfile, "Using mailcap...\n")); + debug_print (2, ("Using mailcap...\n")); entry = rfc1524_new_entry (); rfc1524_mailcap_lookup (a, type, entry, M_PRINT); @@ -930,7 +932,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) } if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter"); + mutt_perror (_("Can't create filter")); rfc1524_free_entry (&entry); safe_fclose (&ifp); @@ -971,8 +973,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) mutt_mktemp (newfile); if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) { - dprint (2, - (debugfile, "successfully decoded %s type attachment to %s\n", + debug_print (2, ("successfully decoded %s type attachment to %s\n", type, newfile)); if ((ifp = fopen (newfile, "r")) == NULL) { @@ -980,17 +981,17 @@ int mutt_print_attachment (FILE * fp, BODY * a) goto bail0; } - dprint (2, (debugfile, "successfully opened %s read-only\n", newfile)); + debug_print (2, ("successfully opened %s read-only\n", newfile)); mutt_endwin (NULL); if ((thepid = mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter"); + mutt_perror (_("Can't create filter")); goto bail0; } - dprint (2, (debugfile, "Filter created.\n")); + debug_print (2, ("Filter created.\n")); mutt_copy_stream (ifp, fpout); @@ -1013,3 +1014,30 @@ int mutt_print_attachment (FILE * fp, BODY * a) return 0; } } + +int mutt_attach_check (HEADER* hdr) { + int found = 0; + char buf[LONG_STRING]; + char *p = NULL; + FILE* fp = NULL; + regmatch_t pmatch[1]; + + if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) || + (fp = safe_fopen (hdr->content->filename, "r")) == NULL) + return (0); + + while (!found && fgets (buf, sizeof (buf), fp)) { + p = buf; + while (p && *p) { + if (regexec ((regex_t*) AttachRemindRegexp.rx, p, 1, + pmatch, 0) == 0) { + found = 1; + break; + } + p++; + } + } + fclose (fp); + + return (found); +}