diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-11-19 13:55:46 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-11-19 13:55:46 +0100 |
| commit | 3bc4fc5857e2daba601442f95771a590bce915bc (patch) | |
| tree | 9ba4897cd937b33d33860945f9655fb9d37170b7 /mailutils/makemime.c | |
| parent | 578b8171511f67a9c2afc5c6ae9745de9f9b5e42 (diff) | |
| download | busybox-w32-3bc4fc5857e2daba601442f95771a590bce915bc.tar.gz busybox-w32-3bc4fc5857e2daba601442f95771a590bce915bc.tar.bz2 busybox-w32-3bc4fc5857e2daba601442f95771a590bce915bc.zip | |
makemime: content-type should default to application/octet-stream
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'mailutils/makemime.c')
| -rw-r--r-- | mailutils/makemime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mailutils/makemime.c b/mailutils/makemime.c index a9ff03d03..f1ef602a4 100644 --- a/mailutils/makemime.c +++ b/mailutils/makemime.c | |||
| @@ -146,6 +146,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |||
| 146 | { | 146 | { |
| 147 | llist_t *opt_headers = NULL, *l; | 147 | llist_t *opt_headers = NULL, *l; |
| 148 | const char *opt_output; | 148 | const char *opt_output; |
| 149 | const char *content_type = "application/octet-stream"; | ||
| 149 | #define boundary opt_output | 150 | #define boundary opt_output |
| 150 | 151 | ||
| 151 | enum { | 152 | enum { |
| @@ -165,7 +166,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |||
| 165 | opt_complementary = "a::"; | 166 | opt_complementary = "a::"; |
| 166 | opts = getopt32(argv, | 167 | opts = getopt32(argv, |
| 167 | "c:e:o:C:N:a:", //:m:j:", | 168 | "c:e:o:C:N:a:", //:m:j:", |
| 168 | &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL | 169 | &content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL |
| 169 | ); | 170 | ); |
| 170 | //argc -= optind; | 171 | //argc -= optind; |
| 171 | argv += optind; | 172 | argv += optind; |
| @@ -202,7 +203,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |||
| 202 | "Content-Disposition: inline; filename=\"%s\"\n" | 203 | "Content-Disposition: inline; filename=\"%s\"\n" |
| 203 | "Content-Transfer-Encoding: base64\n" | 204 | "Content-Transfer-Encoding: base64\n" |
| 204 | , boundary | 205 | , boundary |
| 205 | , G.content_type | 206 | , content_type |
| 206 | , G.opt_charset | 207 | , G.opt_charset |
| 207 | , bb_get_last_path_component_strip(*argv) | 208 | , bb_get_last_path_component_strip(*argv) |
| 208 | ); | 209 | ); |