}
path[0] = '\0';
- strfcpy (path, val, sizeof(path));
+ m_strcpy(path, sizeof(path), val);
mutt_expand_path (path, sizeof(path));
str_replace ((char **) dst->data, path);
return (1);
/* Insist on at least one parameter */
if (!MoreArgs (s)) {
if (data == M_SPAM)
- strfcpy (err->data, _("spam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("spam: no matching pattern"));
else
- strfcpy (err->data, _("nospam: no matching pattern"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("nospam: no matching pattern"));
return -1;
}
}
/* This should not happen. */
- strfcpy (err->data, "This is no good at all.", err->dsize);
+ m_strcpy(err->data, err->dsize, "This is no good at all.");
return -1;
}
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
- strfcpy(err->data, _("attachments: no disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("attachments: no disposition"));
return -1;
}
else
listp = &InlineExclude;
} else {
- strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("attachments: invalid disposition"));
return -1;
}
mutt_extract_token(buf, s, 0);
if (!buf->data || *buf->data == '\0') {
- strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("unattachments: no disposition"));
return -1;
}
listp = &InlineExclude;
}
else {
- strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition"));
return -1;
}
char *estr = NULL;
if (!MoreArgs (s)) {
- strfcpy (err->data, _("alias: no address"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("alias: no address"));
return (-1);
}
mutt_extract_token (buf, s, M_TOKEN_SPACE | M_TOKEN_QUOTE);
if ((p = strpbrk (buf->data, ": \t")) == NULL || *p != ':') {
- strfcpy (err->data, _("invalid header field"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("invalid header field"));
return (-1);
}
keylen = p - buf->data + 1;
snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
return (-1);
}
- SKIPWS (s->dptr);
+ s->dptr = vskipspaces(s->dptr);
if (reset) {
if (query || unset || inv) {
return (-1);
}
- strfcpy (path, tmp->data, sizeof(path));
+ m_strcpy(path, sizeof(path), tmp->data);
mutt_expand_path (path, sizeof(path));
rc += source_rc (path, err);
debug_print (1, ("expand '%s'\n", line));
- SKIPWS (expn.dptr);
+ expn.dptr = vskipspaces(expn.dptr);
while (*expn.dptr) {
if (*expn.dptr == '#')
break; /* rest of line is a comment */
if (strstr (src, try) == src) {
Matches[Num_matched++] = src;
if (dest[0] == 0)
- strfcpy (dest, src, len);
+ m_strcpy(dest, len, src);
else {
for (l = 0; src[l] && src[l] == dest[l]; l++);
dest[l] = 0;
int num;
int spaces; /* keep track of the number of leading spaces on the line */
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
p_clear(Matches, sizeof(Matches));
p_clear(Completed, sizeof(Completed));
for (num = 0; Commands[num].name; num++)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
p_clear(Matches, sizeof(Matches));
p_clear(Completed, sizeof(Completed));
for (num = 0; MuttVars[num].option; num++)
/* first TAB. Collect all the matches */
if (numtabs == 1) {
Num_matched = 0;
- strfcpy (User_typed, pt, sizeof(User_typed));
+ m_strcpy(User_typed, sizeof(User_typed), pt);
p_clear(Matches, sizeof(Matches));
p_clear(Completed, sizeof(Completed));
for (num = 0; menu[num].name; num++)
if (buffer[0] == 0)
return 0;
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
return 0;
if (m_strncmp(buffer, "set", 3) == 0) {
- strfcpy (var, pt, sizeof(var));
+ m_strcpy(var, sizeof(var), pt);
/* ignore the trailing '=' when comparing */
var[m_strlen(var) - 1] = 0;
if (!(option = hash_find (ConfigOptions, var)))
if ((DTYPE (option->type) == DT_STR) ||
(DTYPE (option->type) == DT_PATH) ||
(DTYPE (option->type) == DT_RX)) {
- strfcpy (tmp, NONULL (*((char **) option->data)), sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(*((char **)option->data)));
if (DTYPE (option->type) == DT_PATH)
mutt_pretty_mailbox (tmp);
}
*((ADDRESS **) option->data), 0);
}
else if (DTYPE (option->type) == DT_QUAD)
- strfcpy (tmp, vals[quadoption (option->data)], sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), vals[quadoption(option->data)]);
else if (DTYPE (option->type) == DT_NUM)
snprintf (tmp, sizeof(tmp), "%d", (*((short *) option->data)));
else if (DTYPE (option->type) == DT_SORT) {
default:
p = "unknown";
}
- strfcpy (tmp, p, sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
}
else if (DTYPE (option->type) == DT_BOOL)
- strfcpy (tmp, option (option->data) ? "yes" : "no",
- sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), option(option->data) ? "yes" : "no");
else
return 0;
}
*d = '\0';
- strfcpy (tmp, pt, sizeof(tmp));
+ m_strcpy(tmp, sizeof(tmp), pt);
snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2);
return 1;
if ((p = strchr (utsname.nodename, '.'))) {
Hostname = str_substrdup (utsname.nodename, p);
p++;
- strfcpy (buffer, p, sizeof(buffer)); /* save the domain for below */
+ m_strcpy(buffer, sizeof(buffer), p); /* save the domain for below */
}
else
Hostname = m_strdup(utsname.nodename);
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
fgets (buffer, sizeof(buffer), f);
- p = buffer;
- SKIPWS (p);
+ p = vskipspaces(buffer);
q = (char*)p;
while (*q && !isspace(*q))
q++;
Muttrc = m_strdup(buffer);
}
else {
- strfcpy (buffer, Muttrc, sizeof(buffer));
+ m_strcpy(buffer, sizeof(buffer), Muttrc);
p_delete(&Muttrc);
mutt_expand_path (buffer, sizeof(buffer));
Muttrc = m_strdup(buffer);