diff options
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 @@ | |||
104 | 104 | ||
105 | static void send_r_n(const char *s) | 105 | static void send_r_n(const char *s) |
106 | { | 106 | { |
107 | if (verbose) | 107 | if (G.verbose) |
108 | bb_error_msg("send:'%s'", s); | 108 | bb_error_msg("send:'%s'", s); |
109 | printf("%s\r\n", s); | 109 | printf("%s\r\n", s); |
110 | } | 110 | } |
@@ -120,7 +120,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) | |||
120 | // if code != -1 then checks whether the number equals the code | 120 | // if code != -1 then checks whether the number equals the code |
121 | // if not equal -> die saying msg | 121 | // if not equal -> die saying msg |
122 | while ((answer = xmalloc_fgetline(stdin)) != NULL) { | 122 | while ((answer = xmalloc_fgetline(stdin)) != NULL) { |
123 | if (verbose) | 123 | if (G.verbose) |
124 | bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer); | 124 | bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer); |
125 | if (strlen(answer) <= 3 || '-' != answer[3]) | 125 | if (strlen(answer) <= 3 || '-' != answer[3]) |
126 | break; | 126 | break; |
@@ -128,7 +128,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) | |||
128 | } | 128 | } |
129 | if (answer) { | 129 | if (answer) { |
130 | int n = atoi(answer); | 130 | int n = atoi(answer); |
131 | if (timeout) | 131 | if (G.timeout) |
132 | alarm(0); | 132 | alarm(0); |
133 | free(answer); | 133 | free(answer); |
134 | if (-1 == code || n == code) { | 134 | if (-1 == code || n == code) { |
@@ -223,6 +223,7 @@ static void rcptto_list(const char *list) | |||
223 | int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 223 | int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
224 | int sendmail_main(int argc UNUSED_PARAM, char **argv) | 224 | int sendmail_main(int argc UNUSED_PARAM, char **argv) |
225 | { | 225 | { |
226 | unsigned opts; | ||
226 | char *opt_connect; | 227 | char *opt_connect; |
227 | char *opt_from = NULL; | 228 | char *opt_from = NULL; |
228 | char *s; | 229 | char *s; |
@@ -276,7 +277,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) | |||
276 | // -v is a counter, -H and -S are mutually exclusive, -a is a list | 277 | // -v is a counter, -H and -S are mutually exclusive, -a is a list |
277 | "vv:H--S:S--H", | 278 | "vv:H--S:S--H", |
278 | &opt_from, NULL, | 279 | &opt_from, NULL, |
279 | &timeout, &opt_connect, &opt_connect, &list, &verbose | 280 | &G.timeout, &opt_connect, &opt_connect, &list, &G.verbose |
280 | ); | 281 | ); |
281 | //argc -= optind; | 282 | //argc -= optind; |
282 | argv += optind; | 283 | argv += optind; |