projects
/
mmh
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8cb5a3f
)
Added Content-Description header with the filename of the attachment, with attachform...
author
David Levine
<levinedl@acm.org>
Sat, 7 Jan 2012 16:03:35 +0000
(10:03 -0600)
committer
David Levine
<levinedl@acm.org>
Sat, 7 Jan 2012 16:03:35 +0000
(10:03 -0600)
man/send.man
patch
|
blob
|
history
uip/sendsbr.c
patch
|
blob
|
history
diff --git
a/man/send.man
b/man/send.man
index
ff191c4
..
d9158c8
100644
(file)
--- a/
man/send.man
+++ b/
man/send.man
@@
-116,7
+116,8
@@
includes the
.I x-unix-mode
attribute as noted above. A value of
.B 1
.I x-unix-mode
attribute as noted above. A value of
.B 1
-suppresses both that and the \*(lqContent-Description\*(rq header, and
+suppresses that, puts the file name in the
+\*(lqContent-Description\*(rq header, and
adds a \*(lqContent-Disposition\*(rq header. A value of
.B 2
adds the file
adds a \*(lqContent-Disposition\*(rq header. A value of
.B 2
adds the file
@@
-139,10
+140,12
@@
Content-Description: ASCII text
-attachformat 1:
Content-Type: text/plain; name="VERSION"; charset="us-ascii"
-attachformat 1:
Content-Type: text/plain; name="VERSION"; charset="us-ascii"
+Content-Description: VERSION
Content-Disposition: attachment; filename="VERSION"
-attachformat 2:
Content-Type: text/plain; name="VERSION"; charset="us-ascii"
Content-Disposition: attachment; filename="VERSION"
-attachformat 2:
Content-Type: text/plain; name="VERSION"; charset="us-ascii"
+Content-Description: VERSION
Content-Disposition: attachment; filename="VERSION"; modification-date="Mon, 19 Dec 2005 22:39:51 -0600"
.fi
.PP
Content-Disposition: attachment; filename="VERSION"; modification-date="Mon, 19 Dec 2005 22:39:51 -0600"
.fi
.PP
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
57ef007
..
110050d
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-500,9
+500,10
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
least. */
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
least. */
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
- /* Suppress Content-Id, insert simple Content-Disposition. */
+ /* Suppress Content-Id, insert simple Content-Disposition
+ and Content-Description with filename. */
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%s; name=\"%s\" <>{attachment}",
+ "#%1$s; name=\"%2$s\" <> [%2$s]{attachment}",
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
}
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
}
@@
-517,9
+518,9
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
/* Suppress Content-Id, insert Content-Disposition with
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
/* Suppress Content-Id, insert Content-Disposition with
- modification date. */
+ modification date and Content-Description wtih filename. */
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
+ "#%1$s; name=\"%2$s\" <>[%2$s]{attachment; modification-date=\"%3$s\"}",
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));