X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=complete.c;h=1066b5c3a48e5fb0bbdb0c0c81c60e4543e46a8b;hp=8ff2dcece655e2201a2ab7aa9b14fdd303636f71;hb=1b7e35d0720400f2566023146257c0a3bf89ce87;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/complete.c b/complete.c index 8ff2dce..1066b5c 100644 --- a/complete.c +++ b/complete.c @@ -20,6 +20,8 @@ #include "nntp.h" #endif +#include "lib/str.h" + #include #include #include @@ -206,14 +208,14 @@ int mutt_complete (char *s, size_t slen) /* check to see if it is a directory */ if (dirpart[0]) { strfcpy (buf, exp_dirpart, sizeof (buf)); - strfcpy (buf + strlen (buf), "/", sizeof (buf) - strlen (buf)); + strfcpy (buf + mutt_strlen (buf), "/", sizeof (buf) - mutt_strlen (buf)); } else buf[0] = 0; - strfcpy (buf + strlen (buf), filepart, sizeof (buf) - strlen (buf)); + strfcpy (buf + mutt_strlen (buf), filepart, sizeof (buf) - mutt_strlen (buf)); if (stat (buf, &st) != -1 && (st.st_mode & S_IFDIR)) - strfcpy (filepart + strlen (filepart), "/", - sizeof (filepart) - strlen (filepart)); + strfcpy (filepart + mutt_strlen (filepart), "/", + sizeof (filepart) - mutt_strlen (filepart)); init = 1; } } @@ -224,8 +226,8 @@ int mutt_complete (char *s, size_t slen) strfcpy (s, dirpart, slen); if (mutt_strcmp ("/", dirpart) != 0 && dirpart[0] != '=' && dirpart[0] != '+') - strfcpy (s + strlen (s), "/", slen - strlen (s)); - strfcpy (s + strlen (s), filepart, slen - strlen (s)); + strfcpy (s + mutt_strlen (s), "/", slen - mutt_strlen (s)); + strfcpy (s + mutt_strlen (s), filepart, slen - mutt_strlen (s)); } else strfcpy (s, filepart, slen);