#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
-#include "mapping.h"
#include "mutt_curses.h"
#include "history.h"
#include "keymap.h"
static void num_to_string (char* dst, size_t dstlen,
struct option_t* option) {
/* XXX puke */
- const char* fmt = (str_cmp (option->option, "umask") == 0) ?
+ const char* fmt = (m_strcmp(option->option, "umask") == 0) ?
"%s=%04o" : "%s=%d";
snprintf (dst, dstlen, fmt, option->option,
*((short*) option->data));
* if name starts with $folder, just strip it to keep hierarchy
* $folder=imap://host, path=imap://host/inbox/b -> inbox/b
*/
- if (Maildirlength > 0 && str_ncmp (CurrentFolder, Maildir,
+ if (Maildirlength > 0 && m_strncmp(CurrentFolder, Maildir,
Maildirlength) == 0 &&
m_strlen(CurrentFolder) > Maildirlength) {
val = CurrentFolder + Maildirlength;
}
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);
if (!dst)
return (0);
- if (option (OPTATTACHMSG) && !str_cmp (dst->option, "reply_regexp")) {
+ if (option (OPTATTACHMSG) && !m_strcmp(dst->option, "reply_regexp")) {
if (errbuf)
snprintf (errbuf, errlen,
"Operation not permitted when in attach-message mode.");
p = (rx_t*) dst->data;
/* something to do? */
- if (!val || !*val || (p->pattern && str_cmp (p->pattern, val) == 0))
+ if (!val || !*val || (p->pattern && m_strcmp(p->pattern, val) == 0))
return (1);
- if (str_cmp (dst->option, "mask") != 0)
+ if (m_strcmp(dst->option, "mask") != 0)
flags |= mutt_which_case (val);
s = (char*) val;
- if (str_cmp (dst->option, "mask") == 0 && *s == '!') {
+ if (m_strcmp(dst->option, "mask") == 0 && *s == '!') {
not = 1;
s++;
}
p->rx = rx;
p->not = not;
- if (str_cmp (dst->option, "reply_regexp") == 0)
+ if (m_strcmp(dst->option, "reply_regexp") == 0)
mutt_adjust_all_subjects ();
return (1);
spam = *list;
if (!spam)
return 0;
- if (spam->rx && !str_cmp (spam->rx->pattern, pat)) {
+ if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
*list = spam->next;
rx_free (&spam->rx);
p_delete(&spam->template);
prev = spam;
for (spam = prev->next; spam;) {
- if (!str_cmp (spam->rx->pattern, pat)) {
+ if (!m_strcmp(spam->rx->pattern, pat)) {
prev->next = spam->next;
rx_free (&spam->rx);
p_delete(&spam->template);
{
LIST *p, *last = NULL;
- if (str_cmp ("*", str) == 0)
+ if (m_strcmp("*", str) == 0)
mutt_free_list (l); /* ``unCMD *'' means delete all current entries */
else {
p = *l;
{
int i = 0;
- if (str_cmp ("*", str) == 0) {
+ if (m_strcmp("*", str) == 0) {
list_del (l, (list_del_t*) rx_free);
return (0);
}
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&Alternates, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnAlternates, buf->data, REG_ICASE, err) != 0)
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;
}
/* nospam only ever has one parameter. */
/* "*" is a special case. */
- if (!str_cmp (buf->data, "*")) {
+ if (!m_strcmp(buf->data, "*")) {
mutt_free_spam_list (&SpamList);
list_del (&NoSpamList, (list_del_t*) rx_free);
return 0;
}
/* 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;
}
/*
* Check for deletion of entire list
*/
- if (str_cmp (buf->data, "*") == 0) {
+ if (m_strcmp(buf->data, "*") == 0) {
mutt_free_list ((LIST **) data);
break;
}
a = p_new(ATTACH_MATCH, 1);
/* some cheap hacks that I expect to remove */
- if (!str_casecmp(buf->data, "any"))
+ if (!m_strcasecmp(buf->data, "any"))
a->major = m_strdup("*/.*");
- else if (!str_casecmp(buf->data, "none"))
+ else if (!m_strcasecmp(buf->data, "none"))
a->major = m_strdup("cheap_hack/this_should_never_match");
else
a->major = m_strdup(buf->data);
do {
mutt_extract_token (buf, s, 0);
- if (!str_casecmp(buf->data, "any"))
+ if (!m_strcasecmp(buf->data, "any"))
tmp = m_strdup("*/.*");
- else if (!str_casecmp(buf->data, "none"))
+ else if (!m_strcasecmp(buf->data, "none"))
tmp = m_strdup("cheap_hack/this_should_never_match");
else
tmp = m_strdup(buf->data);
a = (ATTACH_MATCH *)lp->data;
debug_print(5, ("parse_unattach_list: check %s/%s [%d] : %s/%s [%d]\n",
a->major, a->minor, a->major_int, tmp, minor, major));
- if (a->major_int == major && !str_casecmp(minor, a->minor)) {
+ if (a->major_int == major && !m_strcasecmp(minor, a->minor)) {
debug_print(5, ("parse_unattach_list: removed %s/%s [%d]\n",
a->major, a->minor, a->major_int));
regfree(&a->minor_rx);
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;
}
op = '+';
category--;
}
- if (!str_ncasecmp(category, "attachment", strlen(category))) {
+ if (!m_strncasecmp(category, "attachment", strlen(category))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!str_ncasecmp(category, "inline", strlen(category))) {
+ else if (!m_strncasecmp(category, "inline", strlen(category))) {
if (op == '+')
listp = &InlineAllow;
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;
}
op = '+';
p--;
}
- if (!str_ncasecmp(p, "attachment", strlen(p))) {
+ if (!m_strncasecmp(p, "attachment", strlen(p))) {
if (op == '+')
listp = &AttachAllow;
else
listp = &AttachExclude;
}
- else if (!str_ncasecmp(p, "inline", strlen(p))) {
+ else if (!m_strncasecmp(p, "inline", strlen(p))) {
if (op == '+')
listp = &InlineAllow;
else
listp = &InlineExclude;
}
else {
- strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
+ m_strcpy(err->data, err->dsize, _("unattachments: invalid disposition"));
return -1;
}
remove_from_rx_list (&SubscribedLists, buf->data);
remove_from_rx_list (&MailLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnMailLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
mutt_extract_token (buf, s, 0);
remove_from_rx_list (&SubscribedLists, buf->data);
- if (str_cmp (buf->data, "*") &&
+ if (m_strcmp(buf->data, "*") &&
add_to_rx_list (&UnSubscribedLists, buf->data, REG_ICASE, err) != 0)
return -1;
}
do {
mutt_extract_token (buf, s, 0);
- if (str_cmp ("*", buf->data) == 0) {
+ if (m_strcmp("*", buf->data) == 0) {
if (CurrentMenu == MENU_ALIAS) {
for (tmp = Aliases; tmp; tmp = tmp->next)
tmp->del = 1;
}
else
for (tmp = Aliases; tmp; tmp = tmp->next) {
- if (str_casecmp (buf->data, tmp->name) == 0) {
+ if (m_strcasecmp(buf->data, tmp->name) == 0) {
if (CurrentMenu == MENU_ALIAS) {
tmp->del = 1;
set_option (OPTFORCEREDRAWINDEX);
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);
}
/* check to see if an alias with this name already exists */
for (; tmp; tmp = tmp->next) {
- if (!str_casecmp (tmp->name, buf->data))
+ if (!m_strcasecmp(tmp->name, buf->data))
break;
last = tmp;
}
do {
mutt_extract_token (buf, s, 0);
- if (str_cmp ("*", buf->data) == 0)
+ if (m_strcmp("*", buf->data) == 0)
mutt_free_list (&UserHeader);
else {
tmp = UserHeader;
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;
char* errbuf, size_t errlen) {
int i, flags = 0;
- if (str_ncmp ("reverse-", s, 8) == 0) {
+ if (m_strncmp("reverse-", s, 8) == 0) {
s += 8;
flags = SORT_REVERSE;
}
- if (str_ncmp ("last-", s, 5) == 0) {
+ if (m_strncmp("last-", s, 5) == 0) {
s += 5;
flags |= SORT_LAST;
}
/* free()'s option_t* */
static void del_option (void* p) {
- struct option_t* ptr = (struct option_t*) p;
+ struct option_t *ptr = (struct option_t*) p;
char* s = (char*) ptr->data;
debug_print (1, ("removing option '%s' from table\n", NONULL (ptr->option)));
p_delete(&ptr->option);
static int check_dsn_return (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
char* val = (char*) p;
- if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
- str_ncmp (val, "full", 4) != 0) {
+ if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
+ m_strncmp(val, "full", 4) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
return (0);
return (1);
for (i = 0; i < list->length; i++)
- if (str_ncmp (list->data[i], "never", 5) != 0 &&
- str_ncmp (list->data[i], "failure", 7) != 0 &&
- str_ncmp (list->data[i], "delay", 5) != 0 &&
- str_ncmp (list->data[i], "success", 7) != 0) {
+ if (m_strncmp(list->data[i], "never", 5) != 0 &&
+ m_strncmp(list->data[i], "failure", 7) != 0 &&
+ m_strncmp(list->data[i], "delay", 5) != 0 &&
+ m_strncmp(list->data[i], "success", 7) != 0) {
if (errbuf)
snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
(char*) list->data[i], "dsn_notify");
int i = 0;
for (i = 0; SpecialVars[i].name; i++) {
- if (str_cmp (SpecialVars[i].name, name) == 0) {
+ if (m_strcmp(SpecialVars[i].name, name) == 0) {
return (SpecialVars[i].check (SpecialVars[i].name,
val, errbuf, errlen));
}
query = 1;
s->dptr++;
}
- else if (str_ncmp ("no", s->dptr, 2) == 0) {
+ else if (m_strncmp("no", s->dptr, 2) == 0) {
s->dptr += 2;
unset = !unset;
}
- else if (str_ncmp ("inv", s->dptr, 3) == 0) {
+ else if (m_strncmp("inv", s->dptr, 3) == 0) {
s->dptr += 3;
inv = !inv;
}
}
}
- if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
+ if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
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);
}
- if (!str_cmp ("all", tmp->data)) {
+ if (!m_strcmp("all", tmp->data)) {
if (CurrentMenu == MENU_PAGER) {
snprintf (err->data, err->dsize, _("Not available in this menu."));
return (-1);
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 */
}
mutt_extract_token (token, &expn, 0);
for (i = 0; Commands[i].name; i++) {
- if (!str_cmp (token->data, Commands[i].name)) {
+ if (!m_strcmp(token->data, Commands[i].name)) {
if (Commands[i].func (token, &expn, Commands[i].data, err) != 0)
goto finish;
break;
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++)
Matches[(numtabs - 2) % Num_matched]);
/* return the completed command */
- strncpy (buffer, Completed, len - spaces);
+ m_strcpy(buffer, len - spaces, Completed);
}
- else if (!str_ncmp (buffer, "set", 3)
- || !str_ncmp (buffer, "unset", 5)
- || !str_ncmp (buffer, "reset", 5)
- || !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
+ else if (!m_strncmp(buffer, "set", 3)
+ || !m_strncmp(buffer, "unset", 5)
+ || !m_strncmp(buffer, "reset", 5)
+ || !m_strncmp(buffer, "toggle", 6)) { /* complete variables */
const char *prefixes[] = { "no", "inv", "?", "&", NULL };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
- if (!str_ncmp (buffer, "set", 3)) {
+ if (!m_strncmp(buffer, "set", 3)) {
for (num = 0; prefixes[num]; num++) {
- if (!str_ncmp (pt, prefixes[num], m_strlen(prefixes[num]))) {
+ if (!m_strncmp(pt, prefixes[num], m_strlen(prefixes[num]))) {
pt += m_strlen(prefixes[num]);
break;
}
/* 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++)
snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
- else if (!str_ncmp (buffer, "exec", 4)) {
+ else if (!m_strncmp(buffer, "exec", 4)) {
struct binding_t *menu = km_get_table (CurrentMenu);
if (!menu && CurrentMenu != MENU_PAGER)
/* 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++)
snprintf (Completed, sizeof(Completed), "%s",
Matches[(numtabs - 2) % Num_matched]);
- strncpy (pt, Completed, buffer + len - pt - spaces);
+ m_strcpy(pt, buffer + len - pt - spaces, Completed);
}
else
return 0;
if (buffer[0] == 0)
return 0;
- SKIPWS (buffer);
+ buffer = vskipspaces(buffer);
spaces = buffer - pt;
pt = buffer + pos - spaces;
if (*pt == '=') /* abort if no var before the '=' */
return 0;
- if (str_ncmp (buffer, "set", 3) == 0) {
- strfcpy (var, pt, sizeof(var));
+ if (m_strncmp(buffer, "set", 3) == 0) {
+ 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;
return 0;
}
-const char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (map[i].value == val)
- return (map[i].name);
- return NULL;
-}
-
-int mutt_getvaluebyname (const char *name, const struct mapping_t *map)
-{
- int i;
-
- for (i = 0; map[i].name; i++)
- if (ascii_strcasecmp (map[i].name, name) == 0)
- return (map[i].value);
- return (-1);
-}
-
static int mutt_execute_commands (LIST * p)
{
BUFFER err, token;
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++;
Spoolfile = m_strdup(p);
else {
#ifdef HOMESPOOL
- mutt_concat_path (buffer, NONULL (Homedir), MAILPATH, sizeof(buffer));
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(Homedir), MAILPATH);
#else
- mutt_concat_path (buffer, MAILPATH, NONULL (Username), sizeof(buffer));
+ mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(Username));
#endif
Spoolfile = m_strdup(buffer);
}
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);
/* compare two option_t*'s for sorting -t/-T output */
static int opt_cmp (const void* a, const void* b) {
- return (str_cmp ((*(struct option_t**) a)->option,
+ return (m_strcmp((*(struct option_t**) a)->option,
(*(struct option_t**) b)->option));
}
return;
mutt_option_value (option->option, buf, sizeof(buf));
- if (str_cmp (buf, option->init) != 0)
+ if (m_strcmp(buf, option->init) != 0)
list_push_back (l, option);
}
projects / apps / madmutt.git / blobdiff