* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
#include <lib-lib/lib-lib.h>
+
#include <lib-sys/unix.h>
#include <lib-ui/menu.h>
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;
}
}
p_delete(&buf);
- fclose (fp);
+ m_fclose(&fp);
if (mutt_wait_filter (thepid)) {
if (!quiet)
mutt_error ("%s", msg);
static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
{
ENTRY *table = (ENTRY *) m->data;
- char buf2[SHORT_STRING], buf[SHORT_STRING] = "";
+ char buf2[STRING], buf[STRING] = "";
/* need a query format ... hard coded constants are not good */
while (FirstColumn + SecondColumn > 70) {
SecondColumn = QUERY_MIN_COLUMN_LENGHT;
}
- rfc822_write_address (buf, sizeof (buf), table[num].data->addr, 1);
+ rfc822_addrcat(buf, sizeof (buf), table[num].data->addr, 1);
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
tmpa = result_to_addr (results);
mutt_addrlist_to_local (tmpa);
buf[0] = '\0';
- rfc822_write_address (buf, buflen, tmpa, 0);
+ rfc822_addrcat(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
mutt_clear_error ();
return (0);
QUERY *queryp = NULL;
int i, done = 0;
int op;
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
mutt_addrlist_to_local (tmpa);
tagged = 1;
- rfc822_write_address (buf, buflen, tmpa, 0);
+ rfc822_addrcat(buf, buflen, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
address_t *tmpa = result_to_addr (QueryTable[i].data);
mutt_addrlist_to_local (tmpa);
- strcat (buf, ", "); /* __STRCAT_CHECKED__ */
- rfc822_write_address ((char *) buf + curpos + 1,
- buflen - curpos - 1, tmpa, 0);
+ m_strcat(buf, buflen, ", ");
+ rfc822_addrcat(buf + curpos + 1, buflen - curpos - 1, tmpa, 0);
curpos = m_strlen(buf);
address_list_wipe(&tmpa);
}
address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
mutt_addrlist_to_local (tmpa);
- rfc822_write_address (buf, buflen, tmpa, 0);
+ rfc822_addrcat(buf, buflen, tmpa, 0);
address_list_wipe(&tmpa);
}