diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 12:34:25 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-17 12:34:25 +0100 |
commit | b6237c0657074e8a61b2123601df36389659b603 (patch) | |
tree | 29b0dedd34e238c187fb3c270bf2e4fc2f6522c1 /mailutils/sendmail.c | |
parent | 25b2680056454dc4761ba3b2efde7c3414738f8c (diff) | |
download | busybox-w32-b6237c0657074e8a61b2123601df36389659b603.tar.gz busybox-w32-b6237c0657074e8a61b2123601df36389659b603.tar.bz2 busybox-w32-b6237c0657074e8a61b2123601df36389659b603.zip |
mail: commonalize send_r_n()
function old new delta
send_mail_command 85 55 -30
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, 2 insertions, 7 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index 4bb90d3e2..1a01b7110 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c | |||
@@ -102,13 +102,6 @@ | |||
102 | // set to 0 to not limit | 102 | // set to 0 to not limit |
103 | #define MAX_HEADERS 256 | 103 | #define MAX_HEADERS 256 |
104 | 104 | ||
105 | static void send_r_n(const char *s) | ||
106 | { | ||
107 | if (G.verbose) | ||
108 | bb_error_msg("send:'%s'", s); | ||
109 | printf("%s\r\n", s); | ||
110 | } | ||
111 | |||
112 | static int smtp_checkp(const char *fmt, const char *param, int code) | 105 | static int smtp_checkp(const char *fmt, const char *param, int code) |
113 | { | 106 | { |
114 | char *answer; | 107 | char *answer; |
@@ -119,6 +112,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) | |||
119 | // if code = -1 then just return this number | 112 | // if code = -1 then just return this number |
120 | // if code != -1 then checks whether the number equals the code | 113 | // if code != -1 then checks whether the number equals the code |
121 | // if not equal -> die saying msg | 114 | // if not equal -> die saying msg |
115 | //FIXME: limit max len!!! | ||
122 | while ((answer = xmalloc_fgetline(stdin)) != NULL) { | 116 | while ((answer = xmalloc_fgetline(stdin)) != NULL) { |
123 | if (G.verbose) | 117 | if (G.verbose) |
124 | bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer); | 118 | bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer); |
@@ -426,6 +420,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) | |||
426 | // this means we scan stdin for To:, Cc:, Bcc: lines until an empty line | 420 | // this means we scan stdin for To:, Cc:, Bcc: lines until an empty line |
427 | // and then use the rest of stdin as message body | 421 | // and then use the rest of stdin as message body |
428 | code = 0; // set "analyze headers" mode | 422 | code = 0; // set "analyze headers" mode |
423 | //FIXME: limit max len!!! | ||
429 | while ((s = xmalloc_fgetline(G.fp0)) != NULL) { | 424 | while ((s = xmalloc_fgetline(G.fp0)) != NULL) { |
430 | dump: | 425 | dump: |
431 | // put message lines doubling leading dots | 426 | // put message lines doubling leading dots |