/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
* Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
- *
- * 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.
- */
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+ *
+ * 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.
+ */
+
+#include <lib-lib/lib-lib.h>
+
+#include <lib-sys/unix.h>
+#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
+#include "handler.h"
+#include "recvattach.h"
#include "keymap.h"
-#include "rfc1524.h"
-#include "mime.h"
#include "pager.h"
-#include "mailbox.h"
#include "copy.h"
-#include "mx.h"
-#include "mutt_crypt.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
-int mutt_get_tmp_attachment (BODY *a)
+#include <lib-crypt/crypt.h>
+
+int mutt_get_tmp_attachment (BODY * a)
{
char type[STRING];
char tempfile[_POSIX_PATH_MAX];
- rfc1524_entry *entry = rfc1524_new_entry();
+ rfc1524_entry *entry = rfc1524_entry_new();
FILE *fpin = NULL, *fpout = NULL;
struct stat st;
-
- if(a->unlink)
+
+ if (a->unlink)
return 0;
- snprintf(type, sizeof(type), "%s/%s", TYPE(a), a->subtype);
- rfc1524_mailcap_lookup(a, type, entry, 0);
- rfc1524_expand_filename(entry->nametemplate, a->filename,
- tempfile, sizeof(tempfile));
-
- rfc1524_free_entry(&entry);
+ snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
+ rfc1524_mailcap_lookup (a, type, entry, 0);
+ rfc1524_expand_filename (entry->nametemplate, a->filename,
+ tempfile, sizeof (tempfile));
+
+ rfc1524_entry_delete(&entry);
- if(stat(a->filename, &st) == -1)
+ if (stat (a->filename, &st) == -1)
return -1;
- if((fpin = fopen(a->filename, "r")) && (fpout = safe_fopen(tempfile, "w"))) /* __FOPEN_CHECKED__ */
- {
+ if ((fpin = fopen (a->filename, "r")) && (fpout = safe_fopen (tempfile, "w"))) { /* __FOPEN_CHECKED__ */
mutt_copy_stream (fpin, fpout);
- mutt_str_replace (&a->filename, tempfile);
+ m_strreplace(&a->filename, tempfile);
a->unlink = 1;
- if(a->stamp >= st.st_mtime)
- mutt_stamp_attachment(a);
+ if (a->stamp >= st.st_mtime)
+ mutt_stamp_attachment (a);
}
else
mutt_perror(fpin ? tempfile : a->filename);
-
- if(fpin) fclose(fpin);
- if(fpout) fclose(fpout);
-
+
+ m_fclose(&fpin);
+ m_fclose(&fpout);
+
return a->unlink ? 0 : -1;
}
/* return 1 if require full screen redraw, 0 otherwise */
-int mutt_compose_attachment (BODY *a)
+int mutt_compose_attachment (BODY * a)
{
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
short unlink_newfile = 0;
int rc = 0;
-
+
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
- if (rfc1524_mailcap_lookup (a, type, entry, M_COMPOSE))
- {
- if (entry->composecommand || entry->composetypecommand)
- {
+ if (rfc1524_mailcap_lookup (a, type, entry, M_COMPOSE)) {
+ if (entry->composecommand || entry->composetypecommand) {
if (entry->composetypecommand)
- strfcpy (command, entry->composetypecommand, sizeof (command));
- else
- strfcpy (command, entry->composecommand, sizeof (command));
+ m_strcpy(command, sizeof(command), entry->composetypecommand);
+ else
+ m_strcpy(command, sizeof(command), entry->composecommand);
if (rfc1524_expand_filename (entry->nametemplate,
- a->filename, newfile, sizeof (newfile)))
- {
- dprint(1, (debugfile, "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)
- goto bailout;
- }
- else
- unlink_newfile = 1;
+ a->filename, newfile, sizeof (newfile))) {
+ if (safe_symlink (a->filename, newfile) == -1) {
+ if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
+ != M_YES)
+ goto bailout;
+ }
+ else
+ unlink_newfile = 1;
}
else
- strfcpy(newfile, a->filename, sizeof(newfile));
-
+ 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");
+ command, sizeof (command))) {
+ /* For now, editing requires a file, no piping */
+ mutt_error _("Mailcap compose entry requires %%s");
}
- else
- {
- int r;
-
- mutt_endwin (NULL);
- if ((r = mutt_system (command)) == -1)
- mutt_error (_("Error running \"%s\"!"), command);
-
- if (r != -1 && entry->composetypecommand)
- {
- BODY *b;
- FILE *fp, *tfp;
- char tempfile[_POSIX_PATH_MAX];
-
- if ((fp = safe_fopen (a->filename, "r")) == NULL)
- {
- mutt_perror _("Failure to open file to parse headers.");
- goto bailout;
- }
-
- b = mutt_read_mime_header (fp, 0);
- if (b)
- {
- if (b->parameter)
- {
- mutt_free_parameter (&a->parameter);
- a->parameter = b->parameter;
- b->parameter = NULL;
- }
- if (b->description) {
- FREE (&a->description);
- a->description = b->description;
- b->description = NULL;
- }
- if (b->form_name)
- {
- FREE (&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);
- mutt_mktemp (tempfile);
- if ((tfp = safe_fopen (tempfile, "w")) == NULL)
- {
- mutt_perror _("Failure to open file to strip headers.");
- goto bailout;
- }
- mutt_copy_stream (fp, tfp);
- fclose (fp);
- fclose (tfp);
- mutt_unlink (a->filename);
- if (mutt_rename_file (tempfile, a->filename) != 0)
- {
- mutt_perror _("Failure to rename file.");
- goto bailout;
- }
-
- mutt_free_body (&b);
- }
- }
+ else {
+ int r;
+
+ mutt_endwin (NULL);
+ if ((r = mutt_system (command)) == -1)
+ mutt_error (_("Error running \"%s\"!"), command);
+
+ if (r != -1 && entry->composetypecommand) {
+ BODY *b;
+ FILE *fp, *tfp;
+
+ if ((fp = safe_fopen (a->filename, "r")) == NULL) {
+ mutt_perror (_("Failure to open file to parse headers."));
+
+ goto bailout;
+ }
+
+ b = mutt_read_mime_header (fp, 0);
+ if (b) {
+ char tempfile[_POSIX_PATH_MAX];
+
+ if (b->parameter) {
+ parameter_list_wipe(&a->parameter);
+ a->parameter = b->parameter;
+ b->parameter = NULL;
+ }
+ if (b->description) {
+ p_delete(&a->description);
+ a->description = b->description;
+ b->description = NULL;
+ }
+ if (b->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 */
+ fseeko (fp, b->offset, 0);
+ tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!tfp) {
+ mutt_perror (_("Failure to open file to strip headers."));
+ goto bailout;
+ }
+ mutt_copy_stream (fp, tfp);
+ m_fclose(&fp);
+ m_fclose(&tfp);
+ mutt_unlink (a->filename);
+ if (mutt_rename_file (tempfile, a->filename) != 0) {
+ mutt_perror (_("Failure to rename file."));
+
+ goto bailout;
+ }
+
+ body_list_wipe(&b);
+ }
+ }
}
}
}
- else
- {
- rfc1524_free_entry (&entry);
+ else {
+ rfc1524_entry_delete(&entry);
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
- type);
+ type);
return 1;
}
rc = 1;
-
- bailout:
-
- if(unlink_newfile)
- unlink(newfile);
- rfc1524_free_entry (&entry);
+bailout:
+
+ if (unlink_newfile)
+ unlink (newfile);
+
+ rfc1524_entry_delete(&entry);
return rc;
}
* Returns 1 if editor found, 0 if not (useful to tell calling menu to
* redraw)
*/
-int mutt_edit_attachment (BODY *a)
+int mutt_edit_attachment (BODY * a)
{
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
- rfc1524_entry *entry = rfc1524_new_entry ();
+ rfc1524_entry *entry = rfc1524_entry_new();
short unlink_newfile = 0;
int rc = 0;
-
+
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
- if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT))
- {
- if (entry->editcommand)
- {
+ if (rfc1524_mailcap_lookup (a, type, entry, M_EDIT)) {
+ if (entry->editcommand) {
- strfcpy (command, entry->editcommand, sizeof (command));
+ m_strcpy(command, sizeof(command), entry->editcommand);
if (rfc1524_expand_filename (entry->nametemplate,
- a->filename, newfile, sizeof (newfile)))
- {
- dprint(1, (debugfile, "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)
- goto bailout;
- }
- else
- unlink_newfile = 1;
+ a->filename, newfile, sizeof (newfile))) {
+ if (safe_symlink (a->filename, newfile) == -1) {
+ if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
+ != M_YES)
+ goto bailout;
+ }
+ else
+ unlink_newfile = 1;
}
else
- strfcpy(newfile, a->filename, sizeof(newfile));
+ 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");
+ 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)
- mutt_error (_("Error running \"%s\"!"), command);
+ else {
+ mutt_endwin (NULL);
+ if (mutt_system (command) == -1) {
+ mutt_error (_("Error running \"%s\"!"), command);
+ goto bailout;
+ }
}
}
}
- else if (a->type == TYPETEXT)
- {
+ 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);
- mutt_error (_("No mailcap edit entry for %s"),type);
+ else {
+ rfc1524_entry_delete(&entry);
+ mutt_error (_("No mailcap edit entry for %s"), type);
return 0;
}
rc = 1;
-
- bailout:
-
- if(unlink_newfile)
- unlink(newfile);
-
- rfc1524_free_entry (&entry);
+
+bailout:
+
+ if (unlink_newfile)
+ unlink (newfile);
+
+ rfc1524_entry_delete(&entry);
return rc;
}
char tmp[LONG_STRING], *p, *q;
int lng;
- if ((p = getenv ("MM_NOASK")) != NULL && *p)
- {
- if (mutt_strcmp (p, "1") == 0)
+ if ((p = getenv ("MM_NOASK")) != NULL && *p) {
+ if (m_strcmp(p, "1") == 0)
return (1);
- strfcpy (tmp, p, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
p = tmp;
- while ((p = strtok (p, ",")) != NULL)
- {
- if ((q = strrchr (p, '/')) != NULL)
- {
- if (*(q+1) == '*')
- {
- if (ascii_strncasecmp (buf, p, q-p) == 0)
- return (1);
- }
- else
- {
- if (ascii_strcasecmp (buf, p) == 0)
- return (1);
- }
+ while ((p = strtok (p, ",")) != NULL) {
+ if ((q = strrchr (p, '/')) != NULL) {
+ if (*(q + 1) == '*') {
+ if (ascii_strncasecmp (buf, p, q - p) == 0)
+ return (1);
+ }
+ else {
+ if (ascii_strcasecmp (buf, p) == 0)
+ return (1);
+ }
}
- else
- {
- lng = mutt_strlen (p);
- if (buf[lng] == '/' && mutt_strncasecmp (buf, p, lng) == 0)
- return (1);
+ else {
+ lng = m_strlen(p);
+ if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
+ return (1);
}
p = NULL;
return (0);
}
-void mutt_check_lookup_list (BODY *b, char *type, int len)
+void mutt_check_lookup_list (BODY * b, char *type, int len)
{
- LIST *t = MimeLookupList;
+ string_list_t *t = MimeLookupList;
int i;
for (; t; t = t->next) {
- i = mutt_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) {
-
- BODY tmp = {0};
- int n;
- if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
- snprintf (type, len, "%s/%s",
- n == TYPEAUDIO ? "audio" :
- n == TYPEAPPLICATION ? "application" :
- n == TYPEIMAGE ? "image" :
- n == TYPEMESSAGE ? "message" :
- n == TYPEMODEL ? "model" :
- 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));
- }
- if (tmp.subtype)
- FREE (&tmp.subtype);
- if (tmp.xtype)
- FREE (&tmp.xtype);
+ 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) {
+
+ BODY tmp;
+ int n;
+
+ p_clear(&tmp, 1);
+
+ if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
+ snprintf (type, len, "%s/%s",
+ n == TYPEAUDIO ? "audio" :
+ n == TYPEAPPLICATION ? "application" :
+ n == TYPEIMAGE ? "image" :
+ n == TYPEMESSAGE ? "message" :
+ n == TYPEMODEL ? "model" :
+ n == TYPEMULTIPART ? "multipart" :
+ n == TYPETEXT ? "text" :
+ n == TYPEVIDEO ? "video" : "other", tmp.subtype);
+ }
+ if (tmp.subtype)
+ p_delete(&tmp.subtype);
+ if (tmp.xtype)
+ p_delete(&tmp.xtype);
}
}
}
-int mutt_is_autoview (BODY *b, const char *type)
+int mutt_is_autoview (BODY * b, const char *type)
{
- LIST *t = AutoViewList;
+ string_list_t *t = AutoViewList;
char _type[SHORT_STRING];
int i;
if (!type)
snprintf (_type, sizeof (_type), "%s/%s", TYPE (b), b->subtype);
else
- strncpy (_type, type, sizeof(_type));
+ m_strcpy(_type, sizeof(_type), type);
- mutt_check_lookup_list (b, _type, sizeof(_type));
+ mutt_check_lookup_list (b, _type, sizeof (_type));
type = _type;
- if (mutt_needs_mailcap (b))
- {
+ if (rfc1524_mailcap_isneeded(b)) {
if (option (OPTIMPLICITAUTOVIEW))
return 1;
-
+
if (is_mmnoask (type))
return 1;
}
for (; t; t = t->next) {
- i = mutt_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)
+ 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)
return 1;
}
}
/* returns -1 on error, 0 or the return code from mutt_do_pager() on success */
-int mutt_view_attachment (FILE *fp, BODY *a, int flag, HEADER *hdr,
- ATTACHPTR **idx, short idxlen)
+int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
+ ATTACHPTR ** idx, short idxlen)
{
char tempfile[_POSIX_PATH_MAX] = "";
char pagerfile[_POSIX_PATH_MAX] = "";
rfc1524_entry *entry = NULL;
int rc = -1;
int unlink_tempfile = 0;
-
- is_message = mutt_is_message_type(a->type, a->subtype);
- if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
- !crypt_valid_passphrase(a->hdr->security))
+
+ is_message = mutt_is_message_type (a->type, a->subtype);
+ 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 && mutt_needs_mailcap (a)));
+ (flag == M_REGULAR && rfc1524_mailcap_isneeded(a)));
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
-
- if (use_mailcap)
- {
- entry = rfc1524_new_entry ();
- if (!rfc1524_mailcap_lookup (a, type, entry, 0))
- {
- if (flag == M_REGULAR)
- {
- /* fallback to view as text */
- rfc1524_free_entry (&entry);
- mutt_error _("No matching mailcap entry found. Viewing as text.");
- flag = M_AS_TEXT;
- use_mailcap = 0;
+
+ if (use_mailcap) {
+ entry = rfc1524_entry_new();
+ if (!rfc1524_mailcap_lookup (a, type, entry, 0)) {
+ if (flag == M_REGULAR) {
+ /* fallback to view as text */
+ rfc1524_entry_delete(&entry);
+ mutt_error _("No matching mailcap entry found. Viewing as text.");
+
+ flag = M_AS_TEXT;
+ use_mailcap = 0;
}
else
- goto return_error;
+ goto return_error;
}
}
-
- if (use_mailcap)
- {
- if (!entry->command)
- {
+
+ if (use_mailcap) {
+ if (!entry->command) {
mutt_error _("MIME type not defined. Cannot view attachment.");
+
goto return_error;
}
- strfcpy (command, entry->command, sizeof (command));
-
- if (fp)
- {
- fname = safe_strdup (a->filename);
+ m_strcpy(command, sizeof(command), entry->command);
+
+ if (fp) {
+ fname = m_strdup(a->filename);
mutt_sanitize_filename (fname, 1);
}
else
fname = a->filename;
if (rfc1524_expand_filename (entry->nametemplate, fname,
- tempfile, sizeof (tempfile)))
- {
- if (fp == NULL && mutt_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) == M_YES)
- strfcpy (tempfile, a->filename, sizeof (tempfile));
- else
- goto return_error;
- }
- else
- unlink_tempfile = 1;
+ tempfile, sizeof (tempfile))) {
+ if (fp == NULL && m_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)
+ == M_YES)
+ m_strcpy(tempfile, sizeof(tempfile), a->filename);
+ else
+ goto return_error;
+ }
+ else
+ unlink_tempfile = 1;
}
}
- else if (fp == NULL) /* send case */
- strfcpy (tempfile, a->filename, sizeof (tempfile));
-
- if (fp)
- {
+ else if (fp == NULL) /* send case */
+ m_strcpy(tempfile, sizeof(tempfile), a->filename);
+
+ 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;
+ goto return_error;
}
use_pipe = rfc1524_expand_command (a, tempfile, type,
- command, sizeof (command));
+ command, sizeof (command));
use_pager = entry->copiousoutput;
}
-
- if (use_pager)
- {
- if (fp && !use_mailcap && a->filename)
- {
+
+ if (use_pager) {
+ if (fp && !use_mailcap && a->filename) {
/* recv case */
- strfcpy (pagerfile, a->filename, sizeof (pagerfile));
- mutt_adv_mktemp (pagerfile, sizeof(pagerfile));
- }
- else
+ m_strcpy(pagerfile, sizeof(pagerfile), a->filename);
+ mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
+ } else {
mutt_mktemp (pagerfile);
+ }
}
-
- if (use_mailcap)
- {
+
+ if (use_mailcap) {
pid_t thepid = 0;
int tempfd = -1, pagerfd = -1;
-
+
if (!use_pager)
mutt_endwin (NULL);
- if (use_pager || use_pipe)
- {
- if (use_pager && ((pagerfd = safe_open (pagerfile, O_CREAT | O_EXCL | O_WRONLY)) == -1))
- {
- mutt_perror ("open");
- goto return_error;
+ if (use_pager || use_pipe) {
+ if (use_pager
+ && ((pagerfd = safe_open (pagerfile, O_CREAT | O_EXCL | O_WRONLY))
+ == -1)) {
+ mutt_perror ("open");
+ goto return_error;
}
- if (use_pipe && ((tempfd = open (tempfile, 0)) == -1))
- {
- if(pagerfd != -1)
- close(pagerfd);
- mutt_perror ("open");
- goto return_error;
+ if (use_pipe && ((tempfd = open (tempfile, 0)) == -1)) {
+ if (pagerfd != -1)
+ close (pagerfd);
+ mutt_perror ("open");
+ goto return_error;
}
if ((thepid = mutt_create_filter_fd (command, NULL, NULL, NULL,
- use_pipe ? tempfd : -1, use_pager ? pagerfd : -1, -1)) == -1)
- {
- if(pagerfd != -1)
- close(pagerfd);
-
- if(tempfd != -1)
- close(tempfd);
-
- mutt_error _("Cannot create filter");
- goto return_error;
+ use_pipe ? tempfd : -1,
+ use_pager ? pagerfd : -1,
+ -1)) == -1) {
+ if (pagerfd != -1)
+ close (pagerfd);
+
+ if (tempfd != -1)
+ close (tempfd);
+
+ mutt_error _("Cannot create filter");
+
+ goto return_error;
}
- if (use_pager)
- {
- if (a->description)
- snprintf (descrip, sizeof (descrip),
- "---Command: %-20.20s Description: %s",
- command, a->description);
- else
- snprintf (descrip, sizeof (descrip),
- "---Command: %-30.30s Attachment: %s", command, type);
+ if (use_pager) {
+ if (a->description)
+ snprintf (descrip, sizeof (descrip),
+ "---Command: %-20.20s Description: %s",
+ command, a->description);
+ else
+ snprintf (descrip, sizeof (descrip),
+ "---Command: %-30.30s Attachment: %s", command, type);
}
if ((mutt_wait_filter (thepid) || (entry->needsterminal &&
- option (OPTWAITKEY))) && !use_pager)
- mutt_any_key_to_continue (NULL);
-
- close(tempfd);
- close(pagerfd);
-
+ option (OPTWAITKEY))) && !use_pager)
+ mutt_any_key_to_continue (NULL);
+
+ close (tempfd);
+ close (pagerfd);
+
}
- else
- {
+ else {
/* interactive command */
if (mutt_system (command) ||
- (entry->needsterminal && option (OPTWAITKEY)))
- mutt_any_key_to_continue (NULL);
+ (entry->needsterminal && option (OPTWAITKEY)))
+ mutt_any_key_to_continue (NULL);
}
}
- else
- {
+ else {
/* Don't use mailcap; the attachment is viewed in the pager */
- if (flag == M_AS_TEXT)
- {
+ if (flag == M_AS_TEXT) {
/* just let me see the raw data */
if (mutt_save_attachment (fp, a, pagerfile, 0, NULL))
- goto return_error;
+ goto return_error;
}
- else
- {
+ else {
/* 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))
- {
- unset_option (OPTVIEWATTACH);
- goto return_error;
+ 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)) {
+ unset_option (OPTVIEWATTACH);
+ goto return_error;
}
unset_option (OPTVIEWATTACH);
}
-
+
if (a->description)
- strfcpy (descrip, a->description, sizeof (descrip));
+ m_strcpy(descrip, sizeof(descrip), a->description);
else if (a->filename)
snprintf (descrip, sizeof (descrip), "---Attachment: %s : %s",
- a->filename, type);
+ a->filename, type);
else
snprintf (descrip, sizeof (descrip), "---Attachment: %s", type);
}
-
+
/* We only reach this point if there have been no errors */
- if (use_pager)
- {
+ if (use_pager) {
pager_t info;
-
- memset (&info, 0, sizeof (info));
- info.fp = fp;
+ 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);
+ rc = mutt_do_pager(descrip, pagerfile,
+ M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0),
+ &info);
*pagerfile = '\0';
}
else
rc = 0;
- return_error:
-
+return_error:
+
if (entry)
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
if (fp && tempfile[0])
mutt_unlink (tempfile);
else if (unlink_tempfile)
- unlink(tempfile);
+ unlink (tempfile);
if (pagerfile[0])
mutt_unlink (pagerfile);
}
/* 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,
+ char *outfile)
{
pid_t thepid;
int out = -1;
int rv = 0;
-
+
if (outfile && *outfile)
- if ((out = safe_open (outfile, O_CREAT | O_EXCL | O_WRONLY)) < 0)
- {
+ if ((out = safe_open (outfile, O_CREAT | O_EXCL | O_WRONLY)) < 0) {
mutt_perror ("open");
return 0;
}
mutt_endwin (NULL);
- if (fp)
- {
+ 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"));
- if (thepid < 0)
- {
- mutt_perror _("Can't create filter");
goto bail;
}
-
+
s.fpin = fp;
mutt_decode_attachment (b, &s);
- safe_fclose (&s.fpout);
+ m_fclose(&s.fpout);
}
- else
- {
+ else {
/* send case */
FILE *ifp, *ofp;
- if ((ifp = fopen (b->filename, "r")) == NULL)
- {
+ if ((ifp = fopen (b->filename, "r")) == NULL) {
mutt_perror ("fopen");
- if (outfile && *outfile)
- {
- close (out);
- unlink (outfile);
+ if (outfile && *outfile) {
+ close (out);
+ unlink (outfile);
}
return 0;
}
else
thepid = mutt_create_filter (path, &ofp, NULL, NULL);
- if (thepid < 0)
- {
- mutt_perror _("Can't create filter");
- safe_fclose (&ifp);
+ if (thepid < 0) {
+ mutt_perror (_("Can't create filter"));
+
+ m_fclose(&ifp);
goto bail;
}
-
+
mutt_copy_stream (ifp, ofp);
- safe_fclose (&ofp);
- safe_fclose (&ifp);
+ m_fclose(&ofp);
+ m_fclose(&ifp);
}
rv = 1;
-
+
bail:
-
+
if (outfile && *outfile)
close (out);
return rv;
}
-static FILE *
-mutt_save_attachment_open (char *path, int flags)
+static FILE *mutt_save_attachment_open (char *path, int flags)
{
if (flags == M_SAVE_APPEND)
return fopen (path, "a");
- /* be sure not to change the following fopen to safe_fopen
- * as safe_fopen returns w/ an error if path exists
- */
+ /* be sure not to change the following fopen to safe_fopen
+ * as safe_fopen returns w/ an error if path exists
+ */
if (flags == M_SAVE_OVERWRITE)
- return fopen (path, "w"); /* __FOPEN_CHECKED__ */
-
+ return fopen (path, "w"); /* __FOPEN_CHECKED__ */
+
return safe_fopen (path, "w");
}
/* returns 0 on success, -1 on error */
-int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
+int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
+ HEADER * hdr)
{
- if (fp)
- {
-
+ if (fp) {
+
/* recv mode */
- if(hdr &&
- m->hdr &&
- m->encoding != ENCBASE64 &&
- m->encoding != ENCQUOTEDPRINTABLE &&
- mutt_is_message_type(m->type, m->subtype))
- {
+ if (hdr &&
+ m->hdr &&
+ m->encoding != ENCBASE64 &&
+ m->encoding != ENCQUOTEDPRINTABLE &&
+ mutt_is_message_type (m->type, m->subtype)) {
/* message type attachments are written to mail folders. */
char buf[HUGE_STRING];
MESSAGE *msg;
int chflags = 0;
int r = -1;
-
+
hn = m->hdr;
- hn->msgno = hdr->msgno; /* required for MH/maildir */
+ 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)
- return -1;
- if ((msg = mx_open_new_message (&ctx, hn, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
- {
- mx_close_mailbox(&ctx, NULL);
- return -1;
+ return -1;
+ if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
+ return -1;
+ if ((msg =
+ mx_open_new_message (&ctx, hn,
+ is_from (buf, NULL, 0,
+ NULL) ? 0 : M_ADD_FROM)) == NULL) {
+ mx_close_mailbox (&ctx, NULL);
+ return -1;
}
if (ctx.magic == M_MBOX || ctx.magic == M_MMDF)
- chflags = CH_FROM;
+ 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
- && mx_commit_message (msg, &ctx) == 0)
- r = 0;
+ if (_mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags) == 0
+ && mx_commit_message (msg, &ctx) == 0)
+ r = 0;
else
- r = -1;
+ r = -1;
mx_close_message (&msg);
mx_close_mailbox (&ctx, NULL);
return r;
}
- else
- {
+ else {
/* In recv mode, extract from folder and decode */
-
+
STATE s;
-
- memset (&s, 0, sizeof (s));
- if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL)
- {
- mutt_perror ("fopen");
- return (-1);
+ p_clear(&s, 1);
+
+ 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)
- {
- mutt_perror ("fclose");
- return (-1);
+
+ if (m_fclose(&s.fpout) != 0) {
+ mutt_perror ("fclose");
+ return (-1);
}
}
- }
- else
- {
+ } else {
/* In send mode, just copy file */
FILE *ofp, *nfp;
- if ((ofp = fopen (m->filename, "r")) == NULL)
- {
+ if ((ofp = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
return (-1);
}
-
- if ((nfp = mutt_save_attachment_open (path, flags)) == NULL)
- {
+
+ if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
- safe_fclose (&ofp);
+ m_fclose(&ofp);
return (-1);
}
- if (mutt_copy_stream (ofp, nfp) == -1)
- {
+ if (mutt_copy_stream (ofp, nfp) == -1) {
mutt_error _("Write fault!");
- safe_fclose (&ofp);
- safe_fclose (&nfp);
+
+ m_fclose(&ofp);
+ m_fclose(&nfp);
return (-1);
}
- safe_fclose (&ofp);
- safe_fclose (&nfp);
+ m_fclose(&ofp);
+ m_fclose(&nfp);
}
return 0;
}
/* 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, char *path,
+ int displaying, int flags)
{
STATE s;
unsigned int saved_encoding = 0;
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)
s.fpout = fopen (path, "a");
else if (flags == M_SAVE_OVERWRITE)
- s.fpout = safe_fopen (path, "w"); /* __FOPEN_CHECKED__ */
+ s.fpout = safe_fopen (path, "w"); /* __FOPEN_CHECKED__ */
else
s.fpout = safe_fopen (path, "w");
- if (s.fpout == NULL)
- {
+ if (s.fpout == NULL) {
mutt_perror ("fopen");
return (-1);
}
- if (fp == NULL)
- {
+ if (fp == NULL) {
/* When called from the compose menu, the attachment isn't parsed,
* so we need to do it here. */
struct stat st;
- if (stat (m->filename, &st) == -1)
- {
+ if (stat (m->filename, &st) == -1) {
mutt_perror ("stat");
- fclose (s.fpout);
+ m_fclose(&s.fpout);
return (-1);
}
- if ((s.fpin = fopen (m->filename, "r")) == NULL)
- {
+ if ((s.fpin = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
return (-1);
}
saved_encoding = m->encoding;
if (!is_multipart (m))
m->encoding = ENC8BIT;
-
+
m->length = st.st_size;
m->offset = 0;
saved_parts = m->parts;
if (m->noconv || is_multipart (m))
s.flags |= M_CHARCONV;
}
- else
- {
+ else {
s.fpin = fp;
s.flags |= M_CHARCONV;
}
mutt_body_handler (m, &s);
- fclose (s.fpout);
- if (fp == NULL)
- {
+ m_fclose(&s.fpout);
+ if (fp == NULL) {
m->length = 0;
m->encoding = saved_encoding;
- if (saved_parts)
- {
- mutt_free_header (&m->hdr);
+ if (saved_parts) {
+ header_delete(&m->hdr);
m->parts = saved_parts;
m->hdr = saved_hdr;
}
- fclose (s.fpin);
+ m_fclose(&s.fpin);
}
return (0);
* attachment
*/
-int mutt_print_attachment (FILE *fp, BODY *a)
+int mutt_print_attachment (FILE * fp, BODY * a)
{
char newfile[_POSIX_PATH_MAX] = "";
char type[STRING];
pid_t thepid;
FILE *ifp, *fpout;
short unlink_newfile = 0;
-
+
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
- if (rfc1524_mailcap_lookup (a, type, NULL, M_PRINT))
- {
- char command[_POSIX_PATH_MAX+STRING];
+ if (rfc1524_mailcap_lookup (a, type, NULL, M_PRINT)) {
+ char command[_POSIX_PATH_MAX + STRING];
rfc1524_entry *entry;
int piped = FALSE;
- dprint (2, (debugfile, "Using mailcap...\n"));
-
- entry = rfc1524_new_entry ();
+ entry = rfc1524_entry_new();
rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
if (rfc1524_expand_filename (entry->nametemplate, a->filename,
- newfile, sizeof (newfile)))
- {
- if (!fp)
- {
- if (safe_symlink(a->filename, newfile) == -1)
- {
- if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) != M_YES)
- {
- rfc1524_free_entry (&entry);
- return 0;
- }
- strfcpy (newfile, a->filename, sizeof (newfile));
- }
- else
- unlink_newfile = 1;
+ newfile, sizeof (newfile))) {
+ if (!fp) {
+ if (safe_symlink (a->filename, newfile) == -1) {
+ if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
+ != M_YES) {
+ rfc1524_entry_delete(&entry);
+ return 0;
+ }
+ m_strcpy(newfile, sizeof(newfile), a->filename);
+ }
+ else
+ unlink_newfile = 1;
}
}
if (fp)
mutt_save_attachment (fp, a, newfile, 0, NULL);
- strfcpy (command, entry->printcommand, sizeof (command));
- piped = rfc1524_expand_command (a, newfile, type, command, sizeof (command));
+ m_strcpy(command, sizeof(command), entry->printcommand);
+ piped = rfc1524_expand_command(a, newfile, type, command,
+ sizeof(command));
mutt_endwin (NULL);
/* interactive program */
- if (piped)
- {
- if ((ifp = fopen (newfile, "r")) == NULL)
- {
- mutt_perror ("fopen");
- rfc1524_free_entry (&entry);
- return (0);
+ if (piped) {
+ if ((ifp = fopen (newfile, "r")) == NULL) {
+ mutt_perror ("fopen");
+ rfc1524_entry_delete(&entry);
+ return (0);
}
- if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0)
- {
- mutt_perror _("Can't create filter");
- rfc1524_free_entry (&entry);
- safe_fclose (&ifp);
- return 0;
+ if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
+ mutt_perror (_("Can't create filter"));
+
+ rfc1524_entry_delete(&entry);
+ m_fclose(&ifp);
+ return 0;
}
mutt_copy_stream (ifp, fpout);
- safe_fclose (&fpout);
- safe_fclose (&ifp);
+ m_fclose(&fpout);
+ m_fclose(&ifp);
if (mutt_wait_filter (thepid) || option (OPTWAITKEY))
- mutt_any_key_to_continue (NULL);
+ mutt_any_key_to_continue (NULL);
}
- else
- {
+ else {
if (mutt_system (command) || option (OPTWAITKEY))
- mutt_any_key_to_continue (NULL);
+ mutt_any_key_to_continue (NULL);
}
if (fp)
mutt_unlink (newfile);
else if (unlink_newfile)
- unlink(newfile);
+ unlink (newfile);
- rfc1524_free_entry (&entry);
+ rfc1524_entry_delete(&entry);
return (1);
}
if (!ascii_strcasecmp ("text/plain", type) ||
- !ascii_strcasecmp ("application/postscript", type))
- {
- return (mutt_pipe_attachment (fp, a, NONULL(PrintCmd), NULL));
+ !ascii_strcasecmp ("application/postscript", type)) {
+ return (mutt_pipe_attachment (fp, a, NONULL (PrintCmd), NULL));
}
- else if (mutt_can_decode (a))
- {
+ else if (mutt_can_decode (a)) {
/* decode and print */
int rc = 0;
-
+
ifp = NULL;
fpout = NULL;
-
+
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",
- type, newfile));
-
- if ((ifp = fopen (newfile, "r")) == NULL)
- {
- mutt_perror ("fopen");
- goto bail0;
+ if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
+
+ if ((ifp = fopen (newfile, "r")) == NULL) {
+ mutt_perror ("fopen");
+ goto bail0;
}
- dprint (2, (debugfile, "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");
- goto bail0;
+ if ((thepid =
+ mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {
+ mutt_perror (_("Can't create filter"));
+
+ goto bail0;
}
- dprint (2, (debugfile, "Filter created.\n"));
-
mutt_copy_stream (ifp, fpout);
- safe_fclose (&fpout);
- safe_fclose (&ifp);
+ m_fclose(&fpout);
+ m_fclose(&ifp);
if (mutt_wait_filter (thepid) != 0 || option (OPTWAITKEY))
- mutt_any_key_to_continue (NULL);
+ mutt_any_key_to_continue (NULL);
rc = 1;
}
bail0:
- safe_fclose (&ifp);
- safe_fclose (&fpout);
+ m_fclose(&ifp);
+ m_fclose(&fpout);
mutt_unlink (newfile);
return rc;
}
- else
- {
+ else {
mutt_error _("I don't know how to print that!");
+
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++;
+ }
+ }
+ m_fclose(&fp);
+
+ return (found);
+}
projects / apps / madmutt.git / blobdiff