diff options
Diffstat (limited to 'mailutils/sendmail.c')
-rw-r--r-- | mailutils/sendmail.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index 346de2712..f440e6319 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c | |||
@@ -166,9 +166,8 @@ static char *angle_address(char *str) | |||
166 | { | 166 | { |
167 | char *s, *e; | 167 | char *s, *e; |
168 | 168 | ||
169 | trim(str); | 169 | e = trim(str); |
170 | e = last_char_is(str, '>'); | 170 | if (e != str && e[-1] == '>') { |
171 | if (e) { | ||
172 | s = strrchr(str, '<'); | 171 | s = strrchr(str, '<'); |
173 | if (s) { | 172 | if (s) { |
174 | *e = '\0'; | 173 | *e = '\0'; |
@@ -257,13 +256,17 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) | |||
257 | G.fp0 = xfdopen_for_read(3); | 256 | G.fp0 = xfdopen_for_read(3); |
258 | 257 | ||
259 | // parse options | 258 | // parse options |
260 | // -v is a counter, -H and -S are mutually exclusive, -a is a list | ||
261 | opt_complementary = "vv:H--S:S--H"; | ||
262 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect | 259 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect |
263 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, | 260 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, |
264 | // it is still under development. | 261 | // it is still under development. |
265 | opts = getopt32(argv, "tf:o:iw:+H:S:a:*:v", &opt_from, NULL, | 262 | opts = getopt32(argv, "^" |
266 | &timeout, &opt_connect, &opt_connect, &list, &verbose); | 263 | "tf:o:iw:+H:S:a:*:v" |
264 | "\0" | ||
265 | // -v is a counter, -H and -S are mutually exclusive, -a is a list | ||
266 | "vv:H--S:S--H", | ||
267 | &opt_from, NULL, | ||
268 | &timeout, &opt_connect, &opt_connect, &list, &verbose | ||
269 | ); | ||
267 | //argc -= optind; | 270 | //argc -= optind; |
268 | argv += optind; | 271 | argv += optind; |
269 | 272 | ||