int l;
- mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
+ m_quotefile_fmt(cmd, sizeof (cmd), QueryCmd, s);
if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
return 0;
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
- strcat (buf, ", "); /* __STRCAT_CHECKED__ */
+ m_strcat(buf, buflen, ", ");
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
curpos = m_strlen(buf);