projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
67f2aa4
..
a66665c
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-21,12
+21,9
@@
#include <string.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
+
+#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-37,7
+34,6
@@
#include "handler.h"
#include "recvattach.h"
#include "keymap.h"
#include "handler.h"
#include "recvattach.h"
#include "keymap.h"
-#include "rfc1524.h"
#include "pager.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#include "copy.h"
#include "mx.h"
@@
-47,7
+43,7
@@
int mutt_get_tmp_attachment (BODY * a)
{
char type[STRING];
char tempfile[_POSIX_PATH_MAX];
{
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;
FILE *fpin = NULL, *fpout = NULL;
struct stat st;
@@
-59,7
+55,7
@@
int mutt_get_tmp_attachment (BODY * a)
rfc1524_expand_filename (entry->nametemplate, a->filename,
tempfile, sizeof (tempfile));
rfc1524_expand_filename (entry->nametemplate, a->filename,
tempfile, sizeof (tempfile));
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
if (stat (a->filename, &st) == -1)
return -1;
if (stat (a->filename, &st) == -1)
return -1;
@@
-90,7
+86,7
@@
int mutt_compose_attachment (BODY * a)
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
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;
short unlink_newfile = 0;
int rc = 0;
@@
-104,7
+100,6
@@
int mutt_compose_attachment (BODY * a)
m_strcpy(command, sizeof(command), entry->composecommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (newfile))) {
m_strcpy(command, sizeof(command), entry->composecommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (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)
if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
@@
-142,7
+137,7
@@
int mutt_compose_attachment (BODY * a)
b = mutt_read_mime_header (fp, 0);
if (b) {
if (b->parameter) {
b = mutt_read_mime_header (fp, 0);
if (b) {
if (b->parameter) {
- parameter_
delet
e(&a->parameter);
+ parameter_
list_wip
e(&a->parameter);
a->parameter = b->parameter;
b->parameter = NULL;
}
a->parameter = b->parameter;
b->parameter = NULL;
}
@@
-176,14
+171,14
@@
int mutt_compose_attachment (BODY * a)
goto bailout;
}
goto bailout;
}
-
mutt_free_body
(&b);
+
body_list_wipe
(&b);
}
}
}
}
}
else {
}
}
}
}
}
else {
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
type);
return 1;
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
type);
return 1;
@@
-196,7
+191,7
@@
bailout:
if (unlink_newfile)
unlink (newfile);
if (unlink_newfile)
unlink (newfile);
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
return rc;
}
return rc;
}
@@
-214,7
+209,7
@@
int mutt_edit_attachment (BODY * a)
char type[STRING];
char command[STRING];
char newfile[_POSIX_PATH_MAX] = "";
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;
short unlink_newfile = 0;
int rc = 0;
@@
-225,8
+220,7
@@
int mutt_edit_attachment (BODY * a)
m_strcpy(command, sizeof(command), entry->editcommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (newfile))) {
m_strcpy(command, sizeof(command), entry->editcommand);
if (rfc1524_expand_filename (entry->nametemplate,
a->filename, newfile, sizeof (newfile))) {
- debug_print (1, ("oldfile: %s\t newfile: %s\n", a->filename, newfile));
- if (safe_symlink (a->filename, newfile) == -1) {
+ if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
goto bailout;
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES)
goto bailout;
@@
-257,7
+251,7
@@
int mutt_edit_attachment (BODY * a)
mutt_edit_file (NONULL (Editor), a->filename);
}
else {
mutt_edit_file (NONULL (Editor), a->filename);
}
else {
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
mutt_error (_("No mailcap edit entry for %s"), type);
return 0;
}
mutt_error (_("No mailcap edit entry for %s"), type);
return 0;
}
@@
-269,7
+263,7
@@
bailout:
if (unlink_newfile)
unlink (newfile);
if (unlink_newfile)
unlink (newfile);
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
return rc;
}
return rc;
}
@@
-313,7
+307,7
@@
static int is_mmnoask (const char *buf)
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) {
int i;
for (; t; t = t->next) {
@@
-337,7
+331,6
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
n == TYPEMULTIPART ? "multipart" :
n == TYPETEXT ? "text" :
n == TYPEVIDEO ? "video" : "other", tmp.subtype);
n == TYPEMULTIPART ? "multipart" :
n == TYPETEXT ? "text" :
n == TYPEVIDEO ? "video" : "other", tmp.subtype);
- debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
p_delete(&tmp.subtype);
}
if (tmp.subtype)
p_delete(&tmp.subtype);
@@
-349,7
+342,7
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
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;
char _type[SHORT_STRING];
int i;
@@
-361,7
+354,7
@@
int mutt_is_autoview (BODY * b, const char *type)
mutt_check_lookup_list (b, _type, sizeof (_type));
type = _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 (option (OPTIMPLICITAUTOVIEW))
return 1;
@@
-403,15
+396,15
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||
!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) {
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
if (use_mailcap) {
- entry = rfc1524_
new_entry
();
+ entry = rfc1524_
entry_new
();
if (!rfc1524_mailcap_lookup (a, type, entry, 0)) {
if (flag == M_REGULAR) {
/* fallback to view as text */
if (!rfc1524_mailcap_lookup (a, type, entry, 0)) {
if (flag == M_REGULAR) {
/* fallback to view as text */
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
mutt_error _("No matching mailcap entry found. Viewing as text.");
flag = M_AS_TEXT;
mutt_error _("No matching mailcap entry found. Viewing as text.");
flag = M_AS_TEXT;
@@
-590,7
+583,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
return_error:
if (entry)
return_error:
if (entry)
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
if (fp && tempfile[0])
mutt_unlink (tempfile);
else if (unlink_tempfile)
if (fp && tempfile[0])
mutt_unlink (tempfile);
else if (unlink_tempfile)
@@
-897,9
+890,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
rfc1524_entry *entry;
int piped = FALSE;
rfc1524_entry *entry;
int piped = FALSE;
- debug_print (2, ("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))) {
rfc1524_mailcap_lookup (a, type, entry, M_PRINT);
if (rfc1524_expand_filename (entry->nametemplate, a->filename,
newfile, sizeof (newfile))) {
@@
-907,7
+898,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES) {
if (safe_symlink (a->filename, newfile) == -1) {
if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES)
!= M_YES) {
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
return 0;
}
m_strcpy(newfile, sizeof(newfile), a->filename);
return 0;
}
m_strcpy(newfile, sizeof(newfile), a->filename);
@@
-931,14
+922,14
@@
int mutt_print_attachment (FILE * fp, BODY * a)
if (piped) {
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
if (piped) {
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
return (0);
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
mutt_perror (_("Can't create filter"));
return (0);
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
mutt_perror (_("Can't create filter"));
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
safe_fclose (&ifp);
return 0;
}
safe_fclose (&ifp);
return 0;
}
@@
-958,7
+949,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
else if (unlink_newfile)
unlink (newfile);
else if (unlink_newfile)
unlink (newfile);
- rfc1524_
free_entry
(&entry);
+ rfc1524_
entry_delete
(&entry);
return (1);
}
return (1);
}
@@
-977,16
+968,11
@@
int mutt_print_attachment (FILE * fp, BODY * a)
mutt_mktemp (newfile);
if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
mutt_mktemp (newfile);
if (mutt_decode_save_attachment (fp, a, newfile, M_PRINTING, 0) == 0) {
- debug_print (2, ("successfully decoded %s type attachment to %s\n",
- type, newfile));
-
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
goto bail0;
}
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
goto bail0;
}
- 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_endwin (NULL);
if ((thepid =
mutt_create_filter (NONULL (PrintCmd), &fpout, NULL, NULL)) < 0) {
@@
-995,8
+981,6
@@
int mutt_print_attachment (FILE * fp, BODY * a)
goto bail0;
}
goto bail0;
}
- debug_print (2, ("Filter created.\n"));
-
mutt_copy_stream (ifp, fpout);
safe_fclose (&fpout);
mutt_copy_stream (ifp, fpout);
safe_fclose (&fpout);