3bc4fc585
Denys Vlasenko
2011-11-19
Subject
makemime: content-type should default to application/octet-stream
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
mailutils/mail.h+0 -7
| @@ -16,22 +16,15 @@ struct globals { | |
| char *pass; | |
| FILE *fp0; // initial stdin | |
| char *opt_charset; | |
| - | char *content_type; |
| }; | |
| #define G (*ptr_to_globals) | |
| #define timeout (G.timeout ) | |
| #define verbose (G.verbose ) | |
| #define opts (G.opts ) | |
| - | //#define user (G.user ) |
| - | //#define pass (G.pass ) |
| - | //#define fp0 (G.fp0 ) |
| - | //#define opt_charset (G.opt_charset) |
| - | //#define content_type (G.content_type) |
| #define INIT_G() do { \ | |
| SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ | |
| G.opt_charset = (char *)CONFIG_FEATURE_MIME_CHARSET; \ | |
| - | G.content_type = (char *)"text/plain"; \ |
| } while (0) | |
| //char FAST_FUNC *parse_url(char *url, char **user, char **pass); | |
mailutils/makemime.c+3 -2
| @@ -146,6 +146,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |
| { | |
| llist_t *opt_headers = NULL, *l; | |
| const char *opt_output; | |
| + | const char *content_type = "application/octet-stream"; |
| #define boundary opt_output | |
| enum { | |
| @@ -165,7 +166,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |
| opt_complementary = "a::"; | |
| opts = getopt32(argv, | |
| "c:e:o:C:N:a:", //:m:j:", | |
| - | &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL |
| + | &content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL |
| ); | |
| //argc -= optind; | |
| argv += optind; | |
| @@ -202,7 +203,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |
| "Content-Disposition: inline; filename=\"%s\"\n" | |
| "Content-Transfer-Encoding: base64\n" | |
| , boundary | |
| - | , G.content_type |
| + | , content_type |
| , G.opt_charset | |
| , bb_get_last_path_component_strip(*argv) | |
| ); | |