#endif
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include "lib/debug.h"
#include <dirent.h>
if (option (OPTNEWS)) {
LIST *l = CurrentNewsSrv->list;
- strfcpy (filepart, s, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), s);
/*
* special case to handle when there is no filepart yet.
NNTP_DATA *data = (NNTP_DATA *) l->data;
if (data && data->subscribed) {
- strfcpy (filepart, data->group, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), data->group);
init++;
l = l->next;
break;
NNTP_DATA *data = (NNTP_DATA *) l->data;
if (data && data->subscribed &&
- str_ncmp (data->group, filepart, len) == 0) {
+ m_strncmp(data->group, filepart, len) == 0) {
if (init) {
for (i = 0; filepart[i] && data->group[i]; i++) {
if (filepart[i] != data->group[i]) {
filepart[i] = 0;
}
else {
- strfcpy (filepart, data->group, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), data->group);
init = 1;
}
}
/* 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));
+ m_strcpy(imap_path, sizeof(imap_path), s);
if (mx_get_magic (imap_path) == M_IMAP)
return imap_complete (s, slen, imap_path);
dirpart[0] = *s;
dirpart[1] = 0;
if (*s == '!')
- strfcpy (exp_dirpart, NONULL (Spoolfile), sizeof (exp_dirpart));
+ m_strcpy(exp_dirpart, sizeof(exp_dirpart), NONULL(Spoolfile));
else
- strfcpy (exp_dirpart, NONULL (Maildir), sizeof (exp_dirpart));
+ m_strcpy(exp_dirpart, sizeof(exp_dirpart), NONULL(Maildir));
if ((p = strrchr (s, '/'))) {
char buf[_POSIX_PATH_MAX];
*p++ = 0;
- mutt_concat_path (buf, exp_dirpart, s + 1, sizeof (buf));
- strfcpy (exp_dirpart, buf, sizeof (exp_dirpart));
+ mutt_concat_path(buf, sizeof(buf), exp_dirpart, s + 1);
+ m_strcpy(exp_dirpart, sizeof(exp_dirpart), buf);
snprintf (buf, sizeof (buf), "%s%s/", dirpart, s + 1);
- strfcpy (dirpart, buf, sizeof (dirpart));
- strfcpy (filepart, p, sizeof (filepart));
+ m_strcpy(dirpart, sizeof(dirpart), buf);
+ m_strcpy(filepart, sizeof(filepart), p);
}
else
- strfcpy (filepart, s + 1, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), s + 1);
dirp = opendir (exp_dirpart);
}
else {
if ((p = strrchr (s, '/'))) {
if (p == s) { /* absolute path */
p = s + 1;
- strfcpy (dirpart, "/", sizeof (dirpart));
+ m_strcpy(dirpart, sizeof(dirpart), "/");
exp_dirpart[0] = 0;
- strfcpy (filepart, p, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), p);
dirp = opendir (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));
- strfcpy (exp_dirpart, dirpart, sizeof (exp_dirpart));
+ m_strcpy(filepart, sizeof(filepart), p);
+ m_strcpy(exp_dirpart, sizeof(exp_dirpart), dirpart);
mutt_expand_path (exp_dirpart, sizeof (exp_dirpart));
dirp = opendir (exp_dirpart);
}
else {
/* no directory name, so assume current directory. */
dirpart[0] = 0;
- strfcpy (filepart, s, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), s);
dirp = opendir (".");
}
}
while ((de = readdir (dirp)) != NULL) {
if (m_strcmp(".", de->d_name) != 0
&& m_strcmp("..", de->d_name) != 0) {
- strfcpy (filepart, de->d_name, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), de->d_name);
init++;
break;
}
}
while ((de = readdir (dirp)) != NULL) {
- if (str_ncmp (de->d_name, filepart, len) == 0) {
+ if (m_strncmp(de->d_name, filepart, len) == 0) {
if (init) {
for (i = 0; filepart[i] && de->d_name[i]; i++) {
if (filepart[i] != de->d_name[i]) {
char buf[_POSIX_PATH_MAX];
struct stat st;
- strfcpy (filepart, de->d_name, sizeof (filepart));
+ m_strcpy(filepart, sizeof(filepart), de->d_name);
/* check to see if it is a directory */
if (dirpart[0]) {
- strfcpy (buf, exp_dirpart, sizeof (buf));
- strfcpy (buf + m_strlen(buf), "/", sizeof (buf) - m_strlen(buf));
+ m_strcpy(buf, sizeof(buf), exp_dirpart);
+ m_strcpy(buf + m_strlen(buf), sizeof(buf) - m_strlen(buf), "/");
}
else
buf[0] = 0;
- strfcpy (buf + m_strlen(buf), filepart, sizeof (buf) - m_strlen(buf));
+ m_strcpy(buf + m_strlen(buf), sizeof(buf) - m_strlen(buf), filepart);
if (stat (buf, &st) != -1 && (st.st_mode & S_IFDIR))
- strfcpy (filepart + m_strlen(filepart), "/",
- sizeof (filepart) - m_strlen(filepart));
+ m_strcpy(filepart + m_strlen(filepart),
+ sizeof(filepart) - m_strlen(filepart), "/");
init = 1;
}
}
closedir (dirp);
if (dirpart[0]) {
- strfcpy (s, dirpart, slen);
+ m_strcpy(s, slen, dirpart);
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));
+ m_strcpy(s + m_strlen(s), slen - m_strlen(s), "/");
+ m_strcpy(s + m_strlen(s), slen - m_strlen(s), filepart);
}
else
- strfcpy (s, filepart, slen);
+ m_strcpy(s, slen, filepart);
return (init ? 0 : -1);
}