X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=0a199b1de25095c605e0194be416744815fe4d46;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hp=34359415cdb15ab0f8fc5da8022061055b2d7c6b;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57;p=apps%2Fmadmutt.git diff --git a/main.c b/main.c index 3435941..0a199b1 100644 --- a/main.c +++ b/main.c @@ -632,7 +632,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; @@ -817,7 +817,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 */ @@ -886,7 +886,7 @@ int main (int argc, char **argv) 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)) @@ -993,7 +993,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)) {