diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 12:24:50 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 12:24:50 +0100 |
| commit | 25b2680056454dc4761ba3b2efde7c3414738f8c (patch) | |
| tree | 5fc9e7fd30b948a8edba34df429224e9c887eea5 /mailutils/sendmail.c | |
| parent | 91e330a53fc8052addec941a9e1e6fcd4b68702b (diff) | |
mail: move "opts" from globals
function old new delta
popmaildir_main 812 823 +11
sendmail_main 1295 1301 +6
makemime_main 291 288 -3
parse 970 966 -4
reformime_main 107 100 -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/3 up/down: 17/-14) Total: 3 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'mailutils/sendmail.c')
| -rw-r--r-- | mailutils/sendmail.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index 1bdc1c300..4bb90d3e2 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c @@ -104,7 +104,7 @@ static void send_r_n(const char *s) { - if (verbose) + if (G.verbose) bb_error_msg("send:'%s'", s); printf("%s\r\n", s); } @@ -120,7 +120,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) // if code != -1 then checks whether the number equals the code // if not equal -> die saying msg while ((answer = xmalloc_fgetline(stdin)) != NULL) { - if (verbose) + if (G.verbose) bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer); if (strlen(answer) <= 3 || '-' != answer[3]) break; @@ -128,7 +128,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) } if (answer) { int n = atoi(answer); - if (timeout) + if (G.timeout) alarm(0); free(answer); if (-1 == code || n == code) { @@ -223,6 +223,7 @@ static void rcptto_list(const char *list) int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int sendmail_main(int argc UNUSED_PARAM, char **argv) { + unsigned opts; char *opt_connect; char *opt_from = NULL; char *s; @@ -276,7 +277,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) // -v is a counter, -H and -S are mutually exclusive, -a is a list "vv:H--S:S--H", &opt_from, NULL, - &timeout, &opt_connect, &opt_connect, &list, &verbose + &G.timeout, &opt_connect, &opt_connect, &list, &G.verbose ); //argc -= optind; argv += optind; |