X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=725fa9690c5bfc3fb23658ec8062fdb4d779ea19;hp=ca0682706d7b4070550a4cddf998e722b2e21833;hb=814a01519c9605d479201b99eb16c97b0ad8635d;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/attach.c b/attach.c index ca06827..725fa96 100644 --- a/attach.c +++ b/attach.c @@ -1,20 +1,11 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2000 Michael R. Elkins * Copyright (C) 1999-2000 Thomas Roessler - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ #if HAVE_CONFIG_H @@ -28,11 +19,15 @@ #include "rfc1524.h" #include "mime.h" #include "pager.h" -#include "mailbox.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 #include #include @@ -65,14 +60,14 @@ 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); - mutt_str_replace (&a->filename, tempfile); + str_replace (&a->filename, tempfile); a->unlink = 1; if (a->stamp >= st.st_mtime) mutt_stamp_attachment (a); } else - mutt_perror (fpin ? tempfile : a->filename); + mutt_perror(fpin ? tempfile : a->filename); if (fpin) fclose (fpin); @@ -103,8 +98,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) @@ -134,7 +128,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; } @@ -162,7 +156,7 @@ int mutt_compose_attachment (BODY * a) fseek (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; } @@ -171,7 +165,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; } @@ -225,8 +219,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) @@ -279,7 +272,7 @@ static int is_mmnoask (const char *buf) int lng; if ((p = getenv ("MM_NOASK")) != NULL && *p) { - if (mutt_strcmp (p, "1") == 0) + if (safe_strcmp (p, "1") == 0) return (1); strfcpy (tmp, p, sizeof (tmp)); @@ -297,8 +290,8 @@ static int is_mmnoask (const char *buf) } } else { - lng = mutt_strlen (p); - if (buf[lng] == '/' && mutt_strncasecmp (buf, p, lng) == 0) + lng = safe_strlen (p); + if (buf[lng] == '/' && safe_strncasecmp (buf, p, lng) == 0) return (1); } @@ -315,7 +308,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) int i; for (; t; t = t->next) { - i = mutt_strlen (t->data) - 1; + i = safe_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) { @@ -333,8 +326,7 @@ 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); @@ -367,7 +359,7 @@ int mutt_is_autoview (BODY * b, const char *type) } for (; t; t = t->next) { - i = mutt_strlen (t->data) - 1; + i = safe_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) @@ -436,7 +428,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 && mutt_strcmp (tempfile, a->filename)) { + if (fp == NULL && safe_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) @@ -629,7 +621,7 @@ int mutt_pipe_attachment (FILE * fp, BODY * b, const char *path, 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; } @@ -658,7 +650,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; @@ -897,7 +889,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); @@ -936,7 +928,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); @@ -977,8 +969,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) { @@ -986,17 +977,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);