projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further pop_mx_ng work
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
afae486
..
00df99c
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-12,7
+12,7
@@
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-ui/
curses
.h>
+#include <lib-ui/
lib-ui
.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
@@
-138,7
+138,7
@@
int mutt_compose_attachment (BODY * a)
/* Remove headers by copying out data to another file, then
* copying the file back */
fseeko (fp, b->offset, 0);
/* 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(
MC
ore.tmpdir), NULL);
+ tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (!tfp) {
mutt_perror (_("Failure to open file to strip headers."));
goto bailout;
if (!tfp) {
mutt_perror (_("Failure to open file to strip headers."));
goto bailout;
@@
-255,7
+255,7
@@
static int is_mmnoask (const char *buf)
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
if (m_strcmp(p, "1") == 0)
if ((p = getenv ("MM_NOASK")) != NULL && *p) {
if (m_strcmp(p, "1") == 0)
- return
(1)
;
+ return
1
;
m_strcpy(tmp, sizeof(tmp), p);
p = tmp;
m_strcpy(tmp, sizeof(tmp), p);
p = tmp;
@@
-264,22
+264,22
@@
static int is_mmnoask (const char *buf)
if ((q = strrchr (p, '/')) != NULL) {
if (*(q + 1) == '*') {
if (ascii_strncasecmp (buf, p, q - p) == 0)
if ((q = strrchr (p, '/')) != NULL) {
if (*(q + 1) == '*') {
if (ascii_strncasecmp (buf, p, q - p) == 0)
- return
(1)
;
+ return
1
;
} else {
if (ascii_strcasecmp (buf, p) == 0)
} else {
if (ascii_strcasecmp (buf, p) == 0)
- return
(1)
;
+ return
1
;
}
} else {
lng = m_strlen(p);
if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
}
} else {
lng = m_strlen(p);
if (buf[lng] == '/' && m_strncasecmp(buf, p, lng) == 0)
- return
(1)
;
+ return
1
;
}
p = NULL;
}
}
}
p = NULL;
}
}
- return
(0)
;
+ return
0
;
}
void mutt_check_lookup_list (BODY * b, char *type, int len)
}
void mutt_check_lookup_list (BODY * b, char *type, int len)
@@
-437,7
+437,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (use_pager) {
/* recv case */
if (use_pager) {
/* recv case */
- pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(
MC
ore.tmpdir),
+ pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(
mod_c
ore.tmpdir),
fp && !use_mailcap ? a->filename : NULL);
}
fp && !use_mailcap ? a->filename : NULL);
}
@@
-701,14
+701,14
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
if ((s.fpout = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
- return
(-1)
;
+ return
-1
;
}
fseeko ((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (m_fclose(&s.fpout) != 0) {
mutt_perror ("fclose");
}
fseeko ((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (m_fclose(&s.fpout) != 0) {
mutt_perror ("fclose");
- return
(-1)
;
+ return
-1
;
}
}
} else {
}
}
} else {
@@
-718,13
+718,13
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
if ((ofp = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
if ((ofp = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
- return
(-1)
;
+ return
-1
;
}
if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
m_fclose(&ofp);
}
if ((nfp = mutt_save_attachment_open (path, flags)) == NULL) {
mutt_perror ("fopen");
m_fclose(&ofp);
- return
(-1)
;
+ return
-1
;
}
if (mutt_copy_stream (ofp, nfp) == -1) {
}
if (mutt_copy_stream (ofp, nfp) == -1) {
@@
-732,7
+732,7
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
m_fclose(&ofp);
m_fclose(&nfp);
m_fclose(&ofp);
m_fclose(&nfp);
- return
(-1)
;
+ return
-1
;
}
m_fclose(&ofp);
m_fclose(&nfp);
}
m_fclose(&ofp);
m_fclose(&nfp);
@@
-757,7
+757,7
@@
int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
if (s.fpout == NULL) {
close(pathfd);
mutt_perror ("fopen");
if (s.fpout == NULL) {
close(pathfd);
mutt_perror ("fopen");
- return
(-1)
;
+ return
-1
;
}
if (fp == NULL) {
}
if (fp == NULL) {
@@
-768,12
+768,12
@@
int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
if (stat (m->filename, &st) == -1) {
mutt_perror ("stat");
m_fclose(&s.fpout);
if (stat (m->filename, &st) == -1) {
mutt_perror ("stat");
m_fclose(&s.fpout);
- return
(-1)
;
+ return
-1
;
}
if ((s.fpin = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
}
if ((s.fpin = fopen (m->filename, "r")) == NULL) {
mutt_perror ("fopen");
- return
(-1)
;
+ return
-1
;
}
saved_encoding = m->encoding;
}
saved_encoding = m->encoding;
@@
-808,7
+808,7
@@
int mutt_decode_save_attachment (FILE * fp, BODY * m, int pathfd,
m_fclose(&s.fpin);
}
m_fclose(&s.fpin);
}
- return
(0)
;
+ return
0
;
}
/* Ok, the difference between send and receive:
}
/* Ok, the difference between send and receive:
@@
-867,7
+867,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
rfc1524_entry_delete(&entry);
if ((ifp = fopen (newfile, "r")) == NULL) {
mutt_perror ("fopen");
rfc1524_entry_delete(&entry);
- return
(0)
;
+ return
0
;
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
}
if ((thepid = mutt_create_filter (command, &fpout, NULL, NULL)) < 0) {
@@
-894,7
+894,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
unlink (newfile);
rfc1524_entry_delete(&entry);
unlink (newfile);
rfc1524_entry_delete(&entry);
- return
(1)
;
+ return
1
;
}
tok = mime_which_token(type, -1);
}
tok = mime_which_token(type, -1);
@@
-911,7
+911,7
@@
int mutt_print_attachment (FILE * fp, BODY * a)
ifp = NULL;
fpout = NULL;
ifp = NULL;
fpout = NULL;
- newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(
MC
ore.tmpdir), NULL);
+ newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(
mod_c
ore.tmpdir), NULL);
if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
if ((ifp = fopen(newfile, "r")) == NULL) {
if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
if ((ifp = fopen(newfile, "r")) == NULL) {
@@
-956,7
+956,7
@@
int mutt_attach_check (HEADER* hdr) {
if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) ||
(fp = safe_fopen (hdr->content->filename, "r")) == NULL)
if (!hdr || !hdr->content || !((regex_t*) AttachRemindRegexp.rx) ||
(fp = safe_fopen (hdr->content->filename, "r")) == NULL)
- return
(0)
;
+ return
0
;
while (!found && fgets (buf, sizeof (buf), fp)) {
p = buf;
while (!found && fgets (buf, sizeof (buf), fp)) {
p = buf;
@@
-971,5
+971,5
@@
int mutt_attach_check (HEADER* hdr) {
}
m_fclose(&fp);
}
m_fclose(&fp);
- return
(found)
;
+ return
found
;
}
}