diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /mailutils/makemime.c | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'mailutils/makemime.c')
| -rw-r--r-- | mailutils/makemime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mailutils/makemime.c b/mailutils/makemime.c index 4dc53a3b2..a9ff03d03 100644 --- a/mailutils/makemime.c +++ b/mailutils/makemime.c | |||
| @@ -164,7 +164,7 @@ int makemime_main(int argc UNUSED_PARAM, char **argv) | |||
| 164 | // parse options | 164 | // parse options |
| 165 | opt_complementary = "a::"; | 165 | opt_complementary = "a::"; |
| 166 | opts = getopt32(argv, | 166 | opts = getopt32(argv, |
| 167 | "c:e:o:C:N:a", //:m:j:", | 167 | "c:e:o:C:N:a:", //:m:j:", |
| 168 | &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL | 168 | &G.content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL |
| 169 | ); | 169 | ); |
| 170 | //argc -= optind; | 170 | //argc -= optind; |