diff options
Diffstat (limited to 'src/mail.c')
-rw-r--r-- | src/mail.c | 68 |
1 files changed, 23 insertions, 45 deletions
@@ -273,8 +273,6 @@ mail_send_message (mu_address_t rcpt, const char *text, mu_stream_t stream = NULL; mu_header_t hdr; static char *x_mailer = "wydawca (" PACKAGE_STRING ")"; - size_t size; - char *buf; const char *sval; mu_static_memory_stream_create (&stream, text, strlen (text)); @@ -290,20 +288,15 @@ mail_send_message (mu_address_t rcpt, const char *text, if (rcpt) { - mu_address_to_string (rcpt, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - - mu_header_set_value (hdr, "To", buf, 1); - free (buf); - + const char *s; + + if (mu_address_sget_printable (rcpt, &s) == 0) + mu_header_set_value (hdr, "To", s, 1); + if (from_address && mu_header_sget_value (hdr, "From", &sval)) { - mu_address_to_string (from_address, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (from_address, buf, size + 1, NULL); - mu_header_set_value (hdr, "From", buf, 1); - free (buf); + if (mu_address_sget_printable (from_address, &s) == 0) + mu_header_set_value (hdr, "From", s, 1); } } @@ -431,13 +424,10 @@ mail_stats () if (debug_level) { - size_t size; - char *buf; - mu_address_to_string (admin_address, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (admin_address, buf, size + 1, NULL); - logmsg (LOG_DEBUG, _("sending stats to %s"), buf); - free (buf); + const char *s; + + if (mu_address_sget_printable (admin_address, &s) == 0) + logmsg (LOG_DEBUG, _("sending stats to %s"), s); } tc = timer_get_count () * 3; @@ -595,14 +585,11 @@ do_notify (struct file_triplet *trp, enum notification_event ev, { if (rcpt) { - size_t size; - char *buf; - mu_address_to_string (rcpt, NULL, 0, &size); - buf = grecs_malloc (size + 1); - mu_address_to_string (rcpt, buf, size + 1, NULL); - logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), - buf, trp->project, notification_event_str (ev)); - free (buf); + const char *s; + + if (mu_address_sget_printable (rcpt, &s) == 0) + logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), + s, trp->project, notification_event_str (ev)); } else logmsg (LOG_DEBUG, @@ -638,14 +625,8 @@ notify (struct notification *notification_list, const char * expand_email_admin (struct metadef *def, void *data) { - size_t size; - if (mu_address_to_string (admin_address, NULL, 0, &size) == 0) - { - size++; - def->storage = grecs_malloc (size); - mu_address_to_string (admin_address, def->storage, size, NULL); - def->value = def->storage; - } + if (mu_address_aget_printable (admin_address, &def->storage) == 0) + def->value = def->storage; else def->value = ""; return def->value; @@ -657,7 +638,6 @@ expand_email_owner (struct metadef *def, void *data) struct file_triplet *trp = data; mu_address_t addr; const char *errp; - size_t size; addr = get_recipient (trp->spool->dictionary[project_owner_dict], trp, &errp); @@ -667,16 +647,14 @@ expand_email_owner (struct metadef *def, void *data) trp->project, gettext (errp)); def->value = ""; } - else if (mu_address_to_string (addr, NULL, 0, &size) == 0) + else { - size++; - def->storage = grecs_malloc (size); - mu_address_to_string (addr, def->storage, size, NULL); - def->value = def->storage; + if (mu_address_aget_printable (addr, &def->storage) == 0) + def->value = def->storage; + else + def->value = ""; mu_address_destroy (&addr); } - else - def->value = ""; return def->value; } |