aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2013-02-25 00:45:09 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2013-03-18 18:45:14 +0100
commita8ba0a0d0ce4fa5f5afd0a8246e2378c2664c424 (patch)
tree60931edb0341043fa2ea624700fe32a7b89408dd
parent06ad964ae61591ef74313d7c1746367430d0d82b (diff)
downloadbusybox-a8ba0a0d0ce4fa5f5afd0a8246e2378c2664c424.tar.gz
sendmail: support address lists
Headers To:, Cc: and Bcc: may have a list of comma-separated addresses. Add support for that. Commas inside double quotes are ignored. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--mailutils/sendmail.c33
1 files changed, 29 insertions, 4 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 10a5a85d4..c5df5f5d3 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -144,6 +144,33 @@ static void rcptto(const char *s)
bb_error_msg("Bad recipient: <%s>", s);
}
+// send to a list of comma separated addresses
+static void rcptto_list(const char *_str)
+{
+ char *str = xstrdup(_str);
+ int len = strlen(str);
+ int in_quote = 0;
+ char *s = str;
+ char prev = 0;
+ int pos;
+
+ for (pos = 0; pos < len; pos++) {
+ char ch = str[pos];
+
+ if (ch == '"' && prev != '\\') {
+ in_quote = !in_quote;
+ } else if (!in_quote && ch == ',') {
+ str[pos] = '\0';
+ rcptto(angle_address(s));
+ s = str + pos + 1;
+ }
+ prev = ch;
+ }
+ if (prev != ',')
+ rcptto(angle_address(s));
+ free(str);
+}
+
int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int sendmail_main(int argc UNUSED_PARAM, char **argv)
{
@@ -317,14 +344,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// To: or Cc: headers add recipients
if (opts & OPT_t) {
if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
- char *r = xstrdup(s+3);
- rcptto(angle_address(r));
- free(r);
+ rcptto_list(s+3);
goto addheader;
}
// Bcc: header adds blind copy (hidden) recipient
if (0 == strncasecmp("Bcc:", s, 4)) {
- rcptto(angle_address(s+4));
+ rcptto_list(s+4);
free(s);
continue; // N.B. Bcc: vanishes from headers!
}