rfc1524_entry_init(entry);
}
} /* while (!found && (buf = mutt_read_line ())) */
- fclose (fp);
+ m_fclose(&fp);
error:
p_delete(&buf);
m_strcpy(newfile, nflen, oldfile);
}
else if (!oldfile) {
- mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
- }
- else { /* oldfile && nametemplate */
+ m_file_fmt(newfile, nflen, nametemplate, "mutt");
+ } else { /* oldfile && nametemplate */
/* first, compare everything left from the "%s"