makemime: content-type should default to application/octet-stream

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/mailutils/mail.h b/mailutils/mail.h
index d1d783055a3b703b84d6e7fdacfc19ec14c190b4..fa0c5b3785be5a9345933828d4dbcbcb7e1d1280 100644 (file)
--- a/mailutils/mail.h
+++ b/mailutils/mail.h
@@ -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);

diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index a9ff03d030db4ebb9869eef638663fbc623f9d88..f1ef602a4951d18c8a5ef94b6bfff206983b3143 100644 (file)
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -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)
                );