X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=00df99c9a332944d9edd2e70ca5a6ed50acbc189;hp=ccc0a8d6cab998027a017584f13a7aedace46ebd;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=024fe257a96f97619e236bbdafe57b63101eb17f diff --git a/attach.c b/attach.c index ccc0a8d..00df99c 100644 --- a/attach.c +++ b/attach.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -22,7 +22,7 @@ #include "keymap.h" #include "pager.h" #include "copy.h" -#include +#include "crypt.h" int mutt_get_tmp_attachment (BODY * a) { @@ -52,9 +52,9 @@ int mutt_get_tmp_attachment (BODY * a) if (a->stamp >= st.st_mtime) mutt_stamp_attachment (a); - } - else + } else { mutt_perror(fpin ? tempfile : a->filename); + } m_fclose(&fpin); m_fclose(&fpout); @@ -87,19 +87,18 @@ int mutt_compose_attachment (BODY * a) if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) != M_YES) goto bailout; - } - else + } else { unlink_newfile = 1; - } - else + } + } else { m_strcpy(newfile, sizeof(newfile), a->filename); + } if (rfc1524_expand_command (a, newfile, type, command, sizeof (command))) { /* For now, editing requires a file, no piping */ mutt_error _("Mailcap compose entry requires %%s"); - } - else { + } else { int r; mutt_endwin (NULL); @@ -139,7 +138,7 @@ int mutt_compose_attachment (BODY * a) /* Remove headers by copying out data to another file, then * copying the file back */ fseeko (fp, b->offset, 0); - tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (!tfp) { mutt_perror (_("Failure to open file to strip headers.")); goto bailout; @@ -159,8 +158,7 @@ int mutt_compose_attachment (BODY * a) } } } - } - else { + } else { rfc1524_entry_delete(&entry); mutt_message (_("No mailcap compose entry for %s, creating empty file."), type); @@ -207,20 +205,19 @@ int mutt_edit_attachment (BODY * a) if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) != M_YES) goto bailout; - } - else + } else { unlink_newfile = 1; - } - else + } + } else { m_strcpy(newfile, sizeof(newfile), a->filename); + } if (rfc1524_expand_command (a, newfile, type, command, sizeof (command))) { /* For now, editing requires a file, no piping */ mutt_error _("Mailcap Edit entry requires %%s"); goto bailout; - } - else { + } else { mutt_endwin (NULL); if (mutt_system (command) == -1) { mutt_error (_("Error running \"%s\"!"), command); @@ -231,9 +228,8 @@ int mutt_edit_attachment (BODY * a) } else if (a->type == TYPETEXT) { /* On text, default to editor */ - mutt_edit_file (NONULL (Editor), a->filename); - } - else { + mutt_edit_file(a->filename); + } else { rfc1524_entry_delete(&entry); mutt_error (_("No mailcap edit entry for %s"), type); return 0; @@ -259,7 +255,7 @@ static int is_mmnoask (const char *buf) if ((p = getenv ("MM_NOASK")) != NULL && *p) { if (m_strcmp(p, "1") == 0) - return (1); + return 1; m_strcpy(tmp, sizeof(tmp), p); p = tmp; @@ -268,24 +264,22 @@ static int is_mmnoask (const char *buf) if ((q = strrchr (p, '/')) != NULL) { if (*(q + 1) == '*') { if (ascii_strncasecmp (buf, p, q - p) == 0) - return (1); - } - else { + return 1; + } else { if (ascii_strcasecmp (buf, p) == 0) - return (1); + return 1; } - } - else { + } else { lng = m_strlen(p); if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0) - return (1); + return 1; } p = NULL; } } - return (0); + return 0; } void mutt_check_lookup_list (BODY * b, char *type, int len) @@ -326,11 +320,11 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) int mutt_is_autoview (BODY * b, const char *type) { string_list_t *t = AutoViewList; - char _type[SHORT_STRING]; + char _type[STRING]; int i; if (!type) - snprintf (_type, sizeof (_type), "%s/%s", TYPE (b), b->subtype); + snprintf(_type, sizeof(_type), "%s/%s", TYPE(b), b->subtype); else m_strcpy(_type, sizeof(_type), type); @@ -376,9 +370,6 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, int pagerfd = -1; is_message = mutt_is_message_type(a); - if (is_message && a->hdr && (a->hdr->security & ENCRYPT) && - !crypt_valid_passphrase (a->hdr->security)) - return (rc); use_mailcap = (flag == M_MAILCAP || (flag == M_REGULAR && rfc1524_mailcap_isneeded(a))); snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype); @@ -446,7 +437,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, if (use_pager) { /* recv case */ - pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir), + pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(mod_core.tmpdir), fp && !use_mailcap ? a->filename : NULL); } @@ -513,6 +504,8 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, /* Don't use mailcap; the attachment is viewed in the pager */ if (flag == M_AS_TEXT) { + unlink(pagerfile); + close(pagerfd); /* just let me see the raw data */ if (mutt_save_attachment (fp, a, pagerfile, 0, NULL)) goto return_error; @@ -521,7 +514,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, /* Use built-in handler */ set_option (OPTVIEWATTACH); /* disable the "use 'v' to view this part" * message in case of error */ - if (mutt_decode_save_attachment (fp, a, pagerfile, M_DISPLAY, 0)) { + if (mutt_decode_save_attachment (fp, a, pagerfd, M_DISPLAY)) { unset_option (OPTVIEWATTACH); goto return_error; } @@ -540,19 +533,10 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, /* We only reach this point if there have been no errors */ if (use_pager) { - pager_t info; - p_clear(&info, 1); - - 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); + pager_t info = { Context, hdr, a, fp, idx, idxlen }; + rc = mutt_pager(descrip, pagerfile, + M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0), + &info); *pagerfile = '\0'; } else @@ -574,19 +558,11 @@ return_error: } /* returns 1 on success, 0 on error */ -int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, - char *outfile) +int mutt_pipe_attachment(FILE * fp, BODY * b, const char *path, int out) { pid_t thepid; - int out = -1; int rv = 0; - if (outfile && *outfile) - if ((out = safe_open (outfile, O_CREAT | O_EXCL | O_WRONLY)) < 0) { - mutt_perror ("open"); - return 0; - } - mutt_endwin (NULL); if (fp) { @@ -594,7 +570,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, STATE s; p_clear(&s, 1); - if (outfile && *outfile) + if (out >= 0) thepid = mutt_create_filter_fd(path, &s.fpout, NULL, NULL, -1, out, -1); else thepid = mutt_create_filter(path, &s.fpout, NULL, NULL); @@ -608,25 +584,20 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, s.fpin = fp; mutt_decode_attachment (b, &s); m_fclose(&s.fpout); - } - else { + } else { /* send case */ FILE *ifp, *ofp; if ((ifp = fopen (b->filename, "r")) == NULL) { mutt_perror ("fopen"); - if (outfile && *outfile) { - close (out); - unlink (outfile); - } return 0; } - if (outfile && *outfile) - thepid = mutt_create_filter_fd (path, &ofp, NULL, NULL, -1, out, -1); + if (out >= 0) + thepid = mutt_create_filter_fd(path, &ofp, NULL, NULL, -1, out, -1); else - thepid = mutt_create_filter (path, &ofp, NULL, NULL); + thepid = mutt_create_filter(path, &ofp, NULL, NULL); if (thepid < 0) { mutt_perror (_("Can't create filter")); @@ -644,16 +615,16 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, bail: - if (outfile && *outfile) - close (out); + if (out >= 0) + close(out); /* * check for error exit from child process */ - if (mutt_wait_filter (thepid) != 0) + if (mutt_wait_filter(thepid) != 0) rv = 0; - if (rv == 0 || option (OPTWAITKEY)) + if (rv == 0 || option(OPTWAITKEY)) mutt_any_key_to_continue (NULL); return rv; } @@ -709,7 +680,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, mx_close_mailbox (&ctx, NULL); return -1; } - if (ctx.magic == M_MBOX || ctx.magic == M_MMDF) + if (ctx.magic == M_MBOX) chflags = CH_FROM; chflags |= (ctx.magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE); if (_mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags) == 0 @@ -730,14 +701,14 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } fseeko ((s.fpin = fp), m->offset, 0); mutt_decode_attachment (m, &s); if (m_fclose(&s.fpout) != 0) { mutt_perror ("fclose"); - return (-1); + return -1; } } } else { @@ -747,13 +718,13 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, if ((ofp = fopen (m->filename, "r")) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) { mutt_perror ("fopen"); m_fclose(&ofp); - return (-1); + return -1; } if (mutt_copy_stream (ofp, nfp) == -1) { @@ -761,7 +732,7 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, m_fclose(&ofp); m_fclose(&nfp); - return (-1); + return -1; } m_fclose(&ofp); m_fclose(&nfp); @@ -771,8 +742,8 @@ int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags, } /* returns 0 on success, -1 on error */ -int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, - int displaying, int flags) +int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd, + int displaying) { STATE s; unsigned int saved_encoding = 0; @@ -781,15 +752,12 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, p_clear(&s, 1); s.flags = displaying; - - if (flags == M_SAVE_APPEND) - s.fpout = fopen (path, "a"); - else - s.fpout = safe_fopen (path, "w"); + s.fpout = fdopen (pathfd, "w"); if (s.fpout == NULL) { + close(pathfd); mutt_perror ("fopen"); - return (-1); + return -1; } if (fp == NULL) { @@ -800,12 +768,12 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, if (stat (m->filename, &st) == -1) { mutt_perror ("stat"); m_fclose(&s.fpout); - return (-1); + return -1; } if ((s.fpin = fopen (m->filename, "r")) == NULL) { mutt_perror ("fopen"); - return (-1); + return -1; } saved_encoding = m->encoding; @@ -840,7 +808,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path, m_fclose(&s.fpin); } - return (0); + return 0; } /* Ok, the difference between send and receive: @@ -857,6 +825,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) pid_t thepid; FILE *ifp, *fpout; short unlink_newfile = 0; + int tok; snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype); @@ -898,7 +867,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) if ((ifp = fopen (newfile, "r")) == NULL) { mutt_perror ("fopen"); rfc1524_entry_delete(&entry); - return (0); + return 0; } if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) { @@ -925,25 +894,27 @@ int mutt_print_attachment (FILE * fp, BODY * a) unlink (newfile); rfc1524_entry_delete(&entry); - return (1); + return 1; } - if (!ascii_strcasecmp ("text/plain", type) || - !ascii_strcasecmp ("application/postscript", type)) { - return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), NULL)); + tok = mime_which_token(type, -1); + if (tok == MIME_TEXT_PLAIN || tok == MIME_APPLICATION_POSTSCRIPT) { + return mutt_pipe_attachment(fp, a, NONULL (PrintCmd), -1); } - else if (mutt_can_decode (a)) { + + if (mutt_can_decode (a)) { /* decode and print */ int rc = 0; + int newfile_fd = 0; ifp = NULL; fpout = NULL; - mutt_mktemp (newfile); - if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) { + newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(mod_core.tmpdir), NULL); + if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) { - if ((ifp = fopen (newfile, "r")) == NULL) { + if ((ifp = fopen(newfile, "r")) == NULL) { mutt_perror ("fopen"); goto bail0; } @@ -956,8 +927,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) goto bail0; } - mutt_copy_stream (ifp, fpout); - + mutt_copy_stream(ifp, fpout); m_fclose(&fpout); m_fclose(&ifp); @@ -970,8 +940,7 @@ int mutt_print_attachment (FILE * fp, BODY * a) m_fclose(&fpout); mutt_unlink (newfile); return rc; - } - else { + } else { mutt_error _("I don't know how to print that!"); return 0; @@ -987,7 +956,7 @@ int mutt_attach_check (HEADER* hdr) { if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) || (fp = safe_fopen (hdr->content->filename, "r")) == NULL) - return (0); + return 0; while (!found && fgets (buf, sizeof (buf), fp)) { p = buf; @@ -1002,5 +971,5 @@ int mutt_attach_check (HEADER* hdr) { } m_fclose(&fp); - return (found); + return found; }