projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix small bug from julien
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
66c5f7a
..
a2fad56
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-22,12
+22,16
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt.h"
+#include "mx.h"
+#include "buffy.h"
+#include "sort.h"
+#include "mutt_crypt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
-#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
@@
-627,11
+631,11
@@
int main (int argc, char **argv)
break;
case 'F':
break;
case 'F':
-
str_replace
(&Muttrc, optarg);
+
m_strreplace
(&Muttrc, optarg);
break;
case 'f':
break;
case 'f':
-
strfcpy (folder, optarg, sizeof (folder)
);
+
m_strcpy(folder, sizeof(folder), optarg
);
explicit_folder = 1;
break;
explicit_folder = 1;
break;
@@
-784,7
+788,7
@@
int main (int argc, char **argv)
if (alias_queries) {
int rv = 0;
if (alias_queries) {
int rv = 0;
-
ADDRESS
*a;
+
address_t
*a;
for (; alias_queries; alias_queries = alias_queries->next) {
if ((a = mutt_lookup_alias (alias_queries->data))) {
for (; alias_queries; alias_queries = alias_queries->next) {
if ((a = mutt_lookup_alias (alias_queries->data))) {
@@
-816,7
+820,7
@@
int main (int argc, char **argv)
char fpath[_POSIX_PATH_MAX];
char msg[STRING];
char fpath[_POSIX_PATH_MAX];
char msg[STRING];
-
strfcpy (fpath, Maildir, sizeof (fpath)
);
+
m_strcpy(fpath, sizeof(fpath), Maildir
);
mutt_expand_path (fpath, sizeof (fpath));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
mutt_expand_path (fpath, sizeof (fpath));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
@@
-885,7
+889,7
@@
int main (int argc, char **argv)
else {
char path[_POSIX_PATH_MAX];
else {
char path[_POSIX_PATH_MAX];
-
strfcpy (path, infile, sizeof (path)
);
+
m_strcpy(path, sizeof(path), infile
);
mutt_expand_path (path, sizeof (path));
if ((fin = fopen (path, "r")) == NULL) {
if (!option (OPTNOCURSES))
mutt_expand_path (path, sizeof (path));
if ((fin = fopen (path, "r")) == NULL) {
if (!option (OPTNOCURSES))
@@
-992,7
+996,7
@@
int main (int argc, char **argv)
}
if (!folder[0])
}
if (!folder[0])
-
strfcpy (folder, NONULL (Spoolfile), sizeof (folder
));
+
m_strcpy(folder, sizeof(folder), NONULL(Spoolfile
));
#ifdef USE_NNTP
if (option (OPTNEWS)) {
#ifdef USE_NNTP
if (option (OPTNEWS)) {
@@
-1004,8
+1008,8
@@
int main (int argc, char **argv)
#endif
mutt_expand_path (folder, sizeof (folder));
#endif
mutt_expand_path (folder, sizeof (folder));
-
str_replace
(&CurrentFolder, folder);
-
str_replace
(&LastFolder, folder);
+
m_strreplace
(&CurrentFolder, folder);
+
m_strreplace
(&LastFolder, folder);
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */