#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
-#include "mailbox.h"
#include "url.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
break;
case 'F':
- mutt_str_replace (&Muttrc, optarg);
+ str_replace (&Muttrc, optarg);
break;
case 'f':
if (infile || bodytext) {
if (infile) {
- if (mutt_strcmp ("-", infile) == 0)
+ if (safe_strcmp ("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
#endif
mutt_expand_path (folder, sizeof (folder));
- mutt_str_replace (&CurrentFolder, folder);
- mutt_str_replace (&LastFolder, folder);
+ str_replace (&CurrentFolder, folder);
+ str_replace (&LastFolder, folder);
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */