projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop the old string API fully.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
0a199b1
..
13749ce
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-25,10
+25,13
@@
#include <lib-lib/file.h>
#include "mutt.h"
#include <lib-lib/file.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"
@@
-281,12
+284,6
@@
static void show_version (void)
#else
"-USE_DOTLOCK "
#endif
#else
"-USE_DOTLOCK "
#endif
-#ifdef DL_STANDALONE
- "+DL_STANDALONE "
-#else
- "-DL_STANDALONE "
-#endif
- "\n "
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
@@
-628,7
+625,7
@@
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':
@@
-785,7
+782,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))) {
@@
-1005,8
+1002,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 */