X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=54899d85b667f6c28def0c8dc96e0ccb267487de;hp=916f7f002f4fa04b27115656dda8ccc27ab8f6e6;hb=86cf852af75aa1f893b25a5fd615ac1fdb1b6033;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/main.c b/main.c
index 916f7f0..54899d8 100644
--- 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/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_crypt.h"
 #include "mutt_idna.h"
 #include "xterm.h"
 
@@ -631,7 +635,7 @@ int main (int argc, char **argv)
       break;
 
     case 'f':
-      strfcpy (folder, optarg, sizeof (folder));
+      m_strcpy(folder, sizeof(folder), optarg);
       explicit_folder = 1;
       break;
 
@@ -816,7 +820,7 @@ int main (int argc, char **argv)
     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 */
@@ -880,12 +884,12 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (str_cmp ("-", infile) == 0)
+        if (m_strcmp("-", infile) == 0)
           fin = stdin;
         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))
@@ -992,7 +996,7 @@ int main (int argc, char **argv)
     }
 
     if (!folder[0])
-      strfcpy (folder, NONULL (Spoolfile), sizeof (folder));
+      m_strcpy(folder, sizeof(folder), NONULL(Spoolfile));
 
 #ifdef USE_NNTP
     if (option (OPTNEWS)) {