#endif
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include "lib/debug.h"
#include <dirent.h>
/* we can use '/' as a delimiter, imap_complete rewrites it */
if (*s == '=' || *s == '+' || *s == '!') {
const char *q = NONULL(*s == '!' ? Spoolfile : Maildir);
- mutt_concat_path (imap_path, q, s + 1, sizeof (imap_path));
+ mutt_concat_path(imap_path, sizeof(imap_path), q, s + 1);
}
else
strfcpy (imap_path, s, sizeof (imap_path));
char buf[_POSIX_PATH_MAX];
*p++ = 0;
- mutt_concat_path (buf, exp_dirpart, s + 1, sizeof (buf));
+ mutt_concat_path(buf, sizeof(buf), exp_dirpart, s + 1);
strfcpy (exp_dirpart, buf, sizeof (exp_dirpart));
snprintf (buf, sizeof (buf), "%s%s/", dirpart, s + 1);
strfcpy (dirpart, buf, sizeof (dirpart));
else {
*p = 0;
len = (size_t) (p - s);
- strncpy (dirpart, s, len);
+ memcpy(dirpart, s, len);
dirpart[len] = 0;
p++;
strfcpy (filepart, p, sizeof (filepart));
*/
if ((len = m_strlen(filepart)) == 0) {
while ((de = readdir (dirp)) != NULL) {
- if (str_cmp (".", de->d_name) != 0
- && str_cmp ("..", de->d_name) != 0) {
+ if (m_strcmp(".", de->d_name) != 0
+ && m_strcmp("..", de->d_name) != 0) {
strfcpy (filepart, de->d_name, sizeof (filepart));
init++;
break;
if (dirpart[0]) {
strfcpy (s, dirpart, slen);
- if (str_cmp ("/", dirpart) != 0 && dirpart[0] != '='
+ if (m_strcmp("/", dirpart) != 0 && dirpart[0] != '='
&& dirpart[0] != '+')
strfcpy (s + m_strlen(s), "/", slen - m_strlen(s));
strfcpy (s + m_strlen(s), filepart, slen - m_strlen(s));