#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 <ctype.h>
#include <stdlib.h>
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);
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)
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;
}
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;
}
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;
}
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)
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));
}
}
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);
}
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) {
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);
}
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)
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)
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;
}
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;
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);
}
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);
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) {
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);