# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.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>
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)
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."));
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)
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);
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));
}
}
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);
}
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) {
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);
}
}
}
}
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)
strfcpy (command, entry->command, sizeof (command));
if (fp) {
- fname = safe_strdup (a->filename);
+ fname = m_strdup(a->filename);
mutt_sanitize_filename (fname, 1);
}
else
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)
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;
}
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);
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)
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) {
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);
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 =
goto bail0;
}
- dprint (2, (debugfile, "Filter created.\n"));
+ debug_print (2, ("Filter created.\n"));
mutt_copy_stream (ifp, fpout);
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);
+}
projects / apps / madmutt.git / blobdiff